[Aptitude-devel] r3192 - in branches/aptitude-0.3/aptitude: . po
Daniel Burrows
dburrows at costa.debian.org
Mon Jul 18 15:58:14 UTC 2005
Author: dburrows
Date: Sat Apr 30 13:41:32 2005
New Revision: 3192
Modified:
branches/aptitude-0.3/aptitude/ChangeLog
branches/aptitude-0.3/aptitude/po/POTFILES.in
branches/aptitude-0.3/aptitude/po/aptitude.pot
branches/aptitude-0.3/aptitude/po/ar.po
branches/aptitude-0.3/aptitude/po/bs.po
branches/aptitude-0.3/aptitude/po/ca.po
branches/aptitude-0.3/aptitude/po/cs.po
branches/aptitude-0.3/aptitude/po/da.po
branches/aptitude-0.3/aptitude/po/de.po
branches/aptitude-0.3/aptitude/po/el.po
branches/aptitude-0.3/aptitude/po/es.po
branches/aptitude-0.3/aptitude/po/eu.po
branches/aptitude-0.3/aptitude/po/fi.po
branches/aptitude-0.3/aptitude/po/fr.po
branches/aptitude-0.3/aptitude/po/gl.po
branches/aptitude-0.3/aptitude/po/it.po
branches/aptitude-0.3/aptitude/po/ja.po
branches/aptitude-0.3/aptitude/po/lt.po
branches/aptitude-0.3/aptitude/po/nb.po
branches/aptitude-0.3/aptitude/po/nl.po
branches/aptitude-0.3/aptitude/po/nn.po
branches/aptitude-0.3/aptitude/po/pl.po
branches/aptitude-0.3/aptitude/po/pt.po
branches/aptitude-0.3/aptitude/po/pt_BR.po
branches/aptitude-0.3/aptitude/po/ro.po
branches/aptitude-0.3/aptitude/po/ru.po
branches/aptitude-0.3/aptitude/po/sk.po
branches/aptitude-0.3/aptitude/po/tr.po
branches/aptitude-0.3/aptitude/po/zh_CN.po
branches/aptitude-0.3/aptitude/po/zh_TW.po
Log:
pofile updates
Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog (original)
+++ branches/aptitude-0.3/aptitude/ChangeLog Sat Apr 30 13:41:32 2005
@@ -1,5 +1,10 @@
2005-04-29 Daniel Burrows <dburrows at debian.org>
+ * po/POTFILES.in, po/*.po:
+
+ Update POTFILES (oops, forgot to do that for a while) and run
+ 'make update-po'.
+
* src/cmdline/cmdline_resolver.cc:
Be less strict about obeying command-line instructions, to avoid
Modified: branches/aptitude-0.3/aptitude/po/POTFILES.in
==============================================================================
--- branches/aptitude-0.3/aptitude/po/POTFILES.in (original)
+++ branches/aptitude-0.3/aptitude/po/POTFILES.in Sat Apr 30 13:41:32 2005
@@ -5,6 +5,8 @@
src/aptitude.h
src/apt_options.cc
src/apt_options.h
+src/broken_indicator.cc
+src/broken_indicator.h
src/cmdline/cmdline_action.cc
src/cmdline/cmdline_action.h
src/cmdline/cmdline_changelog.cc
@@ -16,6 +18,8 @@
src/cmdline/cmdline_do_action.h
src/cmdline/cmdline_download.cc
src/cmdline/cmdline_download.h
+src/cmdline/cmdline_dump_resolver.cc
+src/cmdline/cmdline_dump_resolver.h
src/cmdline/cmdline_forget_new.cc
src/cmdline/cmdline_forget_new.h
src/cmdline/cmdline_moo.cc
@@ -24,6 +28,8 @@
src/cmdline/cmdline_progress.h
src/cmdline/cmdline_prompt.cc
src/cmdline/cmdline_prompt.h
+src/cmdline/cmdline_resolver.cc
+src/cmdline/cmdline_resolver.h
src/cmdline/cmdline_search.cc
src/cmdline/cmdline_search.h
src/cmdline/cmdline_show_broken.cc
@@ -68,6 +74,8 @@
src/generic/apt.h
src/generic/aptitudepolicy.cc
src/generic/aptitudepolicy.h
+src/generic/aptitude_resolver.cc
+src/generic/aptitude_resolver.h
src/generic/apt_undo_group.cc
src/generic/apt_undo_group.h
src/generic/config_signal.cc
@@ -83,6 +91,8 @@
src/generic/pkg_hier.cc
src/generic/pkg_hier_dump.cc
src/generic/pkg_hier.h
+src/generic/problemresolver/problemresolver.h
+src/generic/problemresolver/test.cc
src/generic/rev_dep_iterator.h
src/generic/strhash.h
src/generic/tasks.cc
@@ -126,6 +136,10 @@
src/pkg_view.h
src/reason_fragment.cc
src/reason_fragment.h
+src/solution_dialog.cc
+src/solution_dialog.h
+src/solution_fragment.cc
+src/solution_fragment.h
src/strhash.h
src/trust.cc
src/trust.h
@@ -144,6 +158,8 @@
src/vscreen/config/keybindings.h
src/vscreen/curses++.cc
src/vscreen/curses++.h
+src/vscreen/fragment_cache.cc
+src/vscreen/fragment_cache.h
src/vscreen/fragment.cc
src/vscreen/fragment_contents.h
src/vscreen/fragment.h
Modified: branches/aptitude-0.3/aptitude/po/aptitude.pot
==============================================================================
--- branches/aptitude-0.3/aptitude/po/aptitude.pot (original)
+++ branches/aptitude-0.3/aptitude/po/aptitude.pot Sat Apr 30 13:41:32 2005
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-01-10 16:26-0800\n"
+"POT-Creation-Date: 2005-04-29 18:11-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -147,16 +147,99 @@
msgstr ""
#: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:184 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
-#: src/vscreen/vs_util.cc:329
+#: src/ui.cc:218 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
+#: src/vscreen/vs_util.cc:328
msgid "Ok"
msgstr ""
#: src/apt_options.cc:242 src/download_list.cc:71 src/mine/cmine.cc:257
-#: src/mine/cmine.cc:330 src/vscreen/vs_util.cc:329
+#: src/mine/cmine.cc:330 src/vscreen/vs_util.cc:328
msgid "Cancel"
msgstr ""
+#: src/broken_indicator.cc:106 src/solution_dialog.cc:97
+msgid "Internal error: unexpected null solution."
+msgstr ""
+
+#: src/broken_indicator.cc:158
+msgid "Suggest "
+msgstr ""
+
+#: src/broken_indicator.cc:164
+#, c-format
+msgid "%d installs"
+msgstr ""
+
+#: src/broken_indicator.cc:169
+msgid "1 install"
+msgstr ""
+
+#: src/broken_indicator.cc:173
+#, c-format
+msgid "%d removals"
+msgstr ""
+
+#: src/broken_indicator.cc:178
+msgid "1 removal"
+msgstr ""
+
+#: src/broken_indicator.cc:182
+#, c-format
+msgid "%d keeps"
+msgstr ""
+
+#: src/broken_indicator.cc:187
+msgid "1 keep"
+msgstr ""
+
+#: src/broken_indicator.cc:191
+#, c-format
+msgid "%d upgrades"
+msgstr ""
+
+#: src/broken_indicator.cc:196
+msgid "1 upgrade"
+msgstr ""
+
+#: src/broken_indicator.cc:200
+#, c-format
+msgid "%d downgrades"
+msgstr ""
+
+#: src/broken_indicator.cc:205
+msgid "1 downgrade"
+msgstr ""
+
+#: src/broken_indicator.cc:214
+#, c-format
+msgid "%s: Examine"
+msgstr ""
+
+#: src/broken_indicator.cc:216
+#, c-format
+msgid "%s: Apply"
+msgstr ""
+
+#: src/broken_indicator.cc:218
+#, c-format
+msgid "%s: Next"
+msgstr ""
+
+#: src/broken_indicator.cc:220
+#, c-format
+msgid "%s: Previous"
+msgstr ""
+
+#: src/broken_indicator.cc:233
+#, c-format
+msgid "%CSolution search failed. %s: try harder"
+msgstr ""
+
+#: src/broken_indicator.cc:239
+#, c-format
+msgid "%CUnable to resolve dependencies."
+msgstr ""
+
#: src/cmdline/cmdline_action.cc:36
#, c-format
msgid ""
@@ -220,48 +303,48 @@
msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
msgstr ""
-#: src/cmdline/cmdline_action.cc:213
+#: src/cmdline/cmdline_action.cc:198
#, c-format
msgid "Note: selecting the task \"%s: %s\" for installation\n"
msgstr ""
-#: src/cmdline/cmdline_action.cc:240
+#: src/cmdline/cmdline_action.cc:225
#, c-format
msgid "You can only specify a package version with an 'install' command.\n"
msgstr ""
-#: src/cmdline/cmdline_action.cc:246
+#: src/cmdline/cmdline_action.cc:231
#, c-format
msgid "You can only specify a package archive with an 'install' command.\n"
msgstr ""
-#: src/cmdline/cmdline_action.cc:280
+#: src/cmdline/cmdline_action.cc:265
#, c-format
msgid ""
"Couldn't find package \"%s\", and more than 40\n"
"packages contain \"%s\" in their name.\n"
msgstr ""
-#: src/cmdline/cmdline_action.cc:283
+#: src/cmdline/cmdline_action.cc:268
#, c-format
msgid ""
"Couldn't find package \"%s\". However, the following\n"
"packages contain \"%s\" in their name:\n"
msgstr ""
-#: src/cmdline/cmdline_action.cc:307
+#: src/cmdline/cmdline_action.cc:292
#, c-format
msgid "Couldn't find any package whose name or description matched \"%s\"\n"
msgstr ""
-#: src/cmdline/cmdline_action.cc:309
+#: src/cmdline/cmdline_action.cc:294
#, c-format
msgid ""
"Couldn't find any package matching \"%s\", and more than 40\n"
"packages contain \"%s\" in their description.\n"
msgstr ""
-#: src/cmdline/cmdline_action.cc:312
+#: src/cmdline/cmdline_action.cc:297
#, c-format
msgid ""
"Couldn't find any package matching \"%s\". However, the following\n"
@@ -302,13 +385,13 @@
msgid "Freed %sB of disk space\n"
msgstr ""
-#: src/cmdline/cmdline_do_action.cc:67
+#: src/cmdline/cmdline_do_action.cc:71
#, c-format
msgid "Invalid operation %s"
msgstr ""
-#: src/cmdline/cmdline_do_action.cc:206 src/cmdline/cmdline_simulate.cc:30
-#: src/cmdline/cmdline_upgrade.cc:89
+#: src/cmdline/cmdline_do_action.cc:201 src/cmdline/cmdline_simulate.cc:31
+#: src/cmdline/cmdline_upgrade.cc:91
#, c-format
msgid "Abort.\n"
msgstr ""
@@ -318,7 +401,7 @@
msgid "download: you must specify at least one package to download\n"
msgstr ""
-#: src/cmdline/cmdline_download.cc:43 src/download.cc:342
+#: src/cmdline/cmdline_download.cc:43 src/download.cc:344
msgid "Couldn't read source list"
msgstr ""
@@ -380,191 +463,193 @@
msgid "What is it? It's an elephant being eaten by a snake, of course.\n"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:44
+#: src/cmdline/cmdline_prompt.cc:45
msgid "Couldn't read list of sources"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:219 src/cmdline/cmdline_show_broken.cc:73
+#: src/cmdline/cmdline_prompt.cc:220 src/cmdline/cmdline_show_broken.cc:73
#, c-format
msgid "but %s is to be installed."
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:222 src/cmdline/cmdline_show_broken.cc:76
+#: src/cmdline/cmdline_prompt.cc:223 src/cmdline/cmdline_show_broken.cc:76
#, c-format
msgid "but %s is installed and it is kept back."
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:225 src/cmdline/cmdline_show_broken.cc:79
+#: src/cmdline/cmdline_prompt.cc:226 src/cmdline/cmdline_show_broken.cc:79
#, c-format
msgid "but %s is installed."
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:229 src/cmdline/cmdline_show_broken.cc:83
+#: src/cmdline/cmdline_prompt.cc:230 src/cmdline/cmdline_show_broken.cc:83
#, c-format
msgid "but it is not installable"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:233 src/cmdline/cmdline_show_broken.cc:87
+#: src/cmdline/cmdline_prompt.cc:234 src/cmdline/cmdline_show_broken.cc:87
#, c-format
msgid " which is a virtual package."
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:236 src/cmdline/cmdline_show_broken.cc:90
+#: src/cmdline/cmdline_prompt.cc:237 src/cmdline/cmdline_show_broken.cc:90
#, c-format
msgid " or"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:248
+#: src/cmdline/cmdline_prompt.cc:249
msgid "The following packages are BROKEN:"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:249
+#: src/cmdline/cmdline_prompt.cc:250
msgid "The following packages are unused and will be REMOVED:"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:250
+#: src/cmdline/cmdline_prompt.cc:251
msgid "The following packages have been automatically kept back:"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:251
+#: src/cmdline/cmdline_prompt.cc:252
msgid "The following NEW packages will be automatically installed:"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:252
+#: src/cmdline/cmdline_prompt.cc:253
msgid "The following packages will be automatically REMOVED:"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:253
+#: src/cmdline/cmdline_prompt.cc:254
msgid "The following packages will be DOWNGRADED:"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:254
+#: src/cmdline/cmdline_prompt.cc:255
msgid "The following packages have been kept back:"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:255
+#: src/cmdline/cmdline_prompt.cc:256
msgid "The following packages will be REINSTALLED:"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:256
+#: src/cmdline/cmdline_prompt.cc:257
msgid "The following NEW packages will be installed:"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:257
+#: src/cmdline/cmdline_prompt.cc:258
msgid "The following packages will be REMOVED:"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:258
+#: src/cmdline/cmdline_prompt.cc:259
msgid "The following packages will be upgraded:"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:307
+#: src/cmdline/cmdline_prompt.cc:311
#, c-format
msgid "The following ESSENTIAL packages will be REMOVED!\n"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:316
+#: src/cmdline/cmdline_prompt.cc:320
#, c-format
msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:326
+#: src/cmdline/cmdline_prompt.cc:330
#, c-format
msgid ""
"WARNING: Performing this action will probably cause your system to break!\n"
" Do NOT continue unless you know EXACTLY what you are doing!\n"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:328
+#: src/cmdline/cmdline_prompt.cc:332
msgid "I am aware that this is a very bad idea"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:331
+#: src/cmdline/cmdline_prompt.cc:335
#, c-format
msgid "To continue, type the phrase \"%s\":\n"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:434
+#: src/cmdline/cmdline_prompt.cc:438
#, c-format
msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:440
+#: src/cmdline/cmdline_prompt.cc:444
#, c-format
msgid "The following packages are SUGGESTED but will NOT be installed:\n"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:445
+#: src/cmdline/cmdline_prompt.cc:449
#, c-format
msgid "No packages will be installed, upgraded, or removed.\n"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:447
+#: src/cmdline/cmdline_prompt.cc:451
#, c-format
msgid "%lu packages upgraded, %lu newly installed, "
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:451
+#: src/cmdline/cmdline_prompt.cc:455
#, c-format
msgid "%lu reinstalled, "
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:453
+#: src/cmdline/cmdline_prompt.cc:457
#, c-format
msgid "%lu downgraded, "
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:455
+#: src/cmdline/cmdline_prompt.cc:459
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:462
+#: src/cmdline/cmdline_prompt.cc:466
#, c-format
msgid "Need to get %sB/%sB of archives. "
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:465
+#: src/cmdline/cmdline_prompt.cc:469
#, c-format
msgid "Need to get %sB of archives. "
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:472
+#: src/cmdline/cmdline_prompt.cc:476
#, c-format
msgid "After unpacking %sB will be used.\n"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:475
+#: src/cmdline/cmdline_prompt.cc:479
#, c-format
msgid "After unpacking %sB will be freed.\n"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:521
+#: src/cmdline/cmdline_prompt.cc:524
#, c-format
msgid "Bad action character '%c'\n"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:596
+#: src/cmdline/cmdline_prompt.cc:595
#, c-format
msgid "No packages to show -- enter the package names on the line after 'i'.\n"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:598 src/cmdline/cmdline_prompt.cc:629
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:597
msgid "Press Return to continue."
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:625
+#: src/cmdline/cmdline_prompt.cc:623
#, c-format
msgid "No packages found -- enter the package names on the line after 'c'.\n"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:665
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:627
+msgid "Press Return to continue"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:675
msgid "Do you want to continue? [Y/n/?] "
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:690
+#: src/cmdline/cmdline_prompt.cc:700
#, c-format
msgid ""
"\n"
@@ -572,7 +657,7 @@
"\n"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:692
+#: src/cmdline/cmdline_prompt.cc:702
#, c-format
msgid ""
"\n"
@@ -580,7 +665,7 @@
"\n"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:698
+#: src/cmdline/cmdline_prompt.cc:708
#, c-format
msgid ""
"\n"
@@ -588,7 +673,7 @@
"\n"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:700
+#: src/cmdline/cmdline_prompt.cc:710
#, c-format
msgid ""
"\n"
@@ -596,7 +681,7 @@
"\n"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:705
+#: src/cmdline/cmdline_prompt.cc:715
#, c-format
msgid ""
"\n"
@@ -604,7 +689,7 @@
"\n"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:717
#, c-format
msgid ""
"\n"
@@ -612,7 +697,7 @@
"\n"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:737
#, c-format
msgid ""
"Commands:\n"
@@ -639,27 +724,78 @@
" = : Hold\n"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:751
+#: src/cmdline/cmdline_prompt.cc:761
#, c-format
msgid "Invalid response. Please enter a valid command or '?' for help.\n"
msgstr ""
-#: src/cmdline/cmdline_search.cc:78
+#: src/cmdline/cmdline_resolver.cc:84
#, c-format
-msgid "search: You must provide at least one search term\n"
+msgid "y: %F%nn: %F%nq: %F%n,: %F%n.: %F%n"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:90
+msgid "accept the proposed changes"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:92
+msgid "reject the proposed changes and search for another solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:94
+msgid "give up and quit the program"
msgstr ""
-#: src/cmdline/cmdline_show_broken.cc:114
+#: src/cmdline/cmdline_resolver.cc:96
+msgid "move to the next solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:98
+msgid "move to the previous solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:131
+msgid "The following actions will resolve these dependencies:"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:146
+msgid "Accept this solution? [Y/n/q/?]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:174
+msgid "Abandoning all efforts to resolve these dependencies."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:184
+msgid "The following commands are available:"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:188
+msgid "Invalid response; please enter one of the following commands:"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:198
+msgid "No solution found within the allotted time. Try harder? [Y/n]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:226
+msgid "Invalid response; please enter 'y' or 'n'."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:235
+msgid "Unable to resolve dependencies! Giving up..."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:240
+msgid "No more solutions."
+msgstr ""
+
+#: src/cmdline/cmdline_search.cc:78
#, c-format
-msgid ""
-"Some packages had unmet dependencies. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming.\n"
-"\n"
+msgid "search: You must provide at least one search term\n"
msgstr ""
-#: src/cmdline/cmdline_show_broken.cc:115
+#: src/cmdline/cmdline_show_broken.cc:113
#, c-format
msgid "The following packages have unmet dependencies:\n"
msgstr ""
@@ -857,12 +993,12 @@
msgid "Description: "
msgstr ""
-#: src/cmdline/cmdline_simulate.cc:36
+#: src/cmdline/cmdline_simulate.cc:37
#, c-format
msgid "Would download/install/remove packages.\n"
msgstr ""
-#: src/cmdline/cmdline_simulate.cc:47
+#: src/cmdline/cmdline_simulate.cc:48
msgid "Internal Error, Ordering didn't finish"
msgstr ""
@@ -904,26 +1040,24 @@
msgid "UNAVAILABLE"
msgstr ""
-#: src/download_bar.cc:57 src/download_list.cc:265
+#: src/download_bar.cc:56 src/download_list.cc:263 src/download_screen.cc:57
#, c-format
-msgid ""
-"Please insert the following disc into the drive \"%s\":\n"
-"%s"
+msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
msgstr ""
-#: src/download_bar.cc:76 src/generic/acqprogress.cc:63
+#: src/download_bar.cc:77 src/generic/acqprogress.cc:63
msgid "Hit "
msgstr ""
-#: src/download_bar.cc:89
+#: src/download_bar.cc:90
msgid "Downloading "
msgstr ""
-#: src/download_bar.cc:102
+#: src/download_bar.cc:103
msgid "Got "
msgstr ""
-#: src/download_bar.cc:156
+#: src/download_bar.cc:157
msgid "Downloading..."
msgstr ""
@@ -931,7 +1065,7 @@
msgid "Couldn't read list of package sources"
msgstr ""
-#: src/download.cc:104 src/download.cc:321
+#: src/download.cc:104 src/download.cc:322
msgid "Couldn't lock list directory..are you root?"
msgstr ""
@@ -943,29 +1077,33 @@
msgid "View the progress of the package list update"
msgstr ""
-#: src/download.cc:159
+#: src/download.cc:113
+msgid "List Update"
+msgstr ""
+
+#: src/download.cc:160
msgid "Couldn't clean out list directories"
msgstr ""
-#: src/download.cc:176 src/ui.cc:1068
+#: src/download.cc:177 src/ui.cc:1152
msgid "Deleting obsolete downloaded files"
msgstr ""
-#: src/download.cc:181
+#: src/download.cc:182
#, c-format
msgid "Deleting obsolete downloaded files\n"
msgstr ""
-#: src/download.cc:223
+#: src/download.cc:224
#, c-format
msgid "Unable to open %s to log actions"
msgstr ""
-#: src/download.cc:229
+#: src/download.cc:230
msgid "log report"
msgstr ""
-#: src/download.cc:230
+#: src/download.cc:231
#, c-format
msgid ""
"IMPORTANT: this log only lists intended actions; actions which fail due to\n"
@@ -973,77 +1111,77 @@
"\n"
msgstr ""
-#: src/download.cc:231
+#: src/download.cc:232
#, c-format
msgid "Will install %li packages, and remove %li packages.\n"
msgstr ""
-#: src/download.cc:233
+#: src/download.cc:234
#, c-format
msgid "%sB of disk space will be used\n"
msgstr ""
-#: src/download.cc:236
+#: src/download.cc:237
#, c-format
msgid "%sB bytes of disk space will be freed\n"
msgstr ""
-#: src/download.cc:244
+#: src/download.cc:245
#, c-format
msgid "[UPGRADE] %s %s -> %s\n"
msgstr ""
-#: src/download.cc:248
+#: src/download.cc:249
#, c-format
msgid "[DOWNGRADE] %s %s -> %s\n"
msgstr ""
-#: src/download.cc:258
+#: src/download.cc:259
msgid "REMOVE"
msgstr ""
-#: src/download.cc:264
+#: src/download.cc:265
msgid "INSTALL"
msgstr ""
-#: src/download.cc:267
+#: src/download.cc:268
msgid "REINSTALL"
msgstr ""
-#: src/download.cc:270
+#: src/download.cc:271
msgid "HOLD"
msgstr ""
-#: src/download.cc:273
+#: src/download.cc:274
msgid "BROKEN"
msgstr ""
-#: src/download.cc:276
+#: src/download.cc:277
msgid "REMOVE, NOT USED"
msgstr ""
-#: src/download.cc:279
+#: src/download.cc:280
msgid "REMOVE, DEPENDENCIES"
msgstr ""
-#: src/download.cc:282
+#: src/download.cc:283
msgid "INSTALL, DEPENDENCIES"
msgstr ""
-#: src/download.cc:285
+#: src/download.cc:286
msgid "HOLD, DEPENDENCIES"
msgstr ""
-#: src/download.cc:287
+#: src/download.cc:288
msgid "????????"
msgstr ""
-#: src/download.cc:291
+#: src/download.cc:292
#, c-format
msgid "[%s] %s\n"
msgstr ""
-#: src/download.cc:294
+#: src/download.cc:295
#, c-format
msgid ""
"===============================================================================\n"
@@ -1051,32 +1189,36 @@
"Log complete.\n"
msgstr ""
-#: src/download.cc:329
+#: src/download.cc:330
msgid "Downloading packages"
msgstr ""
-#: src/download.cc:330
+#: src/download.cc:331
msgid "View the progress of the package download"
msgstr ""
-#: src/download.cc:352
+#: src/download.cc:332
+msgid "Package Download"
+msgstr ""
+
+#: src/download.cc:354
msgid "Internal error: couldn't generate list of packages to download"
msgstr ""
-#: src/download.cc:413
+#: src/download.cc:415
msgid "Unable to correct for unavailable packages"
msgstr ""
-#: src/download.cc:465
+#: src/download.cc:467
msgid ""
"Ack! Something bad happened while installing packages. Trying to recover:"
msgstr ""
-#: src/download.cc:475 src/pkg_item.cc:413
+#: src/download.cc:477 src/pkg_item.cc:432
msgid "Press return to continue.\n"
msgstr ""
-#: src/download.cc:506
+#: src/download.cc:508
msgid ""
"Could not regain the system lock! (Perhaps another apt or dpkg is running?)"
msgstr ""
@@ -1136,11 +1278,6 @@
msgid "[ERROR]"
msgstr ""
-#: src/download_screen.cc:57
-#, c-format
-msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
-msgstr ""
-
#: src/download_screen.cc:181
#, c-format
msgid "Downloaded %sB in %ss (%sB/s)."
@@ -1178,109 +1315,109 @@
"press enter\n"
msgstr ""
-#: src/generic/aptcache.cc:245
+#: src/generic/aptcache.cc:253
msgid "Can't open Aptitude extended state file"
msgstr ""
-#: src/generic/aptcache.cc:252 src/generic/aptcache.cc:305
-#: src/generic/aptcache.cc:307
+#: src/generic/aptcache.cc:260 src/generic/aptcache.cc:313
+#: src/generic/aptcache.cc:315
msgid "Reading extended state information"
msgstr ""
-#: src/generic/aptcache.cc:313 src/generic/aptcache.cc:387
-#: src/generic/aptcache.cc:390
+#: src/generic/aptcache.cc:321 src/generic/aptcache.cc:395
+#: src/generic/aptcache.cc:398
msgid "Initializing package states"
msgstr ""
-#: src/generic/aptcache.cc:501
+#: src/generic/aptcache.cc:509
msgid "Cannot open Aptitude state file"
msgstr ""
-#: src/generic/aptcache.cc:505 src/generic/aptcache.cc:560
-#: src/generic/aptcache.cc:563
+#: src/generic/aptcache.cc:513 src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:571
msgid "Writing extended state information"
msgstr ""
-#: src/generic/aptcache.cc:542
+#: src/generic/aptcache.cc:550
#, c-format
msgid "Internal buffer overflow on package \"%s\" while writing state file"
msgstr ""
-#: src/generic/aptcache.cc:551
+#: src/generic/aptcache.cc:559
msgid "Couldn't write state file"
msgstr ""
-#: src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:576
msgid "Error writing state file"
msgstr ""
-#: src/generic/aptcache.cc:584
+#: src/generic/aptcache.cc:592
msgid "couldn't replace old state file"
msgstr ""
-#: src/generic/aptcache.cc:960
+#: src/generic/aptcache.cc:1000
msgid "Unable to correct dependencies, some packages cannot be installed"
msgstr ""
-#: src/generic/aptcache.cc:1325
+#: src/generic/aptcache.cc:1546
msgid "The list of sources could not be read."
msgstr ""
-#: src/generic/aptcache.cc:1332
+#: src/generic/aptcache.cc:1553
msgid "The package lists or status file could not be parsed or opened."
msgstr ""
-#: src/generic/aptcache.cc:1335
+#: src/generic/aptcache.cc:1556
msgid "You may want to update the package lists to correct these missing files"
msgstr ""
-#: src/generic/apt.cc:141
+#: src/generic/apt.cc:142
#, c-format
msgid "Unable to open %s for writing"
msgstr ""
-#: src/generic/apt.cc:151
+#: src/generic/apt.cc:152
#, c-format
msgid "Unable to replace %s with new configuration file"
msgstr ""
-#: src/generic/apt.cc:226
+#: src/generic/apt.cc:227
msgid "Warning: could not lock the cache file. Opening in read-only mode"
msgstr ""
-#: src/generic/matchers.cc:780
+#: src/generic/matchers.cc:797
msgid "Unmatched '('"
msgstr ""
-#: src/generic/matchers.cc:870 src/generic/matchers.cc:949
+#: src/generic/matchers.cc:887 src/generic/matchers.cc:968
#, c-format
msgid "Unknown dependency type: %s"
msgstr ""
-#: src/generic/matchers.cc:931
+#: src/generic/matchers.cc:950
#, c-format
msgid "Unknown action type: %s"
msgstr ""
-#: src/generic/matchers.cc:998
+#: src/generic/matchers.cc:1017
#, c-format
msgid "Unknown priority %s"
msgstr ""
-#: src/generic/matchers.cc:1020
+#: src/generic/matchers.cc:1039
#, c-format
msgid "Unknown pattern type: %c"
msgstr ""
-#: src/generic/matchers.cc:1065
+#: src/generic/matchers.cc:1084
msgid "Unexpected empty expression"
msgstr ""
-#: src/generic/matchers.cc:1100
+#: src/generic/matchers.cc:1119
msgid "Badly formed expression"
msgstr ""
-#: src/generic/matchers.cc:1129
+#: src/generic/matchers.cc:1148
msgid "Unexpected ')'"
msgstr ""
@@ -1301,7 +1438,7 @@
msgid "Can't get value of $HOME, using TMPDIR (insecure)"
msgstr ""
-#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:60
+#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:61
#, c-format
msgid "ChangeLog of %s"
msgstr ""
@@ -1501,292 +1638,300 @@
msgid "Invalid sorting policy type '%s'"
msgstr ""
-#: src/main.cc:68
+#: src/main.cc:67
#, c-format
msgid "%s %s compiled at %s %s\n"
msgstr ""
-#: src/main.cc:71
+#: src/main.cc:70
#, c-format
msgid "Compiler: g++ %s\n"
msgstr ""
-#: src/main.cc:74
+#: src/main.cc:73
#, c-format
msgid ""
"\n"
"NCurses version: %s\n"
msgstr ""
-#: src/main.cc:76
+#: src/main.cc:75
#, c-format
msgid ""
"\n"
"Curses version: %s\n"
msgstr ""
-#: src/main.cc:78
+#: src/main.cc:77
#, c-format
msgid "libsigc++ version: %s\n"
msgstr ""
-#: src/main.cc:84
+#: src/main.cc:83
#, c-format
msgid "Usage: aptitude [-S fname] [-u|-i]"
msgstr ""
-#: src/main.cc:86
+#: src/main.cc:85
#, c-format
msgid " aptitude [options] <action> ..."
msgstr ""
-#: src/main.cc:88
+#: src/main.cc:87
#, c-format
msgid ""
" Actions (if none is specified, aptitude will enter interactive mode):\n"
"\n"
msgstr ""
-#: src/main.cc:89
+#: src/main.cc:88
#, c-format
msgid " install - Install/upgrade packages\n"
msgstr ""
-#: src/main.cc:90
+#: src/main.cc:89
#, c-format
msgid " remove - Remove packages\n"
msgstr ""
-#: src/main.cc:91
+#: src/main.cc:90
#, c-format
msgid " purge - Remove packages and their configuration files\n"
msgstr ""
-#: src/main.cc:92
+#: src/main.cc:91
#, c-format
msgid " hold - Place packages on hold\n"
msgstr ""
-#: src/main.cc:93
+#: src/main.cc:92
#, c-format
msgid " unhold - Cancel a hold command for a package\n"
msgstr ""
-#: src/main.cc:94
+#: src/main.cc:93
#, c-format
msgid " markauto - Mark packages as having been automatically installed\n"
msgstr ""
-#: src/main.cc:95
+#: src/main.cc:94
#, c-format
msgid " unmarkauto - Mark packages as having been manually installed\n"
msgstr ""
-#: src/main.cc:100
+#: src/main.cc:99
#, c-format
msgid ""
" forbid-version - Forbid aptitude from upgrading to a specific package "
"version.\n"
msgstr ""
-#: src/main.cc:101
+#: src/main.cc:100
#, c-format
msgid " update - Download lists of new/upgradable packages\n"
msgstr ""
-#: src/main.cc:102
+#: src/main.cc:101
#, c-format
msgid " upgrade - Perform a safe upgrade\n"
msgstr ""
-#: src/main.cc:103
+#: src/main.cc:102
#, c-format
msgid ""
" dist-upgrade - Perform an upgrade, possibly installing and removing "
"packages\n"
msgstr ""
-#: src/main.cc:104
+#: src/main.cc:103
#, c-format
msgid " forget-new - Forget what packages are \"new\"\n"
msgstr ""
-#: src/main.cc:105
+#: src/main.cc:104
#, c-format
msgid " search - Search for a package by name and/or expression\n"
msgstr ""
-#: src/main.cc:106
+#: src/main.cc:105
#, c-format
msgid " show - Display detailed information about a package\n"
msgstr ""
-#: src/main.cc:107
+#: src/main.cc:106
#, c-format
msgid " clean - Erase downloaded package files\n"
msgstr ""
-#: src/main.cc:108
+#: src/main.cc:107
#, c-format
msgid " autoclean - Erase old downloaded package files\n"
msgstr ""
-#: src/main.cc:109
+#: src/main.cc:108
#, c-format
msgid " changelog - View a package's changelog\n"
msgstr ""
-#: src/main.cc:110
+#: src/main.cc:109
#, c-format
msgid " download - Download the .deb file for a package\n"
msgstr ""
-#: src/main.cc:112
+#: src/main.cc:111
#, c-format
msgid " Options:\n"
msgstr ""
-#: src/main.cc:113
+#: src/main.cc:112
#, c-format
msgid " -h This help text\n"
msgstr ""
-#: src/main.cc:114
+#: src/main.cc:113
#, c-format
msgid " -s Simulate actions, but do not actually perform them.\n"
msgstr ""
-#: src/main.cc:115
+#: src/main.cc:114
#, c-format
msgid ""
" -d Only download packages, do not install or remove anything.\n"
msgstr ""
-#: src/main.cc:116
+#: src/main.cc:115
#, c-format
msgid " -P Always prompt for confirmation or actions\n"
msgstr ""
-#: src/main.cc:117
+#: src/main.cc:116
#, c-format
msgid ""
" -y Assume that the answer to simple yes/no questions is 'yes'\n"
msgstr ""
-#: src/main.cc:118
+#: src/main.cc:117
#, c-format
msgid ""
" -F format Specify a format for displaying search results; see the "
"manual\n"
msgstr ""
-#: src/main.cc:119
+#: src/main.cc:118
#, c-format
msgid ""
" -O order Specify how search results should be sorted; see the manual\n"
msgstr ""
-#: src/main.cc:120
+#: src/main.cc:119
#, c-format
msgid ""
" -w width Specify the display width for formatting search results\n"
msgstr ""
-#: src/main.cc:121
+#: src/main.cc:120
#, c-format
msgid " -f Aggressively try to fix broken packages.\n"
msgstr ""
-#: src/main.cc:122
+#: src/main.cc:121
#, c-format
msgid " -V Show which versions of packages are to be installed.\n"
msgstr ""
-#: src/main.cc:123
+#: src/main.cc:122
#, c-format
msgid ""
" -D Show the dependencies of automatically changed packages.\n"
msgstr ""
-#: src/main.cc:124
+#: src/main.cc:123
#, c-format
msgid " -Z\t\t Show the change in installed size of each package.\n"
msgstr ""
-#: src/main.cc:125
+#: src/main.cc:124
#, c-format
msgid ""
" -v Display extra information. (may be supplied multiple times)\n"
msgstr ""
-#: src/main.cc:126
+#: src/main.cc:125
#, c-format
msgid ""
" -t [release] Set the release from which packages should be installed\n"
msgstr ""
-#: src/main.cc:127
+#: src/main.cc:126
#, c-format
msgid " -o key=val Directly set the configuration option named 'key'\n"
msgstr ""
-#: src/main.cc:128
+#: src/main.cc:127
#, c-format
msgid ""
" --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
" strong dependencies\n"
msgstr ""
-#: src/main.cc:129
+#: src/main.cc:128
#, c-format
msgid " -S fname: Read the aptitude extended status info from fname.\n"
msgstr ""
-#: src/main.cc:130
+#: src/main.cc:129
#, c-format
msgid " -u : Download new package lists on startup.\n"
msgstr ""
-#: src/main.cc:131
+#: src/main.cc:130
#, c-format
msgid " -i : Perform an install run on startup.\n"
msgstr ""
-#: src/main.cc:133
+#: src/main.cc:132
#, c-format
msgid " This aptitude does not have Super Cow Powers.\n"
msgstr ""
-#: src/main.cc:254
+#: src/main.cc:253
#, c-format
msgid "-o requires an argument of the form key=value, got %s"
msgstr ""
-#: src/main.cc:300 src/main.cc:309
+#: src/main.cc:299 src/main.cc:308
msgid "WEIRDNESS: unknown option code received\n"
msgstr ""
-#: src/main.cc:318
+#: src/main.cc:317
msgid "Only one of -u and -i may be specified\n"
msgstr ""
-#: src/main.cc:326
+#: src/main.cc:325
msgid ""
"-u and -i may not be specified in command-line mode (eg, with 'install')"
msgstr ""
-#: src/main.cc:337
+#: src/main.cc:342
msgid "-u and -i may not be specified with a command"
msgstr ""
-#: src/main.cc:392
+#: src/main.cc:399
#, c-format
msgid "Unknown command \"%s\"\n"
msgstr ""
-#: src/main.cc:400
+#: src/main.cc:406 src/main.cc:463
+msgid "Internal error: uncaught 'out of solutions' exception.\n"
+msgstr ""
+
+#: src/main.cc:411 src/main.cc:468
+msgid "Internal error: uncaught 'out of time' exception.\n"
+msgstr ""
+
+#: src/main.cc:418
#, c-format
-msgid "Invalid option for interactive mode: -s\n"
+msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
msgstr ""
#: src/mine/cmine.cc:93
@@ -1815,7 +1960,7 @@
msgid "Lost"
msgstr ""
-#: src/mine/cmine.cc:119 src/ui.cc:1005
+#: src/mine/cmine.cc:119 src/ui.cc:1089
msgid "Minesweeper"
msgstr ""
@@ -1989,7 +2134,7 @@
msgid "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
msgstr ""
-#: src/pkg_columnizer.cc:84 src/ui.cc:1488
+#: src/pkg_columnizer.cc:84 src/ui.cc:1638
msgid "Package"
msgstr ""
@@ -2237,8 +2382,8 @@
" Packages in the 'comm' section are used to control modems and other "
"hardware communications devices. This includes software to control faxmodems "
"(for instance, PPP for dial-up internet connections and programs originally "
-"written for that purpose (zmodem/kermit), as well as software to control "
-"cellular phones, interface with FidoNet, and run a BBS."
+"written for that purpose, such as zmodem/kermit), as well as software to "
+"control cellular phones, interface with FidoNet, and run a BBS."
msgstr ""
#: src/pkg_grouppolicy.cc:159
@@ -2531,9 +2676,9 @@
" Packages in the 'non-free' section are not part of Debian.\n"
" .\n"
" These packages fail to meet one or more of the requirements of the Debian "
-"Free Software Guidelines (see below) You should read the license of programs "
-"in this section to be sure that you are allowed to use them in the way you "
-"intend.\n"
+"Free Software Guidelines (see below). You should read the license of "
+"programs in this section to be sure that you are allowed to use them in the "
+"way you intend.\n"
" .\n"
" For more information about what Debian considers to be Free Software, see "
"http://www.debian.org/social_contract#guidelines"
@@ -2582,8 +2727,8 @@
msgid ""
"New Packages\n"
" These packages have been added to Debian since the last time you cleared "
-"the list of \"new\" packages. (choose \"Forget new packages\" from the "
-"Actions menu to empty this list)"
+"the list of \"new\" packages (choose \"Forget new packages\" from the "
+"Actions menu to empty this list)."
msgstr ""
#: src/pkg_grouppolicy.cc:321
@@ -2777,93 +2922,111 @@
msgid "Versions"
msgstr ""
-#: src/pkg_item.cc:54
+#: src/pkg_item.cc:55
msgid "Yes, I am aware this is a very bad idea"
msgstr ""
#: src/pkg_item.cc:80
#, c-format
msgid ""
-"%s is an essential package!\n"
-"\n"
-"Are you sure you want to remove it?\n"
-"Type '%s' if you are."
+"%s is an essential package!%n%nAre you sure you want to remove it?%nType '%"
+"s' if you are."
msgstr ""
-#: src/pkg_item.cc:219
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:625
#, c-format
msgid "Information about %s"
msgstr ""
-#: src/pkg_item.cc:304
-msgid "Available versions of "
+#: src/pkg_item.cc:224 src/pkg_ver_item.cc:627
+#, c-format
+msgid "%s info"
msgstr ""
-#: src/pkg_item.cc:312 src/pkg_ver_item.cc:648
+#: src/pkg_item.cc:310
+#, c-format
+msgid "Available versions of %s"
+msgstr ""
+
+#: src/pkg_item.cc:313
+#, c-format
+msgid "%s versions"
+msgstr ""
+
+#: src/pkg_item.cc:325 src/pkg_ver_item.cc:655
#, c-format
msgid "Dependencies of %s"
msgstr ""
-#: src/pkg_item.cc:322 src/pkg_ver_item.cc:657
+#: src/pkg_item.cc:327 src/pkg_ver_item.cc:657
+#, c-format
+msgid "%s deps"
+msgstr ""
+
+#: src/pkg_item.cc:338 src/pkg_ver_item.cc:667
#, c-format
msgid "Packages depending on %s"
msgstr ""
-#: src/pkg_item.cc:373 src/pkg_ver_item.cc:694
+#: src/pkg_item.cc:340 src/pkg_ver_item.cc:669
+#, c-format
+msgid "%s reverse deps"
+msgstr ""
+
+#: src/pkg_item.cc:392 src/pkg_ver_item.cc:707
#, c-format
msgid "Reporting a bug in %s:\n"
msgstr ""
-#: src/pkg_item.cc:395
+#: src/pkg_item.cc:414
msgid ""
-"You are not root and I cannot find any way\n"
-"to become root. To reconfigure this package,\n"
-"install the menu package, the login package,\n"
-"or run aptitude as root."
+"You are not root and I cannot find any way to become root. To reconfigure "
+"this package, install the menu package, the login package, or run aptitude "
+"as root."
msgstr ""
-#: src/pkg_item.cc:403
+#: src/pkg_item.cc:422
#, c-format
msgid "Reconfiguring %s\n"
msgstr ""
-#: src/pkg_item.cc:428
+#: src/pkg_item.cc:447
msgid "Hierarchy editor"
msgstr ""
+#: src/pkg_item.cc:447
+msgid "Hierarchy Editor"
+msgstr ""
+
#: src/pkg_tree.cc:325
msgid "Search for: "
msgstr ""
-#: src/pkg_tree.cc:585
+#: src/pkg_tree.cc:568
msgid "All Packages"
msgstr ""
-#: src/pkg_tree.cc:598 src/pkg_tree.cc:607
+#: src/pkg_tree.cc:581 src/pkg_tree.cc:590
msgid "Building view"
msgstr ""
-#: src/pkg_tree.cc:649
+#: src/pkg_tree.cc:632
#, c-format
msgid "No packages matched the pattern \"%s\"."
msgstr ""
-#: src/pkg_tree.cc:671
+#: src/pkg_tree.cc:654
msgid "Enter the new package tree limit: "
msgstr ""
-#: src/pkg_tree.cc:705
+#: src/pkg_tree.cc:688
msgid "Enter the new package grouping mechanism for this display: "
msgstr ""
-#: src/pkg_tree.cc:713
+#: src/pkg_tree.cc:696
msgid "Enter the new package sorting mechanism for this display: "
msgstr ""
-#: src/pkg_ver_item.cc:623
-msgid "Information about "
-msgstr ""
-
#: src/pkg_view.cc:344
msgid "make_package_view: error in arguments -- two main widgets??"
msgstr ""
@@ -2877,7 +3040,7 @@
msgid "make_package_view: bad argument!"
msgstr ""
-#: src/pkg_view.cc:492
+#: src/pkg_view.cc:495
msgid "make_package_view: no main widget found"
msgstr ""
@@ -3065,6 +3228,66 @@
"broken if it is %s."
msgstr ""
+#: src/solution_dialog.cc:74
+msgid "The package cache is not available."
+msgstr ""
+
+#: src/solution_dialog.cc:82
+msgid "No packages are broken."
+msgstr ""
+
+#: src/solution_dialog.cc:103
+msgid "No resolution found."
+msgstr ""
+
+#: src/solution_dialog.cc:107
+#, c-format
+msgid ""
+"Time exhausted while searching for a solution (you can select \"Next Solution"
+"\" or press %s to try harder)."
+msgstr ""
+
+#: src/solution_dialog.cc:146
+msgid "Previous"
+msgstr ""
+
+#: src/solution_dialog.cc:147
+msgid "Next"
+msgstr ""
+
+#: src/solution_dialog.cc:148
+msgid "Apply"
+msgstr ""
+
+#: src/solution_dialog.cc:149
+msgid "Close"
+msgstr ""
+
+#: src/solution_fragment.cc:125
+msgid "%BRemove%b the following packages:%n"
+msgstr ""
+
+#: src/solution_fragment.cc:135
+msgid "%BInstall%b the following packages:%n"
+msgstr ""
+
+#: src/solution_fragment.cc:148
+msgid "%BKeep%b the following packages at their current version:%n"
+msgstr ""
+
+#: src/solution_fragment.cc:161
+msgid "%BUpgrade%b the following packages:%n"
+msgstr ""
+
+#: src/solution_fragment.cc:176
+msgid "%BDowngrade%b the following packages:%n"
+msgstr ""
+
+#: src/solution_fragment.cc:190
+#, c-format
+msgid "Score is %d"
+msgstr ""
+
#: src/trust.cc:17 src/trust.cc:19
msgid "WARNING"
msgstr ""
@@ -3076,52 +3299,52 @@
"system."
msgstr ""
-#: src/ui.cc:143
+#: src/ui.cc:164
msgid "Er, there aren't any errors, this shouldn't have happened.."
msgstr ""
-#: src/ui.cc:149
+#: src/ui.cc:170
msgid "E:"
msgstr ""
-#: src/ui.cc:151
+#: src/ui.cc:172
msgid "W:"
msgstr ""
-#: src/ui.cc:172
+#: src/ui.cc:193
msgid "Search for:"
msgstr ""
-#: src/ui.cc:205
+#: src/ui.cc:261
msgid "You already are root!"
msgstr ""
-#: src/ui.cc:303
+#: src/ui.cc:359
msgid ""
"Subprocess exited with an error -- did you type your password correctly?"
msgstr ""
-#: src/ui.cc:331
+#: src/ui.cc:387
msgid "Loading cache"
msgstr ""
-#: src/ui.cc:353
+#: src/ui.cc:409
msgid "Really quit Aptitude?"
msgstr ""
-#: src/ui.cc:432
+#: src/ui.cc:488
msgid "Really discard your personal settings and reload the defaults?"
msgstr ""
-#: src/ui.cc:532
+#: src/ui.cc:588 src/ui.cc:590 src/ui.cc:618 src/ui.cc:620
msgid "Packages"
msgstr ""
-#: src/ui.cc:533 src/ui.cc:560
+#: src/ui.cc:589 src/ui.cc:619
msgid "View available packages and choose actions to perform"
msgstr ""
-#: src/ui.cc:599
+#: src/ui.cc:666
msgid ""
"%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
"BABSOLUTELY NO WARRANTY%b; for details see 'license' in the Help menu. This "
@@ -3129,15 +3352,15 @@
"conditions; see 'license' for details."
msgstr ""
-#: src/ui.cc:620
+#: src/ui.cc:687
msgid "help.txt"
msgstr ""
-#: src/ui.cc:636
+#: src/ui.cc:703
msgid "README"
msgstr ""
-#: src/ui.cc:718
+#: src/ui.cc:785
msgid ""
"%C%BWARNING%b: untrusted versions of the following packages will be "
"installed!%n%nUntrusted packages could %Bcompromise your system's security%"
@@ -3145,458 +3368,477 @@
"this is what you want to do.%n%n"
msgstr ""
-#: src/ui.cc:732
+#: src/ui.cc:799
msgid "Really Continue"
msgstr ""
-#: src/ui.cc:734
+#: src/ui.cc:801
msgid "Abort Installation"
msgstr ""
-#: src/ui.cc:796
+#: src/ui.cc:862
msgid "Preview of package installation"
msgstr ""
-#: src/ui.cc:797
+#: src/ui.cc:863
msgid "View and/or adjust the actions that will be performed"
msgstr ""
-#: src/ui.cc:837
-msgid "Some packages were broken and have been fixed"
+#: src/ui.cc:864
+msgid "Preview"
msgstr ""
-#: src/ui.cc:839
-msgid "Some broken packages could not be fixed!"
+#: src/ui.cc:900
+msgid "Some packages were broken and have been fixed:"
msgstr ""
-#: src/ui.cc:847 src/ui.cc:959
-msgid "Some packages are broken. Try to fix them?"
+#: src/ui.cc:906
+msgid "No solution to these dependency problems exists!"
msgstr ""
-#: src/ui.cc:860
+#: src/ui.cc:912
+#, c-format
msgid ""
-"Installing/removing packages requires administrative privileges, which\n"
-"you currently do not have. Would you like to change to the root account?\n"
+"Ran out of time while trying to resolver dependencies (press \"%s\" to try "
+"harder)"
msgstr ""
-#: src/ui.cc:863 src/ui.cc:993
+#: src/ui.cc:958
+msgid ""
+"Installing/removing packages requires administrative privileges, which you "
+"currently do not have. Would you like to change to the root account?"
+msgstr ""
+
+#: src/ui.cc:961 src/ui.cc:1077
msgid "Become root"
msgstr ""
-#: src/ui.cc:865 src/ui.cc:995
+#: src/ui.cc:963 src/ui.cc:1079
msgid "Don't become root"
msgstr ""
-#: src/ui.cc:870 src/ui.cc:1000
+#: src/ui.cc:968 src/ui.cc:1084
msgid "A package-list update or install run is already taking place."
msgstr ""
-#: src/ui.cc:897
+#: src/ui.cc:995
msgid "No packages are scheduled to be installed, removed, or upgraded."
msgstr ""
-#: src/ui.cc:903
+#: src/ui.cc:1001
msgid ""
"No packages will be installed, removed or upgraded. Some packages could be "
"upgraded, but you have not chosen to upgrade them. Type \"U\" to prepare an "
"upgrade."
msgstr ""
-#: src/ui.cc:990
+#: src/ui.cc:1073
msgid ""
-"Updating the package lists requires administrative privileges, which\n"
-"you currently do not have. Would you like to change to the root account?\n"
+"Updating the package lists requires administrative privileges, which you "
+"currently do not have. Would you like to change to the root account?"
msgstr ""
-#: src/ui.cc:1005 src/ui.cc:1198
+#: src/ui.cc:1089 src/ui.cc:1345
msgid "Waste time trying to find mines"
msgstr ""
-#: src/ui.cc:1012 src/ui.cc:1065
+#: src/ui.cc:1096 src/ui.cc:1149
msgid "Cleaning while a download is in progress is not allowed"
msgstr ""
-#: src/ui.cc:1015
+#: src/ui.cc:1099
msgid "Deleting downloaded files"
msgstr ""
-#: src/ui.cc:1029
+#: src/ui.cc:1113
msgid "Downloaded package files have been deleted"
msgstr ""
-#: src/ui.cc:1090
+#: src/ui.cc:1174
#, c-format
msgid ""
"Obsolete downloaded package files have been deleted, freeing %sB of disk "
"space."
msgstr ""
-#: src/ui.cc:1174
+#: src/ui.cc:1246
+msgid "All solutions exhausted."
+msgstr ""
+
+#: src/ui.cc:1251 src/ui.cc:1282
+msgid "Ran out of time while trying to find a solution."
+msgstr ""
+
+#: src/ui.cc:1276
+msgid "Unable to find a solution to apply."
+msgstr ""
+
+#: src/ui.cc:1321
msgid "^Install/remove packages"
msgstr ""
-#: src/ui.cc:1175
+#: src/ui.cc:1322
msgid "Perform all pending installs and removals"
msgstr ""
-#: src/ui.cc:1177
+#: src/ui.cc:1324
msgid "^Update package list"
msgstr ""
-#: src/ui.cc:1178
+#: src/ui.cc:1325
msgid "Check for new versions of packages"
msgstr ""
-#: src/ui.cc:1181
+#: src/ui.cc:1328
msgid "^Forget new packages"
msgstr ""
-#: src/ui.cc:1182
+#: src/ui.cc:1329
msgid "Forget which packages are \"new\""
msgstr ""
-#: src/ui.cc:1185
+#: src/ui.cc:1332
msgid "^Clean package cache"
msgstr ""
-#: src/ui.cc:1186
+#: src/ui.cc:1333
msgid "Delete package files which were previously downloaded"
msgstr ""
-#: src/ui.cc:1189
+#: src/ui.cc:1336
msgid "Clean ^obsolete files"
msgstr ""
-#: src/ui.cc:1190
+#: src/ui.cc:1337
msgid "Delete package files which can no longer be downloaded"
msgstr ""
-#: src/ui.cc:1193
+#: src/ui.cc:1340
msgid "Mark ^Upgradable"
msgstr ""
-#: src/ui.cc:1194
+#: src/ui.cc:1341
msgid "Mark all upgradable packages which are not held for upgrade"
msgstr ""
-#: src/ui.cc:1197
+#: src/ui.cc:1344
msgid "^Play Minesweeper"
msgstr ""
-#: src/ui.cc:1200
+#: src/ui.cc:1347
msgid "^Become root"
msgstr ""
-#: src/ui.cc:1201
+#: src/ui.cc:1348
msgid ""
-"Run 'su' to become root; this will restart the program, but your\n"
-"settings will be preserved"
+"Run 'su' to become root; this will restart the program, but your settings "
+"will be preserved"
msgstr ""
-#: src/ui.cc:1204
+#: src/ui.cc:1351
msgid "^Reload package cache"
msgstr ""
-#: src/ui.cc:1205
+#: src/ui.cc:1352
msgid "Reload the package cache"
msgstr ""
-#: src/ui.cc:1211
+#: src/ui.cc:1358
msgid "^Quit"
msgstr ""
-#: src/ui.cc:1212
+#: src/ui.cc:1359
msgid "Exit the program"
msgstr ""
-#: src/ui.cc:1218 src/ui.cc:1487
+#: src/ui.cc:1365 src/ui.cc:1637
msgid "Undo"
msgstr ""
-#: src/ui.cc:1219
+#: src/ui.cc:1366
msgid "Undo the last package operation or group of operations"
msgstr ""
-#: src/ui.cc:1226
+#: src/ui.cc:1373
msgid "^Install"
msgstr ""
-#: src/ui.cc:1227
+#: src/ui.cc:1374
msgid "Flag the currently selected package for installation or upgrade"
msgstr ""
-#: src/ui.cc:1230
+#: src/ui.cc:1377
msgid "^Remove"
msgstr ""
-#: src/ui.cc:1231
+#: src/ui.cc:1378
msgid "Flag the currently selected package for removal"
msgstr ""
-#: src/ui.cc:1234
+#: src/ui.cc:1381
msgid "^Purge"
msgstr ""
-#: src/ui.cc:1235
+#: src/ui.cc:1382
msgid ""
"Flag the currently selected package and its configuration files for removal"
msgstr ""
-#: src/ui.cc:1238
+#: src/ui.cc:1385
msgid "^Keep"
msgstr ""
-#: src/ui.cc:1239
+#: src/ui.cc:1386
msgid "Cancel any action on the selected package"
msgstr ""
-#: src/ui.cc:1242
+#: src/ui.cc:1389
msgid "^Hold"
msgstr ""
-#: src/ui.cc:1243
+#: src/ui.cc:1390
msgid ""
"Cancel any action on the selected package, and protect it from future "
"upgrades"
msgstr ""
-#: src/ui.cc:1246
+#: src/ui.cc:1393
msgid "Mark ^Auto"
msgstr ""
-#: src/ui.cc:1247
+#: src/ui.cc:1394
msgid ""
-"Mark the selected package as having been automatically installed;\n"
-"it will automatically be removed if no other packages depend on it"
+"Mark the selected package as having been automatically installed; it will "
+"automatically be removed if no other packages depend on it"
msgstr ""
-#: src/ui.cc:1250
+#: src/ui.cc:1397
msgid "Mark ^Manual"
msgstr ""
-#: src/ui.cc:1251
+#: src/ui.cc:1398
msgid ""
-"Mark the selected package as having been manually installed;\n"
-"it will not be removed unless you manually remove it"
+"Mark the selected package as having been manually installed; it will not be "
+"removed unless you manually remove it"
msgstr ""
-#: src/ui.cc:1254
+#: src/ui.cc:1401
msgid "^Forbid Version"
msgstr ""
-#: src/ui.cc:1255
+#: src/ui.cc:1402
msgid ""
-"Forbid the candidate version of the selected package from being installed;\n"
+"Forbid the candidate version of the selected package from being installed; "
"newer versions of the package will be installed as usual"
msgstr ""
-#: src/ui.cc:1259
+#: src/ui.cc:1406
msgid "I^nformation"
msgstr ""
-#: src/ui.cc:1260
+#: src/ui.cc:1407
msgid "Display more information about the selected package"
msgstr ""
-#: src/ui.cc:1263
+#: src/ui.cc:1410
msgid "^Changelog"
msgstr ""
-#: src/ui.cc:1264
+#: src/ui.cc:1411
msgid "Display the Debian changelog of the selected package"
msgstr ""
-#: src/ui.cc:1271
+#: src/ui.cc:1418
msgid "^Find"
msgstr ""
-#: src/ui.cc:1272
+#: src/ui.cc:1419
msgid "Search for a package"
msgstr ""
-#: src/ui.cc:1275
+#: src/ui.cc:1422
msgid "Find ^Again"
msgstr ""
-#: src/ui.cc:1276
+#: src/ui.cc:1423
msgid "Repeat the last search"
msgstr ""
-#: src/ui.cc:1280
+#: src/ui.cc:1427
msgid "^Limit Display"
msgstr ""
-#: src/ui.cc:1281
+#: src/ui.cc:1428
msgid "Apply a filter to the package list"
msgstr ""
-#: src/ui.cc:1284
+#: src/ui.cc:1431
msgid "^Un-Limit Display"
msgstr ""
-#: src/ui.cc:1285
+#: src/ui.cc:1432
msgid "Remove the filter from the package list"
msgstr ""
-#: src/ui.cc:1289
+#: src/ui.cc:1436
msgid "Find ^Broken"
msgstr ""
-#: src/ui.cc:1290
+#: src/ui.cc:1437
msgid "Find the next package with unsatisfied dependencies"
msgstr ""
-#: src/ui.cc:1297
+#: src/ui.cc:1444
msgid "^UI options"
msgstr ""
-#: src/ui.cc:1298
+#: src/ui.cc:1445
msgid "Change the settings which affect the user interface"
msgstr ""
-#: src/ui.cc:1301
+#: src/ui.cc:1448
msgid "^Dependency handling"
msgstr ""
-#: src/ui.cc:1302
+#: src/ui.cc:1449
msgid "Change the settings which affect how package dependencies are handled"
msgstr ""
-#: src/ui.cc:1305
+#: src/ui.cc:1452
msgid "^Miscellaneous"
msgstr ""
-#: src/ui.cc:1306
+#: src/ui.cc:1453
msgid "Change miscellaneous program settings"
msgstr ""
-#: src/ui.cc:1311
+#: src/ui.cc:1458
msgid "^Revert options"
msgstr ""
-#: src/ui.cc:1312
+#: src/ui.cc:1459
msgid "Reset all settings to the system defaults"
msgstr ""
-#: src/ui.cc:1323
+#: src/ui.cc:1470
msgid "^Next"
msgstr ""
-#: src/ui.cc:1324
+#: src/ui.cc:1471
msgid "View next display"
msgstr ""
-#: src/ui.cc:1327
+#: src/ui.cc:1474
msgid "^Prev"
msgstr ""
-#: src/ui.cc:1328
+#: src/ui.cc:1475
msgid "View previous display"
msgstr ""
-#: src/ui.cc:1331
+#: src/ui.cc:1478
msgid "^Close"
msgstr ""
-#: src/ui.cc:1332
+#: src/ui.cc:1479
msgid "Close this display"
msgstr ""
-#: src/ui.cc:1337
+#: src/ui.cc:1484
msgid "New Package ^View"
msgstr ""
-#: src/ui.cc:1338
+#: src/ui.cc:1485
msgid "Create a new default package view"
msgstr ""
-#: src/ui.cc:1341
+#: src/ui.cc:1488
msgid "New Categorical ^Browser"
msgstr ""
-#: src/ui.cc:1343
+#: src/ui.cc:1490
msgid "Browse packages by category"
msgstr ""
-#: src/ui.cc:1351
+#: src/ui.cc:1498
msgid "^About"
msgstr ""
-#: src/ui.cc:1352
+#: src/ui.cc:1499
msgid "View information about this program"
msgstr ""
-#: src/ui.cc:1355
+#: src/ui.cc:1502
msgid "^Help"
msgstr ""
-#: src/ui.cc:1356
+#: src/ui.cc:1503
msgid "View the on-line help"
msgstr ""
-#: src/ui.cc:1358
+#: src/ui.cc:1505
msgid "User's ^Manual"
msgstr ""
-#: src/ui.cc:1359
+#: src/ui.cc:1506
msgid "View the detailed program manual"
msgstr ""
-#: src/ui.cc:1362
+#: src/ui.cc:1509
msgid "^FAQ"
msgstr ""
-#: src/ui.cc:1363
+#: src/ui.cc:1510
msgid "View a list of frequently asked questions"
msgstr ""
-#: src/ui.cc:1366
-msgid "^ChangeLog"
+#: src/ui.cc:1513
+msgid "^NEWS"
msgstr ""
-#: src/ui.cc:1367
-msgid "View the important changes made in each version of the program"
+#: src/ui.cc:1514
+msgid "View the important changes made in each version of "
msgstr ""
-#: src/ui.cc:1370
+#: src/ui.cc:1517
msgid "^License"
msgstr ""
-#: src/ui.cc:1371
+#: src/ui.cc:1518
msgid "View the terms under which you may copy the program"
msgstr ""
-#: src/ui.cc:1486
+#: src/ui.cc:1636
msgid "Actions"
msgstr ""
-#: src/ui.cc:1489
+#: src/ui.cc:1639
msgid "Search"
msgstr ""
-#: src/ui.cc:1490
+#: src/ui.cc:1640
msgid "Options"
msgstr ""
-#: src/ui.cc:1491
+#: src/ui.cc:1641
msgid "Views"
msgstr ""
-#: src/ui.cc:1492
+#: src/ui.cc:1642
msgid "Help"
msgstr ""
-#: src/ui.cc:1537
+#: src/ui.cc:1699
#, c-format
msgid ""
"%s: Menu %s: Help %s: Quit %s: Update %s: Download/Install/Remove Pkgs"
msgstr ""
-#: src/ui.cc:1799 src/vscreen/vscreen.cc:281
+#: src/ui.cc:1968 src/vscreen/vscreen.cc:281
msgid "yes_key"
msgstr ""
-#: src/ui.cc:1800 src/vscreen/vscreen.cc:282
+#: src/ui.cc:1969 src/vscreen/vscreen.cc:282
msgid "no_key"
msgstr ""
@@ -3608,6 +3850,15 @@
msgid "Downloading Changelog"
msgstr ""
+#: src/view_changelog.cc:54
+msgid "Download Changelog"
+msgstr ""
+
+#: src/view_changelog.cc:63
+#, c-format
+msgid "%s changes"
+msgstr ""
+
#: src/vscreen/vscreen.cc:119
#, c-format
msgid "Ouch! Got SIGTERM, dying..\n"
Modified: branches/aptitude-0.3/aptitude/po/ar.po
==============================================================================
--- branches/aptitude-0.3/aptitude/po/ar.po (original)
+++ branches/aptitude-0.3/aptitude/po/ar.po Sat Apr 30 13:41:32 2005
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: aptitude_po\n"
"Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-01-10 16:26-0800\n"
+"POT-Creation-Date: 2005-04-29 18:11-0400\n"
"PO-Revision-Date: 2004-11-27 23:06+0300\n"
"Last-Translator: Ossama M. Khayat <okhayat at yahoo.com>\n"
"Language-Team: Arabic <support at arabeyes.org>\n"
@@ -149,16 +149,103 @@
msgstr "إزالة الØزم الغير مستخدمة والتي تواÙÙ‚ عامل التصÙية تلقائياً"
#: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:184 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
-#: src/vscreen/vs_util.cc:329
+#: src/ui.cc:218 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
+#: src/vscreen/vs_util.cc:328
msgid "Ok"
msgstr "مواÙÙ‚"
#: src/apt_options.cc:242 src/download_list.cc:71 src/mine/cmine.cc:257
-#: src/mine/cmine.cc:330 src/vscreen/vs_util.cc:329
+#: src/mine/cmine.cc:330 src/vscreen/vs_util.cc:328
msgid "Cancel"
msgstr "إلغاء"
+#: src/broken_indicator.cc:106 src/solution_dialog.cc:97
+msgid "Internal error: unexpected null solution."
+msgstr ""
+
+#: src/broken_indicator.cc:158
+#, fuzzy
+msgid "Suggest "
+msgstr "يقترØ"
+
+#: src/broken_indicator.cc:164
+#, fuzzy, c-format
+msgid "%d installs"
+msgstr "تثبيت"
+
+#: src/broken_indicator.cc:169
+#, fuzzy
+msgid "1 install"
+msgstr "تثبيت"
+
+#: src/broken_indicator.cc:173
+#, c-format
+msgid "%d removals"
+msgstr ""
+
+#: src/broken_indicator.cc:178
+msgid "1 removal"
+msgstr ""
+
+#: src/broken_indicator.cc:182
+#, c-format
+msgid "%d keeps"
+msgstr ""
+
+#: src/broken_indicator.cc:187
+msgid "1 keep"
+msgstr ""
+
+#: src/broken_indicator.cc:191
+#, fuzzy, c-format
+msgid "%d upgrades"
+msgstr "ترقية"
+
+#: src/broken_indicator.cc:196
+#, fuzzy
+msgid "1 upgrade"
+msgstr "ترقية"
+
+#: src/broken_indicator.cc:200
+#, fuzzy, c-format
+msgid "%d downgrades"
+msgstr "مثبط"
+
+#: src/broken_indicator.cc:205
+#, fuzzy
+msgid "1 downgrade"
+msgstr "مثبط"
+
+#: src/broken_indicator.cc:214
+#, c-format
+msgid "%s: Examine"
+msgstr ""
+
+#: src/broken_indicator.cc:216
+#, c-format
+msgid "%s: Apply"
+msgstr ""
+
+#: src/broken_indicator.cc:218
+#, fuzzy, c-format
+msgid "%s: Next"
+msgstr "^تالي"
+
+#: src/broken_indicator.cc:220
+#, c-format
+msgid "%s: Previous"
+msgstr ""
+
+#: src/broken_indicator.cc:233
+#, c-format
+msgid "%CSolution search failed. %s: try harder"
+msgstr ""
+
+#: src/broken_indicator.cc:239
+#, c-format
+msgid "%CUnable to resolve dependencies."
+msgstr ""
+
#: src/cmdline/cmdline_action.cc:36
#, c-format
msgid ""
@@ -230,22 +317,22 @@
msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
msgstr "الØزمة %s غير قابلة للترقية، لا يمكن منع الترقية\n"
-#: src/cmdline/cmdline_action.cc:213
+#: src/cmdline/cmdline_action.cc:198
#, c-format
msgid "Note: selecting the task \"%s: %s\" for installation\n"
msgstr "ملاØظة: تØديد المهمة \"%s: %s\" للتثبيت\n"
-#: src/cmdline/cmdline_action.cc:240
+#: src/cmdline/cmdline_action.cc:225
#, c-format
msgid "You can only specify a package version with an 'install' command.\n"
msgstr "يمكنك تØديد نسخة Øزمة Ùقط مع أمر التثبيت 'install'\n"
-#: src/cmdline/cmdline_action.cc:246
+#: src/cmdline/cmdline_action.cc:231
#, c-format
msgid "You can only specify a package archive with an 'install' command.\n"
msgstr "يمكنك تØديد أرشي٠Øزمة Ùقط مع أمر التثبيت 'install'\n"
-#: src/cmdline/cmdline_action.cc:280
+#: src/cmdline/cmdline_action.cc:265
#, c-format
msgid ""
"Couldn't find package \"%s\", and more than 40\n"
@@ -254,7 +341,7 @@
"لم يمكن العثور على \"%s\"، وأكثر من 40\n"
"Øزمة تØتوي %s\" ÙÙŠ اسمها.\n"
-#: src/cmdline/cmdline_action.cc:283
+#: src/cmdline/cmdline_action.cc:268
#, c-format
msgid ""
"Couldn't find package \"%s\". However, the following\n"
@@ -263,12 +350,12 @@
"لم يمكن العثور على \"%s\". على كلّ، الØزمة\n"
"التالية تØتوي %s\" ÙÙŠ اسمها:\n"
-#: src/cmdline/cmdline_action.cc:307
+#: src/cmdline/cmdline_action.cc:292
#, c-format
msgid "Couldn't find any package whose name or description matched \"%s\"\n"
msgstr "لم يمكن العثور على أيّة Øزمة يطابق اسمها أو وصÙها \"%s\"\n"
-#: src/cmdline/cmdline_action.cc:309
+#: src/cmdline/cmdline_action.cc:294
#, c-format
msgid ""
"Couldn't find any package matching \"%s\", and more than 40\n"
@@ -277,7 +364,7 @@
"لم يمكن العثور على أيّة Øزمة تطابق \"%s\"ØŒ وأكثر من 40\n"
"Øزمة تØتوي %s\" ÙÙŠ وصÙها.\n"
-#: src/cmdline/cmdline_action.cc:312
+#: src/cmdline/cmdline_action.cc:297
#, c-format
msgid ""
"Couldn't find any package matching \"%s\". However, the following\n"
@@ -320,13 +407,13 @@
msgid "Freed %sB of disk space\n"
msgstr "سو٠يÙرغ %sبايت من مساØØ© القرص"
-#: src/cmdline/cmdline_do_action.cc:67
+#: src/cmdline/cmdline_do_action.cc:71
#, c-format
msgid "Invalid operation %s"
msgstr "عملية غير صالØØ© %s"
-#: src/cmdline/cmdline_do_action.cc:206 src/cmdline/cmdline_simulate.cc:30
-#: src/cmdline/cmdline_upgrade.cc:89
+#: src/cmdline/cmdline_do_action.cc:201 src/cmdline/cmdline_simulate.cc:31
+#: src/cmdline/cmdline_upgrade.cc:91
#, c-format
msgid "Abort.\n"
msgstr "إجهاض.\n"
@@ -336,7 +423,7 @@
msgid "download: you must specify at least one package to download\n"
msgstr "التنزيل: يجب تØديد Øزمة واØدة على الأقل لتنزيلها\n"
-#: src/cmdline/cmdline_download.cc:43 src/download.cc:342
+#: src/cmdline/cmdline_download.cc:43 src/download.cc:344
msgid "Couldn't read source list"
msgstr "تعذرت قراءة لائØØ© المصادر"
@@ -398,95 +485,95 @@
msgid "What is it? It's an elephant being eaten by a snake, of course.\n"
msgstr "ما الأمر؟ إنّه Ùيلٌ التهمه ثعبان بالطبع.\n"
-#: src/cmdline/cmdline_prompt.cc:44
+#: src/cmdline/cmdline_prompt.cc:45
msgid "Couldn't read list of sources"
msgstr "تعذرت قراءة لائØØ© المصادر"
-#: src/cmdline/cmdline_prompt.cc:219 src/cmdline/cmdline_show_broken.cc:73
+#: src/cmdline/cmdline_prompt.cc:220 src/cmdline/cmdline_show_broken.cc:73
#, c-format
msgid "but %s is to be installed."
msgstr "إلا أنه يجب تثبيت %s."
-#: src/cmdline/cmdline_prompt.cc:222 src/cmdline/cmdline_show_broken.cc:76
+#: src/cmdline/cmdline_prompt.cc:223 src/cmdline/cmdline_show_broken.cc:76
#, c-format
msgid "but %s is installed and it is kept back."
msgstr "إلا أن %s مثبتة ومÙبقاة."
-#: src/cmdline/cmdline_prompt.cc:225 src/cmdline/cmdline_show_broken.cc:79
+#: src/cmdline/cmdline_prompt.cc:226 src/cmdline/cmdline_show_broken.cc:79
#, c-format
msgid "but %s is installed."
msgstr "إلا أنّ %s مثبتة."
-#: src/cmdline/cmdline_prompt.cc:229 src/cmdline/cmdline_show_broken.cc:83
+#: src/cmdline/cmdline_prompt.cc:230 src/cmdline/cmdline_show_broken.cc:83
#, c-format
msgid "but it is not installable"
msgstr "إلا أنّها غير قابلة للتثبيت"
-#: src/cmdline/cmdline_prompt.cc:233 src/cmdline/cmdline_show_broken.cc:87
+#: src/cmdline/cmdline_prompt.cc:234 src/cmdline/cmdline_show_broken.cc:87
#, c-format
msgid " which is a virtual package."
msgstr " والتي هي Øزمة وهمية."
-#: src/cmdline/cmdline_prompt.cc:236 src/cmdline/cmdline_show_broken.cc:90
+#: src/cmdline/cmdline_prompt.cc:237 src/cmdline/cmdline_show_broken.cc:90
#, c-format
msgid " or"
msgstr " أو"
-#: src/cmdline/cmdline_prompt.cc:248
+#: src/cmdline/cmdline_prompt.cc:249
msgid "The following packages are BROKEN:"
msgstr "الØزمة التالية معطوبة:"
-#: src/cmdline/cmdline_prompt.cc:249
+#: src/cmdline/cmdline_prompt.cc:250
msgid "The following packages are unused and will be REMOVED:"
msgstr "الØزم التالية غير مستخدمة وسو٠تزال:"
-#: src/cmdline/cmdline_prompt.cc:250
+#: src/cmdline/cmdline_prompt.cc:251
msgid "The following packages have been automatically kept back:"
msgstr "تمّ إبقاء الØزمة التالية تلقائياً:"
-#: src/cmdline/cmdline_prompt.cc:251
+#: src/cmdline/cmdline_prompt.cc:252
msgid "The following NEW packages will be automatically installed:"
msgstr "الØزم الجديدة التالية سو٠تÙثبت تلقائياً:"
-#: src/cmdline/cmdline_prompt.cc:252
+#: src/cmdline/cmdline_prompt.cc:253
msgid "The following packages will be automatically REMOVED:"
msgstr "سيتم إزالة الØزم التالية تلقائياً:"
-#: src/cmdline/cmdline_prompt.cc:253
+#: src/cmdline/cmdline_prompt.cc:254
msgid "The following packages will be DOWNGRADED:"
msgstr "سيتم تثبيط الØزم التالية:"
-#: src/cmdline/cmdline_prompt.cc:254
+#: src/cmdline/cmdline_prompt.cc:255
msgid "The following packages have been kept back:"
msgstr "تم إبقاء الØزم التالية:"
-#: src/cmdline/cmdline_prompt.cc:255
+#: src/cmdline/cmdline_prompt.cc:256
msgid "The following packages will be REINSTALLED:"
msgstr "سيعاد تثبيت الØزم التالية:"
-#: src/cmdline/cmdline_prompt.cc:256
+#: src/cmdline/cmdline_prompt.cc:257
msgid "The following NEW packages will be installed:"
msgstr "سيتم تثبيت الØزم الجديدة التالية:"
-#: src/cmdline/cmdline_prompt.cc:257
+#: src/cmdline/cmdline_prompt.cc:258
msgid "The following packages will be REMOVED:"
msgstr "سيتم إزالة الØزم التالية:"
-#: src/cmdline/cmdline_prompt.cc:258
+#: src/cmdline/cmdline_prompt.cc:259
msgid "The following packages will be upgraded:"
msgstr "ستتم ترقية الØزم التالية:"
-#: src/cmdline/cmdline_prompt.cc:307
+#: src/cmdline/cmdline_prompt.cc:311
#, c-format
msgid "The following ESSENTIAL packages will be REMOVED!\n"
msgstr "الØزم الأساسيّة التالية سيتم إزالتها!\n"
-#: src/cmdline/cmdline_prompt.cc:316
+#: src/cmdline/cmdline_prompt.cc:320
#, c-format
msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
msgstr "Ø³ØªØµØ¨Ø Ø§Ù„Øزم الأساسية التالية معطوبة بسبب هذا العمل:\n"
-#: src/cmdline/cmdline_prompt.cc:326
+#: src/cmdline/cmdline_prompt.cc:330
#, c-format
msgid ""
"WARNING: Performing this action will probably cause your system to break!\n"
@@ -495,96 +582,99 @@
"تØذير: إجراء هذا العمل سيتسبب على Ø§Ù„Ø£Ø±Ø¬Ø Ø¨Ø¥Ø¹Ø·Ø§Ø¨ نظامك!\n"
" لا تÙكمل ما لم تكن متأكّداً مما تقوم به بالضبط!\n"
-#: src/cmdline/cmdline_prompt.cc:328
+#: src/cmdline/cmdline_prompt.cc:332
msgid "I am aware that this is a very bad idea"
msgstr "أعلم أن هذه Ùكرة سيئة جداً"
-#: src/cmdline/cmdline_prompt.cc:331
+#: src/cmdline/cmdline_prompt.cc:335
#, c-format
msgid "To continue, type the phrase \"%s\":\n"
msgstr "للاستمرار، اكتب الجملة \"%s\":\n"
-#: src/cmdline/cmdline_prompt.cc:434
+#: src/cmdline/cmdline_prompt.cc:438
#, c-format
msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
msgstr "الØزم التالية مقترØØ© ولكن لن يتم تثبيتها:\n"
-#: src/cmdline/cmdline_prompt.cc:440
+#: src/cmdline/cmdline_prompt.cc:444
#, c-format
msgid "The following packages are SUGGESTED but will NOT be installed:\n"
msgstr "الØزم التالية مقترØØ© ولكن لن يتم تثبيتها:\n"
-#: src/cmdline/cmdline_prompt.cc:445
+#: src/cmdline/cmdline_prompt.cc:449
#, c-format
msgid "No packages will be installed, upgraded, or removed.\n"
msgstr "لن يتم تثبيت، أو ترقية، أو إزالة أية Øزم.\n"
-#: src/cmdline/cmdline_prompt.cc:447
+#: src/cmdline/cmdline_prompt.cc:451
#, c-format
msgid "%lu packages upgraded, %lu newly installed, "
msgstr "%lu Øزمة تمت ترقيتها، Ùˆ%lu Øزمة جديدة تم تثبيتها، "
-#: src/cmdline/cmdline_prompt.cc:451
+#: src/cmdline/cmdline_prompt.cc:455
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu تمت إعادة تثبيتها، "
-#: src/cmdline/cmdline_prompt.cc:453
+#: src/cmdline/cmdline_prompt.cc:457
#, c-format
msgid "%lu downgraded, "
msgstr "%lu تم تثبيطها، "
-#: src/cmdline/cmdline_prompt.cc:455
+#: src/cmdline/cmdline_prompt.cc:459
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu سيتم إزالتها و %lu لم يتم ترقيتها.\n"
-#: src/cmdline/cmdline_prompt.cc:462
+#: src/cmdline/cmdline_prompt.cc:466
#, c-format
msgid "Need to get %sB/%sB of archives. "
msgstr "Ù†Øتاج إلى جلب %sب/%sب من الأرشيÙ. "
-#: src/cmdline/cmdline_prompt.cc:465
+#: src/cmdline/cmdline_prompt.cc:469
#, c-format
msgid "Need to get %sB of archives. "
msgstr "يجب جلب %sب من الأرشيÙ. "
-#: src/cmdline/cmdline_prompt.cc:472
+#: src/cmdline/cmdline_prompt.cc:476
#, c-format
msgid "After unpacking %sB will be used.\n"
msgstr "ÙÙƒ ÙÙƒ التغلي٠سيستخدم %sب.\n"
-#: src/cmdline/cmdline_prompt.cc:475
+#: src/cmdline/cmdline_prompt.cc:479
#, c-format
msgid "After unpacking %sB will be freed.\n"
msgstr "ÙÙƒ ÙÙƒ التغلي٠سيÙرغ %sب.\n"
-#: src/cmdline/cmdline_prompt.cc:521
+#: src/cmdline/cmdline_prompt.cc:524
#, c-format
msgid "Bad action character '%c'\n"
msgstr "Øر٠عمل سيء '%c'\n"
-#: src/cmdline/cmdline_prompt.cc:596
+#: src/cmdline/cmdline_prompt.cc:595
#, c-format
msgid "No packages to show -- enter the package names on the line after 'i'.\n"
msgstr "ليست هناك Øزم لإظهارها -- أدخل أسماء الØزم على السطر بعد 'i'.\n"
-#: src/cmdline/cmdline_prompt.cc:598 src/cmdline/cmdline_prompt.cc:629
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:597
msgid "Press Return to continue."
msgstr "إضغط زر الإدخال للاستمرار."
-#: src/cmdline/cmdline_prompt.cc:625
+#: src/cmdline/cmdline_prompt.cc:623
#, c-format
msgid "No packages found -- enter the package names on the line after 'c'.\n"
msgstr "لم يعثر على أية Øزم -- أدخل أسماء الØزم على السطر بعد 'c'.\n"
-#: src/cmdline/cmdline_prompt.cc:665
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:627
+#, fuzzy
+msgid "Press Return to continue"
+msgstr "إضغط زر الإدخال للاستمرار."
+
+#: src/cmdline/cmdline_prompt.cc:675
msgid "Do you want to continue? [Y/n/?] "
msgstr "هل تريد الاستمرار؟ [ن/ل/؟]"
-#: src/cmdline/cmdline_prompt.cc:690
+#: src/cmdline/cmdline_prompt.cc:700
#, c-format
msgid ""
"\n"
@@ -595,7 +685,7 @@
"سو٠تظهر معلومات المعتمدات.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:692
+#: src/cmdline/cmdline_prompt.cc:702
#, c-format
msgid ""
"\n"
@@ -606,7 +696,7 @@
"لن تظهر معلومات المعتمدات.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:698
+#: src/cmdline/cmdline_prompt.cc:708
#, c-format
msgid ""
"\n"
@@ -617,7 +707,7 @@
"ستظهر معلومات النسخة.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:700
+#: src/cmdline/cmdline_prompt.cc:710
#, c-format
msgid ""
"\n"
@@ -628,7 +718,7 @@
"لن تظهر معلومات النسخة.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:705
+#: src/cmdline/cmdline_prompt.cc:715
#, c-format
msgid ""
"\n"
@@ -639,7 +729,7 @@
"ستظهر تغييرات الØجم.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:717
#, c-format
msgid ""
"\n"
@@ -650,7 +740,7 @@
"لن تظهر تغييرات الØجم.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:737
#, fuzzy, c-format
msgid ""
"Commands:\n"
@@ -697,32 +787,83 @@
" _ : Purge\n"
" = : Hold\n"
-#: src/cmdline/cmdline_prompt.cc:751
+#: src/cmdline/cmdline_prompt.cc:761
#, c-format
msgid "Invalid response. Please enter a valid command or '?' for help.\n"
msgstr "ردّ غير صالØ. رجاء أدخل أمراً صالØاً Ø£ 'ØŸ' للمساعدة.\n"
+#: src/cmdline/cmdline_resolver.cc:84
+#, c-format
+msgid "y: %F%nn: %F%nq: %F%n,: %F%n.: %F%n"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:90
+msgid "accept the proposed changes"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:92
+msgid "reject the proposed changes and search for another solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:94
+#, fuzzy
+msgid "give up and quit the program"
+msgstr "الخروج من البرنامج"
+
+#: src/cmdline/cmdline_resolver.cc:96
+msgid "move to the next solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:98
+msgid "move to the previous solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:131
+#, fuzzy
+msgid "The following actions will resolve these dependencies:"
+msgstr "الØزم التالية لها معتمدات غير متوÙرة:\n"
+
+#: src/cmdline/cmdline_resolver.cc:146
+msgid "Accept this solution? [Y/n/q/?]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:174
+msgid "Abandoning all efforts to resolve these dependencies."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:184
+#, fuzzy
+msgid "The following commands are available:"
+msgstr "الØزمة التالية معطوبة:"
+
+#: src/cmdline/cmdline_resolver.cc:188
+#, fuzzy
+msgid "Invalid response; please enter one of the following commands:"
+msgstr "ردّ غير صالØ. رجاء أدخل أمراً صالØاً Ø£ 'ØŸ' للمساعدة.\n"
+
+#: src/cmdline/cmdline_resolver.cc:198
+msgid "No solution found within the allotted time. Try harder? [Y/n]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:226
+#, fuzzy
+msgid "Invalid response; please enter 'y' or 'n'."
+msgstr "ردّ غير صالØ. رجاء أدخل أمراً صالØاً Ø£ 'ØŸ' للمساعدة.\n"
+
+#: src/cmdline/cmdline_resolver.cc:235
+msgid "Unable to resolve dependencies! Giving up..."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:240
+msgid "No more solutions."
+msgstr ""
+
#: src/cmdline/cmdline_search.cc:78
#, c-format
msgid "search: You must provide at least one search term\n"
msgstr "البØØ«: يجب أن تعطي كلمة بØØ« واØدة على الأقل\n"
-#: src/cmdline/cmdline_show_broken.cc:114
-#, c-format
-msgid ""
-"Some packages had unmet dependencies. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming.\n"
-"\n"
-msgstr ""
-"كان لبعض الØزم معتمدات غير متوÙرة. قد يعني هذا أنّك\n"
-"طلبت وضعاً مستØيلاً أو إن كنت تستخدم توزيعة\n"
-"unstable Ùذلك يعني أن بعض الØزم المطلوبة لم تÙنشأ\n"
-"بعد أو أنه تمت إزالتها من الوارد.\n"
-"\n"
-
-#: src/cmdline/cmdline_show_broken.cc:115
+#: src/cmdline/cmdline_show_broken.cc:113
#, c-format
msgid "The following packages have unmet dependencies:\n"
msgstr "الØزم التالية لها معتمدات غير متوÙرة:\n"
@@ -920,12 +1061,12 @@
msgid "Description: "
msgstr "الوصÙ: "
-#: src/cmdline/cmdline_simulate.cc:36
+#: src/cmdline/cmdline_simulate.cc:37
#, c-format
msgid "Would download/install/remove packages.\n"
msgstr "سيقوم بتنزيل/تثبيت/إزالة الØزم.\n"
-#: src/cmdline/cmdline_simulate.cc:47
+#: src/cmdline/cmdline_simulate.cc:48
#, fuzzy
msgid "Internal Error, Ordering didn't finish"
msgstr "خطأ داخلي، لم ينته الترتيب"
@@ -968,28 +1109,24 @@
msgid "UNAVAILABLE"
msgstr "غير متوÙر"
-#: src/download_bar.cc:57 src/download_list.cc:265
+#: src/download_bar.cc:56 src/download_list.cc:263 src/download_screen.cc:57
#, c-format
-msgid ""
-"Please insert the following disc into the drive \"%s\":\n"
-"%s"
-msgstr ""
-"رجاء أدخل القرص التالي ÙÙŠ السواقة \"%s\":\n"
-"%s"
+msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
+msgstr "رجاء إدخال القرص المÙعنون \"%s\" ÙÙŠ السواقة \"%s\""
-#: src/download_bar.cc:76 src/generic/acqprogress.cc:63
+#: src/download_bar.cc:77 src/generic/acqprogress.cc:63
msgid "Hit "
msgstr "زيارة "
-#: src/download_bar.cc:89
+#: src/download_bar.cc:90
msgid "Downloading "
msgstr "تØميل "
-#: src/download_bar.cc:102
+#: src/download_bar.cc:103
msgid "Got "
msgstr "ØÙصل على "
-#: src/download_bar.cc:156
+#: src/download_bar.cc:157
msgid "Downloading..."
msgstr "جاري التØميل..."
@@ -997,7 +1134,7 @@
msgid "Couldn't read list of package sources"
msgstr "تعذرت قراءة لائØØ© مصادر الØزم"
-#: src/download.cc:104 src/download.cc:321
+#: src/download.cc:104 src/download.cc:322
msgid "Couldn't lock list directory..are you root?"
msgstr "لم يمكن Ù‚ÙÙ„ دليل اللائØØ©... أأنت مستخدم جذر؟"
@@ -1009,29 +1146,33 @@
msgid "View the progress of the package list update"
msgstr "عرض سريان تØديث لائØØ© الØزم"
-#: src/download.cc:159
+#: src/download.cc:113
+msgid "List Update"
+msgstr ""
+
+#: src/download.cc:160
msgid "Couldn't clean out list directories"
msgstr "لم يمكن تنظي٠أدلة اللوائØ"
-#: src/download.cc:176 src/ui.cc:1068
+#: src/download.cc:177 src/ui.cc:1152
msgid "Deleting obsolete downloaded files"
msgstr "Øذ٠الملÙات المنزلة الملغاة"
-#: src/download.cc:181
+#: src/download.cc:182
#, c-format
msgid "Deleting obsolete downloaded files\n"
msgstr "Øذ٠الملÙات المنزلة الملغاة\n"
-#: src/download.cc:223
+#: src/download.cc:224
#, c-format
msgid "Unable to open %s to log actions"
msgstr "لم يمكن ÙØªØ %s لتسجيل الأعمال"
-#: src/download.cc:229
+#: src/download.cc:230
msgid "log report"
msgstr "تقرير التسجيل"
-#: src/download.cc:230
+#: src/download.cc:231
#, c-format
msgid ""
"IMPORTANT: this log only lists intended actions; actions which fail due to\n"
@@ -1039,77 +1180,77 @@
"\n"
msgstr ""
-#: src/download.cc:231
+#: src/download.cc:232
#, c-format
msgid "Will install %li packages, and remove %li packages.\n"
msgstr "سيثبّت %li Øزمة، ويزيل %li Øزمة.\n"
-#: src/download.cc:233
+#: src/download.cc:234
#, c-format
msgid "%sB of disk space will be used\n"
msgstr "%s بايت من مساØØ© القرص سيتم استخدامها\n"
-#: src/download.cc:236
+#: src/download.cc:237
#, c-format
msgid "%sB bytes of disk space will be freed\n"
msgstr "%s بايت من مساØØ© القرص سيتم Ø¥Ùراغها\n"
-#: src/download.cc:244
+#: src/download.cc:245
#, c-format
msgid "[UPGRADE] %s %s -> %s\n"
msgstr "[ترقية] %s %s -> %s\n"
-#: src/download.cc:248
+#: src/download.cc:249
#, c-format
msgid "[DOWNGRADE] %s %s -> %s\n"
msgstr "[تثبيط] %s %s -> %s\n"
-#: src/download.cc:258
+#: src/download.cc:259
msgid "REMOVE"
msgstr "إزالة"
-#: src/download.cc:264
+#: src/download.cc:265
msgid "INSTALL"
msgstr "تثبيت"
-#: src/download.cc:267
+#: src/download.cc:268
msgid "REINSTALL"
msgstr "إعادة تثبيت"
-#: src/download.cc:270
+#: src/download.cc:271
msgid "HOLD"
msgstr "إمساك"
-#: src/download.cc:273
+#: src/download.cc:274
msgid "BROKEN"
msgstr "معطوب"
-#: src/download.cc:276
+#: src/download.cc:277
msgid "REMOVE, NOT USED"
msgstr "إزالة، غير مستخدم"
-#: src/download.cc:279
+#: src/download.cc:280
msgid "REMOVE, DEPENDENCIES"
msgstr "إزالة، معتمدات"
-#: src/download.cc:282
+#: src/download.cc:283
msgid "INSTALL, DEPENDENCIES"
msgstr "تثبيت، معتمدات"
-#: src/download.cc:285
+#: src/download.cc:286
msgid "HOLD, DEPENDENCIES"
msgstr "إمساك، معتمدات"
-#: src/download.cc:287
+#: src/download.cc:288
msgid "????????"
msgstr "????????"
-#: src/download.cc:291
+#: src/download.cc:292
#, c-format
msgid "[%s] %s\n"
msgstr "[%s] %s\n"
-#: src/download.cc:294
+#: src/download.cc:295
#, c-format
msgid ""
"===============================================================================\n"
@@ -1120,32 +1261,37 @@
"\n"
"اكتمل التسجيل.\n"
-#: src/download.cc:329
+#: src/download.cc:330
msgid "Downloading packages"
msgstr "تنزيل الØزم"
-#: src/download.cc:330
+#: src/download.cc:331
msgid "View the progress of the package download"
msgstr "عرض سريان تØميل الØزم"
-#: src/download.cc:352
+#: src/download.cc:332
+#, fuzzy
+msgid "Package Download"
+msgstr "الØزمة: "
+
+#: src/download.cc:354
msgid "Internal error: couldn't generate list of packages to download"
msgstr "خطأ داخلي: لم يمكن توليد لائØØ© الØزم المطلوب تنزيلها"
-#: src/download.cc:413
+#: src/download.cc:415
msgid "Unable to correct for unavailable packages"
msgstr ""
-#: src/download.cc:465
+#: src/download.cc:467
msgid ""
"Ack! Something bad happened while installing packages. Trying to recover:"
msgstr ""
-#: src/download.cc:475 src/pkg_item.cc:413
+#: src/download.cc:477 src/pkg_item.cc:432
msgid "Press return to continue.\n"
msgstr "اضغط Ù…ÙØªØ§Ø Ø§Ù„Ø¥Ø¯Ø®Ø§Ù„ للاستمرار.\n"
-#: src/download.cc:506
+#: src/download.cc:508
msgid ""
"Could not regain the system lock! (Perhaps another apt or dpkg is running?)"
msgstr ""
@@ -1205,11 +1351,6 @@
msgid "[ERROR]"
msgstr "[خطأ]"
-#: src/download_screen.cc:57
-#, c-format
-msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
-msgstr "رجاء إدخال القرص المÙعنون \"%s\" ÙÙŠ السواقة \"%s\""
-
#: src/download_screen.cc:181
#, c-format
msgid "Downloaded %sB in %ss (%sB/s)."
@@ -1248,109 +1389,109 @@
msgstr ""
"تغيير الوسط: رجاء إدخال القرص المعنون '%s' ÙÙŠ السواقة '%s' وضغط زر الإدخال\n"
-#: src/generic/aptcache.cc:245
+#: src/generic/aptcache.cc:253
msgid "Can't open Aptitude extended state file"
msgstr "تعذر ÙØªØ Ù…Ù„Ù ÙˆØ¶Ø¹ Aptitude التÙصيلي"
-#: src/generic/aptcache.cc:252 src/generic/aptcache.cc:305
-#: src/generic/aptcache.cc:307
+#: src/generic/aptcache.cc:260 src/generic/aptcache.cc:313
+#: src/generic/aptcache.cc:315
msgid "Reading extended state information"
msgstr "قراءة معلومات الوضع التÙصيلية"
-#: src/generic/aptcache.cc:313 src/generic/aptcache.cc:387
-#: src/generic/aptcache.cc:390
+#: src/generic/aptcache.cc:321 src/generic/aptcache.cc:395
+#: src/generic/aptcache.cc:398
msgid "Initializing package states"
msgstr ""
-#: src/generic/aptcache.cc:501
+#: src/generic/aptcache.cc:509
msgid "Cannot open Aptitude state file"
msgstr "تعذر ÙØªØ Ù…Ù„Ù ÙˆØ¶Ø¹ Aptitude"
-#: src/generic/aptcache.cc:505 src/generic/aptcache.cc:560
-#: src/generic/aptcache.cc:563
+#: src/generic/aptcache.cc:513 src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:571
msgid "Writing extended state information"
msgstr "كتابة معلومات الوضع التÙصيلية"
-#: src/generic/aptcache.cc:542
+#: src/generic/aptcache.cc:550
#, c-format
msgid "Internal buffer overflow on package \"%s\" while writing state file"
msgstr ""
-#: src/generic/aptcache.cc:551
+#: src/generic/aptcache.cc:559
msgid "Couldn't write state file"
msgstr "تعذرت كتابة مل٠الوضع"
-#: src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:576
msgid "Error writing state file"
msgstr "خطأ ÙÙŠ كتابة مل٠الوضع"
-#: src/generic/aptcache.cc:584
+#: src/generic/aptcache.cc:592
msgid "couldn't replace old state file"
msgstr "تعذر استبدال مل٠الوضع القديم"
-#: src/generic/aptcache.cc:960
+#: src/generic/aptcache.cc:1000
msgid "Unable to correct dependencies, some packages cannot be installed"
msgstr "لم يمكن تصØÙŠØ Ø§Ù„Ù…Ø¹ØªÙ…Ø¯Ø§ØªØŒ لذا لن يمكن تثبيت بعض الØزم"
-#: src/generic/aptcache.cc:1325
+#: src/generic/aptcache.cc:1546
msgid "The list of sources could not be read."
msgstr "تعذرت قراءة لائØØ© المصادر."
-#: src/generic/aptcache.cc:1332
+#: src/generic/aptcache.cc:1553
msgid "The package lists or status file could not be parsed or opened."
msgstr "Ù„ÙˆØ§Ø¦Ø Ø§Ù„Øزم أو مل٠الوضع لم يمكن إعرابه أو ÙتØÙ‡."
-#: src/generic/aptcache.cc:1335
+#: src/generic/aptcache.cc:1556
msgid "You may want to update the package lists to correct these missing files"
msgstr "قد ترغب بتØديث Ù„ÙˆØ§Ø¦Ø Ø§Ù„Øزم لتصØÙŠØ Ù‡Ø°Ù‡ الملÙات المÙقودة"
-#: src/generic/apt.cc:141
+#: src/generic/apt.cc:142
#, c-format
msgid "Unable to open %s for writing"
msgstr "تعذر ÙØªØ %s للكتابة"
-#: src/generic/apt.cc:151
+#: src/generic/apt.cc:152
#, c-format
msgid "Unable to replace %s with new configuration file"
msgstr "تعذر استبدال %s بمل٠التهيئة الجديد"
-#: src/generic/apt.cc:226
+#: src/generic/apt.cc:227
msgid "Warning: could not lock the cache file. Opening in read-only mode"
msgstr ""
-#: src/generic/matchers.cc:780
+#: src/generic/matchers.cc:797
msgid "Unmatched '('"
msgstr "'(' غير Ù…Ùطابق"
-#: src/generic/matchers.cc:870 src/generic/matchers.cc:949
+#: src/generic/matchers.cc:887 src/generic/matchers.cc:968
#, c-format
msgid "Unknown dependency type: %s"
msgstr "نوع معتمد مجهول: %s"
-#: src/generic/matchers.cc:931
+#: src/generic/matchers.cc:950
#, c-format
msgid "Unknown action type: %s"
msgstr "نوع عمل مجهول: %s"
-#: src/generic/matchers.cc:998
+#: src/generic/matchers.cc:1017
#, c-format
msgid "Unknown priority %s"
msgstr "أولوية مجهولة %s"
-#: src/generic/matchers.cc:1020
+#: src/generic/matchers.cc:1039
#, c-format
msgid "Unknown pattern type: %c"
msgstr "نوع صيغة مجهول: %c"
-#: src/generic/matchers.cc:1065
+#: src/generic/matchers.cc:1084
msgid "Unexpected empty expression"
msgstr "صيغة Ùارغة غير متوقعة"
-#: src/generic/matchers.cc:1100
+#: src/generic/matchers.cc:1119
msgid "Badly formed expression"
msgstr "صيغة مشكلة بشكل سيء"
-#: src/generic/matchers.cc:1129
+#: src/generic/matchers.cc:1148
msgid "Unexpected ')'"
msgstr "')' غير متوقع"
@@ -1373,7 +1514,7 @@
msgid "Can't get value of $HOME, using TMPDIR (insecure)"
msgstr "لا يمكن الØصول على قيمة $HOMEØŒ استخدام TMPDIR (غير آمن)"
-#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:60
+#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:61
#, c-format
msgid "ChangeLog of %s"
msgstr "سجل تغييرات %s"
@@ -1573,292 +1714,300 @@
msgid "Invalid sorting policy type '%s'"
msgstr ""
-#: src/main.cc:68
+#: src/main.cc:67
#, c-format
msgid "%s %s compiled at %s %s\n"
msgstr ""
-#: src/main.cc:71
+#: src/main.cc:70
#, c-format
msgid "Compiler: g++ %s\n"
msgstr ""
-#: src/main.cc:74
+#: src/main.cc:73
#, c-format
msgid ""
"\n"
"NCurses version: %s\n"
msgstr ""
-#: src/main.cc:76
+#: src/main.cc:75
#, c-format
msgid ""
"\n"
"Curses version: %s\n"
msgstr ""
-#: src/main.cc:78
+#: src/main.cc:77
#, c-format
msgid "libsigc++ version: %s\n"
msgstr ""
-#: src/main.cc:84
+#: src/main.cc:83
#, c-format
msgid "Usage: aptitude [-S fname] [-u|-i]"
msgstr ""
-#: src/main.cc:86
+#: src/main.cc:85
#, c-format
msgid " aptitude [options] <action> ..."
msgstr ""
-#: src/main.cc:88
+#: src/main.cc:87
#, c-format
msgid ""
" Actions (if none is specified, aptitude will enter interactive mode):\n"
"\n"
msgstr ""
-#: src/main.cc:89
+#: src/main.cc:88
#, c-format
msgid " install - Install/upgrade packages\n"
msgstr ""
-#: src/main.cc:90
+#: src/main.cc:89
#, c-format
msgid " remove - Remove packages\n"
msgstr ""
-#: src/main.cc:91
+#: src/main.cc:90
#, c-format
msgid " purge - Remove packages and their configuration files\n"
msgstr ""
-#: src/main.cc:92
+#: src/main.cc:91
#, c-format
msgid " hold - Place packages on hold\n"
msgstr ""
-#: src/main.cc:93
+#: src/main.cc:92
#, c-format
msgid " unhold - Cancel a hold command for a package\n"
msgstr ""
-#: src/main.cc:94
+#: src/main.cc:93
#, c-format
msgid " markauto - Mark packages as having been automatically installed\n"
msgstr ""
-#: src/main.cc:95
+#: src/main.cc:94
#, c-format
msgid " unmarkauto - Mark packages as having been manually installed\n"
msgstr ""
-#: src/main.cc:100
+#: src/main.cc:99
#, c-format
msgid ""
" forbid-version - Forbid aptitude from upgrading to a specific package "
"version.\n"
msgstr ""
-#: src/main.cc:101
+#: src/main.cc:100
#, c-format
msgid " update - Download lists of new/upgradable packages\n"
msgstr ""
-#: src/main.cc:102
+#: src/main.cc:101
#, c-format
msgid " upgrade - Perform a safe upgrade\n"
msgstr ""
-#: src/main.cc:103
+#: src/main.cc:102
#, c-format
msgid ""
" dist-upgrade - Perform an upgrade, possibly installing and removing "
"packages\n"
msgstr ""
-#: src/main.cc:104
+#: src/main.cc:103
#, c-format
msgid " forget-new - Forget what packages are \"new\"\n"
msgstr ""
-#: src/main.cc:105
+#: src/main.cc:104
#, c-format
msgid " search - Search for a package by name and/or expression\n"
msgstr ""
-#: src/main.cc:106
+#: src/main.cc:105
#, c-format
msgid " show - Display detailed information about a package\n"
msgstr ""
-#: src/main.cc:107
+#: src/main.cc:106
#, c-format
msgid " clean - Erase downloaded package files\n"
msgstr ""
-#: src/main.cc:108
+#: src/main.cc:107
#, c-format
msgid " autoclean - Erase old downloaded package files\n"
msgstr ""
-#: src/main.cc:109
+#: src/main.cc:108
#, c-format
msgid " changelog - View a package's changelog\n"
msgstr ""
-#: src/main.cc:110
+#: src/main.cc:109
#, c-format
msgid " download - Download the .deb file for a package\n"
msgstr ""
-#: src/main.cc:112
+#: src/main.cc:111
#, c-format
msgid " Options:\n"
msgstr ""
-#: src/main.cc:113
+#: src/main.cc:112
#, c-format
msgid " -h This help text\n"
msgstr ""
-#: src/main.cc:114
+#: src/main.cc:113
#, c-format
msgid " -s Simulate actions, but do not actually perform them.\n"
msgstr ""
-#: src/main.cc:115
+#: src/main.cc:114
#, c-format
msgid ""
" -d Only download packages, do not install or remove anything.\n"
msgstr ""
-#: src/main.cc:116
+#: src/main.cc:115
#, c-format
msgid " -P Always prompt for confirmation or actions\n"
msgstr ""
-#: src/main.cc:117
+#: src/main.cc:116
#, c-format
msgid ""
" -y Assume that the answer to simple yes/no questions is 'yes'\n"
msgstr ""
-#: src/main.cc:118
+#: src/main.cc:117
#, c-format
msgid ""
" -F format Specify a format for displaying search results; see the "
"manual\n"
msgstr ""
-#: src/main.cc:119
+#: src/main.cc:118
#, c-format
msgid ""
" -O order Specify how search results should be sorted; see the manual\n"
msgstr ""
-#: src/main.cc:120
+#: src/main.cc:119
#, c-format
msgid ""
" -w width Specify the display width for formatting search results\n"
msgstr ""
-#: src/main.cc:121
+#: src/main.cc:120
#, c-format
msgid " -f Aggressively try to fix broken packages.\n"
msgstr ""
-#: src/main.cc:122
+#: src/main.cc:121
#, c-format
msgid " -V Show which versions of packages are to be installed.\n"
msgstr ""
-#: src/main.cc:123
+#: src/main.cc:122
#, c-format
msgid ""
" -D Show the dependencies of automatically changed packages.\n"
msgstr ""
-#: src/main.cc:124
+#: src/main.cc:123
#, c-format
msgid " -Z\t\t Show the change in installed size of each package.\n"
msgstr ""
-#: src/main.cc:125
+#: src/main.cc:124
#, c-format
msgid ""
" -v Display extra information. (may be supplied multiple times)\n"
msgstr ""
-#: src/main.cc:126
+#: src/main.cc:125
#, c-format
msgid ""
" -t [release] Set the release from which packages should be installed\n"
msgstr ""
-#: src/main.cc:127
+#: src/main.cc:126
#, c-format
msgid " -o key=val Directly set the configuration option named 'key'\n"
msgstr ""
-#: src/main.cc:128
+#: src/main.cc:127
#, c-format
msgid ""
" --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
" strong dependencies\n"
msgstr ""
-#: src/main.cc:129
+#: src/main.cc:128
#, c-format
msgid " -S fname: Read the aptitude extended status info from fname.\n"
msgstr ""
-#: src/main.cc:130
+#: src/main.cc:129
#, c-format
msgid " -u : Download new package lists on startup.\n"
msgstr ""
-#: src/main.cc:131
+#: src/main.cc:130
#, c-format
msgid " -i : Perform an install run on startup.\n"
msgstr ""
-#: src/main.cc:133
+#: src/main.cc:132
#, c-format
msgid " This aptitude does not have Super Cow Powers.\n"
msgstr ""
-#: src/main.cc:254
+#: src/main.cc:253
#, c-format
msgid "-o requires an argument of the form key=value, got %s"
msgstr ""
-#: src/main.cc:300 src/main.cc:309
+#: src/main.cc:299 src/main.cc:308
msgid "WEIRDNESS: unknown option code received\n"
msgstr ""
-#: src/main.cc:318
+#: src/main.cc:317
msgid "Only one of -u and -i may be specified\n"
msgstr ""
-#: src/main.cc:326
+#: src/main.cc:325
msgid ""
"-u and -i may not be specified in command-line mode (eg, with 'install')"
msgstr ""
-#: src/main.cc:337
+#: src/main.cc:342
msgid "-u and -i may not be specified with a command"
msgstr ""
-#: src/main.cc:392
+#: src/main.cc:399
#, c-format
msgid "Unknown command \"%s\"\n"
msgstr ""
-#: src/main.cc:400
+#: src/main.cc:406 src/main.cc:463
+msgid "Internal error: uncaught 'out of solutions' exception.\n"
+msgstr ""
+
+#: src/main.cc:411 src/main.cc:468
+msgid "Internal error: uncaught 'out of time' exception.\n"
+msgstr ""
+
+#: src/main.cc:418
#, c-format
-msgid "Invalid option for interactive mode: -s\n"
+msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
msgstr ""
#: src/mine/cmine.cc:93
@@ -1887,7 +2036,7 @@
msgid "Lost"
msgstr ""
-#: src/mine/cmine.cc:119 src/ui.cc:1005
+#: src/mine/cmine.cc:119 src/ui.cc:1089
msgid "Minesweeper"
msgstr ""
@@ -2061,7 +2210,7 @@
msgid "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
msgstr "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
-#: src/pkg_columnizer.cc:84 src/ui.cc:1488
+#: src/pkg_columnizer.cc:84 src/ui.cc:1638
msgid "Package"
msgstr "Øزمة"
@@ -2309,8 +2458,8 @@
" Packages in the 'comm' section are used to control modems and other "
"hardware communications devices. This includes software to control faxmodems "
"(for instance, PPP for dial-up internet connections and programs originally "
-"written for that purpose (zmodem/kermit), as well as software to control "
-"cellular phones, interface with FidoNet, and run a BBS."
+"written for that purpose, such as zmodem/kermit), as well as software to "
+"control cellular phones, interface with FidoNet, and run a BBS."
msgstr ""
#: src/pkg_grouppolicy.cc:159
@@ -2603,9 +2752,9 @@
" Packages in the 'non-free' section are not part of Debian.\n"
" .\n"
" These packages fail to meet one or more of the requirements of the Debian "
-"Free Software Guidelines (see below) You should read the license of programs "
-"in this section to be sure that you are allowed to use them in the way you "
-"intend.\n"
+"Free Software Guidelines (see below). You should read the license of "
+"programs in this section to be sure that you are allowed to use them in the "
+"way you intend.\n"
" .\n"
" For more information about what Debian considers to be Free Software, see "
"http://www.debian.org/social_contract#guidelines"
@@ -2658,11 +2807,12 @@
" تتوÙر نسخة أجدد من هذه الØزم."
#: src/pkg_grouppolicy.cc:320
+#, fuzzy
msgid ""
"New Packages\n"
" These packages have been added to Debian since the last time you cleared "
-"the list of \"new\" packages. (choose \"Forget new packages\" from the "
-"Actions menu to empty this list)"
+"the list of \"new\" packages (choose \"Forget new packages\" from the "
+"Actions menu to empty this list)."
msgstr ""
"الØزم الجديدة\n"
" تمت إضاÙØ© هذه الØزمة إلى دبيان منذ المرة الأخيرة التي مسØت بها لائØØ© الØزم "
@@ -2895,101 +3045,121 @@
msgid "Versions"
msgstr "النسخ"
-#: src/pkg_item.cc:54
+#: src/pkg_item.cc:55
msgid "Yes, I am aware this is a very bad idea"
msgstr "نعم، أنا على علم بأن هذه Ùكرة سيئة جداً"
#: src/pkg_item.cc:80
-#, c-format
+#, fuzzy, c-format
msgid ""
-"%s is an essential package!\n"
-"\n"
-"Are you sure you want to remove it?\n"
-"Type '%s' if you are."
+"%s is an essential package!%n%nAre you sure you want to remove it?%nType '%"
+"s' if you are."
msgstr ""
"%s هي Øزمة أساسية!\n"
"\n"
"هل أنت متأكّد من أنك تريد إزالتها؟\n"
"اطبع '%s' إن كنت كذلك."
-#: src/pkg_item.cc:219
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:625
#, c-format
msgid "Information about %s"
msgstr "معلومات Øول %s"
-#: src/pkg_item.cc:304
-msgid "Available versions of "
+#: src/pkg_item.cc:224 src/pkg_ver_item.cc:627
+#, c-format
+msgid "%s info"
+msgstr ""
+
+#: src/pkg_item.cc:310
+#, fuzzy, c-format
+msgid "Available versions of %s"
msgstr "النسخ المتوÙرة من"
-#: src/pkg_item.cc:312 src/pkg_ver_item.cc:648
+#: src/pkg_item.cc:313
+#, fuzzy, c-format
+msgid "%s versions"
+msgstr "النسخ"
+
+#: src/pkg_item.cc:325 src/pkg_ver_item.cc:655
#, c-format
msgid "Dependencies of %s"
msgstr "معتمدات %s"
-#: src/pkg_item.cc:322 src/pkg_ver_item.cc:657
+#: src/pkg_item.cc:327 src/pkg_ver_item.cc:657
+#, c-format
+msgid "%s deps"
+msgstr ""
+
+#: src/pkg_item.cc:338 src/pkg_ver_item.cc:667
#, c-format
msgid "Packages depending on %s"
msgstr "الØزم التي تعتمد على %s"
-#: src/pkg_item.cc:373 src/pkg_ver_item.cc:694
+#: src/pkg_item.cc:340 src/pkg_ver_item.cc:669
+#, c-format
+msgid "%s reverse deps"
+msgstr ""
+
+#: src/pkg_item.cc:392 src/pkg_ver_item.cc:707
#, c-format
msgid "Reporting a bug in %s:\n"
msgstr "جاري تقرير خليل ÙÙŠ %s:\n"
-#: src/pkg_item.cc:395
+#: src/pkg_item.cc:414
+#, fuzzy
msgid ""
-"You are not root and I cannot find any way\n"
-"to become root. To reconfigure this package,\n"
-"install the menu package, the login package,\n"
-"or run aptitude as root."
+"You are not root and I cannot find any way to become root. To reconfigure "
+"this package, install the menu package, the login package, or run aptitude "
+"as root."
msgstr ""
"أنت لست الجذر ولا يمكن العثور على أية طريقة\n"
"Ù„ØªØµØ¨Ø Ø§Ù„Ø¬Ø°Ø±. كي تعيد تهيئة هذه الØزمة،\n"
"قم بتثبيت Øزمة menuØŒ ÙˆØزمة loginØŒ\n"
"وقم بتشغيل aptitude كمستخدم جذر."
-#: src/pkg_item.cc:403
+#: src/pkg_item.cc:422
#, c-format
msgid "Reconfiguring %s\n"
msgstr "إعادة تهيئة %s\n"
-#: src/pkg_item.cc:428
+#: src/pkg_item.cc:447
msgid "Hierarchy editor"
msgstr "Ù…ÙØرر الهيكلة"
+#: src/pkg_item.cc:447
+#, fuzzy
+msgid "Hierarchy Editor"
+msgstr "Ù…ÙØرر الهيكلة"
+
#: src/pkg_tree.cc:325
msgid "Search for: "
msgstr "البØØ« عن: "
-#: src/pkg_tree.cc:585
+#: src/pkg_tree.cc:568
msgid "All Packages"
msgstr "كل الØزم"
-#: src/pkg_tree.cc:598 src/pkg_tree.cc:607
+#: src/pkg_tree.cc:581 src/pkg_tree.cc:590
msgid "Building view"
msgstr "بناء العرض"
-#: src/pkg_tree.cc:649
+#: src/pkg_tree.cc:632
#, c-format
msgid "No packages matched the pattern \"%s\"."
msgstr "لم تطابق أية Øزم الصيغة \"%s\"."
-#: src/pkg_tree.cc:671
+#: src/pkg_tree.cc:654
msgid "Enter the new package tree limit: "
msgstr "أدخل Øدّ شجرة الØزم الجديدة: "
-#: src/pkg_tree.cc:705
+#: src/pkg_tree.cc:688
msgid "Enter the new package grouping mechanism for this display: "
msgstr "أدخل الطريقة الجديدة لتجميع الØزم لهذا العرض: "
-#: src/pkg_tree.cc:713
+#: src/pkg_tree.cc:696
msgid "Enter the new package sorting mechanism for this display: "
msgstr "أدخل الطريقة الجديدة Ù„Ùرز الØزم لهذا العرض: "
-#: src/pkg_ver_item.cc:623
-msgid "Information about "
-msgstr "معلومات Øول"
-
#: src/pkg_view.cc:344
#, fuzzy
msgid "make_package_view: error in arguments -- two main widgets??"
@@ -3005,7 +3175,7 @@
msgid "make_package_view: bad argument!"
msgstr "make_package_view: Ù…Ùعطى سيّء!"
-#: src/pkg_view.cc:492
+#: src/pkg_view.cc:495
#, fuzzy
msgid "make_package_view: no main widget found"
msgstr "make_package_view: لم يعثر على ودجت أساسيّة"
@@ -3203,6 +3373,74 @@
"broken if it is %s."
msgstr "الØزم التالية تعتمد على النسخة %B%s%b من %B%s%bØŒ وسو٠تÙعطب إن كانت %s."
+#: src/solution_dialog.cc:74
+msgid "The package cache is not available."
+msgstr ""
+
+#: src/solution_dialog.cc:82
+#, fuzzy
+msgid "No packages are broken."
+msgstr "بعض الØزم معطوبة. أتريد Ù…Øاولة إصلاØها؟"
+
+#: src/solution_dialog.cc:103
+msgid "No resolution found."
+msgstr ""
+
+#: src/solution_dialog.cc:107
+#, c-format
+msgid ""
+"Time exhausted while searching for a solution (you can select \"Next Solution"
+"\" or press %s to try harder)."
+msgstr ""
+
+#: src/solution_dialog.cc:146
+#, fuzzy
+msgid "Previous"
+msgstr "ÙŠÙÙˆÙّر"
+
+#: src/solution_dialog.cc:147
+#, fuzzy
+msgid "Next"
+msgstr "^تالي"
+
+#: src/solution_dialog.cc:148
+msgid "Apply"
+msgstr ""
+
+#: src/solution_dialog.cc:149
+#, fuzzy
+msgid "Close"
+msgstr "^إغلاق"
+
+#: src/solution_fragment.cc:125
+#, fuzzy
+msgid "%BRemove%b the following packages:%n"
+msgstr "الØزمة التالية معطوبة:"
+
+#: src/solution_fragment.cc:135
+#, fuzzy
+msgid "%BInstall%b the following packages:%n"
+msgstr "الØزمة التالية معطوبة:"
+
+#: src/solution_fragment.cc:148
+msgid "%BKeep%b the following packages at their current version:%n"
+msgstr ""
+
+#: src/solution_fragment.cc:161
+#, fuzzy
+msgid "%BUpgrade%b the following packages:%n"
+msgstr "الØزمة التالية معطوبة:"
+
+#: src/solution_fragment.cc:176
+#, fuzzy
+msgid "%BDowngrade%b the following packages:%n"
+msgstr "تنزيل الØزم"
+
+#: src/solution_fragment.cc:190
+#, c-format
+msgid "Score is %d"
+msgstr ""
+
#: src/trust.cc:17 src/trust.cc:19
msgid "WARNING"
msgstr ""
@@ -3214,52 +3452,52 @@
"system."
msgstr ""
-#: src/ui.cc:143
+#: src/ui.cc:164
msgid "Er, there aren't any errors, this shouldn't have happened.."
msgstr "همم، ليست هناك أية أخطاء، ولم يجب أن ÙŠØدث هذا."
-#: src/ui.cc:149
+#: src/ui.cc:170
msgid "E:"
msgstr ""
-#: src/ui.cc:151
+#: src/ui.cc:172
msgid "W:"
msgstr ""
-#: src/ui.cc:172
+#: src/ui.cc:193
msgid "Search for:"
msgstr "البØØ« عن:"
-#: src/ui.cc:205
+#: src/ui.cc:261
msgid "You already are root!"
msgstr "أنت الجذر مسبقا!"
-#: src/ui.cc:303
+#: src/ui.cc:359
msgid ""
"Subprocess exited with an error -- did you type your password correctly?"
msgstr "العملية الÙرعية انتهت بخطأ -- هل كتبت كلمة المرور بشكل صØÙŠØØŸ"
-#: src/ui.cc:331
+#: src/ui.cc:387
msgid "Loading cache"
msgstr "تØميل المخزن"
-#: src/ui.cc:353
+#: src/ui.cc:409
msgid "Really quit Aptitude?"
msgstr "Øقاً تريد الخروج من AptitudeØŸ"
-#: src/ui.cc:432
+#: src/ui.cc:488
msgid "Really discard your personal settings and reload the defaults?"
msgstr "Øقاً تريد تجاهل إعادادات الشخصية وإعادة تØميل الاÙتراضيّات؟"
-#: src/ui.cc:532
+#: src/ui.cc:588 src/ui.cc:590 src/ui.cc:618 src/ui.cc:620
msgid "Packages"
msgstr "الØزم"
-#: src/ui.cc:533 src/ui.cc:560
+#: src/ui.cc:589 src/ui.cc:619
msgid "View available packages and choose actions to perform"
msgstr "عرض الØزم المتوÙرة واختيار الأعمال للقيام بها"
-#: src/ui.cc:599
+#: src/ui.cc:666
#, fuzzy
msgid ""
"%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
@@ -3275,15 +3513,15 @@
"قائمة المساعدة. هذا برنامج Øر، ونرØب بقيامك بإعادة توزيعة\n"
"ÙˆÙقاً لشروط معينة؛ راجع 'الرخصة' للتÙاصيل."
-#: src/ui.cc:620
+#: src/ui.cc:687
msgid "help.txt"
msgstr "help.txt"
-#: src/ui.cc:636
+#: src/ui.cc:703
msgid "README"
msgstr "اقرأني"
-#: src/ui.cc:718
+#: src/ui.cc:785
msgid ""
"%C%BWARNING%b: untrusted versions of the following packages will be "
"installed!%n%nUntrusted packages could %Bcompromise your system's security%"
@@ -3291,60 +3529,70 @@
"this is what you want to do.%n%n"
msgstr ""
-#: src/ui.cc:732
+#: src/ui.cc:799
#, fuzzy
msgid "Really Continue"
msgstr "استمرار"
-#: src/ui.cc:734
+#: src/ui.cc:801
msgid "Abort Installation"
msgstr ""
-#: src/ui.cc:796
+#: src/ui.cc:862
msgid "Preview of package installation"
msgstr "معاينة تثبيت الØزم"
-#: src/ui.cc:797
+#: src/ui.cc:863
msgid "View and/or adjust the actions that will be performed"
msgstr "عرض و/أو تعديل الأعمال التي ستتم"
-#: src/ui.cc:837
-msgid "Some packages were broken and have been fixed"
+#: src/ui.cc:864
+#, fuzzy
+msgid "Preview"
+msgstr "^سابق"
+
+#: src/ui.cc:900
+#, fuzzy
+msgid "Some packages were broken and have been fixed:"
msgstr "بعض الØزم كانت معطوبة وتمّ إصلاØها."
-#: src/ui.cc:839
-msgid "Some broken packages could not be fixed!"
-msgstr "تعذر Ø¥ØµÙ„Ø§Ø Ø¨Ø¹Ø¶ الØزم المعطوبة!"
+#: src/ui.cc:906
+msgid "No solution to these dependency problems exists!"
+msgstr ""
-#: src/ui.cc:847 src/ui.cc:959
-msgid "Some packages are broken. Try to fix them?"
-msgstr "بعض الØزم معطوبة. أتريد Ù…Øاولة إصلاØها؟"
+#: src/ui.cc:912
+#, c-format
+msgid ""
+"Ran out of time while trying to resolver dependencies (press \"%s\" to try "
+"harder)"
+msgstr ""
-#: src/ui.cc:860
+#: src/ui.cc:958
+#, fuzzy
msgid ""
-"Installing/removing packages requires administrative privileges, which\n"
-"you currently do not have. Would you like to change to the root account?\n"
+"Installing/removing packages requires administrative privileges, which you "
+"currently do not have. Would you like to change to the root account?"
msgstr ""
"تثبيت/إزالة الØزم بتطلب صلاØيات إداريّة، والتي\n"
"لا تملكها Øاليّاً. هل تود التغيّر إلى Øساب الجذر؟\n"
-#: src/ui.cc:863 src/ui.cc:993
+#: src/ui.cc:961 src/ui.cc:1077
msgid "Become root"
msgstr "تØوّÙÙ„ إلى جذر"
-#: src/ui.cc:865 src/ui.cc:995
+#: src/ui.cc:963 src/ui.cc:1079
msgid "Don't become root"
msgstr "لا تØوّل إلى جذر"
-#: src/ui.cc:870 src/ui.cc:1000
+#: src/ui.cc:968 src/ui.cc:1084
msgid "A package-list update or install run is already taking place."
msgstr "هناك عملية تØديث أو تثبيت Øزم تجري Øالياً."
-#: src/ui.cc:897
+#: src/ui.cc:995
msgid "No packages are scheduled to be installed, removed, or upgraded."
msgstr "لم يتمّ جدولة تثبيت، أو إزالة أو ترقية أيّة Øزم."
-#: src/ui.cc:903
+#: src/ui.cc:1001
#, fuzzy
msgid ""
"No packages will be installed, removed or upgraded. Some packages could be "
@@ -3356,412 +3604,431 @@
"يمكن ترقية بعض الØزم، إلا أنّك لم تختر ترقيتها.\n"
"اكتب \"U\" كي تØضّر الترقية."
-#: src/ui.cc:990
+#: src/ui.cc:1073
+#, fuzzy
msgid ""
-"Updating the package lists requires administrative privileges, which\n"
-"you currently do not have. Would you like to change to the root account?\n"
+"Updating the package lists requires administrative privileges, which you "
+"currently do not have. Would you like to change to the root account?"
msgstr ""
"تØديث Ù„ÙˆØ§Ø¦Ø Ø§Ù„Øزم بتطلب صلاØيات إداريّة، والتي\n"
"لا تملكها Øاليّاً. هل تود التغيّر إلى Øساب الجذر؟\n"
-#: src/ui.cc:1005 src/ui.cc:1198
+#: src/ui.cc:1089 src/ui.cc:1345
msgid "Waste time trying to find mines"
msgstr "إضاعة الوقت بمØاولة البØØ« عن الألغام"
-#: src/ui.cc:1012 src/ui.cc:1065
+#: src/ui.cc:1096 src/ui.cc:1149
msgid "Cleaning while a download is in progress is not allowed"
msgstr "التنظي٠أثناء القيام بالتنزيل غير Ù…Ø³Ù…ÙˆØ Ø¨Ù‡"
-#: src/ui.cc:1015
+#: src/ui.cc:1099
msgid "Deleting downloaded files"
msgstr "Øذ٠الملÙات المنزلة"
-#: src/ui.cc:1029
+#: src/ui.cc:1113
msgid "Downloaded package files have been deleted"
msgstr "تم Øذ٠ملÙات الØزم المنزلة"
-#: src/ui.cc:1090
+#: src/ui.cc:1174
#, fuzzy, c-format
msgid ""
"Obsolete downloaded package files have been deleted, freeing %sB of disk "
"space."
msgstr "ملÙات الØزم المنزلة الملغاة تم ØØ°Ùها"
-#: src/ui.cc:1174
+#: src/ui.cc:1246
+msgid "All solutions exhausted."
+msgstr ""
+
+#: src/ui.cc:1251 src/ui.cc:1282
+#, fuzzy
+msgid "Ran out of time while trying to find a solution."
+msgstr "إضاعة الوقت بمØاولة البØØ« عن الألغام"
+
+#: src/ui.cc:1276
+msgid "Unable to find a solution to apply."
+msgstr ""
+
+#: src/ui.cc:1321
msgid "^Install/remove packages"
msgstr "^تثبيت/إزالة الØزم"
-#: src/ui.cc:1175
+#: src/ui.cc:1322
msgid "Perform all pending installs and removals"
msgstr "إجراء كل عمليات التثبيت والإزالة المؤخَّرة"
-#: src/ui.cc:1177
+#: src/ui.cc:1324
msgid "^Update package list"
msgstr "^تØديث لائØØ© الØزم"
-#: src/ui.cc:1178
+#: src/ui.cc:1325
msgid "Check for new versions of packages"
msgstr "التØقق من وجود نسخ جديدة من الØزم"
-#: src/ui.cc:1181
+#: src/ui.cc:1328
msgid "^Forget new packages"
msgstr "^نسيان الØزم الجديدة"
-#: src/ui.cc:1182
+#: src/ui.cc:1329
msgid "Forget which packages are \"new\""
msgstr "نسيان أيّ الØزم هي \"جديدة\""
-#: src/ui.cc:1185
+#: src/ui.cc:1332
msgid "^Clean package cache"
msgstr "^تنظي٠مخزن الØزم"
-#: src/ui.cc:1186
+#: src/ui.cc:1333
msgid "Delete package files which were previously downloaded"
msgstr "Øذ٠ملÙات الØزم التي تم تنزيلها من قبل"
-#: src/ui.cc:1189
+#: src/ui.cc:1336
msgid "Clean ^obsolete files"
msgstr "Øذ٠الملÙاة ال^ملغية"
-#: src/ui.cc:1190
+#: src/ui.cc:1337
msgid "Delete package files which can no longer be downloaded"
msgstr "Øذ٠ملÙات الØزم التي لا يمكن تنزيلها بعد الآن"
-#: src/ui.cc:1193
+#: src/ui.cc:1340
msgid "Mark ^Upgradable"
msgstr "تعليم ال^قابلة للترقية"
-#: src/ui.cc:1194
+#: src/ui.cc:1341
msgid "Mark all upgradable packages which are not held for upgrade"
msgstr "تعليم كل الØزم القابلة للترقية والتي ليست مبقاة للترقية"
-#: src/ui.cc:1197
+#: src/ui.cc:1344
msgid "^Play Minesweeper"
msgstr "^لعب كانسة الألغام"
-#: src/ui.cc:1200
+#: src/ui.cc:1347
msgid "^Become root"
msgstr "^تØوّل إلى مستخدم جذر"
-#: src/ui.cc:1201
+#: src/ui.cc:1348
+#, fuzzy
msgid ""
-"Run 'su' to become root; this will restart the program, but your\n"
-"settings will be preserved"
+"Run 'su' to become root; this will restart the program, but your settings "
+"will be preserved"
msgstr ""
"استخدم 'su' كي ØªØµØ¨Ø Ù…Ø³ØªØ®Ø¯Ù… جذر؛ سيقوم هذا بإعادة تشغيل البرنامج، ولكن سيتم\n"
"الإبقاء على إعداداتك"
-#: src/ui.cc:1204
+#: src/ui.cc:1351
msgid "^Reload package cache"
msgstr "^إعادة تØميل مخزن الØزم"
-#: src/ui.cc:1205
+#: src/ui.cc:1352
msgid "Reload the package cache"
msgstr "إعادة تØميل مخزن الØزم"
-#: src/ui.cc:1211
+#: src/ui.cc:1358
msgid "^Quit"
msgstr "^خروج"
-#: src/ui.cc:1212
+#: src/ui.cc:1359
msgid "Exit the program"
msgstr "الخروج من البرنامج"
-#: src/ui.cc:1218 src/ui.cc:1487
+#: src/ui.cc:1365 src/ui.cc:1637
msgid "Undo"
msgstr "تراجع"
-#: src/ui.cc:1219
+#: src/ui.cc:1366
msgid "Undo the last package operation or group of operations"
msgstr "التراجع عن آخر عملية Øزمة أو مجموعة من العمليات"
-#: src/ui.cc:1226
+#: src/ui.cc:1373
msgid "^Install"
msgstr "^تثبيت"
-#: src/ui.cc:1227
+#: src/ui.cc:1374
msgid "Flag the currently selected package for installation or upgrade"
msgstr "تعليم الØزمة المØددة Øالياً للتثبيت أو الترقية"
-#: src/ui.cc:1230
+#: src/ui.cc:1377
msgid "^Remove"
msgstr "إ^زالة"
-#: src/ui.cc:1231
+#: src/ui.cc:1378
msgid "Flag the currently selected package for removal"
msgstr "تعليم الØزمة المØددة Øالياً للإزالة"
-#: src/ui.cc:1234
+#: src/ui.cc:1381
msgid "^Purge"
msgstr "^إلغاء"
-#: src/ui.cc:1235
+#: src/ui.cc:1382
msgid ""
"Flag the currently selected package and its configuration files for removal"
msgstr "تعليم الØزمة المØددة Øالياً وملÙات تهيئتها للإزالة"
-#: src/ui.cc:1238
+#: src/ui.cc:1385
msgid "^Keep"
msgstr "^Ù…ØاÙظة"
-#: src/ui.cc:1239
+#: src/ui.cc:1386
msgid "Cancel any action on the selected package"
msgstr "إلغاء أيّ عمل على الØزمة المØددة"
-#: src/ui.cc:1242
+#: src/ui.cc:1389
msgid "^Hold"
msgstr "إ^بقاء"
-#: src/ui.cc:1243
+#: src/ui.cc:1390
msgid ""
"Cancel any action on the selected package, and protect it from future "
"upgrades"
msgstr "إلغاء أي عمل على الØزمة المØددة، ÙˆØمايتها من الترقيات المستقبليّة"
-#: src/ui.cc:1246
+#: src/ui.cc:1393
msgid "Mark ^Auto"
msgstr "تØديد ^تلقائي"
-#: src/ui.cc:1247
+#: src/ui.cc:1394
+#, fuzzy
msgid ""
-"Mark the selected package as having been automatically installed;\n"
-"it will automatically be removed if no other packages depend on it"
+"Mark the selected package as having been automatically installed; it will "
+"automatically be removed if no other packages depend on it"
msgstr ""
"تØديد الØزمة المØدّدة على أنها Ø«Ùبتت تلقائيّاً؛\n"
"سو٠يتم إزالتها إن لم تعتمد عليها أية Øزمة أخرى"
-#: src/ui.cc:1250
+#: src/ui.cc:1397
msgid "Mark ^Manual"
msgstr "تØديد ^يدوي"
-#: src/ui.cc:1251
+#: src/ui.cc:1398
+#, fuzzy
msgid ""
-"Mark the selected package as having been manually installed;\n"
-"it will not be removed unless you manually remove it"
+"Mark the selected package as having been manually installed; it will not be "
+"removed unless you manually remove it"
msgstr ""
"تØديد الØزمة المØدّدة على أنها Ø«Ùبتت يدويّاً؛\n"
"لن يتم إزالتها إلا إن قمت بذلك"
-#: src/ui.cc:1254
+#: src/ui.cc:1401
msgid "^Forbid Version"
msgstr "^منع النسخة"
-#: src/ui.cc:1255
+#: src/ui.cc:1402
+#, fuzzy
msgid ""
-"Forbid the candidate version of the selected package from being installed;\n"
+"Forbid the candidate version of the selected package from being installed; "
"newer versions of the package will be installed as usual"
msgstr ""
"منع تثبيت النسخة المرشØØ© من الØزمة المØددة؛\n"
"أما النسخ الأجدد من الØزمة Ùسيتم تثبيتها كالعادة"
-#: src/ui.cc:1259
+#: src/ui.cc:1406
msgid "I^nformation"
msgstr "^معلومات"
-#: src/ui.cc:1260
+#: src/ui.cc:1407
msgid "Display more information about the selected package"
msgstr "عرض مزيد من المعلومات Øول الØزمة المØدّدة"
-#: src/ui.cc:1263
+#: src/ui.cc:1410
msgid "^Changelog"
msgstr "^سجل التغيير"
-#: src/ui.cc:1264
+#: src/ui.cc:1411
msgid "Display the Debian changelog of the selected package"
msgstr "عرض سجل تغيير دبيان للØزمة المØدّدة"
-#: src/ui.cc:1271
+#: src/ui.cc:1418
msgid "^Find"
msgstr "^بØØ«"
-#: src/ui.cc:1272
+#: src/ui.cc:1419
msgid "Search for a package"
msgstr "البØØ« عن Øزمة"
-#: src/ui.cc:1275
+#: src/ui.cc:1422
msgid "Find ^Again"
msgstr "البØØ« ^مجدّداً"
-#: src/ui.cc:1276
+#: src/ui.cc:1423
msgid "Repeat the last search"
msgstr "تكرار البØØ« الأخير"
-#: src/ui.cc:1280
+#: src/ui.cc:1427
msgid "^Limit Display"
msgstr "^Øدّ العرض"
-#: src/ui.cc:1281
+#: src/ui.cc:1428
msgid "Apply a filter to the package list"
msgstr "تصÙية لائØØ© الØزم"
-#: src/ui.cc:1284
+#: src/ui.cc:1431
msgid "^Un-Limit Display"
msgstr "Ø¥^زالة Øدّ العرض"
-#: src/ui.cc:1285
+#: src/ui.cc:1432
msgid "Remove the filter from the package list"
msgstr "إزالة التصÙية من لائØØ© الØزم"
-#: src/ui.cc:1289
+#: src/ui.cc:1436
msgid "Find ^Broken"
msgstr "عثور على ^معطوبة"
-#: src/ui.cc:1290
+#: src/ui.cc:1437
msgid "Find the next package with unsatisfied dependencies"
msgstr "العثور على الØزمة التالية ذات المعتمدات الغير مستوÙية"
-#: src/ui.cc:1297
+#: src/ui.cc:1444
msgid "^UI options"
msgstr "خيارات ^واجهة المستخدم"
-#: src/ui.cc:1298
+#: src/ui.cc:1445
msgid "Change the settings which affect the user interface"
msgstr "تغيير الإعدادات التي تؤثر على واجهة المستخدم"
-#: src/ui.cc:1301
+#: src/ui.cc:1448
msgid "^Dependency handling"
msgstr "إ^دارة المعتمدات"
-#: src/ui.cc:1302
+#: src/ui.cc:1449
msgid "Change the settings which affect how package dependencies are handled"
msgstr "تغيير الإعدادات التي تؤثر على كيÙية التعامل مع معتمدات الØزم"
-#: src/ui.cc:1305
+#: src/ui.cc:1452
msgid "^Miscellaneous"
msgstr "^متÙرقات"
-#: src/ui.cc:1306
+#: src/ui.cc:1453
msgid "Change miscellaneous program settings"
msgstr "تغيير إعدادات البرنامج المختلÙØ©"
-#: src/ui.cc:1311
+#: src/ui.cc:1458
msgid "^Revert options"
msgstr "^استعادة الخيارات"
-#: src/ui.cc:1312
+#: src/ui.cc:1459
msgid "Reset all settings to the system defaults"
msgstr "إعادة كل الإعدادات إلى اÙتراضيّات النظام"
-#: src/ui.cc:1323
+#: src/ui.cc:1470
msgid "^Next"
msgstr "^تالي"
-#: src/ui.cc:1324
+#: src/ui.cc:1471
msgid "View next display"
msgstr "عرض الشاشة التالية"
-#: src/ui.cc:1327
+#: src/ui.cc:1474
msgid "^Prev"
msgstr "^سابق"
-#: src/ui.cc:1328
+#: src/ui.cc:1475
msgid "View previous display"
msgstr "عرض الشاشة السابقة"
-#: src/ui.cc:1331
+#: src/ui.cc:1478
msgid "^Close"
msgstr "^إغلاق"
-#: src/ui.cc:1332
+#: src/ui.cc:1479
msgid "Close this display"
msgstr "إغلاق هذه الشاشة"
-#: src/ui.cc:1337
+#: src/ui.cc:1484
msgid "New Package ^View"
msgstr "^عرض Øزم جديد"
-#: src/ui.cc:1338
+#: src/ui.cc:1485
msgid "Create a new default package view"
msgstr "إنشاء عرض Øزم اÙتراضي جديد"
-#: src/ui.cc:1341
+#: src/ui.cc:1488
msgid "New Categorical ^Browser"
msgstr "^مستعرض تصنيÙÙŠ جديد"
-#: src/ui.cc:1343
+#: src/ui.cc:1490
msgid "Browse packages by category"
msgstr "استعراض الØزم بØسب الصنÙ"
-#: src/ui.cc:1351
+#: src/ui.cc:1498
msgid "^About"
msgstr "^Øول"
-#: src/ui.cc:1352
+#: src/ui.cc:1499
msgid "View information about this program"
msgstr "عرض معلومات Øول هذا البرنامج"
-#: src/ui.cc:1355
+#: src/ui.cc:1502
msgid "^Help"
msgstr "^مساعدة"
-#: src/ui.cc:1356
+#: src/ui.cc:1503
msgid "View the on-line help"
msgstr "عرض المساعدة الÙورية"
-#: src/ui.cc:1358
+#: src/ui.cc:1505
msgid "User's ^Manual"
msgstr "دليل ال^مستخدم"
-#: src/ui.cc:1359
+#: src/ui.cc:1506
msgid "View the detailed program manual"
msgstr "عرض دليل البرنامج المÙصّل"
-#: src/ui.cc:1362
+#: src/ui.cc:1509
msgid "^FAQ"
msgstr "^FAQ"
-#: src/ui.cc:1363
+#: src/ui.cc:1510
msgid "View a list of frequently asked questions"
msgstr "عرض لائØØ© بالأسئلة الأكثر طرØاً"
-#: src/ui.cc:1366
-msgid "^ChangeLog"
-msgstr "^سجل التغيير"
+#: src/ui.cc:1513
+msgid "^NEWS"
+msgstr ""
-#: src/ui.cc:1367
-msgid "View the important changes made in each version of the program"
+#: src/ui.cc:1514
+#, fuzzy
+msgid "View the important changes made in each version of "
msgstr "عرض التغييرات المهمة التي تمت ÙÙŠ كل نسخة من البرنامج"
-#: src/ui.cc:1370
+#: src/ui.cc:1517
msgid "^License"
msgstr "^الرخصة"
-#: src/ui.cc:1371
+#: src/ui.cc:1518
msgid "View the terms under which you may copy the program"
msgstr "عرض الشروط التي يمكنك نسخ البرنامج ضمنها"
-#: src/ui.cc:1486
+#: src/ui.cc:1636
msgid "Actions"
msgstr "أعمال"
-#: src/ui.cc:1489
+#: src/ui.cc:1639
msgid "Search"
msgstr "بØØ«"
-#: src/ui.cc:1490
+#: src/ui.cc:1640
msgid "Options"
msgstr "خيارات"
-#: src/ui.cc:1491
+#: src/ui.cc:1641
msgid "Views"
msgstr "عروض"
-#: src/ui.cc:1492
+#: src/ui.cc:1642
msgid "Help"
msgstr "مساعدة"
-#: src/ui.cc:1537
+#: src/ui.cc:1699
#, c-format
msgid ""
"%s: Menu %s: Help %s: Quit %s: Update %s: Download/Install/Remove Pkgs"
msgstr ""
"%s: قائمة %s: مساعدة %s: خروج %s: تØديث %s: تنزيل/تثبيت/إزالة الØزم"
-#: src/ui.cc:1799 src/vscreen/vscreen.cc:281
+#: src/ui.cc:1968 src/vscreen/vscreen.cc:281
msgid "yes_key"
msgstr "yes_key"
-#: src/ui.cc:1800 src/vscreen/vscreen.cc:282
+#: src/ui.cc:1969 src/vscreen/vscreen.cc:282
msgid "no_key"
msgstr "no_key"
@@ -3773,6 +4040,16 @@
msgid "Downloading Changelog"
msgstr "تنزيل سجل التغيير"
+#: src/view_changelog.cc:54
+#, fuzzy
+msgid "Download Changelog"
+msgstr "تنزيل سجل التغيير"
+
+#: src/view_changelog.cc:63
+#, c-format
+msgid "%s changes"
+msgstr ""
+
#: src/vscreen/vscreen.cc:119
#, c-format
msgid "Ouch! Got SIGTERM, dying..\n"
@@ -3800,3 +4077,32 @@
#: src/vscreen/vs_util.cc:175 src/vscreen/vs_util.cc:212
msgid "No"
msgstr "لا"
+
+#~ msgid ""
+#~ "Some packages had unmet dependencies. This may mean that you have\n"
+#~ "requested an impossible situation or if you are using the unstable\n"
+#~ "distribution that some required packages have not yet been created\n"
+#~ "or been moved out of Incoming.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "كان لبعض الØزم معتمدات غير متوÙرة. قد يعني هذا أنّك\n"
+#~ "طلبت وضعاً مستØيلاً أو إن كنت تستخدم توزيعة\n"
+#~ "unstable Ùذلك يعني أن بعض الØزم المطلوبة لم تÙنشأ\n"
+#~ "بعد أو أنه تمت إزالتها من الوارد.\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Please insert the following disc into the drive \"%s\":\n"
+#~ "%s"
+#~ msgstr ""
+#~ "رجاء أدخل القرص التالي ÙÙŠ السواقة \"%s\":\n"
+#~ "%s"
+
+#~ msgid "Information about "
+#~ msgstr "معلومات Øول"
+
+#~ msgid "Some broken packages could not be fixed!"
+#~ msgstr "تعذر Ø¥ØµÙ„Ø§Ø Ø¨Ø¹Ø¶ الØزم المعطوبة!"
+
+#~ msgid "^ChangeLog"
+#~ msgstr "^سجل التغيير"
Modified: branches/aptitude-0.3/aptitude/po/bs.po
==============================================================================
--- branches/aptitude-0.3/aptitude/po/bs.po (original)
+++ branches/aptitude-0.3/aptitude/po/bs.po Sat Apr 30 13:41:32 2005
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: aptitude\n"
"Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-01-10 16:26-0800\n"
+"POT-Creation-Date: 2005-04-29 18:11-0400\n"
"PO-Revision-Date: 2004-05-08 17:40+0100\n"
"Last-Translator: Safir Šećerović <sapphire at linux.org.ba>\n"
"Language-Team: Bosnian <lokal at lugbih.org>\n"
@@ -149,16 +149,100 @@
msgstr ""
#: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:184 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
-#: src/vscreen/vs_util.cc:329
+#: src/ui.cc:218 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
+#: src/vscreen/vs_util.cc:328
msgid "Ok"
msgstr "Uredu"
#: src/apt_options.cc:242 src/download_list.cc:71 src/mine/cmine.cc:257
-#: src/mine/cmine.cc:330 src/vscreen/vs_util.cc:329
+#: src/mine/cmine.cc:330 src/vscreen/vs_util.cc:328
msgid "Cancel"
msgstr "Poništi"
+#: src/broken_indicator.cc:106 src/solution_dialog.cc:97
+msgid "Internal error: unexpected null solution."
+msgstr ""
+
+#: src/broken_indicator.cc:158
+#, fuzzy
+msgid "Suggest "
+msgstr "Predlaže"
+
+#: src/broken_indicator.cc:164
+#, c-format
+msgid "%d installs"
+msgstr ""
+
+#: src/broken_indicator.cc:169
+msgid "1 install"
+msgstr ""
+
+#: src/broken_indicator.cc:173
+#, c-format
+msgid "%d removals"
+msgstr ""
+
+#: src/broken_indicator.cc:178
+msgid "1 removal"
+msgstr ""
+
+#: src/broken_indicator.cc:182
+#, c-format
+msgid "%d keeps"
+msgstr ""
+
+#: src/broken_indicator.cc:187
+msgid "1 keep"
+msgstr ""
+
+#: src/broken_indicator.cc:191
+#, c-format
+msgid "%d upgrades"
+msgstr ""
+
+#: src/broken_indicator.cc:196
+msgid "1 upgrade"
+msgstr ""
+
+#: src/broken_indicator.cc:200
+#, c-format
+msgid "%d downgrades"
+msgstr ""
+
+#: src/broken_indicator.cc:205
+msgid "1 downgrade"
+msgstr ""
+
+#: src/broken_indicator.cc:214
+#, c-format
+msgid "%s: Examine"
+msgstr ""
+
+#: src/broken_indicator.cc:216
+#, c-format
+msgid "%s: Apply"
+msgstr ""
+
+#: src/broken_indicator.cc:218
+#, c-format
+msgid "%s: Next"
+msgstr ""
+
+#: src/broken_indicator.cc:220
+#, c-format
+msgid "%s: Previous"
+msgstr ""
+
+#: src/broken_indicator.cc:233
+#, c-format
+msgid "%CSolution search failed. %s: try harder"
+msgstr ""
+
+#: src/broken_indicator.cc:239
+#, c-format
+msgid "%CUnable to resolve dependencies."
+msgstr ""
+
#: src/cmdline/cmdline_action.cc:36
#, c-format
msgid ""
@@ -222,48 +306,48 @@
msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
msgstr ""
-#: src/cmdline/cmdline_action.cc:213
+#: src/cmdline/cmdline_action.cc:198
#, c-format
msgid "Note: selecting the task \"%s: %s\" for installation\n"
msgstr ""
-#: src/cmdline/cmdline_action.cc:240
+#: src/cmdline/cmdline_action.cc:225
#, c-format
msgid "You can only specify a package version with an 'install' command.\n"
msgstr ""
-#: src/cmdline/cmdline_action.cc:246
+#: src/cmdline/cmdline_action.cc:231
#, c-format
msgid "You can only specify a package archive with an 'install' command.\n"
msgstr ""
-#: src/cmdline/cmdline_action.cc:280
+#: src/cmdline/cmdline_action.cc:265
#, c-format
msgid ""
"Couldn't find package \"%s\", and more than 40\n"
"packages contain \"%s\" in their name.\n"
msgstr ""
-#: src/cmdline/cmdline_action.cc:283
+#: src/cmdline/cmdline_action.cc:268
#, c-format
msgid ""
"Couldn't find package \"%s\". However, the following\n"
"packages contain \"%s\" in their name:\n"
msgstr ""
-#: src/cmdline/cmdline_action.cc:307
+#: src/cmdline/cmdline_action.cc:292
#, c-format
msgid "Couldn't find any package whose name or description matched \"%s\"\n"
msgstr ""
-#: src/cmdline/cmdline_action.cc:309
+#: src/cmdline/cmdline_action.cc:294
#, c-format
msgid ""
"Couldn't find any package matching \"%s\", and more than 40\n"
"packages contain \"%s\" in their description.\n"
msgstr ""
-#: src/cmdline/cmdline_action.cc:312
+#: src/cmdline/cmdline_action.cc:297
#, c-format
msgid ""
"Couldn't find any package matching \"%s\". However, the following\n"
@@ -304,13 +388,13 @@
msgid "Freed %sB of disk space\n"
msgstr "S'alliberaran %sB de l'espai de disc"
-#: src/cmdline/cmdline_do_action.cc:67
+#: src/cmdline/cmdline_do_action.cc:71
#, c-format
msgid "Invalid operation %s"
msgstr ""
-#: src/cmdline/cmdline_do_action.cc:206 src/cmdline/cmdline_simulate.cc:30
-#: src/cmdline/cmdline_upgrade.cc:89
+#: src/cmdline/cmdline_do_action.cc:201 src/cmdline/cmdline_simulate.cc:31
+#: src/cmdline/cmdline_upgrade.cc:91
#, c-format
msgid "Abort.\n"
msgstr ""
@@ -320,7 +404,7 @@
msgid "download: you must specify at least one package to download\n"
msgstr ""
-#: src/cmdline/cmdline_download.cc:43 src/download.cc:342
+#: src/cmdline/cmdline_download.cc:43 src/download.cc:344
msgid "Couldn't read source list"
msgstr ""
@@ -382,191 +466,193 @@
msgid "What is it? It's an elephant being eaten by a snake, of course.\n"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:44
+#: src/cmdline/cmdline_prompt.cc:45
msgid "Couldn't read list of sources"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:219 src/cmdline/cmdline_show_broken.cc:73
+#: src/cmdline/cmdline_prompt.cc:220 src/cmdline/cmdline_show_broken.cc:73
#, c-format
msgid "but %s is to be installed."
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:222 src/cmdline/cmdline_show_broken.cc:76
+#: src/cmdline/cmdline_prompt.cc:223 src/cmdline/cmdline_show_broken.cc:76
#, c-format
msgid "but %s is installed and it is kept back."
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:225 src/cmdline/cmdline_show_broken.cc:79
+#: src/cmdline/cmdline_prompt.cc:226 src/cmdline/cmdline_show_broken.cc:79
#, c-format
msgid "but %s is installed."
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:229 src/cmdline/cmdline_show_broken.cc:83
+#: src/cmdline/cmdline_prompt.cc:230 src/cmdline/cmdline_show_broken.cc:83
#, c-format
msgid "but it is not installable"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:233 src/cmdline/cmdline_show_broken.cc:87
+#: src/cmdline/cmdline_prompt.cc:234 src/cmdline/cmdline_show_broken.cc:87
#, c-format
msgid " which is a virtual package."
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:236 src/cmdline/cmdline_show_broken.cc:90
+#: src/cmdline/cmdline_prompt.cc:237 src/cmdline/cmdline_show_broken.cc:90
#, c-format
msgid " or"
msgstr " ili"
-#: src/cmdline/cmdline_prompt.cc:248
+#: src/cmdline/cmdline_prompt.cc:249
msgid "The following packages are BROKEN:"
msgstr "Slijedeći paketi su OŠTEĆENI:"
-#: src/cmdline/cmdline_prompt.cc:249
+#: src/cmdline/cmdline_prompt.cc:250
msgid "The following packages are unused and will be REMOVED:"
msgstr "Slijedeći paketi se ne koriste i biti će UKLONJENI:"
-#: src/cmdline/cmdline_prompt.cc:250
+#: src/cmdline/cmdline_prompt.cc:251
msgid "The following packages have been automatically kept back:"
msgstr "Slijedeći paketi će biti automatski zadržani:"
-#: src/cmdline/cmdline_prompt.cc:251
+#: src/cmdline/cmdline_prompt.cc:252
msgid "The following NEW packages will be automatically installed:"
msgstr "Slijedeći NOVI paketi će biti automatski instalirani:"
-#: src/cmdline/cmdline_prompt.cc:252
+#: src/cmdline/cmdline_prompt.cc:253
msgid "The following packages will be automatically REMOVED:"
msgstr "Slijedeći paketi će biti automatski UKLONJENI:"
-#: src/cmdline/cmdline_prompt.cc:253
+#: src/cmdline/cmdline_prompt.cc:254
msgid "The following packages will be DOWNGRADED:"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:254
+#: src/cmdline/cmdline_prompt.cc:255
msgid "The following packages have been kept back:"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:255
+#: src/cmdline/cmdline_prompt.cc:256
msgid "The following packages will be REINSTALLED:"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:256
+#: src/cmdline/cmdline_prompt.cc:257
msgid "The following NEW packages will be installed:"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:257
+#: src/cmdline/cmdline_prompt.cc:258
msgid "The following packages will be REMOVED:"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:258
+#: src/cmdline/cmdline_prompt.cc:259
msgid "The following packages will be upgraded:"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:307
+#: src/cmdline/cmdline_prompt.cc:311
#, c-format
msgid "The following ESSENTIAL packages will be REMOVED!\n"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:316
+#: src/cmdline/cmdline_prompt.cc:320
#, c-format
msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:326
+#: src/cmdline/cmdline_prompt.cc:330
#, c-format
msgid ""
"WARNING: Performing this action will probably cause your system to break!\n"
" Do NOT continue unless you know EXACTLY what you are doing!\n"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:328
+#: src/cmdline/cmdline_prompt.cc:332
msgid "I am aware that this is a very bad idea"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:331
+#: src/cmdline/cmdline_prompt.cc:335
#, c-format
msgid "To continue, type the phrase \"%s\":\n"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:434
+#: src/cmdline/cmdline_prompt.cc:438
#, fuzzy, c-format
msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
msgstr "Slijedeći NOVI paketi će biti automatski instalirani:"
-#: src/cmdline/cmdline_prompt.cc:440
+#: src/cmdline/cmdline_prompt.cc:444
#, c-format
msgid "The following packages are SUGGESTED but will NOT be installed:\n"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:445
+#: src/cmdline/cmdline_prompt.cc:449
#, c-format
msgid "No packages will be installed, upgraded, or removed.\n"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:447
+#: src/cmdline/cmdline_prompt.cc:451
#, c-format
msgid "%lu packages upgraded, %lu newly installed, "
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:451
+#: src/cmdline/cmdline_prompt.cc:455
#, c-format
msgid "%lu reinstalled, "
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:453
+#: src/cmdline/cmdline_prompt.cc:457
#, c-format
msgid "%lu downgraded, "
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:455
+#: src/cmdline/cmdline_prompt.cc:459
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:462
+#: src/cmdline/cmdline_prompt.cc:466
#, c-format
msgid "Need to get %sB/%sB of archives. "
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:465
+#: src/cmdline/cmdline_prompt.cc:469
#, c-format
msgid "Need to get %sB of archives. "
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:472
+#: src/cmdline/cmdline_prompt.cc:476
#, c-format
msgid "After unpacking %sB will be used.\n"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:475
+#: src/cmdline/cmdline_prompt.cc:479
#, c-format
msgid "After unpacking %sB will be freed.\n"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:521
+#: src/cmdline/cmdline_prompt.cc:524
#, c-format
msgid "Bad action character '%c'\n"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:596
+#: src/cmdline/cmdline_prompt.cc:595
#, c-format
msgid "No packages to show -- enter the package names on the line after 'i'.\n"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:598 src/cmdline/cmdline_prompt.cc:629
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:597
msgid "Press Return to continue."
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:625
+#: src/cmdline/cmdline_prompt.cc:623
#, c-format
msgid "No packages found -- enter the package names on the line after 'c'.\n"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:665
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:627
+msgid "Press Return to continue"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:675
msgid "Do you want to continue? [Y/n/?] "
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:690
+#: src/cmdline/cmdline_prompt.cc:700
#, c-format
msgid ""
"\n"
@@ -574,7 +660,7 @@
"\n"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:692
+#: src/cmdline/cmdline_prompt.cc:702
#, c-format
msgid ""
"\n"
@@ -582,7 +668,7 @@
"\n"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:698
+#: src/cmdline/cmdline_prompt.cc:708
#, c-format
msgid ""
"\n"
@@ -590,7 +676,7 @@
"\n"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:700
+#: src/cmdline/cmdline_prompt.cc:710
#, c-format
msgid ""
"\n"
@@ -598,7 +684,7 @@
"\n"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:705
+#: src/cmdline/cmdline_prompt.cc:715
#, c-format
msgid ""
"\n"
@@ -606,7 +692,7 @@
"\n"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:717
#, c-format
msgid ""
"\n"
@@ -614,7 +700,7 @@
"\n"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:737
#, c-format
msgid ""
"Commands:\n"
@@ -641,27 +727,79 @@
" = : Hold\n"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:751
+#: src/cmdline/cmdline_prompt.cc:761
#, c-format
msgid "Invalid response. Please enter a valid command or '?' for help.\n"
msgstr ""
-#: src/cmdline/cmdline_search.cc:78
+#: src/cmdline/cmdline_resolver.cc:84
#, c-format
-msgid "search: You must provide at least one search term\n"
+msgid "y: %F%nn: %F%nq: %F%n,: %F%n.: %F%n"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:90
+msgid "accept the proposed changes"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:92
+msgid "reject the proposed changes and search for another solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:94
+msgid "give up and quit the program"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:96
+msgid "move to the next solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:98
+msgid "move to the previous solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:131
+msgid "The following actions will resolve these dependencies:"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:146
+msgid "Accept this solution? [Y/n/q/?]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:174
+msgid "Abandoning all efforts to resolve these dependencies."
msgstr ""
-#: src/cmdline/cmdline_show_broken.cc:114
+#: src/cmdline/cmdline_resolver.cc:184
+#, fuzzy
+msgid "The following commands are available:"
+msgstr "Slijedeći paketi su OŠTEĆENI:"
+
+#: src/cmdline/cmdline_resolver.cc:188
+msgid "Invalid response; please enter one of the following commands:"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:198
+msgid "No solution found within the allotted time. Try harder? [Y/n]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:226
+msgid "Invalid response; please enter 'y' or 'n'."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:235
+msgid "Unable to resolve dependencies! Giving up..."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:240
+msgid "No more solutions."
+msgstr ""
+
+#: src/cmdline/cmdline_search.cc:78
#, c-format
-msgid ""
-"Some packages had unmet dependencies. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming.\n"
-"\n"
+msgid "search: You must provide at least one search term\n"
msgstr ""
-#: src/cmdline/cmdline_show_broken.cc:115
+#: src/cmdline/cmdline_show_broken.cc:113
#, c-format
msgid "The following packages have unmet dependencies:\n"
msgstr ""
@@ -860,12 +998,12 @@
msgid "Description: "
msgstr ""
-#: src/cmdline/cmdline_simulate.cc:36
+#: src/cmdline/cmdline_simulate.cc:37
#, c-format
msgid "Would download/install/remove packages.\n"
msgstr ""
-#: src/cmdline/cmdline_simulate.cc:47
+#: src/cmdline/cmdline_simulate.cc:48
msgid "Internal Error, Ordering didn't finish"
msgstr ""
@@ -907,26 +1045,24 @@
msgid "UNAVAILABLE"
msgstr ""
-#: src/download_bar.cc:57 src/download_list.cc:265
+#: src/download_bar.cc:56 src/download_list.cc:263 src/download_screen.cc:57
#, c-format
-msgid ""
-"Please insert the following disc into the drive \"%s\":\n"
-"%s"
+msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
msgstr ""
-#: src/download_bar.cc:76 src/generic/acqprogress.cc:63
+#: src/download_bar.cc:77 src/generic/acqprogress.cc:63
msgid "Hit "
msgstr ""
-#: src/download_bar.cc:89
+#: src/download_bar.cc:90
msgid "Downloading "
msgstr ""
-#: src/download_bar.cc:102
+#: src/download_bar.cc:103
msgid "Got "
msgstr ""
-#: src/download_bar.cc:156
+#: src/download_bar.cc:157
msgid "Downloading..."
msgstr ""
@@ -934,7 +1070,7 @@
msgid "Couldn't read list of package sources"
msgstr ""
-#: src/download.cc:104 src/download.cc:321
+#: src/download.cc:104 src/download.cc:322
msgid "Couldn't lock list directory..are you root?"
msgstr ""
@@ -946,29 +1082,33 @@
msgid "View the progress of the package list update"
msgstr ""
-#: src/download.cc:159
+#: src/download.cc:113
+msgid "List Update"
+msgstr ""
+
+#: src/download.cc:160
msgid "Couldn't clean out list directories"
msgstr ""
-#: src/download.cc:176 src/ui.cc:1068
+#: src/download.cc:177 src/ui.cc:1152
msgid "Deleting obsolete downloaded files"
msgstr ""
-#: src/download.cc:181
+#: src/download.cc:182
#, c-format
msgid "Deleting obsolete downloaded files\n"
msgstr ""
-#: src/download.cc:223
+#: src/download.cc:224
#, c-format
msgid "Unable to open %s to log actions"
msgstr ""
-#: src/download.cc:229
+#: src/download.cc:230
msgid "log report"
msgstr ""
-#: src/download.cc:230
+#: src/download.cc:231
#, c-format
msgid ""
"IMPORTANT: this log only lists intended actions; actions which fail due to\n"
@@ -976,77 +1116,77 @@
"\n"
msgstr ""
-#: src/download.cc:231
+#: src/download.cc:232
#, c-format
msgid "Will install %li packages, and remove %li packages.\n"
msgstr ""
-#: src/download.cc:233
+#: src/download.cc:234
#, c-format
msgid "%sB of disk space will be used\n"
msgstr ""
-#: src/download.cc:236
+#: src/download.cc:237
#, c-format
msgid "%sB bytes of disk space will be freed\n"
msgstr ""
-#: src/download.cc:244
+#: src/download.cc:245
#, c-format
msgid "[UPGRADE] %s %s -> %s\n"
msgstr ""
-#: src/download.cc:248
+#: src/download.cc:249
#, c-format
msgid "[DOWNGRADE] %s %s -> %s\n"
msgstr ""
-#: src/download.cc:258
+#: src/download.cc:259
msgid "REMOVE"
msgstr "UKLONI"
-#: src/download.cc:264
+#: src/download.cc:265
msgid "INSTALL"
msgstr "INSTALIRAJ"
-#: src/download.cc:267
+#: src/download.cc:268
msgid "REINSTALL"
msgstr "REINSTALIRAJ"
-#: src/download.cc:270
+#: src/download.cc:271
msgid "HOLD"
msgstr "ZADRŽI"
-#: src/download.cc:273
+#: src/download.cc:274
msgid "BROKEN"
msgstr "OŠTEĆEN"
-#: src/download.cc:276
+#: src/download.cc:277
msgid "REMOVE, NOT USED"
msgstr "UKLONI, NIJE KORIÅ TEN"
-#: src/download.cc:279
+#: src/download.cc:280
msgid "REMOVE, DEPENDENCIES"
msgstr "UKLONI, ZAVISNOSTI"
-#: src/download.cc:282
+#: src/download.cc:283
msgid "INSTALL, DEPENDENCIES"
msgstr "INSTALIRAJ, ZAVISNOSTI"
-#: src/download.cc:285
+#: src/download.cc:286
msgid "HOLD, DEPENDENCIES"
msgstr "ZADRŽI, ZAVISNOSTI"
-#: src/download.cc:287
+#: src/download.cc:288
msgid "????????"
msgstr ""
-#: src/download.cc:291
+#: src/download.cc:292
#, c-format
msgid "[%s] %s\n"
msgstr ""
-#: src/download.cc:294
+#: src/download.cc:295
#, c-format
msgid ""
"===============================================================================\n"
@@ -1054,32 +1194,37 @@
"Log complete.\n"
msgstr ""
-#: src/download.cc:329
+#: src/download.cc:330
msgid "Downloading packages"
msgstr ""
-#: src/download.cc:330
+#: src/download.cc:331
msgid "View the progress of the package download"
msgstr ""
-#: src/download.cc:352
+#: src/download.cc:332
+#, fuzzy
+msgid "Package Download"
+msgstr "Paket:"
+
+#: src/download.cc:354
msgid "Internal error: couldn't generate list of packages to download"
msgstr ""
-#: src/download.cc:413
+#: src/download.cc:415
msgid "Unable to correct for unavailable packages"
msgstr ""
-#: src/download.cc:465
+#: src/download.cc:467
msgid ""
"Ack! Something bad happened while installing packages. Trying to recover:"
msgstr ""
-#: src/download.cc:475 src/pkg_item.cc:413
+#: src/download.cc:477 src/pkg_item.cc:432
msgid "Press return to continue.\n"
msgstr ""
-#: src/download.cc:506
+#: src/download.cc:508
msgid ""
"Could not regain the system lock! (Perhaps another apt or dpkg is running?)"
msgstr ""
@@ -1139,11 +1284,6 @@
msgid "[ERROR]"
msgstr ""
-#: src/download_screen.cc:57
-#, c-format
-msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
-msgstr ""
-
#: src/download_screen.cc:181
#, c-format
msgid "Downloaded %sB in %ss (%sB/s)."
@@ -1181,109 +1321,109 @@
"press enter\n"
msgstr ""
-#: src/generic/aptcache.cc:245
+#: src/generic/aptcache.cc:253
msgid "Can't open Aptitude extended state file"
msgstr ""
-#: src/generic/aptcache.cc:252 src/generic/aptcache.cc:305
-#: src/generic/aptcache.cc:307
+#: src/generic/aptcache.cc:260 src/generic/aptcache.cc:313
+#: src/generic/aptcache.cc:315
msgid "Reading extended state information"
msgstr ""
-#: src/generic/aptcache.cc:313 src/generic/aptcache.cc:387
-#: src/generic/aptcache.cc:390
+#: src/generic/aptcache.cc:321 src/generic/aptcache.cc:395
+#: src/generic/aptcache.cc:398
msgid "Initializing package states"
msgstr ""
-#: src/generic/aptcache.cc:501
+#: src/generic/aptcache.cc:509
msgid "Cannot open Aptitude state file"
msgstr ""
-#: src/generic/aptcache.cc:505 src/generic/aptcache.cc:560
-#: src/generic/aptcache.cc:563
+#: src/generic/aptcache.cc:513 src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:571
msgid "Writing extended state information"
msgstr ""
-#: src/generic/aptcache.cc:542
+#: src/generic/aptcache.cc:550
#, c-format
msgid "Internal buffer overflow on package \"%s\" while writing state file"
msgstr ""
-#: src/generic/aptcache.cc:551
+#: src/generic/aptcache.cc:559
msgid "Couldn't write state file"
msgstr ""
-#: src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:576
msgid "Error writing state file"
msgstr ""
-#: src/generic/aptcache.cc:584
+#: src/generic/aptcache.cc:592
msgid "couldn't replace old state file"
msgstr ""
-#: src/generic/aptcache.cc:960
+#: src/generic/aptcache.cc:1000
msgid "Unable to correct dependencies, some packages cannot be installed"
msgstr ""
-#: src/generic/aptcache.cc:1325
+#: src/generic/aptcache.cc:1546
msgid "The list of sources could not be read."
msgstr ""
-#: src/generic/aptcache.cc:1332
+#: src/generic/aptcache.cc:1553
msgid "The package lists or status file could not be parsed or opened."
msgstr ""
-#: src/generic/aptcache.cc:1335
+#: src/generic/aptcache.cc:1556
msgid "You may want to update the package lists to correct these missing files"
msgstr ""
-#: src/generic/apt.cc:141
+#: src/generic/apt.cc:142
#, c-format
msgid "Unable to open %s for writing"
msgstr ""
-#: src/generic/apt.cc:151
+#: src/generic/apt.cc:152
#, c-format
msgid "Unable to replace %s with new configuration file"
msgstr ""
-#: src/generic/apt.cc:226
+#: src/generic/apt.cc:227
msgid "Warning: could not lock the cache file. Opening in read-only mode"
msgstr ""
-#: src/generic/matchers.cc:780
+#: src/generic/matchers.cc:797
msgid "Unmatched '('"
msgstr ""
-#: src/generic/matchers.cc:870 src/generic/matchers.cc:949
+#: src/generic/matchers.cc:887 src/generic/matchers.cc:968
#, c-format
msgid "Unknown dependency type: %s"
msgstr ""
-#: src/generic/matchers.cc:931
+#: src/generic/matchers.cc:950
#, c-format
msgid "Unknown action type: %s"
msgstr ""
-#: src/generic/matchers.cc:998
+#: src/generic/matchers.cc:1017
#, c-format
msgid "Unknown priority %s"
msgstr ""
-#: src/generic/matchers.cc:1020
+#: src/generic/matchers.cc:1039
#, c-format
msgid "Unknown pattern type: %c"
msgstr ""
-#: src/generic/matchers.cc:1065
+#: src/generic/matchers.cc:1084
msgid "Unexpected empty expression"
msgstr ""
-#: src/generic/matchers.cc:1100
+#: src/generic/matchers.cc:1119
msgid "Badly formed expression"
msgstr ""
-#: src/generic/matchers.cc:1129
+#: src/generic/matchers.cc:1148
msgid "Unexpected ')'"
msgstr ""
@@ -1304,7 +1444,7 @@
msgid "Can't get value of $HOME, using TMPDIR (insecure)"
msgstr ""
-#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:60
+#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:61
#, c-format
msgid "ChangeLog of %s"
msgstr ""
@@ -1504,292 +1644,300 @@
msgid "Invalid sorting policy type '%s'"
msgstr ""
-#: src/main.cc:68
+#: src/main.cc:67
#, c-format
msgid "%s %s compiled at %s %s\n"
msgstr ""
-#: src/main.cc:71
+#: src/main.cc:70
#, c-format
msgid "Compiler: g++ %s\n"
msgstr ""
-#: src/main.cc:74
+#: src/main.cc:73
#, c-format
msgid ""
"\n"
"NCurses version: %s\n"
msgstr ""
-#: src/main.cc:76
+#: src/main.cc:75
#, c-format
msgid ""
"\n"
"Curses version: %s\n"
msgstr ""
-#: src/main.cc:78
+#: src/main.cc:77
#, c-format
msgid "libsigc++ version: %s\n"
msgstr ""
-#: src/main.cc:84
+#: src/main.cc:83
#, c-format
msgid "Usage: aptitude [-S fname] [-u|-i]"
msgstr ""
-#: src/main.cc:86
+#: src/main.cc:85
#, c-format
msgid " aptitude [options] <action> ..."
msgstr ""
-#: src/main.cc:88
+#: src/main.cc:87
#, c-format
msgid ""
" Actions (if none is specified, aptitude will enter interactive mode):\n"
"\n"
msgstr ""
-#: src/main.cc:89
+#: src/main.cc:88
#, c-format
msgid " install - Install/upgrade packages\n"
msgstr ""
-#: src/main.cc:90
+#: src/main.cc:89
#, c-format
msgid " remove - Remove packages\n"
msgstr ""
-#: src/main.cc:91
+#: src/main.cc:90
#, c-format
msgid " purge - Remove packages and their configuration files\n"
msgstr ""
-#: src/main.cc:92
+#: src/main.cc:91
#, c-format
msgid " hold - Place packages on hold\n"
msgstr ""
-#: src/main.cc:93
+#: src/main.cc:92
#, c-format
msgid " unhold - Cancel a hold command for a package\n"
msgstr ""
-#: src/main.cc:94
+#: src/main.cc:93
#, c-format
msgid " markauto - Mark packages as having been automatically installed\n"
msgstr ""
-#: src/main.cc:95
+#: src/main.cc:94
#, c-format
msgid " unmarkauto - Mark packages as having been manually installed\n"
msgstr ""
-#: src/main.cc:100
+#: src/main.cc:99
#, c-format
msgid ""
" forbid-version - Forbid aptitude from upgrading to a specific package "
"version.\n"
msgstr ""
-#: src/main.cc:101
+#: src/main.cc:100
#, c-format
msgid " update - Download lists of new/upgradable packages\n"
msgstr ""
-#: src/main.cc:102
+#: src/main.cc:101
#, c-format
msgid " upgrade - Perform a safe upgrade\n"
msgstr ""
-#: src/main.cc:103
+#: src/main.cc:102
#, c-format
msgid ""
" dist-upgrade - Perform an upgrade, possibly installing and removing "
"packages\n"
msgstr ""
-#: src/main.cc:104
+#: src/main.cc:103
#, c-format
msgid " forget-new - Forget what packages are \"new\"\n"
msgstr ""
-#: src/main.cc:105
+#: src/main.cc:104
#, c-format
msgid " search - Search for a package by name and/or expression\n"
msgstr ""
-#: src/main.cc:106
+#: src/main.cc:105
#, c-format
msgid " show - Display detailed information about a package\n"
msgstr ""
-#: src/main.cc:107
+#: src/main.cc:106
#, c-format
msgid " clean - Erase downloaded package files\n"
msgstr ""
-#: src/main.cc:108
+#: src/main.cc:107
#, c-format
msgid " autoclean - Erase old downloaded package files\n"
msgstr ""
-#: src/main.cc:109
+#: src/main.cc:108
#, c-format
msgid " changelog - View a package's changelog\n"
msgstr ""
-#: src/main.cc:110
+#: src/main.cc:109
#, c-format
msgid " download - Download the .deb file for a package\n"
msgstr ""
-#: src/main.cc:112
+#: src/main.cc:111
#, c-format
msgid " Options:\n"
msgstr ""
-#: src/main.cc:113
+#: src/main.cc:112
#, c-format
msgid " -h This help text\n"
msgstr ""
-#: src/main.cc:114
+#: src/main.cc:113
#, c-format
msgid " -s Simulate actions, but do not actually perform them.\n"
msgstr ""
-#: src/main.cc:115
+#: src/main.cc:114
#, c-format
msgid ""
" -d Only download packages, do not install or remove anything.\n"
msgstr ""
-#: src/main.cc:116
+#: src/main.cc:115
#, c-format
msgid " -P Always prompt for confirmation or actions\n"
msgstr ""
-#: src/main.cc:117
+#: src/main.cc:116
#, c-format
msgid ""
" -y Assume that the answer to simple yes/no questions is 'yes'\n"
msgstr ""
-#: src/main.cc:118
+#: src/main.cc:117
#, c-format
msgid ""
" -F format Specify a format for displaying search results; see the "
"manual\n"
msgstr ""
-#: src/main.cc:119
+#: src/main.cc:118
#, c-format
msgid ""
" -O order Specify how search results should be sorted; see the manual\n"
msgstr ""
-#: src/main.cc:120
+#: src/main.cc:119
#, c-format
msgid ""
" -w width Specify the display width for formatting search results\n"
msgstr ""
-#: src/main.cc:121
+#: src/main.cc:120
#, c-format
msgid " -f Aggressively try to fix broken packages.\n"
msgstr ""
-#: src/main.cc:122
+#: src/main.cc:121
#, c-format
msgid " -V Show which versions of packages are to be installed.\n"
msgstr ""
-#: src/main.cc:123
+#: src/main.cc:122
#, c-format
msgid ""
" -D Show the dependencies of automatically changed packages.\n"
msgstr ""
-#: src/main.cc:124
+#: src/main.cc:123
#, c-format
msgid " -Z\t\t Show the change in installed size of each package.\n"
msgstr ""
-#: src/main.cc:125
+#: src/main.cc:124
#, c-format
msgid ""
" -v Display extra information. (may be supplied multiple times)\n"
msgstr ""
-#: src/main.cc:126
+#: src/main.cc:125
#, c-format
msgid ""
" -t [release] Set the release from which packages should be installed\n"
msgstr ""
-#: src/main.cc:127
+#: src/main.cc:126
#, c-format
msgid " -o key=val Directly set the configuration option named 'key'\n"
msgstr ""
-#: src/main.cc:128
+#: src/main.cc:127
#, c-format
msgid ""
" --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
" strong dependencies\n"
msgstr ""
-#: src/main.cc:129
+#: src/main.cc:128
#, c-format
msgid " -S fname: Read the aptitude extended status info from fname.\n"
msgstr ""
-#: src/main.cc:130
+#: src/main.cc:129
#, c-format
msgid " -u : Download new package lists on startup.\n"
msgstr ""
-#: src/main.cc:131
+#: src/main.cc:130
#, c-format
msgid " -i : Perform an install run on startup.\n"
msgstr ""
-#: src/main.cc:133
+#: src/main.cc:132
#, c-format
msgid " This aptitude does not have Super Cow Powers.\n"
msgstr ""
-#: src/main.cc:254
+#: src/main.cc:253
#, c-format
msgid "-o requires an argument of the form key=value, got %s"
msgstr ""
-#: src/main.cc:300 src/main.cc:309
+#: src/main.cc:299 src/main.cc:308
msgid "WEIRDNESS: unknown option code received\n"
msgstr ""
-#: src/main.cc:318
+#: src/main.cc:317
msgid "Only one of -u and -i may be specified\n"
msgstr ""
-#: src/main.cc:326
+#: src/main.cc:325
msgid ""
"-u and -i may not be specified in command-line mode (eg, with 'install')"
msgstr ""
-#: src/main.cc:337
+#: src/main.cc:342
msgid "-u and -i may not be specified with a command"
msgstr ""
-#: src/main.cc:392
+#: src/main.cc:399
#, c-format
msgid "Unknown command \"%s\"\n"
msgstr ""
-#: src/main.cc:400
+#: src/main.cc:406 src/main.cc:463
+msgid "Internal error: uncaught 'out of solutions' exception.\n"
+msgstr ""
+
+#: src/main.cc:411 src/main.cc:468
+msgid "Internal error: uncaught 'out of time' exception.\n"
+msgstr ""
+
+#: src/main.cc:418
#, c-format
-msgid "Invalid option for interactive mode: -s\n"
+msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
msgstr ""
#: src/mine/cmine.cc:93
@@ -1818,7 +1966,7 @@
msgid "Lost"
msgstr ""
-#: src/mine/cmine.cc:119 src/ui.cc:1005
+#: src/mine/cmine.cc:119 src/ui.cc:1089
msgid "Minesweeper"
msgstr ""
@@ -1992,7 +2140,7 @@
msgid "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
msgstr ""
-#: src/pkg_columnizer.cc:84 src/ui.cc:1488
+#: src/pkg_columnizer.cc:84 src/ui.cc:1638
msgid "Package"
msgstr ""
@@ -2240,8 +2388,8 @@
" Packages in the 'comm' section are used to control modems and other "
"hardware communications devices. This includes software to control faxmodems "
"(for instance, PPP for dial-up internet connections and programs originally "
-"written for that purpose (zmodem/kermit), as well as software to control "
-"cellular phones, interface with FidoNet, and run a BBS."
+"written for that purpose, such as zmodem/kermit), as well as software to "
+"control cellular phones, interface with FidoNet, and run a BBS."
msgstr ""
#: src/pkg_grouppolicy.cc:159
@@ -2534,9 +2682,9 @@
" Packages in the 'non-free' section are not part of Debian.\n"
" .\n"
" These packages fail to meet one or more of the requirements of the Debian "
-"Free Software Guidelines (see below) You should read the license of programs "
-"in this section to be sure that you are allowed to use them in the way you "
-"intend.\n"
+"Free Software Guidelines (see below). You should read the license of "
+"programs in this section to be sure that you are allowed to use them in the "
+"way you intend.\n"
" .\n"
" For more information about what Debian considers to be Free Software, see "
"http://www.debian.org/social_contract#guidelines"
@@ -2585,8 +2733,8 @@
msgid ""
"New Packages\n"
" These packages have been added to Debian since the last time you cleared "
-"the list of \"new\" packages. (choose \"Forget new packages\" from the "
-"Actions menu to empty this list)"
+"the list of \"new\" packages (choose \"Forget new packages\" from the "
+"Actions menu to empty this list)."
msgstr ""
#: src/pkg_grouppolicy.cc:321
@@ -2780,93 +2928,111 @@
msgid "Versions"
msgstr ""
-#: src/pkg_item.cc:54
+#: src/pkg_item.cc:55
msgid "Yes, I am aware this is a very bad idea"
msgstr ""
#: src/pkg_item.cc:80
#, c-format
msgid ""
-"%s is an essential package!\n"
-"\n"
-"Are you sure you want to remove it?\n"
-"Type '%s' if you are."
+"%s is an essential package!%n%nAre you sure you want to remove it?%nType '%"
+"s' if you are."
msgstr ""
-#: src/pkg_item.cc:219
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:625
#, c-format
msgid "Information about %s"
msgstr ""
-#: src/pkg_item.cc:304
-msgid "Available versions of "
+#: src/pkg_item.cc:224 src/pkg_ver_item.cc:627
+#, c-format
+msgid "%s info"
+msgstr ""
+
+#: src/pkg_item.cc:310
+#, c-format
+msgid "Available versions of %s"
msgstr ""
-#: src/pkg_item.cc:312 src/pkg_ver_item.cc:648
+#: src/pkg_item.cc:313
+#, fuzzy, c-format
+msgid "%s versions"
+msgstr "Verzija:"
+
+#: src/pkg_item.cc:325 src/pkg_ver_item.cc:655
#, c-format
msgid "Dependencies of %s"
msgstr ""
-#: src/pkg_item.cc:322 src/pkg_ver_item.cc:657
+#: src/pkg_item.cc:327 src/pkg_ver_item.cc:657
+#, c-format
+msgid "%s deps"
+msgstr ""
+
+#: src/pkg_item.cc:338 src/pkg_ver_item.cc:667
#, c-format
msgid "Packages depending on %s"
msgstr ""
-#: src/pkg_item.cc:373 src/pkg_ver_item.cc:694
+#: src/pkg_item.cc:340 src/pkg_ver_item.cc:669
+#, c-format
+msgid "%s reverse deps"
+msgstr ""
+
+#: src/pkg_item.cc:392 src/pkg_ver_item.cc:707
#, c-format
msgid "Reporting a bug in %s:\n"
msgstr ""
-#: src/pkg_item.cc:395
+#: src/pkg_item.cc:414
msgid ""
-"You are not root and I cannot find any way\n"
-"to become root. To reconfigure this package,\n"
-"install the menu package, the login package,\n"
-"or run aptitude as root."
+"You are not root and I cannot find any way to become root. To reconfigure "
+"this package, install the menu package, the login package, or run aptitude "
+"as root."
msgstr ""
-#: src/pkg_item.cc:403
+#: src/pkg_item.cc:422
#, c-format
msgid "Reconfiguring %s\n"
msgstr ""
-#: src/pkg_item.cc:428
+#: src/pkg_item.cc:447
msgid "Hierarchy editor"
msgstr ""
+#: src/pkg_item.cc:447
+msgid "Hierarchy Editor"
+msgstr ""
+
#: src/pkg_tree.cc:325
msgid "Search for: "
msgstr ""
-#: src/pkg_tree.cc:585
+#: src/pkg_tree.cc:568
msgid "All Packages"
msgstr ""
-#: src/pkg_tree.cc:598 src/pkg_tree.cc:607
+#: src/pkg_tree.cc:581 src/pkg_tree.cc:590
msgid "Building view"
msgstr ""
-#: src/pkg_tree.cc:649
+#: src/pkg_tree.cc:632
#, c-format
msgid "No packages matched the pattern \"%s\"."
msgstr ""
-#: src/pkg_tree.cc:671
+#: src/pkg_tree.cc:654
msgid "Enter the new package tree limit: "
msgstr ""
-#: src/pkg_tree.cc:705
+#: src/pkg_tree.cc:688
msgid "Enter the new package grouping mechanism for this display: "
msgstr ""
-#: src/pkg_tree.cc:713
+#: src/pkg_tree.cc:696
msgid "Enter the new package sorting mechanism for this display: "
msgstr ""
-#: src/pkg_ver_item.cc:623
-msgid "Information about "
-msgstr ""
-
#: src/pkg_view.cc:344
msgid "make_package_view: error in arguments -- two main widgets??"
msgstr ""
@@ -2880,7 +3046,7 @@
msgid "make_package_view: bad argument!"
msgstr ""
-#: src/pkg_view.cc:492
+#: src/pkg_view.cc:495
msgid "make_package_view: no main widget found"
msgstr ""
@@ -3068,6 +3234,71 @@
"broken if it is %s."
msgstr ""
+#: src/solution_dialog.cc:74
+msgid "The package cache is not available."
+msgstr ""
+
+#: src/solution_dialog.cc:82
+#, fuzzy
+msgid "No packages are broken."
+msgstr "Automatski prikazuj zašto su paketi oštećeni"
+
+#: src/solution_dialog.cc:103
+msgid "No resolution found."
+msgstr ""
+
+#: src/solution_dialog.cc:107
+#, c-format
+msgid ""
+"Time exhausted while searching for a solution (you can select \"Next Solution"
+"\" or press %s to try harder)."
+msgstr ""
+
+#: src/solution_dialog.cc:146
+msgid "Previous"
+msgstr ""
+
+#: src/solution_dialog.cc:147
+msgid "Next"
+msgstr ""
+
+#: src/solution_dialog.cc:148
+msgid "Apply"
+msgstr ""
+
+#: src/solution_dialog.cc:149
+msgid "Close"
+msgstr ""
+
+#: src/solution_fragment.cc:125
+#, fuzzy
+msgid "%BRemove%b the following packages:%n"
+msgstr "Slijedeći paketi su OŠTEĆENI:"
+
+#: src/solution_fragment.cc:135
+#, fuzzy
+msgid "%BInstall%b the following packages:%n"
+msgstr "Slijedeći paketi su OŠTEĆENI:"
+
+#: src/solution_fragment.cc:148
+msgid "%BKeep%b the following packages at their current version:%n"
+msgstr ""
+
+#: src/solution_fragment.cc:161
+#, fuzzy
+msgid "%BUpgrade%b the following packages:%n"
+msgstr "Slijedeći paketi su OŠTEĆENI:"
+
+#: src/solution_fragment.cc:176
+#, fuzzy
+msgid "%BDowngrade%b the following packages:%n"
+msgstr "Slijedeći paketi su OŠTEĆENI:"
+
+#: src/solution_fragment.cc:190
+#, c-format
+msgid "Score is %d"
+msgstr ""
+
#: src/trust.cc:17 src/trust.cc:19
msgid "WARNING"
msgstr ""
@@ -3079,52 +3310,52 @@
"system."
msgstr ""
-#: src/ui.cc:143
+#: src/ui.cc:164
msgid "Er, there aren't any errors, this shouldn't have happened.."
msgstr ""
-#: src/ui.cc:149
+#: src/ui.cc:170
msgid "E:"
msgstr ""
-#: src/ui.cc:151
+#: src/ui.cc:172
msgid "W:"
msgstr ""
-#: src/ui.cc:172
+#: src/ui.cc:193
msgid "Search for:"
msgstr ""
-#: src/ui.cc:205
+#: src/ui.cc:261
msgid "You already are root!"
msgstr ""
-#: src/ui.cc:303
+#: src/ui.cc:359
msgid ""
"Subprocess exited with an error -- did you type your password correctly?"
msgstr ""
-#: src/ui.cc:331
+#: src/ui.cc:387
msgid "Loading cache"
msgstr ""
-#: src/ui.cc:353
+#: src/ui.cc:409
msgid "Really quit Aptitude?"
msgstr ""
-#: src/ui.cc:432
+#: src/ui.cc:488
msgid "Really discard your personal settings and reload the defaults?"
msgstr ""
-#: src/ui.cc:532
+#: src/ui.cc:588 src/ui.cc:590 src/ui.cc:618 src/ui.cc:620
msgid "Packages"
msgstr ""
-#: src/ui.cc:533 src/ui.cc:560
+#: src/ui.cc:589 src/ui.cc:619
msgid "View available packages and choose actions to perform"
msgstr ""
-#: src/ui.cc:599
+#: src/ui.cc:666
msgid ""
"%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
"BABSOLUTELY NO WARRANTY%b; for details see 'license' in the Help menu. This "
@@ -3132,15 +3363,15 @@
"conditions; see 'license' for details."
msgstr ""
-#: src/ui.cc:620
+#: src/ui.cc:687
msgid "help.txt"
msgstr ""
-#: src/ui.cc:636
+#: src/ui.cc:703
msgid "README"
msgstr ""
-#: src/ui.cc:718
+#: src/ui.cc:785
msgid ""
"%C%BWARNING%b: untrusted versions of the following packages will be "
"installed!%n%nUntrusted packages could %Bcompromise your system's security%"
@@ -3148,460 +3379,479 @@
"this is what you want to do.%n%n"
msgstr ""
-#: src/ui.cc:732
+#: src/ui.cc:799
msgid "Really Continue"
msgstr ""
-#: src/ui.cc:734
+#: src/ui.cc:801
msgid "Abort Installation"
msgstr ""
-#: src/ui.cc:796
+#: src/ui.cc:862
msgid "Preview of package installation"
msgstr ""
-#: src/ui.cc:797
+#: src/ui.cc:863
msgid "View and/or adjust the actions that will be performed"
msgstr ""
-#: src/ui.cc:837
-msgid "Some packages were broken and have been fixed"
+#: src/ui.cc:864
+msgid "Preview"
msgstr ""
-#: src/ui.cc:839
-msgid "Some broken packages could not be fixed!"
+#: src/ui.cc:900
+msgid "Some packages were broken and have been fixed:"
msgstr ""
-#: src/ui.cc:847 src/ui.cc:959
-msgid "Some packages are broken. Try to fix them?"
+#: src/ui.cc:906
+msgid "No solution to these dependency problems exists!"
msgstr ""
-#: src/ui.cc:860
+#: src/ui.cc:912
+#, c-format
msgid ""
-"Installing/removing packages requires administrative privileges, which\n"
-"you currently do not have. Would you like to change to the root account?\n"
+"Ran out of time while trying to resolver dependencies (press \"%s\" to try "
+"harder)"
msgstr ""
-#: src/ui.cc:863 src/ui.cc:993
+#: src/ui.cc:958
+msgid ""
+"Installing/removing packages requires administrative privileges, which you "
+"currently do not have. Would you like to change to the root account?"
+msgstr ""
+
+#: src/ui.cc:961 src/ui.cc:1077
msgid "Become root"
msgstr ""
-#: src/ui.cc:865 src/ui.cc:995
+#: src/ui.cc:963 src/ui.cc:1079
msgid "Don't become root"
msgstr ""
-#: src/ui.cc:870 src/ui.cc:1000
+#: src/ui.cc:968 src/ui.cc:1084
msgid "A package-list update or install run is already taking place."
msgstr ""
-#: src/ui.cc:897
+#: src/ui.cc:995
msgid "No packages are scheduled to be installed, removed, or upgraded."
msgstr ""
-#: src/ui.cc:903
+#: src/ui.cc:1001
msgid ""
"No packages will be installed, removed or upgraded. Some packages could be "
"upgraded, but you have not chosen to upgrade them. Type \"U\" to prepare an "
"upgrade."
msgstr ""
-#: src/ui.cc:990
+#: src/ui.cc:1073
msgid ""
-"Updating the package lists requires administrative privileges, which\n"
-"you currently do not have. Would you like to change to the root account?\n"
+"Updating the package lists requires administrative privileges, which you "
+"currently do not have. Would you like to change to the root account?"
msgstr ""
-#: src/ui.cc:1005 src/ui.cc:1198
+#: src/ui.cc:1089 src/ui.cc:1345
msgid "Waste time trying to find mines"
msgstr ""
-#: src/ui.cc:1012 src/ui.cc:1065
+#: src/ui.cc:1096 src/ui.cc:1149
msgid "Cleaning while a download is in progress is not allowed"
msgstr ""
-#: src/ui.cc:1015
+#: src/ui.cc:1099
msgid "Deleting downloaded files"
msgstr ""
-#: src/ui.cc:1029
+#: src/ui.cc:1113
msgid "Downloaded package files have been deleted"
msgstr ""
-#: src/ui.cc:1090
+#: src/ui.cc:1174
#, c-format
msgid ""
"Obsolete downloaded package files have been deleted, freeing %sB of disk "
"space."
msgstr ""
-#: src/ui.cc:1174
+#: src/ui.cc:1246
+msgid "All solutions exhausted."
+msgstr ""
+
+#: src/ui.cc:1251 src/ui.cc:1282
+msgid "Ran out of time while trying to find a solution."
+msgstr ""
+
+#: src/ui.cc:1276
+msgid "Unable to find a solution to apply."
+msgstr ""
+
+#: src/ui.cc:1321
msgid "^Install/remove packages"
msgstr ""
-#: src/ui.cc:1175
+#: src/ui.cc:1322
msgid "Perform all pending installs and removals"
msgstr ""
-#: src/ui.cc:1177
+#: src/ui.cc:1324
msgid "^Update package list"
msgstr ""
-#: src/ui.cc:1178
+#: src/ui.cc:1325
msgid "Check for new versions of packages"
msgstr ""
-#: src/ui.cc:1181
+#: src/ui.cc:1328
msgid "^Forget new packages"
msgstr ""
-#: src/ui.cc:1182
+#: src/ui.cc:1329
msgid "Forget which packages are \"new\""
msgstr ""
-#: src/ui.cc:1185
+#: src/ui.cc:1332
msgid "^Clean package cache"
msgstr ""
-#: src/ui.cc:1186
+#: src/ui.cc:1333
msgid "Delete package files which were previously downloaded"
msgstr ""
-#: src/ui.cc:1189
+#: src/ui.cc:1336
msgid "Clean ^obsolete files"
msgstr ""
-#: src/ui.cc:1190
+#: src/ui.cc:1337
msgid "Delete package files which can no longer be downloaded"
msgstr ""
-#: src/ui.cc:1193
+#: src/ui.cc:1340
msgid "Mark ^Upgradable"
msgstr ""
-#: src/ui.cc:1194
+#: src/ui.cc:1341
msgid "Mark all upgradable packages which are not held for upgrade"
msgstr ""
-#: src/ui.cc:1197
+#: src/ui.cc:1344
msgid "^Play Minesweeper"
msgstr ""
-#: src/ui.cc:1200
+#: src/ui.cc:1347
msgid "^Become root"
msgstr ""
-#: src/ui.cc:1201
+#: src/ui.cc:1348
msgid ""
-"Run 'su' to become root; this will restart the program, but your\n"
-"settings will be preserved"
+"Run 'su' to become root; this will restart the program, but your settings "
+"will be preserved"
msgstr ""
-#: src/ui.cc:1204
+#: src/ui.cc:1351
msgid "^Reload package cache"
msgstr ""
-#: src/ui.cc:1205
+#: src/ui.cc:1352
msgid "Reload the package cache"
msgstr ""
-#: src/ui.cc:1211
+#: src/ui.cc:1358
msgid "^Quit"
msgstr ""
-#: src/ui.cc:1212
+#: src/ui.cc:1359
msgid "Exit the program"
msgstr ""
-#: src/ui.cc:1218 src/ui.cc:1487
+#: src/ui.cc:1365 src/ui.cc:1637
msgid "Undo"
msgstr ""
-#: src/ui.cc:1219
+#: src/ui.cc:1366
msgid "Undo the last package operation or group of operations"
msgstr ""
-#: src/ui.cc:1226
+#: src/ui.cc:1373
msgid "^Install"
msgstr ""
-#: src/ui.cc:1227
+#: src/ui.cc:1374
msgid "Flag the currently selected package for installation or upgrade"
msgstr ""
-#: src/ui.cc:1230
+#: src/ui.cc:1377
msgid "^Remove"
msgstr ""
-#: src/ui.cc:1231
+#: src/ui.cc:1378
msgid "Flag the currently selected package for removal"
msgstr ""
-#: src/ui.cc:1234
+#: src/ui.cc:1381
msgid "^Purge"
msgstr ""
-#: src/ui.cc:1235
+#: src/ui.cc:1382
msgid ""
"Flag the currently selected package and its configuration files for removal"
msgstr ""
-#: src/ui.cc:1238
+#: src/ui.cc:1385
msgid "^Keep"
msgstr ""
-#: src/ui.cc:1239
+#: src/ui.cc:1386
msgid "Cancel any action on the selected package"
msgstr ""
-#: src/ui.cc:1242
+#: src/ui.cc:1389
msgid "^Hold"
msgstr ""
-#: src/ui.cc:1243
+#: src/ui.cc:1390
msgid ""
"Cancel any action on the selected package, and protect it from future "
"upgrades"
msgstr ""
-#: src/ui.cc:1246
+#: src/ui.cc:1393
msgid "Mark ^Auto"
msgstr ""
-#: src/ui.cc:1247
+#: src/ui.cc:1394
msgid ""
-"Mark the selected package as having been automatically installed;\n"
-"it will automatically be removed if no other packages depend on it"
+"Mark the selected package as having been automatically installed; it will "
+"automatically be removed if no other packages depend on it"
msgstr ""
-#: src/ui.cc:1250
+#: src/ui.cc:1397
msgid "Mark ^Manual"
msgstr ""
-#: src/ui.cc:1251
+#: src/ui.cc:1398
msgid ""
-"Mark the selected package as having been manually installed;\n"
-"it will not be removed unless you manually remove it"
+"Mark the selected package as having been manually installed; it will not be "
+"removed unless you manually remove it"
msgstr ""
-#: src/ui.cc:1254
+#: src/ui.cc:1401
msgid "^Forbid Version"
msgstr ""
-#: src/ui.cc:1255
+#: src/ui.cc:1402
msgid ""
-"Forbid the candidate version of the selected package from being installed;\n"
+"Forbid the candidate version of the selected package from being installed; "
"newer versions of the package will be installed as usual"
msgstr ""
-#: src/ui.cc:1259
+#: src/ui.cc:1406
msgid "I^nformation"
msgstr ""
-#: src/ui.cc:1260
+#: src/ui.cc:1407
msgid "Display more information about the selected package"
msgstr ""
-#: src/ui.cc:1263
+#: src/ui.cc:1410
#, fuzzy
msgid "^Changelog"
msgstr "Poništi"
-#: src/ui.cc:1264
+#: src/ui.cc:1411
msgid "Display the Debian changelog of the selected package"
msgstr ""
-#: src/ui.cc:1271
+#: src/ui.cc:1418
msgid "^Find"
msgstr ""
-#: src/ui.cc:1272
+#: src/ui.cc:1419
msgid "Search for a package"
msgstr ""
-#: src/ui.cc:1275
+#: src/ui.cc:1422
msgid "Find ^Again"
msgstr ""
-#: src/ui.cc:1276
+#: src/ui.cc:1423
msgid "Repeat the last search"
msgstr ""
-#: src/ui.cc:1280
+#: src/ui.cc:1427
msgid "^Limit Display"
msgstr ""
-#: src/ui.cc:1281
+#: src/ui.cc:1428
msgid "Apply a filter to the package list"
msgstr ""
-#: src/ui.cc:1284
+#: src/ui.cc:1431
msgid "^Un-Limit Display"
msgstr ""
-#: src/ui.cc:1285
+#: src/ui.cc:1432
#, fuzzy
msgid "Remove the filter from the package list"
msgstr "Ukloni zastarjele datoteke paketa nakon preuzimanja nove liste paketa"
-#: src/ui.cc:1289
+#: src/ui.cc:1436
msgid "Find ^Broken"
msgstr ""
-#: src/ui.cc:1290
+#: src/ui.cc:1437
msgid "Find the next package with unsatisfied dependencies"
msgstr ""
-#: src/ui.cc:1297
+#: src/ui.cc:1444
msgid "^UI options"
msgstr ""
-#: src/ui.cc:1298
+#: src/ui.cc:1445
msgid "Change the settings which affect the user interface"
msgstr ""
-#: src/ui.cc:1301
+#: src/ui.cc:1448
msgid "^Dependency handling"
msgstr ""
-#: src/ui.cc:1302
+#: src/ui.cc:1449
msgid "Change the settings which affect how package dependencies are handled"
msgstr ""
-#: src/ui.cc:1305
+#: src/ui.cc:1452
msgid "^Miscellaneous"
msgstr ""
-#: src/ui.cc:1306
+#: src/ui.cc:1453
msgid "Change miscellaneous program settings"
msgstr ""
-#: src/ui.cc:1311
+#: src/ui.cc:1458
msgid "^Revert options"
msgstr ""
-#: src/ui.cc:1312
+#: src/ui.cc:1459
msgid "Reset all settings to the system defaults"
msgstr ""
-#: src/ui.cc:1323
+#: src/ui.cc:1470
msgid "^Next"
msgstr ""
-#: src/ui.cc:1324
+#: src/ui.cc:1471
msgid "View next display"
msgstr ""
-#: src/ui.cc:1327
+#: src/ui.cc:1474
msgid "^Prev"
msgstr ""
-#: src/ui.cc:1328
+#: src/ui.cc:1475
msgid "View previous display"
msgstr ""
-#: src/ui.cc:1331
+#: src/ui.cc:1478
msgid "^Close"
msgstr ""
-#: src/ui.cc:1332
+#: src/ui.cc:1479
msgid "Close this display"
msgstr ""
-#: src/ui.cc:1337
+#: src/ui.cc:1484
msgid "New Package ^View"
msgstr ""
-#: src/ui.cc:1338
+#: src/ui.cc:1485
msgid "Create a new default package view"
msgstr ""
-#: src/ui.cc:1341
+#: src/ui.cc:1488
msgid "New Categorical ^Browser"
msgstr ""
-#: src/ui.cc:1343
+#: src/ui.cc:1490
msgid "Browse packages by category"
msgstr ""
-#: src/ui.cc:1351
+#: src/ui.cc:1498
msgid "^About"
msgstr ""
-#: src/ui.cc:1352
+#: src/ui.cc:1499
msgid "View information about this program"
msgstr ""
-#: src/ui.cc:1355
+#: src/ui.cc:1502
msgid "^Help"
msgstr ""
-#: src/ui.cc:1356
+#: src/ui.cc:1503
msgid "View the on-line help"
msgstr ""
-#: src/ui.cc:1358
+#: src/ui.cc:1505
msgid "User's ^Manual"
msgstr ""
-#: src/ui.cc:1359
+#: src/ui.cc:1506
msgid "View the detailed program manual"
msgstr ""
-#: src/ui.cc:1362
+#: src/ui.cc:1509
msgid "^FAQ"
msgstr ""
-#: src/ui.cc:1363
+#: src/ui.cc:1510
msgid "View a list of frequently asked questions"
msgstr ""
-#: src/ui.cc:1366
-msgid "^ChangeLog"
+#: src/ui.cc:1513
+msgid "^NEWS"
msgstr ""
-#: src/ui.cc:1367
-msgid "View the important changes made in each version of the program"
+#: src/ui.cc:1514
+msgid "View the important changes made in each version of "
msgstr ""
-#: src/ui.cc:1370
+#: src/ui.cc:1517
msgid "^License"
msgstr ""
-#: src/ui.cc:1371
+#: src/ui.cc:1518
msgid "View the terms under which you may copy the program"
msgstr ""
-#: src/ui.cc:1486
+#: src/ui.cc:1636
msgid "Actions"
msgstr ""
-#: src/ui.cc:1489
+#: src/ui.cc:1639
msgid "Search"
msgstr ""
-#: src/ui.cc:1490
+#: src/ui.cc:1640
msgid "Options"
msgstr "Opcije"
-#: src/ui.cc:1491
+#: src/ui.cc:1641
msgid "Views"
msgstr ""
-#: src/ui.cc:1492
+#: src/ui.cc:1642
msgid "Help"
msgstr ""
-#: src/ui.cc:1537
+#: src/ui.cc:1699
#, c-format
msgid ""
"%s: Menu %s: Help %s: Quit %s: Update %s: Download/Install/Remove Pkgs"
msgstr ""
-#: src/ui.cc:1799 src/vscreen/vscreen.cc:281
+#: src/ui.cc:1968 src/vscreen/vscreen.cc:281
msgid "yes_key"
msgstr ""
-#: src/ui.cc:1800 src/vscreen/vscreen.cc:282
+#: src/ui.cc:1969 src/vscreen/vscreen.cc:282
msgid "no_key"
msgstr ""
@@ -3613,6 +3863,16 @@
msgid "Downloading Changelog"
msgstr "Preuzimam Changelog datoteku"
+#: src/view_changelog.cc:54
+#, fuzzy
+msgid "Download Changelog"
+msgstr "Preuzimam Changelog datoteku"
+
+#: src/view_changelog.cc:63
+#, c-format
+msgid "%s changes"
+msgstr ""
+
#: src/vscreen/vscreen.cc:119
#, c-format
msgid "Ouch! Got SIGTERM, dying..\n"
Modified: branches/aptitude-0.3/aptitude/po/ca.po
==============================================================================
--- branches/aptitude-0.3/aptitude/po/ca.po (original)
+++ branches/aptitude-0.3/aptitude/po/ca.po Sat Apr 30 13:41:32 2005
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: aptitude_0.2.13-2\n"
"Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-01-10 16:26-0800\n"
+"POT-Creation-Date: 2005-04-29 18:11-0400\n"
"PO-Revision-Date: 2004-07-22 17:53+0100\n"
"Last-Translator: Aleix Badia i Bosch <a.badia at callusdigital.org>\n"
"Language-Team: Catalan <debian-l10n-catalan at lists.debian.org>\n"
@@ -163,16 +163,103 @@
"aquest filtre"
#: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:184 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
-#: src/vscreen/vs_util.cc:329
+#: src/ui.cc:218 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
+#: src/vscreen/vs_util.cc:328
msgid "Ok"
msgstr "D'acord"
#: src/apt_options.cc:242 src/download_list.cc:71 src/mine/cmine.cc:257
-#: src/mine/cmine.cc:330 src/vscreen/vs_util.cc:329
+#: src/mine/cmine.cc:330 src/vscreen/vs_util.cc:328
msgid "Cancel"
msgstr "Cancel·la"
+#: src/broken_indicator.cc:106 src/solution_dialog.cc:97
+msgid "Internal error: unexpected null solution."
+msgstr ""
+
+#: src/broken_indicator.cc:158
+#, fuzzy
+msgid "Suggest "
+msgstr "Suggereix"
+
+#: src/broken_indicator.cc:164
+#, fuzzy, c-format
+msgid "%d installs"
+msgstr "instal·la"
+
+#: src/broken_indicator.cc:169
+#, fuzzy
+msgid "1 install"
+msgstr "instal·la"
+
+#: src/broken_indicator.cc:173
+#, c-format
+msgid "%d removals"
+msgstr ""
+
+#: src/broken_indicator.cc:178
+msgid "1 removal"
+msgstr ""
+
+#: src/broken_indicator.cc:182
+#, c-format
+msgid "%d keeps"
+msgstr ""
+
+#: src/broken_indicator.cc:187
+msgid "1 keep"
+msgstr ""
+
+#: src/broken_indicator.cc:191
+#, fuzzy, c-format
+msgid "%d upgrades"
+msgstr "actualitza"
+
+#: src/broken_indicator.cc:196
+#, fuzzy
+msgid "1 upgrade"
+msgstr "actualitza"
+
+#: src/broken_indicator.cc:200
+#, fuzzy, c-format
+msgid "%d downgrades"
+msgstr "desactualitzat"
+
+#: src/broken_indicator.cc:205
+#, fuzzy
+msgid "1 downgrade"
+msgstr "desactualitzat"
+
+#: src/broken_indicator.cc:214
+#, c-format
+msgid "%s: Examine"
+msgstr ""
+
+#: src/broken_indicator.cc:216
+#, c-format
+msgid "%s: Apply"
+msgstr ""
+
+#: src/broken_indicator.cc:218
+#, fuzzy, c-format
+msgid "%s: Next"
+msgstr "Següe^nt"
+
+#: src/broken_indicator.cc:220
+#, c-format
+msgid "%s: Previous"
+msgstr ""
+
+#: src/broken_indicator.cc:233
+#, c-format
+msgid "%CSolution search failed. %s: try harder"
+msgstr ""
+
+#: src/broken_indicator.cc:239
+#, c-format
+msgid "%CUnable to resolve dependencies."
+msgstr ""
+
#: src/cmdline/cmdline_action.cc:36
#, c-format
msgid ""
@@ -244,22 +331,22 @@
msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
msgstr "El paquet %s no és actualitzable, no es pot prohibir l'actualització\n"
-#: src/cmdline/cmdline_action.cc:213
+#: src/cmdline/cmdline_action.cc:198
#, c-format
msgid "Note: selecting the task \"%s: %s\" for installation\n"
msgstr "Nota: s'està seleccionant la tasca \"%s: %s\" per a la instal·lació\n"
-#: src/cmdline/cmdline_action.cc:240
+#: src/cmdline/cmdline_action.cc:225
#, c-format
msgid "You can only specify a package version with an 'install' command.\n"
msgstr "En una ordre 'install' només podeu especificar una versió de paquet.\n"
-#: src/cmdline/cmdline_action.cc:246
+#: src/cmdline/cmdline_action.cc:231
#, c-format
msgid "You can only specify a package archive with an 'install' command.\n"
msgstr "En una ordre 'install' només podeu especificar un arxiu.\n"
-#: src/cmdline/cmdline_action.cc:280
+#: src/cmdline/cmdline_action.cc:265
#, c-format
msgid ""
"Couldn't find package \"%s\", and more than 40\n"
@@ -268,7 +355,7 @@
"No s'ha pogut trobar el paquet \"%s\" i el nom de més\n"
"de 40 paquets conté \"%s\".\n"
-#: src/cmdline/cmdline_action.cc:283
+#: src/cmdline/cmdline_action.cc:268
#, c-format
msgid ""
"Couldn't find package \"%s\". However, the following\n"
@@ -277,14 +364,14 @@
"No s'ha pogut trobar el paquet \"%s\". Tot i això, el nom dels\n"
"següents paquets conté \"%s\":\n"
-#: src/cmdline/cmdline_action.cc:307
+#: src/cmdline/cmdline_action.cc:292
#, c-format
msgid "Couldn't find any package whose name or description matched \"%s\"\n"
msgstr ""
"No s'ha pogut trobar cap paquet amb un nom o descripció que coincideixi amb "
"\"%s\"\n"
-#: src/cmdline/cmdline_action.cc:309
+#: src/cmdline/cmdline_action.cc:294
#, c-format
msgid ""
"Couldn't find any package matching \"%s\", and more than 40\n"
@@ -293,7 +380,7 @@
"No s'ha pogut trobar cap paquet que coincideixi amb \"%s\". Més de 40\n"
"paquets contenen \"%s\" en la descripció.\n"
-#: src/cmdline/cmdline_action.cc:312
+#: src/cmdline/cmdline_action.cc:297
#, c-format
msgid ""
"Couldn't find any package matching \"%s\". However, the following\n"
@@ -339,13 +426,13 @@
msgid "Freed %sB of disk space\n"
msgstr "S'alliberaran %sB de l'espai de disc"
-#: src/cmdline/cmdline_do_action.cc:67
+#: src/cmdline/cmdline_do_action.cc:71
#, c-format
msgid "Invalid operation %s"
msgstr "L'operació %s no és và lida"
-#: src/cmdline/cmdline_do_action.cc:206 src/cmdline/cmdline_simulate.cc:30
-#: src/cmdline/cmdline_upgrade.cc:89
+#: src/cmdline/cmdline_do_action.cc:201 src/cmdline/cmdline_simulate.cc:31
+#: src/cmdline/cmdline_upgrade.cc:91
#, c-format
msgid "Abort.\n"
msgstr "Abandona.\n"
@@ -355,7 +442,7 @@
msgid "download: you must specify at least one package to download\n"
msgstr "baixa: heu d'especificar un mÃnim d'un paquet a baixar\n"
-#: src/cmdline/cmdline_download.cc:43 src/download.cc:342
+#: src/cmdline/cmdline_download.cc:43 src/download.cc:344
msgid "Couldn't read source list"
msgstr "No s'ha pogut llegir la llista de fonts"
@@ -419,95 +506,95 @@
msgid "What is it? It's an elephant being eaten by a snake, of course.\n"
msgstr "Què és això? Evidentment és una serp menjant-se un elefant.\n"
-#: src/cmdline/cmdline_prompt.cc:44
+#: src/cmdline/cmdline_prompt.cc:45
msgid "Couldn't read list of sources"
msgstr "No s'ha pogut llegir la llista de fonts"
-#: src/cmdline/cmdline_prompt.cc:219 src/cmdline/cmdline_show_broken.cc:73
+#: src/cmdline/cmdline_prompt.cc:220 src/cmdline/cmdline_show_broken.cc:73
#, c-format
msgid "but %s is to be installed."
msgstr "però el %s està per instal·lar."
-#: src/cmdline/cmdline_prompt.cc:222 src/cmdline/cmdline_show_broken.cc:76
+#: src/cmdline/cmdline_prompt.cc:223 src/cmdline/cmdline_show_broken.cc:76
#, c-format
msgid "but %s is installed and it is kept back."
msgstr "però el %s està insta·lat i apartat."
-#: src/cmdline/cmdline_prompt.cc:225 src/cmdline/cmdline_show_broken.cc:79
+#: src/cmdline/cmdline_prompt.cc:226 src/cmdline/cmdline_show_broken.cc:79
#, c-format
msgid "but %s is installed."
msgstr "però el %s està instal·lat."
-#: src/cmdline/cmdline_prompt.cc:229 src/cmdline/cmdline_show_broken.cc:83
+#: src/cmdline/cmdline_prompt.cc:230 src/cmdline/cmdline_show_broken.cc:83
#, c-format
msgid "but it is not installable"
msgstr "però no es pot instal·lar."
-#: src/cmdline/cmdline_prompt.cc:233 src/cmdline/cmdline_show_broken.cc:87
+#: src/cmdline/cmdline_prompt.cc:234 src/cmdline/cmdline_show_broken.cc:87
#, c-format
msgid " which is a virtual package."
msgstr " que és un paquet virtual."
-#: src/cmdline/cmdline_prompt.cc:236 src/cmdline/cmdline_show_broken.cc:90
+#: src/cmdline/cmdline_prompt.cc:237 src/cmdline/cmdline_show_broken.cc:90
#, c-format
msgid " or"
msgstr " o"
-#: src/cmdline/cmdline_prompt.cc:248
+#: src/cmdline/cmdline_prompt.cc:249
msgid "The following packages are BROKEN:"
msgstr "Els paquets següents contenen errors."
-#: src/cmdline/cmdline_prompt.cc:249
+#: src/cmdline/cmdline_prompt.cc:250
msgid "The following packages are unused and will be REMOVED:"
msgstr "Els paquets següents no s'utilitzen i se suprimiran:"
-#: src/cmdline/cmdline_prompt.cc:250
+#: src/cmdline/cmdline_prompt.cc:251
msgid "The following packages have been automatically kept back:"
msgstr "Els paquets següents s'han apartat automà ticament:"
-#: src/cmdline/cmdline_prompt.cc:251
+#: src/cmdline/cmdline_prompt.cc:252
msgid "The following NEW packages will be automatically installed:"
msgstr "Els paquets nous següents s'instal·laran automà ticament:<"
-#: src/cmdline/cmdline_prompt.cc:252
+#: src/cmdline/cmdline_prompt.cc:253
msgid "The following packages will be automatically REMOVED:"
msgstr "Els paquets següents se suprimiran automà ticament:"
-#: src/cmdline/cmdline_prompt.cc:253
+#: src/cmdline/cmdline_prompt.cc:254
msgid "The following packages will be DOWNGRADED:"
msgstr "Els paquets següents es desactualitzaran:"
-#: src/cmdline/cmdline_prompt.cc:254
+#: src/cmdline/cmdline_prompt.cc:255
msgid "The following packages have been kept back:"
msgstr "Els paquets següents s'han apartat:"
-#: src/cmdline/cmdline_prompt.cc:255
+#: src/cmdline/cmdline_prompt.cc:256
msgid "The following packages will be REINSTALLED:"
msgstr "Els paquets següents es tornaran a instal·lar:"
-#: src/cmdline/cmdline_prompt.cc:256
+#: src/cmdline/cmdline_prompt.cc:257
msgid "The following NEW packages will be installed:"
msgstr "Els paquets nous següents s'instal·laran:"
-#: src/cmdline/cmdline_prompt.cc:257
+#: src/cmdline/cmdline_prompt.cc:258
msgid "The following packages will be REMOVED:"
msgstr "Els paquets següents se suprimiran:"
-#: src/cmdline/cmdline_prompt.cc:258
+#: src/cmdline/cmdline_prompt.cc:259
msgid "The following packages will be upgraded:"
msgstr "Els paquets següents s'actualitzaran:"
-#: src/cmdline/cmdline_prompt.cc:307
+#: src/cmdline/cmdline_prompt.cc:311
#, c-format
msgid "The following ESSENTIAL packages will be REMOVED!\n"
msgstr "Els paquets essencials següents se suprimiran\n"
-#: src/cmdline/cmdline_prompt.cc:316
+#: src/cmdline/cmdline_prompt.cc:320
#, c-format
msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
msgstr "Els paquets essencials següents contindran errors arran de l'acció:\n"
-#: src/cmdline/cmdline_prompt.cc:326
+#: src/cmdline/cmdline_prompt.cc:330
#, c-format
msgid ""
"WARNING: Performing this action will probably cause your system to break!\n"
@@ -517,100 +604,103 @@
"sistema.\n"
" No contineu si no coneixeu exactament el que esteu fent.\n"
-#: src/cmdline/cmdline_prompt.cc:328
+#: src/cmdline/cmdline_prompt.cc:332
msgid "I am aware that this is a very bad idea"
msgstr "Sóc conscient que no és una bona idea"
-#: src/cmdline/cmdline_prompt.cc:331
+#: src/cmdline/cmdline_prompt.cc:335
#, c-format
msgid "To continue, type the phrase \"%s\":\n"
msgstr "Per continuar introduïu la frase \"%s\":\n"
-#: src/cmdline/cmdline_prompt.cc:434
+#: src/cmdline/cmdline_prompt.cc:438
#, c-format
msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
msgstr "Els paquets següents són RECOMANATS però NO s'instal·laran:\n"
-#: src/cmdline/cmdline_prompt.cc:440
+#: src/cmdline/cmdline_prompt.cc:444
#, c-format
msgid "The following packages are SUGGESTED but will NOT be installed:\n"
msgstr "Els paquets següents són un SUGGERIMENT però NO s'instal·laran:\n"
-#: src/cmdline/cmdline_prompt.cc:445
+#: src/cmdline/cmdline_prompt.cc:449
#, c-format
msgid "No packages will be installed, upgraded, or removed.\n"
msgstr "No s'instal·larà , actualitzarà o suprimirà cap paquet.\n"
-#: src/cmdline/cmdline_prompt.cc:447
+#: src/cmdline/cmdline_prompt.cc:451
#, c-format
msgid "%lu packages upgraded, %lu newly installed, "
msgstr "%lu paquets actualitzats, %lu instal·lats, "
-#: src/cmdline/cmdline_prompt.cc:451
+#: src/cmdline/cmdline_prompt.cc:455
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu tornats a instal·lar, "
-#: src/cmdline/cmdline_prompt.cc:453
+#: src/cmdline/cmdline_prompt.cc:457
#, c-format
msgid "%lu downgraded, "
msgstr "%lu desactualitzats, "
-#: src/cmdline/cmdline_prompt.cc:455
+#: src/cmdline/cmdline_prompt.cc:459
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu a suprimir i %lu a no actualitzar.\n"
-#: src/cmdline/cmdline_prompt.cc:462
+#: src/cmdline/cmdline_prompt.cc:466
#, c-format
msgid "Need to get %sB/%sB of archives. "
msgstr "Es necessita obtenir %sB/%sB d'arxius. "
-#: src/cmdline/cmdline_prompt.cc:465
+#: src/cmdline/cmdline_prompt.cc:469
#, c-format
msgid "Need to get %sB of archives. "
msgstr "Es necessita obtenir %sB d'arxius. "
-#: src/cmdline/cmdline_prompt.cc:472
+#: src/cmdline/cmdline_prompt.cc:476
#, c-format
msgid "After unpacking %sB will be used.\n"
msgstr "Després del desempaquetat s'utilitzaran %sB.\n"
-#: src/cmdline/cmdline_prompt.cc:475
+#: src/cmdline/cmdline_prompt.cc:479
#, c-format
msgid "After unpacking %sB will be freed.\n"
msgstr "Després del desempaquetat s'alliberaran %sB.\n"
-#: src/cmdline/cmdline_prompt.cc:521
+#: src/cmdline/cmdline_prompt.cc:524
#, c-format
msgid "Bad action character '%c'\n"
msgstr "El carà cter d'acció '%c' és erroni\n"
-#: src/cmdline/cmdline_prompt.cc:596
+#: src/cmdline/cmdline_prompt.cc:595
#, c-format
msgid "No packages to show -- enter the package names on the line after 'i'.\n"
msgstr ""
"No s'ha trobat cap paquet a mostrar -- introduïu els noms dels paquets a la "
"lÃnia posterior a 'i'.\n"
-#: src/cmdline/cmdline_prompt.cc:598 src/cmdline/cmdline_prompt.cc:629
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:597
msgid "Press Return to continue."
msgstr "Per continuar premeu la tecla de retorn."
-#: src/cmdline/cmdline_prompt.cc:625
+#: src/cmdline/cmdline_prompt.cc:623
#, c-format
msgid "No packages found -- enter the package names on the line after 'c'.\n"
msgstr ""
"No s'ha trobat cap paquet -- introduïu els noms dels paquets a la lÃnia "
"posterior a 'c'.\n"
-#: src/cmdline/cmdline_prompt.cc:665
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:627
+#, fuzzy
+msgid "Press Return to continue"
+msgstr "Per continuar premeu la tecla de retorn."
+
+#: src/cmdline/cmdline_prompt.cc:675
msgid "Do you want to continue? [Y/n/?] "
msgstr "Esteu segur de voler continuar? [Y/n/?] "
-#: src/cmdline/cmdline_prompt.cc:690
+#: src/cmdline/cmdline_prompt.cc:700
#, c-format
msgid ""
"\n"
@@ -621,7 +711,7 @@
"Es mostrarà la informació de les dependències.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:692
+#: src/cmdline/cmdline_prompt.cc:702
#, c-format
msgid ""
"\n"
@@ -632,7 +722,7 @@
"No es mostrarà la informació de les dependències.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:698
+#: src/cmdline/cmdline_prompt.cc:708
#, c-format
msgid ""
"\n"
@@ -643,7 +733,7 @@
"Es mostraran les versions.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:700
+#: src/cmdline/cmdline_prompt.cc:710
#, c-format
msgid ""
"\n"
@@ -654,7 +744,7 @@
"No es mostraran les versions.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:705
+#: src/cmdline/cmdline_prompt.cc:715
#, c-format
msgid ""
"\n"
@@ -665,7 +755,7 @@
"Es mostraran els canvis de mides.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:717
#, c-format
msgid ""
"\n"
@@ -676,7 +766,7 @@
"No es mostraran els canvis de mides.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:737
#, c-format
msgid ""
"Commands:\n"
@@ -726,33 +816,86 @@
" _ : purga\n"
" = : congela\n"
-#: src/cmdline/cmdline_prompt.cc:751
+#: src/cmdline/cmdline_prompt.cc:761
#, c-format
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:84
+#, c-format
+msgid "y: %F%nn: %F%nq: %F%n,: %F%n.: %F%n"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:90
+msgid "accept the proposed changes"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:92
+msgid "reject the proposed changes and search for another solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:94
+#, fuzzy
+msgid "give up and quit the program"
+msgstr "Surt del programa"
+
+#: src/cmdline/cmdline_resolver.cc:96
+msgid "move to the next solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:98
+msgid "move to the previous solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:131
+#, 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:146
+msgid "Accept this solution? [Y/n/q/?]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:174
+msgid "Abandoning all efforts to resolve these dependencies."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:184
+#, fuzzy
+msgid "The following commands are available:"
+msgstr "Els paquets següents contenen errors."
+
+#: src/cmdline/cmdline_resolver.cc:188
+#, 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:198
+msgid "No solution found within the allotted time. Try harder? [Y/n]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:226
+#, 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:235
+msgid "Unable to resolve dependencies! Giving up..."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:240
+msgid "No more solutions."
+msgstr ""
+
#: src/cmdline/cmdline_search.cc:78
#, c-format
msgid "search: You must provide at least one search term\n"
msgstr "cerca: heu de proporcionar, com a mÃnim, un terme de cerca\n"
-#: src/cmdline/cmdline_show_broken.cc:114
-#, c-format
-msgid ""
-"Some packages had unmet dependencies. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming.\n"
-"\n"
-msgstr ""
-"Alguns paquets tenen dependències sense satisfer. Això pot significar\n"
-"que heu demanat una situació impossible o si esteu usant la distribució\n"
-"«unstable» que encara no s'han creat o no s'han mogut fora d'Incoming "
-"alguns\n"
-"dels paquets requerits.\n"
-
-#: src/cmdline/cmdline_show_broken.cc:115
+#: src/cmdline/cmdline_show_broken.cc:113
#, c-format
msgid "The following packages have unmet dependencies:\n"
msgstr "No s'han trobat les dependències del paquets següents:\n"
@@ -950,12 +1093,12 @@
msgid "Description: "
msgstr "Descripció: "
-#: src/cmdline/cmdline_simulate.cc:36
+#: src/cmdline/cmdline_simulate.cc:37
#, c-format
msgid "Would download/install/remove packages.\n"
msgstr "Es baixarà /instal·larà /suprimirà paquets.\n"
-#: src/cmdline/cmdline_simulate.cc:47
+#: src/cmdline/cmdline_simulate.cc:48
msgid "Internal Error, Ordering didn't finish"
msgstr "S'ha produït un error intern, l'ordre no ha finalitzat"
@@ -999,28 +1142,24 @@
msgid "UNAVAILABLE"
msgstr "No disponible"
-#: src/download_bar.cc:57 src/download_list.cc:265
+#: src/download_bar.cc:56 src/download_list.cc:263 src/download_screen.cc:57
#, c-format
-msgid ""
-"Please insert the following disc into the drive \"%s\":\n"
-"%s"
-msgstr ""
-"Introduïu el disc següent a la unitat \"%s\":\n"
-"%s"
+msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
+msgstr "Introduïu el disc etiquetat com a \"%s\" a la unitat \"%s\""
-#: src/download_bar.cc:76 src/generic/acqprogress.cc:63
+#: src/download_bar.cc:77 src/generic/acqprogress.cc:63
msgid "Hit "
msgstr "Prem"
-#: src/download_bar.cc:89
+#: src/download_bar.cc:90
msgid "Downloading "
msgstr "S'està baixant"
-#: src/download_bar.cc:102
+#: src/download_bar.cc:103
msgid "Got "
msgstr "Obtingut/s "
-#: src/download_bar.cc:156
+#: src/download_bar.cc:157
msgid "Downloading..."
msgstr "S'està baixant..."
@@ -1028,7 +1167,7 @@
msgid "Couldn't read list of package sources"
msgstr "No s'ha pogut llegir la llista de fonts de paquets"
-#: src/download.cc:104 src/download.cc:321
+#: src/download.cc:104 src/download.cc:322
msgid "Couldn't lock list directory..are you root?"
msgstr "No s'ha pogut bloquejar el directori de la llista...sou superusuari?"
@@ -1040,29 +1179,33 @@
msgid "View the progress of the package list update"
msgstr "Visualitza la progressió de l'actualització de la llista de paquets"
-#: src/download.cc:159
+#: src/download.cc:113
+msgid "List Update"
+msgstr ""
+
+#: src/download.cc:160
msgid "Couldn't clean out list directories"
msgstr "No s'han pogut netejar els directoris de la llista"
-#: src/download.cc:176 src/ui.cc:1068
+#: src/download.cc:177 src/ui.cc:1152
msgid "Deleting obsolete downloaded files"
msgstr "S'estan suprimint els fitxers baixats obsolets"
-#: src/download.cc:181
+#: src/download.cc:182
#, c-format
msgid "Deleting obsolete downloaded files\n"
msgstr "S'estan suprimint els fitxers baixats obsolets\n"
-#: src/download.cc:223
+#: src/download.cc:224
#, c-format
msgid "Unable to open %s to log actions"
msgstr "No s'ha pogut obrir el %s per registrar les accions"
-#: src/download.cc:229
+#: src/download.cc:230
msgid "log report"
msgstr "informe del registre"
-#: src/download.cc:230
+#: src/download.cc:231
#, c-format
msgid ""
"IMPORTANT: this log only lists intended actions; actions which fail due to\n"
@@ -1073,77 +1216,77 @@
"que no es realitzen correctament arran de problemes del dpkg no es "
"completaran.\n"
-#: src/download.cc:231
+#: src/download.cc:232
#, c-format
msgid "Will install %li packages, and remove %li packages.\n"
msgstr "S'instal·laran %li paquets i se'n suprimiran %li.\n"
-#: src/download.cc:233
+#: src/download.cc:234
#, c-format
msgid "%sB of disk space will be used\n"
msgstr "s'utilitzarà una espai de disc de %sB\n"
-#: src/download.cc:236
+#: src/download.cc:237
#, c-format
msgid "%sB bytes of disk space will be freed\n"
msgstr "S'alliberaran %sB bytes d'espai de disc\n"
-#: src/download.cc:244
+#: src/download.cc:245
#, c-format
msgid "[UPGRADE] %s %s -> %s\n"
msgstr "[Actualitza] %s %s -> %s\n"
-#: src/download.cc:248
+#: src/download.cc:249
#, c-format
msgid "[DOWNGRADE] %s %s -> %s\n"
msgstr "[Desactualitza] %s %s -> %s\n"
-#: src/download.cc:258
+#: src/download.cc:259
msgid "REMOVE"
msgstr "Suprimeix"
-#: src/download.cc:264
+#: src/download.cc:265
msgid "INSTALL"
msgstr "Instal·la"
-#: src/download.cc:267
+#: src/download.cc:268
msgid "REINSTALL"
msgstr "Reinstal·la"
-#: src/download.cc:270
+#: src/download.cc:271
msgid "HOLD"
msgstr "Congelat"
-#: src/download.cc:273
+#: src/download.cc:274
msgid "BROKEN"
msgstr "Amb errors"
-#: src/download.cc:276
+#: src/download.cc:277
msgid "REMOVE, NOT USED"
msgstr "Suprimeix, no utilitzat"
-#: src/download.cc:279
+#: src/download.cc:280
msgid "REMOVE, DEPENDENCIES"
msgstr "Suprimeix, dependències"
-#: src/download.cc:282
+#: src/download.cc:283
msgid "INSTALL, DEPENDENCIES"
msgstr "Instal·la, dependències"
-#: src/download.cc:285
+#: src/download.cc:286
msgid "HOLD, DEPENDENCIES"
msgstr "Congela, dependències"
-#: src/download.cc:287
+#: src/download.cc:288
msgid "????????"
msgstr "????????"
-#: src/download.cc:291
+#: src/download.cc:292
#, c-format
msgid "[%s] %s\n"
msgstr "[%s] %s\n"
-#: src/download.cc:294
+#: src/download.cc:295
#, c-format
msgid ""
"===============================================================================\n"
@@ -1154,36 +1297,41 @@
"\n"
"Enregistrament complet.\n"
-#: src/download.cc:329
+#: src/download.cc:330
msgid "Downloading packages"
msgstr "S'estan baixant les paquets"
-#: src/download.cc:330
+#: src/download.cc:331
msgid "View the progress of the package download"
msgstr "Visualitza la progressió de la baixada de paquets"
-#: src/download.cc:352
+#: src/download.cc:332
+#, fuzzy
+msgid "Package Download"
+msgstr "Paquet: "
+
+#: src/download.cc:354
msgid "Internal error: couldn't generate list of packages to download"
msgstr ""
"S'ha produït un error intern, no s'ha pogut generar la llista de paquets a "
"baixar"
-#: src/download.cc:413
+#: src/download.cc:415
msgid "Unable to correct for unavailable packages"
msgstr "No s'ha pogut solucionar els problemes amb els paquets no disponibles"
-#: src/download.cc:465
+#: src/download.cc:467
msgid ""
"Ack! Something bad happened while installing packages. Trying to recover:"
msgstr ""
"S'ha produït un error en la instal·lació dels paquets. S'està intentant la "
"recuperació:"
-#: src/download.cc:475 src/pkg_item.cc:413
+#: src/download.cc:477 src/pkg_item.cc:432
msgid "Press return to continue.\n"
msgstr "Premeu retorn per continuar.\n"
-#: src/download.cc:506
+#: src/download.cc:508
msgid ""
"Could not regain the system lock! (Perhaps another apt or dpkg is running?)"
msgstr ""
@@ -1245,11 +1393,6 @@
msgid "[ERROR]"
msgstr "[Error]"
-#: src/download_screen.cc:57
-#, c-format
-msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
-msgstr "Introduïu el disc etiquetat com a \"%s\" a la unitat \"%s\""
-
#: src/download_screen.cc:181
#, c-format
msgid "Downloaded %sB in %ss (%sB/s)."
@@ -1289,118 +1432,118 @@
"Canvi del mitjà : introduïu el disc amb l'etiqueta '%s' a la unitat '%s' i "
"cliqueu retorn\n"
-#: src/generic/aptcache.cc:245
+#: src/generic/aptcache.cc:253
msgid "Can't open Aptitude extended state file"
msgstr "No s'ha pogut obrir el fitxer d'estat estès de l'Aptitude"
-#: src/generic/aptcache.cc:252 src/generic/aptcache.cc:305
-#: src/generic/aptcache.cc:307
+#: src/generic/aptcache.cc:260 src/generic/aptcache.cc:313
+#: src/generic/aptcache.cc:315
msgid "Reading extended state information"
msgstr "S'està llegint la informació d'estat estesa"
-#: src/generic/aptcache.cc:313 src/generic/aptcache.cc:387
-#: src/generic/aptcache.cc:390
+#: src/generic/aptcache.cc:321 src/generic/aptcache.cc:395
+#: src/generic/aptcache.cc:398
msgid "Initializing package states"
msgstr "S'estan inicialitzant els estats dels paquets"
-#: src/generic/aptcache.cc:501
+#: src/generic/aptcache.cc:509
msgid "Cannot open Aptitude state file"
msgstr "No s'ha pogut obrir el fitxer d'estat de l'Aptitude"
-#: src/generic/aptcache.cc:505 src/generic/aptcache.cc:560
-#: src/generic/aptcache.cc:563
+#: src/generic/aptcache.cc:513 src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:571
msgid "Writing extended state information"
msgstr "S'està escrivint la informació d'estat estesa"
-#: src/generic/aptcache.cc:542
+#: src/generic/aptcache.cc:550
#, 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/aptcache.cc:551
+#: src/generic/aptcache.cc:559
msgid "Couldn't write state file"
msgstr "No s'ha pogut escriure el fitxer d'estat"
-#: src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:576
msgid "Error writing state file"
msgstr "S'ha produït un error en escriure el fitxer d'estat"
-#: src/generic/aptcache.cc:584
+#: src/generic/aptcache.cc:592
msgid "couldn't replace old state file"
msgstr "no s'ha pogut reemplaçar el fitxer d'estat antic"
-#: src/generic/aptcache.cc:960
+#: src/generic/aptcache.cc:1000
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/aptcache.cc:1325
+#: src/generic/aptcache.cc:1546
msgid "The list of sources could not be read."
msgstr "No s'ha pogut llegir la llista de fonts."
-#: src/generic/aptcache.cc:1332
+#: src/generic/aptcache.cc:1553
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/aptcache.cc:1335
+#: src/generic/aptcache.cc:1556
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 "
"problemes amb els fitxers que falten."
-#: src/generic/apt.cc:141
+#: src/generic/apt.cc:142
#, c-format
msgid "Unable to open %s for writing"
msgstr "No s'ha pogut obrir %s per a l'escriptura"
-#: src/generic/apt.cc:151
+#: src/generic/apt.cc:152
#, c-format
msgid "Unable to replace %s with new configuration file"
msgstr "No s'ha pogut reemplaçar el %s pel nou fitxer de configuració"
-#: src/generic/apt.cc:226
+#: src/generic/apt.cc:227
msgid "Warning: could not lock the cache file. Opening in read-only mode"
msgstr ""
"AvÃs: no s'ha pogut bloquejar el fitxer de memòria cau. S'està obrint amb el "
"mode de només lectura"
-#: src/generic/matchers.cc:780
+#: src/generic/matchers.cc:797
msgid "Unmatched '('"
msgstr "'(' no està tancada"
-#: src/generic/matchers.cc:870 src/generic/matchers.cc:949
+#: src/generic/matchers.cc:887 src/generic/matchers.cc:968
#, c-format
msgid "Unknown dependency type: %s"
msgstr "El tipus de dependència és desconegut: %s"
-#: src/generic/matchers.cc:931
+#: src/generic/matchers.cc:950
#, c-format
msgid "Unknown action type: %s"
msgstr "El tipus d'acció és desconegut: %s"
-#: src/generic/matchers.cc:998
+#: src/generic/matchers.cc:1017
#, c-format
msgid "Unknown priority %s"
msgstr "La prioritat %s és desconeguda"
-#: src/generic/matchers.cc:1020
+#: src/generic/matchers.cc:1039
#, c-format
msgid "Unknown pattern type: %c"
msgstr "El tipus de patró és desconegut: %c"
-#: src/generic/matchers.cc:1065
+#: src/generic/matchers.cc:1084
msgid "Unexpected empty expression"
msgstr "L'expressió, inesperadament, és buida"
-#: src/generic/matchers.cc:1100
+#: src/generic/matchers.cc:1119
msgid "Badly formed expression"
msgstr "L'expressió està mal formada"
-#: src/generic/matchers.cc:1129
+#: src/generic/matchers.cc:1148
msgid "Unexpected ')'"
msgstr "El ')' és inesperat"
@@ -1426,7 +1569,7 @@
msgstr ""
"No s'ha pogut obtenir el valor de $HOME, s'està utilitzant TMPDIR (insegur)"
-#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:60
+#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:61
#, c-format
msgid "ChangeLog of %s"
msgstr "El registre de canvis de %s"
@@ -1647,17 +1790,17 @@
msgid "Invalid sorting policy type '%s'"
msgstr "El tipus de polÃtica d'ordenació '%s' és invà lid"
-#: src/main.cc:68
+#: src/main.cc:67
#, c-format
msgid "%s %s compiled at %s %s\n"
msgstr "%s %s compilat el %s %s\n"
-#: src/main.cc:71
+#: src/main.cc:70
#, c-format
msgid "Compiler: g++ %s\n"
msgstr "Compilador: g++ %s\n"
-#: src/main.cc:74
+#: src/main.cc:73
#, c-format
msgid ""
"\n"
@@ -1666,7 +1809,7 @@
"\n"
"Versió de les NCurses: %s\n"
-#: src/main.cc:76
+#: src/main.cc:75
#, c-format
msgid ""
"\n"
@@ -1675,22 +1818,22 @@
"\n"
"Versió de les Curses: %s\n"
-#: src/main.cc:78
+#: src/main.cc:77
#, c-format
msgid "libsigc++ version: %s\n"
msgstr "versió de la libsigc++: %s\n"
-#: src/main.cc:84
+#: src/main.cc:83
#, c-format
msgid "Usage: aptitude [-S fname] [-u|-i]"
msgstr "Utilització: aptitude [-S nomfitxer] [-u|-i]"
-#: src/main.cc:86
+#: src/main.cc:85
#, c-format
msgid " aptitude [options] <action> ..."
msgstr " aptitude [opcions] <acció> ..."
-#: src/main.cc:88
+#: src/main.cc:87
#, c-format
msgid ""
" Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -1700,44 +1843,44 @@
"interactiu):\n"
"\n"
-#: src/main.cc:89
+#: src/main.cc:88
#, c-format
msgid " install - Install/upgrade packages\n"
msgstr " install - Instal·la/actualitza els paquets\n"
-#: src/main.cc:90
+#: src/main.cc:89
#, c-format
msgid " remove - Remove packages\n"
msgstr " remove - Suprimeix els paquets\n"
-#: src/main.cc:91
+#: src/main.cc:90
#, c-format
msgid " purge - Remove packages and their configuration files\n"
msgstr ""
" purge - Suprimeix els paquets i els corresponents fitxers de "
"configuració\n"
-#: src/main.cc:92
+#: src/main.cc:91
#, c-format
msgid " hold - Place packages on hold\n"
msgstr " hold - Deixa els paquets congelats\n"
-#: src/main.cc:93
+#: src/main.cc:92
#, c-format
msgid " unhold - Cancel a hold command for a package\n"
msgstr " unhold - Cancel·la l'ordre de congelació d'un paquet\n"
-#: src/main.cc:94
+#: src/main.cc:93
#, c-format
msgid " markauto - Mark packages as having been automatically installed\n"
msgstr " markauto - Marca els paquets com a instal·lats automà ticament\n"
-#: src/main.cc:95
+#: src/main.cc:94
#, c-format
msgid " unmarkauto - Mark packages as having been manually installed\n"
msgstr " unmarkauto - Marca els paquets com a instal·lats manualment\n"
-#: src/main.cc:100
+#: src/main.cc:99
#, c-format
msgid ""
" forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -1746,17 +1889,17 @@
" forbid-version - Prohibeix l'actualització a una versió especÃfica d'un "
"paquet.\n"
-#: src/main.cc:101
+#: src/main.cc:100
#, c-format
msgid " update - Download lists of new/upgradable packages\n"
msgstr " update - Baixa les llistes dels paquets nous/actualitzables\n"
-#: src/main.cc:102
+#: src/main.cc:101
#, c-format
msgid " upgrade - Perform a safe upgrade\n"
msgstr " upgrades - Realitza una actualització segura\n"
-#: src/main.cc:103
+#: src/main.cc:102
#, c-format
msgid ""
" dist-upgrade - Perform an upgrade, possibly installing and removing "
@@ -1765,75 +1908,75 @@
" dist-upgrade - Realitza una actualització, probablement instal·lant i "
"suprimint paquets\n"
-#: src/main.cc:104
+#: src/main.cc:103
#, c-format
msgid " forget-new - Forget what packages are \"new\"\n"
msgstr " forget-net - Oblida quins paquets són \"nous\"\n"
-#: src/main.cc:105
+#: src/main.cc:104
#, c-format
msgid " search - Search for a package by name and/or expression\n"
msgstr " search - Cerca un paquet pel seu nom i/o expressió\n"
-#: src/main.cc:106
+#: src/main.cc:105
#, c-format
msgid " show - Display detailed information about a package\n"
msgstr " mostra - Mostra informació detallada d'un paquet\n"
-#: src/main.cc:107
+#: src/main.cc:106
#, c-format
msgid " clean - Erase downloaded package files\n"
msgstr " clean - Suprimeix els fitxers dels paquets baixats\n"
-#: src/main.cc:108
+#: src/main.cc:107
#, c-format
msgid " autoclean - Erase old downloaded package files\n"
msgstr " autoclean - Suprimeix els fitxers dels paquets baixats antics\n"
-#: src/main.cc:109
+#: src/main.cc:108
#, c-format
msgid " changelog - View a package's changelog\n"
msgstr " changelog - Visualitza un registre de modificacions d'un paquet\n"
-#: src/main.cc:110
+#: src/main.cc:109
#, c-format
msgid " download - Download the .deb file for a package\n"
msgstr " download - Baixa el fitxer .deb d'un paquet\n"
-#: src/main.cc:112
+#: src/main.cc:111
#, c-format
msgid " Options:\n"
msgstr " Opcions:\n"
-#: src/main.cc:113
+#: src/main.cc:112
#, c-format
msgid " -h This help text\n"
msgstr " -h Aquest text d'ajuda\n"
-#: src/main.cc:114
+#: src/main.cc:113
#, c-format
msgid " -s Simulate actions, but do not actually perform them.\n"
msgstr " -s Simula les accions però no les duguis a terme.\n"
-#: src/main.cc:115
+#: src/main.cc:114
#, c-format
msgid ""
" -d Only download packages, do not install or remove anything.\n"
msgstr " -d Baixa els paquets però n'instal·lis o suprimeixis cap.\n"
-#: src/main.cc:116
+#: src/main.cc:115
#, c-format
msgid " -P Always prompt for confirmation or actions\n"
msgstr " -P Pregunta permanentment les confirmacions o accions\n"
-#: src/main.cc:117
+#: src/main.cc:116
#, c-format
msgid ""
" -y Assume that the answer to simple yes/no questions is 'yes'\n"
msgstr ""
" -y Assumeix que la resposta a les preguntes sÃ/noo és 'sÃ'\n"
-#: src/main.cc:118
+#: src/main.cc:117
#, c-format
msgid ""
" -F format Specify a format for displaying search results; see the "
@@ -1842,7 +1985,7 @@
" -F format Especifica un format per a la visualització dels resultats "
"de la cerca; fes una ullada al manual\n"
-#: src/main.cc:119
+#: src/main.cc:118
#, c-format
msgid ""
" -O order Specify how search results should be sorted; see the manual\n"
@@ -1850,7 +1993,7 @@
" -O ordre Especifica el mode en que s'han d'ordenar els resultats de "
"la cerca, fes una ullada al manual\n"
-#: src/main.cc:120
+#: src/main.cc:119
#, c-format
msgid ""
" -w width Specify the display width for formatting search results\n"
@@ -1858,17 +2001,17 @@
" -w amplada Especifica l'amplada de la visualització pel formatat dels "
"resultats de la cerca\n"
-#: src/main.cc:121
+#: src/main.cc:120
#, c-format
msgid " -f Aggressively try to fix broken packages.\n"
msgstr " -f Intent agressiu de resoldre els errors dels paquets.\n"
-#: src/main.cc:122
+#: src/main.cc:121
#, c-format
msgid " -V Show which versions of packages are to be installed.\n"
msgstr " -V Mostra les versions dels programes a instal·lar.\n"
-#: src/main.cc:123
+#: src/main.cc:122
#, c-format
msgid ""
" -D Show the dependencies of automatically changed packages.\n"
@@ -1876,18 +2019,18 @@
" -D Mostra les dependències dels paquets modificats "
"automà ticament.\n"
-#: src/main.cc:124
+#: src/main.cc:123
#, c-format
msgid " -Z\t\t Show the change in installed size of each package.\n"
msgstr " -Z Mostra els canvis de la mida instal·lada per a cada paquet.\n"
-#: src/main.cc:125
+#: src/main.cc:124
#, c-format
msgid ""
" -v Display extra information. (may be supplied multiple times)\n"
msgstr " -v Mostra la informació extra. (s'utilitza múltiples vegades)\n"
-#: src/main.cc:126
+#: src/main.cc:125
#, c-format
msgid ""
" -t [release] Set the release from which packages should be installed\n"
@@ -1895,12 +2038,12 @@
" -t [versió] Especifica la versió de llançament de la qual s'haurien "
"d'instal·lar les paquets\n"
-#: src/main.cc:127
+#: src/main.cc:126
#, c-format
msgid " -o key=val Directly set the configuration option named 'key'\n"
msgstr " -o clau=val Defineix directament l'opció de configuració 'clau'\n"
-#: src/main.cc:128
+#: src/main.cc:127
#, c-format
msgid ""
" --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -1910,60 +2053,68 @@
"recomanacions com\n"
" dependències fortes\n"
-#: src/main.cc:129
+#: src/main.cc:128
#, c-format
msgid " -S fname: Read the aptitude extended status info from fname.\n"
msgstr ""
" -S nomf: Llegeix la informació d'estat estesa de l'aptitude del nom.\n"
-#: src/main.cc:130
+#: src/main.cc:129
#, c-format
msgid " -u : Download new package lists on startup.\n"
msgstr " -u : Baixa una nova llista de paquets a l'inici.\n"
-#: src/main.cc:131
+#: src/main.cc:130
#, c-format
msgid " -i : Perform an install run on startup.\n"
msgstr "-i : Executa la instal·lació a l'inici.\n"
-#: src/main.cc:133
+#: src/main.cc:132
#, c-format
msgid " This aptitude does not have Super Cow Powers.\n"
msgstr " L'aptitude no té super poders bovins.\n"
-#: src/main.cc:254
+#: src/main.cc:253
#, c-format
msgid "-o requires an argument of the form key=value, got %s"
msgstr "-o precisa d'un argument del tipus clau=valor, s'ha obtingut %s"
-#: src/main.cc:300 src/main.cc:309
+#: src/main.cc:299 src/main.cc:308
msgid "WEIRDNESS: unknown option code received\n"
msgstr "Rar: s'ha rebut un codi d'opció desconegut\n"
-#: src/main.cc:318
+#: src/main.cc:317
msgid "Only one of -u and -i may be specified\n"
msgstr "Només es pot utilitzar un -u o -i\n"
-#: src/main.cc:326
+#: src/main.cc:325
msgid ""
"-u and -i may not be specified in command-line mode (eg, with 'install')"
msgstr ""
"-u i -i no es poden utilitzar en el mode de lÃnia d'ordres (ex, amb "
"'install')"
-#: src/main.cc:337
+#: src/main.cc:342
msgid "-u and -i may not be specified with a command"
msgstr "-u i -i no s'han d'utilitzar amb una ordre"
-#: src/main.cc:392
+#: src/main.cc:399
#, c-format
msgid "Unknown command \"%s\"\n"
msgstr "Ordre desconeguda \"%s\"\n"
-#: src/main.cc:400
+#: src/main.cc:406 src/main.cc:463
+msgid "Internal error: uncaught 'out of solutions' exception.\n"
+msgstr ""
+
+#: src/main.cc:411 src/main.cc:468
+msgid "Internal error: uncaught 'out of time' exception.\n"
+msgstr ""
+
+#: src/main.cc:418
#, c-format
-msgid "Invalid option for interactive mode: -s\n"
-msgstr "Opció invà lida pel mode interactiu: -s\n"
+msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
+msgstr ""
#: src/mine/cmine.cc:93
#, c-format
@@ -1991,7 +2142,7 @@
msgid "Lost"
msgstr "Perdut"
-#: src/mine/cmine.cc:119 src/ui.cc:1005
+#: src/mine/cmine.cc:119 src/ui.cc:1089
msgid "Minesweeper"
msgstr "Busca mines"
@@ -2167,7 +2318,7 @@
msgid "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
msgstr "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
-#: src/pkg_columnizer.cc:84 src/ui.cc:1488
+#: src/pkg_columnizer.cc:84 src/ui.cc:1638
msgid "Package"
msgstr "Paquet"
@@ -2431,13 +2582,14 @@
"inicial."
#: src/pkg_grouppolicy.cc:158
+#, fuzzy
msgid ""
"Programs for faxmodems and other communications devices\n"
" Packages in the 'comm' section are used to control modems and other "
"hardware communications devices. This includes software to control faxmodems "
"(for instance, PPP for dial-up internet connections and programs originally "
-"written for that purpose (zmodem/kermit), as well as software to control "
-"cellular phones, interface with FidoNet, and run a BBS."
+"written for that purpose, such as zmodem/kermit), as well as software to "
+"control cellular phones, interface with FidoNet, and run a BBS."
msgstr ""
"Programes per a faxmòdems i d'altres dispositius de comunicació\n"
" Els paquets de la secció 'comm' s'utilitzen per al control dels mòdems i "
@@ -2893,14 +3045,15 @@
"trobà veu en aquesta secció s'han migrat a 'main'."
#: src/pkg_grouppolicy.cc:193
+#, fuzzy
msgid ""
"Programs which are not free software\n"
" Packages in the 'non-free' section are not part of Debian.\n"
" .\n"
" These packages fail to meet one or more of the requirements of the Debian "
-"Free Software Guidelines (see below) You should read the license of programs "
-"in this section to be sure that you are allowed to use them in the way you "
-"intend.\n"
+"Free Software Guidelines (see below). You should read the license of "
+"programs in this section to be sure that you are allowed to use them in the "
+"way you intend.\n"
" .\n"
" For more information about what Debian considers to be Free Software, see "
"http://www.debian.org/social_contract#guidelines"
@@ -2964,11 +3117,12 @@
" Aquests paquets disposen d'una versió actualitzada."
#: src/pkg_grouppolicy.cc:320
+#, fuzzy
msgid ""
"New Packages\n"
" These packages have been added to Debian since the last time you cleared "
-"the list of \"new\" packages. (choose \"Forget new packages\" from the "
-"Actions menu to empty this list)"
+"the list of \"new\" packages (choose \"Forget new packages\" from the "
+"Actions menu to empty this list)."
msgstr ""
"Paquets nous\n"
" Aquesta paquets s'han afegit a Debian des de l'última vegada que vau "
@@ -3220,105 +3374,125 @@
msgid "Versions"
msgstr "Versions"
-#: src/pkg_item.cc:54
+#: src/pkg_item.cc:55
msgid "Yes, I am aware this is a very bad idea"
msgstr "SÃ, soc conscient que no és una bona idea"
#: src/pkg_item.cc:80
-#, c-format
+#, fuzzy, c-format
msgid ""
-"%s is an essential package!\n"
-"\n"
-"Are you sure you want to remove it?\n"
-"Type '%s' if you are."
+"%s is an essential package!%n%nAre you sure you want to remove it?%nType '%"
+"s' if you are."
msgstr ""
"%s és un paquet essencial.\n"
"\n"
"Esteu segur que el voleu suprimir?\n"
"Si n'esteu segur introduïu '%s'."
-#: src/pkg_item.cc:219
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:625
#, c-format
msgid "Information about %s"
msgstr "Informació quant a %s"
-#: src/pkg_item.cc:304
-msgid "Available versions of "
+#: src/pkg_item.cc:224 src/pkg_ver_item.cc:627
+#, c-format
+msgid "%s info"
+msgstr ""
+
+#: src/pkg_item.cc:310
+#, fuzzy, c-format
+msgid "Available versions of %s"
msgstr "Versions disponibles de "
-#: src/pkg_item.cc:312 src/pkg_ver_item.cc:648
+#: src/pkg_item.cc:313
+#, fuzzy, c-format
+msgid "%s versions"
+msgstr "Versions"
+
+#: src/pkg_item.cc:325 src/pkg_ver_item.cc:655
#, c-format
msgid "Dependencies of %s"
msgstr "Dependències de %s"
-#: src/pkg_item.cc:322 src/pkg_ver_item.cc:657
+#: src/pkg_item.cc:327 src/pkg_ver_item.cc:657
+#, c-format
+msgid "%s deps"
+msgstr ""
+
+#: src/pkg_item.cc:338 src/pkg_ver_item.cc:667
#, c-format
msgid "Packages depending on %s"
msgstr "Paquets que depenen de %s"
-#: src/pkg_item.cc:373 src/pkg_ver_item.cc:694
+#: src/pkg_item.cc:340 src/pkg_ver_item.cc:669
+#, c-format
+msgid "%s reverse deps"
+msgstr ""
+
+#: src/pkg_item.cc:392 src/pkg_ver_item.cc:707
#, c-format
msgid "Reporting a bug in %s:\n"
msgstr "S'està informant d'un error a %s:\n"
-#: src/pkg_item.cc:395
+#: src/pkg_item.cc:414
+#, fuzzy
msgid ""
-"You are not root and I cannot find any way\n"
-"to become root. To reconfigure this package,\n"
-"install the menu package, the login package,\n"
-"or run aptitude as root."
+"You are not root and I cannot find any way to become root. To reconfigure "
+"this package, install the menu package, the login package, or run aptitude "
+"as root."
msgstr ""
"No sou superusuari i no s'ha pogut trobat cap mètode\n"
"per esdevenir-ho. Per reconfigurar aquest paquet\n"
"heu d'instal·lar el paquet menú, el paquet login o\n"
"executeu l'aptitude com a superusuari."
-#: src/pkg_item.cc:403
+#: src/pkg_item.cc:422
#, c-format
msgid "Reconfiguring %s\n"
msgstr "S'està reconfigurant %s\n"
-#: src/pkg_item.cc:428
+#: src/pkg_item.cc:447
msgid "Hierarchy editor"
msgstr "Editor de jerarquies"
+#: src/pkg_item.cc:447
+#, fuzzy
+msgid "Hierarchy Editor"
+msgstr "Editor de jerarquies"
+
#: src/pkg_tree.cc:325
msgid "Search for: "
msgstr "Cerca: "
-#: src/pkg_tree.cc:585
+#: src/pkg_tree.cc:568
msgid "All Packages"
msgstr "Tots els paquets"
-#: src/pkg_tree.cc:598 src/pkg_tree.cc:607
+#: src/pkg_tree.cc:581 src/pkg_tree.cc:590
msgid "Building view"
msgstr "S'està construïnt la vista"
-#: src/pkg_tree.cc:649
+#: src/pkg_tree.cc:632
#, c-format
msgid "No packages matched the pattern \"%s\"."
msgstr "No hi ha cap paquet que coincideixi amb el patró \"%s\"."
-#: src/pkg_tree.cc:671
+#: src/pkg_tree.cc:654
msgid "Enter the new package tree limit: "
msgstr "Introduïu el nou lÃmit de l'arbre de paquets: "
-#: src/pkg_tree.cc:705
+#: src/pkg_tree.cc:688
msgid "Enter the new package grouping mechanism for this display: "
msgstr ""
"Introduïu el nou mecanisme d'agrupació de paquets per a aquesta "
"visualització: "
-#: src/pkg_tree.cc:713
+#: src/pkg_tree.cc:696
msgid "Enter the new package sorting mechanism for this display: "
msgstr ""
"Introduïu el nou mecanisme d'ordenació de paquets per a aquesta "
"visualització: "
-#: src/pkg_ver_item.cc:623
-msgid "Information about "
-msgstr "Informació sobre "
-
#: src/pkg_view.cc:344
msgid "make_package_view: error in arguments -- two main widgets??"
msgstr ""
@@ -3336,7 +3510,7 @@
msgid "make_package_view: bad argument!"
msgstr "make_package_view: argument erroni."
-#: src/pkg_view.cc:492
+#: src/pkg_view.cc:495
msgid "make_package_view: no main widget found"
msgstr ""
"make_package_view: no s'ha trobat cap element principal de la interfÃcie "
@@ -3558,6 +3732,74 @@
"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:74
+msgid "The package cache is not available."
+msgstr ""
+
+#: src/solution_dialog.cc:82
+#, fuzzy
+msgid "No packages are broken."
+msgstr "Alguns paquets contenen errors. Voleu intentar arreglar-los?"
+
+#: src/solution_dialog.cc:103
+msgid "No resolution found."
+msgstr ""
+
+#: src/solution_dialog.cc:107
+#, c-format
+msgid ""
+"Time exhausted while searching for a solution (you can select \"Next Solution"
+"\" or press %s to try harder)."
+msgstr ""
+
+#: src/solution_dialog.cc:146
+#, fuzzy
+msgid "Previous"
+msgstr "Proporciona"
+
+#: src/solution_dialog.cc:147
+#, fuzzy
+msgid "Next"
+msgstr "Següe^nt"
+
+#: src/solution_dialog.cc:148
+msgid "Apply"
+msgstr ""
+
+#: src/solution_dialog.cc:149
+#, fuzzy
+msgid "Close"
+msgstr "Tan^ca"
+
+#: src/solution_fragment.cc:125
+#, fuzzy
+msgid "%BRemove%b the following packages:%n"
+msgstr "Els paquets següents contenen errors."
+
+#: src/solution_fragment.cc:135
+#, fuzzy
+msgid "%BInstall%b the following packages:%n"
+msgstr "Els paquets següents contenen errors."
+
+#: src/solution_fragment.cc:148
+msgid "%BKeep%b the following packages at their current version:%n"
+msgstr ""
+
+#: src/solution_fragment.cc:161
+#, fuzzy
+msgid "%BUpgrade%b the following packages:%n"
+msgstr "Els paquets següents contenen errors."
+
+#: src/solution_fragment.cc:176
+#, fuzzy
+msgid "%BDowngrade%b the following packages:%n"
+msgstr "S'estan baixant les paquets"
+
+#: src/solution_fragment.cc:190
+#, c-format
+msgid "Score is %d"
+msgstr ""
+
#: src/trust.cc:17 src/trust.cc:19
msgid "WARNING"
msgstr ""
@@ -3569,56 +3811,56 @@
"system."
msgstr ""
-#: src/ui.cc:143
+#: src/ui.cc:164
msgid "Er, there aren't any errors, this shouldn't have happened.."
msgstr "Er, no s'ha produït cap error, aquesta situació no s'hauria de donar.."
-#: src/ui.cc:149
+#: src/ui.cc:170
msgid "E:"
msgstr ""
-#: src/ui.cc:151
+#: src/ui.cc:172
msgid "W:"
msgstr ""
-#: src/ui.cc:172
+#: src/ui.cc:193
msgid "Search for:"
msgstr "Cerca:"
-#: src/ui.cc:205
+#: src/ui.cc:261
msgid "You already are root!"
msgstr "Ja sou el superusuari"
-#: src/ui.cc:303
+#: src/ui.cc:359
msgid ""
"Subprocess exited with an error -- did you type your password correctly?"
msgstr ""
"Els subprocés ha finalitzat amb un error -- heu introduït correctament la "
"contrasenya?"
-#: src/ui.cc:331
+#: src/ui.cc:387
msgid "Loading cache"
msgstr "S'està carregant la memòria cau"
-#: src/ui.cc:353
+#: src/ui.cc:409
msgid "Really quit Aptitude?"
msgstr "Esteu segur de voler sortir de l'Aptitude?"
-#: src/ui.cc:432
+#: src/ui.cc:488
msgid "Really discard your personal settings and reload the defaults?"
msgstr ""
"Esteu segur de voler descartar els vostres parà metres personals i utilitzar "
"els predeterminats?"
-#: src/ui.cc:532
+#: src/ui.cc:588 src/ui.cc:590 src/ui.cc:618 src/ui.cc:620
msgid "Packages"
msgstr "Paquets"
-#: src/ui.cc:533 src/ui.cc:560
+#: src/ui.cc:589 src/ui.cc:619
msgid "View available packages and choose actions to perform"
msgstr "Observeu els paquets disponibles i escolliu les accions a realitzar"
-#: src/ui.cc:599
+#: src/ui.cc:666
#, fuzzy
msgid ""
"%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
@@ -3636,15 +3878,15 @@
"podeu redistribuir acceptant una seguit de termes dels quals podeu trobar "
"més informació a 'llicència'."
-#: src/ui.cc:620
+#: src/ui.cc:687
msgid "help.txt"
msgstr "help.txt"
-#: src/ui.cc:636
+#: src/ui.cc:703
msgid "README"
msgstr "README"
-#: src/ui.cc:718
+#: src/ui.cc:785
msgid ""
"%C%BWARNING%b: untrusted versions of the following packages will be "
"installed!%n%nUntrusted packages could %Bcompromise your system's security%"
@@ -3652,61 +3894,71 @@
"this is what you want to do.%n%n"
msgstr ""
-#: src/ui.cc:732
+#: src/ui.cc:799
#, fuzzy
msgid "Really Continue"
msgstr "Continua"
-#: src/ui.cc:734
+#: src/ui.cc:801
msgid "Abort Installation"
msgstr ""
-#: src/ui.cc:796
+#: src/ui.cc:862
msgid "Preview of package installation"
msgstr "Previsualització de la instal·lació de paquets"
-#: src/ui.cc:797
+#: src/ui.cc:863
msgid "View and/or adjust the actions that will be performed"
msgstr "Visualitza i/o ajusta les accions que es duran a terme"
-#: src/ui.cc:837
-msgid "Some packages were broken and have been fixed"
+#: src/ui.cc:864
+#, fuzzy
+msgid "Preview"
+msgstr "^Ante"
+
+#: src/ui.cc:900
+#, fuzzy
+msgid "Some packages were broken and have been fixed:"
msgstr "Alguns paquets contenien errors i s'han arreglat"
-#: src/ui.cc:839
-msgid "Some broken packages could not be fixed!"
-msgstr "Alguns dels paquets amb errors no s'han pogut arreglar"
+#: src/ui.cc:906
+msgid "No solution to these dependency problems exists!"
+msgstr ""
-#: src/ui.cc:847 src/ui.cc:959
-msgid "Some packages are broken. Try to fix them?"
-msgstr "Alguns paquets contenen errors. Voleu intentar arreglar-los?"
+#: src/ui.cc:912
+#, c-format
+msgid ""
+"Ran out of time while trying to resolver dependencies (press \"%s\" to try "
+"harder)"
+msgstr ""
-#: src/ui.cc:860
+#: src/ui.cc:958
+#, fuzzy
msgid ""
-"Installing/removing packages requires administrative privileges, which\n"
-"you currently do not have. Would you like to change to the root account?\n"
+"Installing/removing packages requires administrative privileges, which you "
+"currently do not have. Would you like to change to the root account?"
msgstr ""
"El procés de suprimir/instal·lar paquets precisa de privilegis "
"d'administrador,\n"
"els quals actualment no teniu. Voleu canviar al compte de superusuari?\n"
-#: src/ui.cc:863 src/ui.cc:993
+#: src/ui.cc:961 src/ui.cc:1077
msgid "Become root"
msgstr "Esdevé superusuari"
-#: src/ui.cc:865 src/ui.cc:995
+#: src/ui.cc:963 src/ui.cc:1079
msgid "Don't become root"
msgstr "No esdevinguis superusuari"
-#: src/ui.cc:870 src/ui.cc:1000
+#: src/ui.cc:968 src/ui.cc:1084
msgid "A package-list update or install run is already taking place."
msgstr "La llista de paquets ja s'està actualitzant o instal·lant."
-#: src/ui.cc:897
+#: src/ui.cc:995
msgid "No packages are scheduled to be installed, removed, or upgraded."
msgstr "No s'instal·larà , actualitzarà o suprimirà cap paquet."
-#: src/ui.cc:903
+#: src/ui.cc:1001
#, fuzzy
msgid ""
"No packages will be installed, removed or upgraded. Some packages could be "
@@ -3718,170 +3970,185 @@
"Alguns paquets es podrien actualitzar, però no heu escollit fer-ho.\n"
"Premeu \"U\" per preparar-ne una actualització."
-#: src/ui.cc:990
+#: src/ui.cc:1073
+#, fuzzy
msgid ""
-"Updating the package lists requires administrative privileges, which\n"
-"you currently do not have. Would you like to change to the root account?\n"
+"Updating the package lists requires administrative privileges, which you "
+"currently do not have. Would you like to change to the root account?"
msgstr ""
"El procés d'actualitzar paquets precisa de privilegis d'administrador,\n"
"els quals actualment no teniu. Voleu canviar al compte de superusuari?\n"
-#: src/ui.cc:1005 src/ui.cc:1198
+#: src/ui.cc:1089 src/ui.cc:1345
msgid "Waste time trying to find mines"
msgstr "Perdeu el temps intentant trobar les mines"
-#: src/ui.cc:1012 src/ui.cc:1065
+#: src/ui.cc:1096 src/ui.cc:1149
msgid "Cleaning while a download is in progress is not allowed"
msgstr ""
"La tasca de neteja no es pot realitzar quan s'està realitzant una baixada"
-#: src/ui.cc:1015
+#: src/ui.cc:1099
msgid "Deleting downloaded files"
msgstr "S'estan suprimint els fitxers baixats"
-#: src/ui.cc:1029
+#: src/ui.cc:1113
msgid "Downloaded package files have been deleted"
msgstr "S'han suprimit els fitxers dels paquets baixats"
-#: src/ui.cc:1090
+#: src/ui.cc:1174
#, fuzzy, c-format
msgid ""
"Obsolete downloaded package files have been deleted, freeing %sB of disk "
"space."
msgstr "S'han suprimit els fitxers del paquets baixats"
-#: src/ui.cc:1174
+#: src/ui.cc:1246
+msgid "All solutions exhausted."
+msgstr ""
+
+#: src/ui.cc:1251 src/ui.cc:1282
+#, fuzzy
+msgid "Ran out of time while trying to find a solution."
+msgstr "Perdeu el temps intentant trobar les mines"
+
+#: src/ui.cc:1276
+msgid "Unable to find a solution to apply."
+msgstr ""
+
+#: src/ui.cc:1321
msgid "^Install/remove packages"
msgstr "^Instal·la/suprimeix els paquets"
-#: src/ui.cc:1175
+#: src/ui.cc:1322
msgid "Perform all pending installs and removals"
msgstr "Realitza totes les instal·lacions i supressions pendents"
-#: src/ui.cc:1177
+#: src/ui.cc:1324
msgid "^Update package list"
msgstr "Act^ualitza la llista de paquets"
-#: src/ui.cc:1178
+#: src/ui.cc:1325
msgid "Check for new versions of packages"
msgstr "Verifica si hi ha noves versions dels paquets"
-#: src/ui.cc:1181
+#: src/ui.cc:1328
msgid "^Forget new packages"
msgstr "^Oblida els paquets nous"
-#: src/ui.cc:1182
+#: src/ui.cc:1329
msgid "Forget which packages are \"new\""
msgstr "Oblida quins paquets són \"nous\""
-#: src/ui.cc:1185
+#: src/ui.cc:1332
msgid "^Clean package cache"
msgstr "Neteja la memòria ^cau dels paquets"
-#: src/ui.cc:1186
+#: src/ui.cc:1333
msgid "Delete package files which were previously downloaded"
msgstr "Suprimeix els fitxers dels paquets prèviament baixats"
-#: src/ui.cc:1189
+#: src/ui.cc:1336
msgid "Clean ^obsolete files"
msgstr "Neteja els fitxers ^obsolets"
-#: src/ui.cc:1190
+#: src/ui.cc:1337
msgid "Delete package files which can no longer be downloaded"
msgstr "Suprimeix els fitxers dels paquets que no es podran tornar a baixar"
-#: src/ui.cc:1193
+#: src/ui.cc:1340
msgid "Mark ^Upgradable"
msgstr "Marca com a ^actualitzable"
-#: src/ui.cc:1194
+#: src/ui.cc:1341
msgid "Mark all upgradable packages which are not held for upgrade"
msgstr ""
"Marca tots els paquets actualitzables que no estiguin congelats per a "
"l'actualització"
-#: src/ui.cc:1197
+#: src/ui.cc:1344
msgid "^Play Minesweeper"
msgstr "^Juga al busca mines"
-#: src/ui.cc:1200
+#: src/ui.cc:1347
msgid "^Become root"
msgstr "^Sigues superusuari"
-#: src/ui.cc:1201
+#: src/ui.cc:1348
+#, fuzzy
msgid ""
-"Run 'su' to become root; this will restart the program, but your\n"
-"settings will be preserved"
+"Run 'su' to become root; this will restart the program, but your settings "
+"will be preserved"
msgstr ""
"Executeu l'ordre 'su' per ser superusuari. Aquesta ordre reinicia el "
"programa però manté els parà metres personals."
-#: src/ui.cc:1204
+#: src/ui.cc:1351
msgid "^Reload package cache"
msgstr "^Recarrega la memòria cau dels paquets"
-#: src/ui.cc:1205
+#: src/ui.cc:1352
msgid "Reload the package cache"
msgstr "Torna a carregar la memòria cau dels paquets"
-#: src/ui.cc:1211
+#: src/ui.cc:1358
msgid "^Quit"
msgstr "Su^rt"
-#: src/ui.cc:1212
+#: src/ui.cc:1359
msgid "Exit the program"
msgstr "Surt del programa"
-#: src/ui.cc:1218 src/ui.cc:1487
+#: src/ui.cc:1365 src/ui.cc:1637
msgid "Undo"
msgstr "Desfés"
-#: src/ui.cc:1219
+#: src/ui.cc:1366
msgid "Undo the last package operation or group of operations"
msgstr "Desfés l'última operació o grup d'operacions del paquets"
-#: src/ui.cc:1226
+#: src/ui.cc:1373
msgid "^Install"
msgstr "^Instal·la"
-#: src/ui.cc:1227
+#: src/ui.cc:1374
msgid "Flag the currently selected package for installation or upgrade"
msgstr ""
"Senyala els paquets seleccionats per a la corresponent instal·lació o "
"actualització"
-#: src/ui.cc:1230
+#: src/ui.cc:1377
msgid "^Remove"
msgstr "Sup^rimeix"
-#: src/ui.cc:1231
+#: src/ui.cc:1378
msgid "Flag the currently selected package for removal"
msgstr "Senyala els paquets seleccionats per a la corresponent supressió"
-#: src/ui.cc:1234
+#: src/ui.cc:1381
msgid "^Purge"
msgstr "^Purga"
-#: src/ui.cc:1235
+#: src/ui.cc:1382
msgid ""
"Flag the currently selected package and its configuration files for removal"
msgstr ""
"Senyala els paquets seleccionats i els fitxers de configuració relacionats "
"per a la corresponents supressió"
-#: src/ui.cc:1238
+#: src/ui.cc:1385
msgid "^Keep"
msgstr "Man^té"
-#: src/ui.cc:1239
+#: src/ui.cc:1386
msgid "Cancel any action on the selected package"
msgstr "Cancel·la qualsevol acció al paquet seleccionat"
-#: src/ui.cc:1242
+#: src/ui.cc:1389
msgid "^Hold"
msgstr "Con^gela"
-#: src/ui.cc:1243
+#: src/ui.cc:1390
msgid ""
"Cancel any action on the selected package, and protect it from future "
"upgrades"
@@ -3889,242 +4156,246 @@
"Cancel·la qualsevol acció al paquet seleccionat i protegeix-lo de futures "
"actualitzacions"
-#: src/ui.cc:1246
+#: src/ui.cc:1393
msgid "Mark ^Auto"
msgstr "Marca ^Automà tic"
-#: src/ui.cc:1247
+#: src/ui.cc:1394
+#, fuzzy
msgid ""
-"Mark the selected package as having been automatically installed;\n"
-"it will automatically be removed if no other packages depend on it"
+"Mark the selected package as having been automatically installed; it will "
+"automatically be removed if no other packages depend on it"
msgstr ""
"Marca els paquets seleccionat com a instal·lats automà ticament;\n"
"se suprimiran automà ticament si cap paquet en depèn"
-#: src/ui.cc:1250
+#: src/ui.cc:1397
msgid "Mark ^Manual"
msgstr "Marca ^Manual"
-#: src/ui.cc:1251
+#: src/ui.cc:1398
+#, fuzzy
msgid ""
-"Mark the selected package as having been manually installed;\n"
-"it will not be removed unless you manually remove it"
+"Mark the selected package as having been manually installed; it will not be "
+"removed unless you manually remove it"
msgstr ""
"Marca els paquets seleccionats com a instal·lats manualment;\n"
"no se suprimiran si no ho feu vosaltres manualment"
-#: src/ui.cc:1254
+#: src/ui.cc:1401
msgid "^Forbid Version"
msgstr "^Prohibeix la versió"
-#: src/ui.cc:1255
+#: src/ui.cc:1402
+#, fuzzy
msgid ""
-"Forbid the candidate version of the selected package from being installed;\n"
+"Forbid the candidate version of the selected package from being installed; "
"newer versions of the package will be installed as usual"
msgstr ""
"Prohibeix la instal·lació de la versió candidata del paquet seleccionat;\n"
"les noves versions del paquet s'instal·laran"
-#: src/ui.cc:1259
+#: src/ui.cc:1406
msgid "I^nformation"
msgstr "I^nformació"
-#: src/ui.cc:1260
+#: src/ui.cc:1407
msgid "Display more information about the selected package"
msgstr "Mostra més informació dels paquets seleccionats"
-#: src/ui.cc:1263
+#: src/ui.cc:1410
msgid "^Changelog"
msgstr "Registre de modifi^cacions"
-#: src/ui.cc:1264
+#: src/ui.cc:1411
msgid "Display the Debian changelog of the selected package"
msgstr ""
"Mostra el registre de modificacions de Debian dels paquets seleccionats"
-#: src/ui.cc:1271
+#: src/ui.cc:1418
msgid "^Find"
msgstr "^Cerca"
-#: src/ui.cc:1272
+#: src/ui.cc:1419
msgid "Search for a package"
msgstr "Cerca un paquet"
-#: src/ui.cc:1275
+#: src/ui.cc:1422
msgid "Find ^Again"
msgstr "Torna a cerc^ar"
-#: src/ui.cc:1276
+#: src/ui.cc:1423
msgid "Repeat the last search"
msgstr "Repeteix l'última cerca"
-#: src/ui.cc:1280
+#: src/ui.cc:1427
msgid "^Limit Display"
msgstr "^Limita la visualització"
-#: src/ui.cc:1281
+#: src/ui.cc:1428
msgid "Apply a filter to the package list"
msgstr "Aplica un filtre a la llista de paquets"
-#: src/ui.cc:1284
+#: src/ui.cc:1431
msgid "^Un-Limit Display"
msgstr "No limits la vis^ualització"
-#: src/ui.cc:1285
+#: src/ui.cc:1432
msgid "Remove the filter from the package list"
msgstr "Suprimeix el filtre de la llista de paquets"
-#: src/ui.cc:1289
+#: src/ui.cc:1436
msgid "Find ^Broken"
msgstr "C^erca els trencats"
-#: src/ui.cc:1290
+#: src/ui.cc:1437
msgid "Find the next package with unsatisfied dependencies"
msgstr "Cerca el següent paquet amb dependències no resoltes"
-#: src/ui.cc:1297
+#: src/ui.cc:1444
msgid "^UI options"
msgstr "Opcions de l'I^U"
-#: src/ui.cc:1298
+#: src/ui.cc:1445
msgid "Change the settings which affect the user interface"
msgstr "Canvia els parà metres relacionats amb la interfÃcie d'usuari"
-#: src/ui.cc:1301
+#: src/ui.cc:1448
msgid "^Dependency handling"
msgstr "Gestió de les ^dependències"
-#: src/ui.cc:1302
+#: src/ui.cc:1449
msgid "Change the settings which affect how package dependencies are handled"
msgstr ""
"Canvia els parà metres que fan referència al mode de gestionar les "
"dependències dels paquets"
-#: src/ui.cc:1305
+#: src/ui.cc:1452
msgid "^Miscellaneous"
msgstr "^Diversos"
-#: src/ui.cc:1306
+#: src/ui.cc:1453
msgid "Change miscellaneous program settings"
msgstr "Canvia diversos parà metres de programa"
-#: src/ui.cc:1311
+#: src/ui.cc:1458
msgid "^Revert options"
msgstr "^Recupera les opcions"
-#: src/ui.cc:1312
+#: src/ui.cc:1459
msgid "Reset all settings to the system defaults"
msgstr "Reinicia tots els parà metres als predeterminats del sistema"
-#: src/ui.cc:1323
+#: src/ui.cc:1470
msgid "^Next"
msgstr "Següe^nt"
-#: src/ui.cc:1324
+#: src/ui.cc:1471
msgid "View next display"
msgstr "Mostra la visualització següent"
-#: src/ui.cc:1327
+#: src/ui.cc:1474
msgid "^Prev"
msgstr "^Ante"
-#: src/ui.cc:1328
+#: src/ui.cc:1475
msgid "View previous display"
msgstr "Mostra la visualització anterior"
-#: src/ui.cc:1331
+#: src/ui.cc:1478
msgid "^Close"
msgstr "Tan^ca"
-#: src/ui.cc:1332
+#: src/ui.cc:1479
msgid "Close this display"
msgstr "Tanca aquesta visualització"
-#: src/ui.cc:1337
+#: src/ui.cc:1484
msgid "New Package ^View"
msgstr "Nova ^vista de paquets"
-#: src/ui.cc:1338
+#: src/ui.cc:1485
msgid "Create a new default package view"
msgstr "Crea una nova vista de paquets predeterminada"
-#: src/ui.cc:1341
+#: src/ui.cc:1488
msgid "New Categorical ^Browser"
msgstr "Nou na^vegador per categories"
-#: src/ui.cc:1343
+#: src/ui.cc:1490
msgid "Browse packages by category"
msgstr "Navega pels paquets per categories"
-#: src/ui.cc:1351
+#: src/ui.cc:1498
msgid "^About"
msgstr "Qu^ant a"
-#: src/ui.cc:1352
+#: src/ui.cc:1499
msgid "View information about this program"
msgstr "Mostra la informació sobre aquest programa"
-#: src/ui.cc:1355
+#: src/ui.cc:1502
msgid "^Help"
msgstr "A^juda"
-#: src/ui.cc:1356
+#: src/ui.cc:1503
msgid "View the on-line help"
msgstr "Mostra la informació en lÃnia"
-#: src/ui.cc:1358
+#: src/ui.cc:1505
msgid "User's ^Manual"
msgstr "^Manual d'usuari"
-#: src/ui.cc:1359
+#: src/ui.cc:1506
msgid "View the detailed program manual"
msgstr "Mostra el manual detallat del programa"
-#: src/ui.cc:1362
+#: src/ui.cc:1509
msgid "^FAQ"
msgstr "PM^F"
-#: src/ui.cc:1363
+#: src/ui.cc:1510
msgid "View a list of frequently asked questions"
msgstr "Mostra una llista de les preguntes més freqüents"
-#: src/ui.cc:1366
-msgid "^ChangeLog"
-msgstr "Registre de ^canvis"
+#: src/ui.cc:1513
+msgid "^NEWS"
+msgstr ""
-#: src/ui.cc:1367
-msgid "View the important changes made in each version of the program"
+#: src/ui.cc:1514
+#, fuzzy
+msgid "View the important changes made in each version of "
msgstr "Mostra els canvis importants realitzats en cada versió del programa"
-#: src/ui.cc:1370
+#: src/ui.cc:1517
msgid "^License"
msgstr "^Llicència"
-#: src/ui.cc:1371
+#: src/ui.cc:1518
msgid "View the terms under which you may copy the program"
msgstr "Mostra les condicions sota les quals podeu copiar el programa"
-#: src/ui.cc:1486
+#: src/ui.cc:1636
msgid "Actions"
msgstr "Accions"
-#: src/ui.cc:1489
+#: src/ui.cc:1639
msgid "Search"
msgstr "Cerca"
-#: src/ui.cc:1490
+#: src/ui.cc:1640
msgid "Options"
msgstr "Opcions"
-#: src/ui.cc:1491
+#: src/ui.cc:1641
msgid "Views"
msgstr "Vistes"
-#: src/ui.cc:1492
+#: src/ui.cc:1642
msgid "Help"
msgstr "Ajuda"
-#: src/ui.cc:1537
+#: src/ui.cc:1699
#, c-format
msgid ""
"%s: Menu %s: Help %s: Quit %s: Update %s: Download/Install/Remove Pkgs"
@@ -4132,11 +4403,11 @@
"%s: Menú %s: Ajuda %s: Surt %s: Actualitza %s: Baixa/Instal·la/Suprimeix "
"Paquets"
-#: src/ui.cc:1799 src/vscreen/vscreen.cc:281
+#: src/ui.cc:1968 src/vscreen/vscreen.cc:281
msgid "yes_key"
msgstr "yes_key"
-#: src/ui.cc:1800 src/vscreen/vscreen.cc:282
+#: src/ui.cc:1969 src/vscreen/vscreen.cc:282
msgid "no_key"
msgstr "no_key"
@@ -4150,6 +4421,16 @@
msgid "Downloading Changelog"
msgstr "S'està baixant el registre de modificacions"
+#: src/view_changelog.cc:54
+#, fuzzy
+msgid "Download Changelog"
+msgstr "S'està baixant el registre de modificacions"
+
+#: src/view_changelog.cc:63
+#, c-format
+msgid "%s changes"
+msgstr ""
+
#: src/vscreen/vscreen.cc:119
#, c-format
msgid "Ouch! Got SIGTERM, dying..\n"
@@ -4178,6 +4459,38 @@
msgid "No"
msgstr "No"
+#~ msgid ""
+#~ "Some packages had unmet dependencies. This may mean that you have\n"
+#~ "requested an impossible situation or if you are using the unstable\n"
+#~ "distribution that some required packages have not yet been created\n"
+#~ "or been moved out of Incoming.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Alguns paquets tenen dependències sense satisfer. Això pot significar\n"
+#~ "que heu demanat una situació impossible o si esteu usant la distribució\n"
+#~ "«unstable» que encara no s'han creat o no s'han mogut fora d'Incoming "
+#~ "alguns\n"
+#~ "dels paquets requerits.\n"
+
+#~ msgid ""
+#~ "Please insert the following disc into the drive \"%s\":\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Introduïu el disc següent a la unitat \"%s\":\n"
+#~ "%s"
+
+#~ msgid "Invalid option for interactive mode: -s\n"
+#~ msgstr "Opció invà lida pel mode interactiu: -s\n"
+
+#~ msgid "Information about "
+#~ msgstr "Informació sobre "
+
+#~ msgid "Some broken packages could not be fixed!"
+#~ msgstr "Alguns dels paquets amb errors no s'han pogut arreglar"
+
+#~ msgid "^ChangeLog"
+#~ msgstr "Registre de ^canvis"
+
#~ msgid "Go away, I'm trying to think.\n"
#~ msgstr "Deixeu-me tranquil, estic intentant pensar.\n"
Modified: branches/aptitude-0.3/aptitude/po/cs.po
==============================================================================
--- branches/aptitude-0.3/aptitude/po/cs.po (original)
+++ branches/aptitude-0.3/aptitude/po/cs.po Sat Apr 30 13:41:32 2005
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: aptitude\n"
"Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-01-10 16:26-0800\n"
+"POT-Creation-Date: 2005-04-29 18:11-0400\n"
"PO-Revision-Date: 2004-10-02 10:13+0200\n"
"Last-Translator: Miroslav Kure <kurem at debian.cz>\n"
"Language-Team: Czech <provoz at debian.cz>\n"
@@ -149,16 +149,103 @@
msgstr "Automaticky odstranit nepoužÃvané balÃky splňujÃcà filtr"
#: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:184 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
-#: src/vscreen/vs_util.cc:329
+#: src/ui.cc:218 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
+#: src/vscreen/vs_util.cc:328
msgid "Ok"
msgstr "Ok"
#: src/apt_options.cc:242 src/download_list.cc:71 src/mine/cmine.cc:257
-#: src/mine/cmine.cc:330 src/vscreen/vs_util.cc:329
+#: src/mine/cmine.cc:330 src/vscreen/vs_util.cc:328
msgid "Cancel"
msgstr "Zrušit"
+#: src/broken_indicator.cc:106 src/solution_dialog.cc:97
+msgid "Internal error: unexpected null solution."
+msgstr ""
+
+#: src/broken_indicator.cc:158
+#, fuzzy
+msgid "Suggest "
+msgstr "Navrhuje"
+
+#: src/broken_indicator.cc:164
+#, fuzzy, c-format
+msgid "%d installs"
+msgstr "instalovat"
+
+#: src/broken_indicator.cc:169
+#, fuzzy
+msgid "1 install"
+msgstr "instalovat"
+
+#: src/broken_indicator.cc:173
+#, c-format
+msgid "%d removals"
+msgstr ""
+
+#: src/broken_indicator.cc:178
+msgid "1 removal"
+msgstr ""
+
+#: src/broken_indicator.cc:182
+#, c-format
+msgid "%d keeps"
+msgstr ""
+
+#: src/broken_indicator.cc:187
+msgid "1 keep"
+msgstr ""
+
+#: src/broken_indicator.cc:191
+#, fuzzy, c-format
+msgid "%d upgrades"
+msgstr "aktualizovat"
+
+#: src/broken_indicator.cc:196
+#, fuzzy
+msgid "1 upgrade"
+msgstr "aktualizovat"
+
+#: src/broken_indicator.cc:200
+#, fuzzy, c-format
+msgid "%d downgrades"
+msgstr "degradován"
+
+#: src/broken_indicator.cc:205
+#, fuzzy
+msgid "1 downgrade"
+msgstr "degradován"
+
+#: src/broken_indicator.cc:214
+#, c-format
+msgid "%s: Examine"
+msgstr ""
+
+#: src/broken_indicator.cc:216
+#, c-format
+msgid "%s: Apply"
+msgstr ""
+
+#: src/broken_indicator.cc:218
+#, fuzzy, c-format
+msgid "%s: Next"
+msgstr "DalÅ¡Ã"
+
+#: src/broken_indicator.cc:220
+#, c-format
+msgid "%s: Previous"
+msgstr ""
+
+#: src/broken_indicator.cc:233
+#, c-format
+msgid "%CSolution search failed. %s: try harder"
+msgstr ""
+
+#: src/broken_indicator.cc:239
+#, c-format
+msgid "%CUnable to resolve dependencies."
+msgstr ""
+
#: src/cmdline/cmdline_action.cc:36
#, c-format
msgid ""
@@ -230,22 +317,22 @@
msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
msgstr "BalÃk %s nenà aktualizovatelný, nelze tedy zakázat aktualizaci\n"
-#: src/cmdline/cmdline_action.cc:213
+#: src/cmdline/cmdline_action.cc:198
#, c-format
msgid "Note: selecting the task \"%s: %s\" for installation\n"
msgstr "Pozn: vybÃrám pro instalaci úlohu \"%s: %s\"\n"
-#: src/cmdline/cmdline_action.cc:240
+#: src/cmdline/cmdline_action.cc:225
#, c-format
msgid "You can only specify a package version with an 'install' command.\n"
msgstr "Verzi balÃku můžete zadat jen s pÅ™Ãkazem 'install'.\n"
-#: src/cmdline/cmdline_action.cc:246
+#: src/cmdline/cmdline_action.cc:231
#, c-format
msgid "You can only specify a package archive with an 'install' command.\n"
msgstr "Archiv balÃku můžete zadat jen s pÅ™Ãkazem 'install'.\n"
-#: src/cmdline/cmdline_action.cc:280
+#: src/cmdline/cmdline_action.cc:265
#, c-format
msgid ""
"Couldn't find package \"%s\", and more than 40\n"
@@ -254,7 +341,7 @@
"Nemohl jsem najÃt balÃk \"%s\" a vÃce než 40\n"
"balÃků obsahuje \"%s\" ve svém názvu.\n"
-#: src/cmdline/cmdline_action.cc:283
+#: src/cmdline/cmdline_action.cc:268
#, c-format
msgid ""
"Couldn't find package \"%s\". However, the following\n"
@@ -263,12 +350,12 @@
"Nemohl jsem najÃt balÃk \"%s\", ale následujÃcà balÃky\n"
"obsahujà \"%s\" ve svém názvu:\n"
-#: src/cmdline/cmdline_action.cc:307
+#: src/cmdline/cmdline_action.cc:292
#, c-format
msgid "Couldn't find any package whose name or description matched \"%s\"\n"
msgstr "Nemohl jsem najÃt balÃk, jehož název nebo popis se shoduje s \"%s\"\n"
-#: src/cmdline/cmdline_action.cc:309
+#: src/cmdline/cmdline_action.cc:294
#, c-format
msgid ""
"Couldn't find any package matching \"%s\", and more than 40\n"
@@ -277,7 +364,7 @@
"Nemohl jsem najÃt balÃk vyhovujÃcà \"%s\" a vÃce než 40\n"
"balÃků obsahuje \"%s\" ve svém popisu.\n"
-#: src/cmdline/cmdline_action.cc:312
+#: src/cmdline/cmdline_action.cc:297
#, c-format
msgid ""
"Couldn't find any package matching \"%s\". However, the following\n"
@@ -320,13 +407,13 @@
msgid "Freed %sB of disk space\n"
msgstr "Na disku se uvolnà %sB"
-#: src/cmdline/cmdline_do_action.cc:67
+#: src/cmdline/cmdline_do_action.cc:71
#, c-format
msgid "Invalid operation %s"
msgstr "Neplatná operace %s"
-#: src/cmdline/cmdline_do_action.cc:206 src/cmdline/cmdline_simulate.cc:30
-#: src/cmdline/cmdline_upgrade.cc:89
+#: src/cmdline/cmdline_do_action.cc:201 src/cmdline/cmdline_simulate.cc:31
+#: src/cmdline/cmdline_upgrade.cc:91
#, c-format
msgid "Abort.\n"
msgstr "Přerušeno.\n"
@@ -336,7 +423,7 @@
msgid "download: you must specify at least one package to download\n"
msgstr "download: musÃte zadat alespoň jeden balÃk ke staženÃ\n"
-#: src/cmdline/cmdline_download.cc:43 src/download.cc:342
+#: src/cmdline/cmdline_download.cc:43 src/download.cc:344
msgid "Couldn't read source list"
msgstr "Nemohu ÄÃst seznam zdrojů"
@@ -401,95 +488,95 @@
msgid "What is it? It's an elephant being eaten by a snake, of course.\n"
msgstr "Co to je? Co by to bylo! Přece had žeroucà slona.\n"
-#: src/cmdline/cmdline_prompt.cc:44
+#: src/cmdline/cmdline_prompt.cc:45
msgid "Couldn't read list of sources"
msgstr "Nemohu ÄÃst seznam zdrojů"
-#: src/cmdline/cmdline_prompt.cc:219 src/cmdline/cmdline_show_broken.cc:73
+#: src/cmdline/cmdline_prompt.cc:220 src/cmdline/cmdline_show_broken.cc:73
#, c-format
msgid "but %s is to be installed."
msgstr "ale %s se bude instalovat."
-#: src/cmdline/cmdline_prompt.cc:222 src/cmdline/cmdline_show_broken.cc:76
+#: src/cmdline/cmdline_prompt.cc:223 src/cmdline/cmdline_show_broken.cc:76
#, c-format
msgid "but %s is installed and it is kept back."
msgstr "ale %s je nainstalován a je podržen v aktuálnÃm stavu."
-#: src/cmdline/cmdline_prompt.cc:225 src/cmdline/cmdline_show_broken.cc:79
+#: src/cmdline/cmdline_prompt.cc:226 src/cmdline/cmdline_show_broken.cc:79
#, c-format
msgid "but %s is installed."
msgstr "ale %s nenà instalovaný."
-#: src/cmdline/cmdline_prompt.cc:229 src/cmdline/cmdline_show_broken.cc:83
+#: src/cmdline/cmdline_prompt.cc:230 src/cmdline/cmdline_show_broken.cc:83
#, c-format
msgid "but it is not installable"
msgstr "ale nedá se nainstalovat"
-#: src/cmdline/cmdline_prompt.cc:233 src/cmdline/cmdline_show_broken.cc:87
+#: src/cmdline/cmdline_prompt.cc:234 src/cmdline/cmdline_show_broken.cc:87
#, c-format
msgid " which is a virtual package."
msgstr " což je virtuálnà balÃk."
-#: src/cmdline/cmdline_prompt.cc:236 src/cmdline/cmdline_show_broken.cc:90
+#: src/cmdline/cmdline_prompt.cc:237 src/cmdline/cmdline_show_broken.cc:90
#, c-format
msgid " or"
msgstr " nebo"
-#: src/cmdline/cmdline_prompt.cc:248
+#: src/cmdline/cmdline_prompt.cc:249
msgid "The following packages are BROKEN:"
msgstr "NásledujÃcà balÃky jsou POÅ KOZENY:"
-#: src/cmdline/cmdline_prompt.cc:249
+#: src/cmdline/cmdline_prompt.cc:250
msgid "The following packages are unused and will be REMOVED:"
msgstr "NásledujÃcà balÃky jsou nepoužÃvané a budou ODSTRANÄšNY:"
-#: src/cmdline/cmdline_prompt.cc:250
+#: src/cmdline/cmdline_prompt.cc:251
msgid "The following packages have been automatically kept back:"
msgstr "NásledujÃcà balÃky jsou automaticky podrženy v aktuálnÃm stavu:"
-#: src/cmdline/cmdline_prompt.cc:251
+#: src/cmdline/cmdline_prompt.cc:252
msgid "The following NEW packages will be automatically installed:"
msgstr "NásledujÃcà NOVÉ balÃky budou nainstalovány automaticky:"
-#: src/cmdline/cmdline_prompt.cc:252
+#: src/cmdline/cmdline_prompt.cc:253
msgid "The following packages will be automatically REMOVED:"
msgstr "NásledujÃcà balÃky budou automaticky ODSTRANÄšNY:"
-#: src/cmdline/cmdline_prompt.cc:253
+#: src/cmdline/cmdline_prompt.cc:254
msgid "The following packages will be DOWNGRADED:"
msgstr "NásledujÃcà balÃky budou DEGRADOVÃNY:"
-#: src/cmdline/cmdline_prompt.cc:254
+#: src/cmdline/cmdline_prompt.cc:255
msgid "The following packages have been kept back:"
msgstr "NásledujÃcà balÃky jsou podrženy v aktuálnÃm stavu:"
-#: src/cmdline/cmdline_prompt.cc:255
+#: src/cmdline/cmdline_prompt.cc:256
msgid "The following packages will be REINSTALLED:"
msgstr "NásledujÃcà balÃky budou reinstalovány:"
-#: src/cmdline/cmdline_prompt.cc:256
+#: src/cmdline/cmdline_prompt.cc:257
msgid "The following NEW packages will be installed:"
msgstr "NásledujÃcà NOVÉ balÃky budou instalovány:"
-#: src/cmdline/cmdline_prompt.cc:257
+#: src/cmdline/cmdline_prompt.cc:258
msgid "The following packages will be REMOVED:"
msgstr "NásledujÃcà balÃky budou ODSTRANÄšNY:"
-#: src/cmdline/cmdline_prompt.cc:258
+#: src/cmdline/cmdline_prompt.cc:259
msgid "The following packages will be upgraded:"
msgstr "NásledujÃcà balÃky budou aktualizovány:"
-#: src/cmdline/cmdline_prompt.cc:307
+#: src/cmdline/cmdline_prompt.cc:311
#, c-format
msgid "The following ESSENTIAL packages will be REMOVED!\n"
msgstr "NásledujÃcà NEZBYTNÉ balÃky budou ODSTRANÄšNY!\n"
-#: src/cmdline/cmdline_prompt.cc:316
+#: src/cmdline/cmdline_prompt.cc:320
#, c-format
msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
msgstr "NásledujÃcà NEZBYTNÉ balÃky budou touto akcà PORUÅ ENY:\n"
-#: src/cmdline/cmdline_prompt.cc:326
+#: src/cmdline/cmdline_prompt.cc:330
#, c-format
msgid ""
"WARNING: Performing this action will probably cause your system to break!\n"
@@ -498,96 +585,99 @@
"VAROVÃNÃ: ProvedenÃm této akce pravdÄ›podobnÄ› poÅ¡kodÃte systém!\n"
" Pokud PŘESNÄš nevÃte, co dÄ›láte, NEPOKRAÄŒUJTE!\n"
-#: src/cmdline/cmdline_prompt.cc:328
+#: src/cmdline/cmdline_prompt.cc:332
msgid "I am aware that this is a very bad idea"
msgstr "Jsem si vědom, že to je špatný nápad"
-#: src/cmdline/cmdline_prompt.cc:331
+#: src/cmdline/cmdline_prompt.cc:335
#, c-format
msgid "To continue, type the phrase \"%s\":\n"
msgstr "Pro pokraÄovánà napiÅ¡te frázi \"%s\":\n"
-#: src/cmdline/cmdline_prompt.cc:434
+#: src/cmdline/cmdline_prompt.cc:438
#, c-format
msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
msgstr "NásledujÃcà balÃky jsou DOPORUÄŒENÉ, ale NEBUDOU instalovány:\n"
-#: src/cmdline/cmdline_prompt.cc:440
+#: src/cmdline/cmdline_prompt.cc:444
#, c-format
msgid "The following packages are SUGGESTED but will NOT be installed:\n"
msgstr "NásledujÃcà balÃky jsou NAVRHOVANÉ, ale NEBUDOU instalovány:\n"
-#: src/cmdline/cmdline_prompt.cc:445
+#: src/cmdline/cmdline_prompt.cc:449
#, c-format
msgid "No packages will be installed, upgraded, or removed.\n"
msgstr "Žádné balÃky se nebudou instalovat, aktualizovat nebo odstraňovat.\n"
-#: src/cmdline/cmdline_prompt.cc:447
+#: src/cmdline/cmdline_prompt.cc:451
#, c-format
msgid "%lu packages upgraded, %lu newly installed, "
msgstr "%lu balÃků aktualizováno, %lu novÄ› instalováno, "
-#: src/cmdline/cmdline_prompt.cc:451
+#: src/cmdline/cmdline_prompt.cc:455
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstalováno, "
-#: src/cmdline/cmdline_prompt.cc:453
+#: src/cmdline/cmdline_prompt.cc:457
#, c-format
msgid "%lu downgraded, "
msgstr "%lu degradováno, "
-#: src/cmdline/cmdline_prompt.cc:455
+#: src/cmdline/cmdline_prompt.cc:459
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu k odstraněnà a %lu neaktualizováno.\n"
-#: src/cmdline/cmdline_prompt.cc:462
+#: src/cmdline/cmdline_prompt.cc:466
#, c-format
msgid "Need to get %sB/%sB of archives. "
msgstr "Potřebuji stáhnout %sB/%sB archivů. "
-#: src/cmdline/cmdline_prompt.cc:465
+#: src/cmdline/cmdline_prompt.cc:469
#, c-format
msgid "Need to get %sB of archives. "
msgstr "Potřebuji stáhnout %sB archivů. "
-#: src/cmdline/cmdline_prompt.cc:472
+#: src/cmdline/cmdline_prompt.cc:476
#, c-format
msgid "After unpacking %sB will be used.\n"
msgstr "Po rozbalenà bude použito %sB.\n"
-#: src/cmdline/cmdline_prompt.cc:475
+#: src/cmdline/cmdline_prompt.cc:479
#, c-format
msgid "After unpacking %sB will be freed.\n"
msgstr "Po rozbalenà bude uvolněno %sB.\n"
-#: src/cmdline/cmdline_prompt.cc:521
+#: src/cmdline/cmdline_prompt.cc:524
#, c-format
msgid "Bad action character '%c'\n"
msgstr "Chybná akce '%c'\n"
-#: src/cmdline/cmdline_prompt.cc:596
+#: src/cmdline/cmdline_prompt.cc:595
#, c-format
msgid "No packages to show -- enter the package names on the line after 'i'.\n"
msgstr "Nenà co zobrazit -- zadejte názvy balÃků na řádek za 'i'.\n"
-#: src/cmdline/cmdline_prompt.cc:598 src/cmdline/cmdline_prompt.cc:629
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:597
msgid "Press Return to continue."
msgstr "Pro pokraÄovánà stisknÄ›te Enter."
-#: src/cmdline/cmdline_prompt.cc:625
+#: src/cmdline/cmdline_prompt.cc:623
#, c-format
msgid "No packages found -- enter the package names on the line after 'c'.\n"
msgstr "Žádné balÃky nenalezeny -- zadejte názvy balÃků na řádek za 'c'.\n"
-#: src/cmdline/cmdline_prompt.cc:665
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:627
+#, fuzzy
+msgid "Press Return to continue"
+msgstr "Pro pokraÄovánà stisknÄ›te Enter."
+
+#: src/cmdline/cmdline_prompt.cc:675
msgid "Do you want to continue? [Y/n/?] "
msgstr "Chcete pokraÄovat? [Y/n/?] "
-#: src/cmdline/cmdline_prompt.cc:690
+#: src/cmdline/cmdline_prompt.cc:700
#, c-format
msgid ""
"\n"
@@ -598,7 +688,7 @@
"Informace o závislostech budou zobrazeny.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:692
+#: src/cmdline/cmdline_prompt.cc:702
#, c-format
msgid ""
"\n"
@@ -609,7 +699,7 @@
"Informace o závislostech nebudou zobrazeny.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:698
+#: src/cmdline/cmdline_prompt.cc:708
#, c-format
msgid ""
"\n"
@@ -620,7 +710,7 @@
"Verze budou zobrazeny.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:700
+#: src/cmdline/cmdline_prompt.cc:710
#, c-format
msgid ""
"\n"
@@ -631,7 +721,7 @@
"Verze nebudou zobrazeny.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:705
+#: src/cmdline/cmdline_prompt.cc:715
#, c-format
msgid ""
"\n"
@@ -642,7 +732,7 @@
"Změny velikostà budou zobrazeny.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:717
#, c-format
msgid ""
"\n"
@@ -653,7 +743,7 @@
"Změny velikostà nebudou zobrazeny.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:737
#, c-format
msgid ""
"Commands:\n"
@@ -702,31 +792,83 @@
" _ : OdstranÄ›nà i s konfiguracÃ\n"
" = : Podrženà v aktuálnÃm stavu\n"
-#: src/cmdline/cmdline_prompt.cc:751
+#: src/cmdline/cmdline_prompt.cc:761
#, c-format
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:84
+#, c-format
+msgid "y: %F%nn: %F%nq: %F%n,: %F%n.: %F%n"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:90
+msgid "accept the proposed changes"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:92
+msgid "reject the proposed changes and search for another solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:94
+#, fuzzy
+msgid "give up and quit the program"
+msgstr "UkonÄÃ program"
+
+#: src/cmdline/cmdline_resolver.cc:96
+msgid "move to the next solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:98
+msgid "move to the previous solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:131
+#, fuzzy
+msgid "The following actions will resolve these dependencies:"
+msgstr "NásledujÃcà balÃky majà nesplnÄ›né závislosti:\n"
+
+#: src/cmdline/cmdline_resolver.cc:146
+msgid "Accept this solution? [Y/n/q/?]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:174
+msgid "Abandoning all efforts to resolve these dependencies."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:184
+#, fuzzy
+msgid "The following commands are available:"
+msgstr "NásledujÃcà balÃky jsou POÅ KOZENY:"
+
+#: src/cmdline/cmdline_resolver.cc:188
+#, fuzzy
+msgid "Invalid response; please enter one of the following commands:"
+msgstr "Chybná odpovÄ›Ä. Zadejte platný pÅ™Ãkaz nebo '?' pro nápovÄ›du.\n"
+
+#: src/cmdline/cmdline_resolver.cc:198
+msgid "No solution found within the allotted time. Try harder? [Y/n]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:226
+#, fuzzy
+msgid "Invalid response; please enter 'y' or 'n'."
+msgstr "Chybná odpovÄ›Ä. Zadejte platný pÅ™Ãkaz nebo '?' pro nápovÄ›du.\n"
+
+#: src/cmdline/cmdline_resolver.cc:235
+msgid "Unable to resolve dependencies! Giving up..."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:240
+msgid "No more solutions."
+msgstr ""
+
#: src/cmdline/cmdline_search.cc:78
#, c-format
msgid "search: You must provide at least one search term\n"
msgstr "hledánÃ: MusÃte zadat alespoň jeden hledaný term\n"
-#: src/cmdline/cmdline_show_broken.cc:114
-#, c-format
-msgid ""
-"Some packages had unmet dependencies. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming.\n"
-"\n"
-msgstr ""
-"NÄ›které balÃky majà nesplnÄ›né závislosti. To může znamenat, že požadujete\n"
-"nemožnou situaci, nebo, pokud použÃváte nestabilnà distribuci, že\n"
-"vyžadované balÃky jeÅ¡tÄ› nebyly vytvoÅ™eny nebo pÅ™esunuty z PÅ™Ãchozà fronty.\n"
-"\n"
-
-#: src/cmdline/cmdline_show_broken.cc:115
+#: src/cmdline/cmdline_show_broken.cc:113
#, c-format
msgid "The following packages have unmet dependencies:\n"
msgstr "NásledujÃcà balÃky majà nesplnÄ›né závislosti:\n"
@@ -924,12 +1066,12 @@
msgid "Description: "
msgstr "Popis: "
-#: src/cmdline/cmdline_simulate.cc:36
+#: src/cmdline/cmdline_simulate.cc:37
#, c-format
msgid "Would download/install/remove packages.\n"
msgstr "Teoreticky by stáhl/nainstaloval/odstranil balÃky.\n"
-#: src/cmdline/cmdline_simulate.cc:47
+#: src/cmdline/cmdline_simulate.cc:48
msgid "Internal Error, Ordering didn't finish"
msgstr "VnitÅ™nà chyba, výbÄ›r neskonÄil"
@@ -971,28 +1113,24 @@
msgid "UNAVAILABLE"
msgstr "NEDOSTUPNÃ"
-#: src/download_bar.cc:57 src/download_list.cc:265
+#: src/download_bar.cc:56 src/download_list.cc:263 src/download_screen.cc:57
#, c-format
-msgid ""
-"Please insert the following disc into the drive \"%s\":\n"
-"%s"
-msgstr ""
-"NásledujÃcà disk vložte do mechaniky \"%s\":\n"
-"%s"
+msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
+msgstr "Vložte do mechaniky \"%s\" disk nazvaný \"%s\""
-#: src/download_bar.cc:76 src/generic/acqprogress.cc:63
+#: src/download_bar.cc:77 src/generic/acqprogress.cc:63
msgid "Hit "
msgstr "CÃl "
-#: src/download_bar.cc:89
+#: src/download_bar.cc:90
msgid "Downloading "
msgstr "Stahuji "
-#: src/download_bar.cc:102
+#: src/download_bar.cc:103
msgid "Got "
msgstr "Mám "
-#: src/download_bar.cc:156
+#: src/download_bar.cc:157
msgid "Downloading..."
msgstr "Stahuji..."
@@ -1000,7 +1138,7 @@
msgid "Couldn't read list of package sources"
msgstr "Nemohu ÄÃst seznam se zdroji balÃků"
-#: src/download.cc:104 src/download.cc:321
+#: src/download.cc:104 src/download.cc:322
msgid "Couldn't lock list directory..are you root?"
msgstr "Nemohu zamknout adresář seznamů...jste root?"
@@ -1012,29 +1150,33 @@
msgid "View the progress of the package list update"
msgstr "Zobrazà průbÄ›h aktualizace seznamu balÃků"
-#: src/download.cc:159
+#: src/download.cc:113
+msgid "List Update"
+msgstr ""
+
+#: src/download.cc:160
msgid "Couldn't clean out list directories"
msgstr "Nemohu vyÄistit adresáře seznamů"
-#: src/download.cc:176 src/ui.cc:1068
+#: src/download.cc:177 src/ui.cc:1152
msgid "Deleting obsolete downloaded files"
msgstr "Mažu staré stažené soubory"
-#: src/download.cc:181
+#: src/download.cc:182
#, c-format
msgid "Deleting obsolete downloaded files\n"
msgstr "Mažu staré stažené soubory\n"
-#: src/download.cc:223
+#: src/download.cc:224
#, c-format
msgid "Unable to open %s to log actions"
msgstr "Nemohu otevÅ™Ãt %s pro záznam akcÃ"
-#: src/download.cc:229
+#: src/download.cc:230
msgid "log report"
msgstr "záznam hlášenÃ"
-#: src/download.cc:230
+#: src/download.cc:231
#, c-format
msgid ""
"IMPORTANT: this log only lists intended actions; actions which fail due to\n"
@@ -1045,77 +1187,77 @@
"kvůli problémům v dpkg nemusà být dokonÄeny.\n"
"\n"
-#: src/download.cc:231
+#: src/download.cc:232
#, c-format
msgid "Will install %li packages, and remove %li packages.\n"
msgstr "Budu instalovat %li balÃků a odstraňovat %li balÃků.\n"
-#: src/download.cc:233
+#: src/download.cc:234
#, c-format
msgid "%sB of disk space will be used\n"
msgstr "%sB mÃsta na disku bude použito\n"
-#: src/download.cc:236
+#: src/download.cc:237
#, c-format
msgid "%sB bytes of disk space will be freed\n"
msgstr "%sB mÃsta na disku bude uvolnÄ›no\n"
-#: src/download.cc:244
+#: src/download.cc:245
#, c-format
msgid "[UPGRADE] %s %s -> %s\n"
msgstr "[AKTUALIZACE] %s %s -> %s\n"
-#: src/download.cc:248
+#: src/download.cc:249
#, c-format
msgid "[DOWNGRADE] %s %s -> %s\n"
msgstr "[DEGRADACE] %s %s -> %s\n"
-#: src/download.cc:258
+#: src/download.cc:259
msgid "REMOVE"
msgstr "ODSTRANIT"
-#: src/download.cc:264
+#: src/download.cc:265
msgid "INSTALL"
msgstr "INSTALOVAT"
-#: src/download.cc:267
+#: src/download.cc:268
msgid "REINSTALL"
msgstr "REINSTALOVAT"
-#: src/download.cc:270
+#: src/download.cc:271
msgid "HOLD"
msgstr "PODRŽET"
-#: src/download.cc:273
+#: src/download.cc:274
msgid "BROKEN"
msgstr "POÅ KOZENÃ"
-#: src/download.cc:276
+#: src/download.cc:277
msgid "REMOVE, NOT USED"
msgstr "ODSTRANIT, NEPOUŽÃVANÃ"
-#: src/download.cc:279
+#: src/download.cc:280
msgid "REMOVE, DEPENDENCIES"
msgstr "ODSTRANIT, ZÃVISLOSTI"
-#: src/download.cc:282
+#: src/download.cc:283
msgid "INSTALL, DEPENDENCIES"
msgstr "INSTALOVAT, ZÃVISLOSTI"
-#: src/download.cc:285
+#: src/download.cc:286
msgid "HOLD, DEPENDENCIES"
msgstr "PODRŽET, ZÃVISLOSTI"
-#: src/download.cc:287
+#: src/download.cc:288
msgid "????????"
msgstr "????????"
-#: src/download.cc:291
+#: src/download.cc:292
#, c-format
msgid "[%s] %s\n"
msgstr "[%s] %s\n"
-#: src/download.cc:294
+#: src/download.cc:295
#, c-format
msgid ""
"===============================================================================\n"
@@ -1126,32 +1268,37 @@
"\n"
"Záznam kompletnÃ.\n"
-#: src/download.cc:329
+#: src/download.cc:330
msgid "Downloading packages"
msgstr "Stahuji balÃky"
-#: src/download.cc:330
+#: src/download.cc:331
msgid "View the progress of the package download"
msgstr "Zobrazà průbÄ›h stahovánà balÃků"
-#: src/download.cc:352
+#: src/download.cc:332
+#, fuzzy
+msgid "Package Download"
+msgstr "BalÃk: "
+
+#: src/download.cc:354
msgid "Internal error: couldn't generate list of packages to download"
msgstr "VnitÅ™nà chyba: nemohu vytvoÅ™it seznam balÃků ke staženÃ"
-#: src/download.cc:413
+#: src/download.cc:415
msgid "Unable to correct for unavailable packages"
msgstr "Nemohu opravit kvůli nedostupným balÃkům"
-#: src/download.cc:465
+#: src/download.cc:467
msgid ""
"Ack! Something bad happened while installing packages. Trying to recover:"
msgstr "BÄ›hem instalace balÃků se stalo nÄ›co zlého. ZkouÅ¡Ãm obnovit:"
-#: src/download.cc:475 src/pkg_item.cc:413
+#: src/download.cc:477 src/pkg_item.cc:432
msgid "Press return to continue.\n"
msgstr "Pro pokraÄovánà stisknÄ›te enter.\n"
-#: src/download.cc:506
+#: src/download.cc:508
msgid ""
"Could not regain the system lock! (Perhaps another apt or dpkg is running?)"
msgstr "Nemohu zÃskat systémový zámek! (Možná běžà dalÅ¡Ã apt nebo dpkg?)"
@@ -1211,11 +1358,6 @@
msgid "[ERROR]"
msgstr "[CHYBA]"
-#: src/download_screen.cc:57
-#, c-format
-msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
-msgstr "Vložte do mechaniky \"%s\" disk nazvaný \"%s\""
-
#: src/download_screen.cc:181
#, c-format
msgid "Downloaded %sB in %ss (%sB/s)."
@@ -1254,110 +1396,110 @@
msgstr ""
"Výměna média: Do mechaniky '%s' vložte disk nazvaný '%s' a stiskněte enter\n"
-#: src/generic/aptcache.cc:245
+#: src/generic/aptcache.cc:253
msgid "Can't open Aptitude extended state file"
msgstr "Nemohu otevÅ™Ãt rozÅ¡ÃÅ™ený stavový soubor programu Aptitude"
-#: src/generic/aptcache.cc:252 src/generic/aptcache.cc:305
-#: src/generic/aptcache.cc:307
+#: src/generic/aptcache.cc:260 src/generic/aptcache.cc:313
+#: src/generic/aptcache.cc:315
msgid "Reading extended state information"
msgstr "ÄŒtu rozÅ¡ÃÅ™ené stavové informace"
-#: src/generic/aptcache.cc:313 src/generic/aptcache.cc:387
-#: src/generic/aptcache.cc:390
+#: src/generic/aptcache.cc:321 src/generic/aptcache.cc:395
+#: src/generic/aptcache.cc:398
msgid "Initializing package states"
msgstr "Inicializuji stavy balÃků"
-#: src/generic/aptcache.cc:501
+#: src/generic/aptcache.cc:509
msgid "Cannot open Aptitude state file"
msgstr "Nemohu otevÅ™Ãt stavový soubor programu Aptitude"
-#: src/generic/aptcache.cc:505 src/generic/aptcache.cc:560
-#: src/generic/aptcache.cc:563
+#: src/generic/aptcache.cc:513 src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:571
msgid "Writing extended state information"
msgstr "Zapisuji rozÅ¡ÃÅ™ené stavové informace"
-#: src/generic/aptcache.cc:542
+#: src/generic/aptcache.cc:550
#, 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/aptcache.cc:551
+#: src/generic/aptcache.cc:559
msgid "Couldn't write state file"
msgstr "Nemohu zapsat stavový soubor"
-#: src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:576
msgid "Error writing state file"
msgstr "Chyba při zápisu stavového souboru"
-#: src/generic/aptcache.cc:584
+#: src/generic/aptcache.cc:592
msgid "couldn't replace old state file"
msgstr "nemohu nahradit starý stavový soubor"
-#: src/generic/aptcache.cc:960
+#: src/generic/aptcache.cc:1000
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/aptcache.cc:1325
+#: src/generic/aptcache.cc:1546
msgid "The list of sources could not be read."
msgstr "Nelze pÅ™eÄÃst seznam zdrojů."
-#: src/generic/aptcache.cc:1332
+#: src/generic/aptcache.cc:1553
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/aptcache.cc:1335
+#: src/generic/aptcache.cc:1556
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ů"
-#: src/generic/apt.cc:141
+#: src/generic/apt.cc:142
#, c-format
msgid "Unable to open %s for writing"
msgstr "Nemohu otevÅ™Ãt %s pro zápis"
-#: src/generic/apt.cc:151
+#: src/generic/apt.cc:152
#, c-format
msgid "Unable to replace %s with new configuration file"
msgstr "Nemohu nahradit %s novým konfiguraÄnÃm souborem"
-#: src/generic/apt.cc:226
+#: src/generic/apt.cc:227
msgid "Warning: could not lock the cache file. Opening in read-only mode"
msgstr ""
"VarovánÃ: nelze zamknout cache soubor. OtevÃrám v režimu pouze pro ÄtenÃ"
-#: src/generic/matchers.cc:780
+#: src/generic/matchers.cc:797
msgid "Unmatched '('"
msgstr "Nepárová '('"
-#: src/generic/matchers.cc:870 src/generic/matchers.cc:949
+#: src/generic/matchers.cc:887 src/generic/matchers.cc:968
#, c-format
msgid "Unknown dependency type: %s"
msgstr "Neznámá závislost: %s"
-#: src/generic/matchers.cc:931
+#: src/generic/matchers.cc:950
#, c-format
msgid "Unknown action type: %s"
msgstr "Neznámá akce: %s"
-#: src/generic/matchers.cc:998
+#: src/generic/matchers.cc:1017
#, c-format
msgid "Unknown priority %s"
msgstr "Neznámá priorita: %s"
-#: src/generic/matchers.cc:1020
+#: src/generic/matchers.cc:1039
#, c-format
msgid "Unknown pattern type: %c"
msgstr "Neznámý vzor: %c"
-#: src/generic/matchers.cc:1065
+#: src/generic/matchers.cc:1084
msgid "Unexpected empty expression"
msgstr "NeoÄekávaný prázdný výraz"
-#: src/generic/matchers.cc:1100
+#: src/generic/matchers.cc:1119
msgid "Badly formed expression"
msgstr "Špatně zformulovaný výraz"
-#: src/generic/matchers.cc:1129
+#: src/generic/matchers.cc:1148
msgid "Unexpected ')'"
msgstr "NeoÄekávaná ')'"
@@ -1381,7 +1523,7 @@
msgid "Can't get value of $HOME, using TMPDIR (insecure)"
msgstr "Nemohu zjistit hodnotu $HOME, použÃvám TMPDIR (nebezpeÄné)"
-#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:60
+#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:61
#, c-format
msgid "ChangeLog of %s"
msgstr "Soubor změn %s"
@@ -1583,17 +1725,17 @@
msgid "Invalid sorting policy type '%s'"
msgstr "Neplatný tÅ™ÃdÃcà mechanizmus '%s'"
-#: src/main.cc:68
+#: src/main.cc:67
#, c-format
msgid "%s %s compiled at %s %s\n"
msgstr "%s %s zkompilován %s %s\n"
-#: src/main.cc:71
+#: src/main.cc:70
#, c-format
msgid "Compiler: g++ %s\n"
msgstr "Kompilátor: g++ %s\n"
-#: src/main.cc:74
+#: src/main.cc:73
#, c-format
msgid ""
"\n"
@@ -1602,7 +1744,7 @@
"\n"
"Verze ncurses: %s\n"
-#: src/main.cc:76
+#: src/main.cc:75
#, c-format
msgid ""
"\n"
@@ -1611,22 +1753,22 @@
"\n"
"Verze curses: %s\n"
-#: src/main.cc:78
+#: src/main.cc:77
#, c-format
msgid "libsigc++ version: %s\n"
msgstr "verze libsigc++: %s\n"
-#: src/main.cc:84
+#: src/main.cc:83
#, c-format
msgid "Usage: aptitude [-S fname] [-u|-i]"
msgstr "PoužitÃ: aptitude [-S názsoub] [-u|-i]"
-#: src/main.cc:86
+#: src/main.cc:85
#, c-format
msgid " aptitude [options] <action> ..."
msgstr " aptitude [volby] <akce> ..."
-#: src/main.cc:88
+#: src/main.cc:87
#, c-format
msgid ""
" Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -1635,42 +1777,42 @@
" Akce (pokud nejsou zadány, aptitude spustà interaktivnà režim):\n"
"\n"
-#: src/main.cc:89
+#: src/main.cc:88
#, c-format
msgid " install - Install/upgrade packages\n"
msgstr " install - Instaluje/aktualizuje balÃky\n"
-#: src/main.cc:90
+#: src/main.cc:89
#, c-format
msgid " remove - Remove packages\n"
msgstr " remove - Odstranà balÃky\n"
-#: src/main.cc:91
+#: src/main.cc:90
#, c-format
msgid " purge - Remove packages and their configuration files\n"
msgstr " purge - Odstranà balÃky a jejich konfiguraÄnà soubory\n"
-#: src/main.cc:92
+#: src/main.cc:91
#, c-format
msgid " hold - Place packages on hold\n"
msgstr " hold - Ochránà balÃky pÅ™ed aktualizacÃ\n"
-#: src/main.cc:93
+#: src/main.cc:92
#, c-format
msgid " unhold - Cancel a hold command for a package\n"
msgstr " unhold - ZruÅ¡Ã ochranu balÃku pÅ™ed aktualizacÃ\n"
-#: src/main.cc:94
+#: src/main.cc:93
#, c-format
msgid " markauto - Mark packages as having been automatically installed\n"
msgstr " markauto - OznaÄà balÃky, jako že byly instalovány automaticky\n"
-#: src/main.cc:95
+#: src/main.cc:94
#, c-format
msgid " unmarkauto - Mark packages as having been manually installed\n"
msgstr " unmarkauto - OznaÄà balÃky, jako že byly instalovány ruÄnÄ›\n"
-#: src/main.cc:100
+#: src/main.cc:99
#, c-format
msgid ""
" forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -1678,17 +1820,17 @@
msgstr ""
" forbid-version - Zakáže aptitude aktualizaci na konkrétnà verzi balÃku.\n"
-#: src/main.cc:101
+#: src/main.cc:100
#, c-format
msgid " update - Download lists of new/upgradable packages\n"
msgstr " update - Stáhne seznamy nových/aktualizovatelných balÃků\n"
-#: src/main.cc:102
+#: src/main.cc:101
#, c-format
msgid " upgrade - Perform a safe upgrade\n"
msgstr " upgrade - Provede bezpeÄnou aktualizaci\n"
-#: src/main.cc:103
+#: src/main.cc:102
#, c-format
msgid ""
" dist-upgrade - Perform an upgrade, possibly installing and removing "
@@ -1697,75 +1839,75 @@
" dist-upgrade - Provede aktualizaci, při které možná (na|od)instaluje "
"balÃky\n"
-#: src/main.cc:104
+#: src/main.cc:103
#, c-format
msgid " forget-new - Forget what packages are \"new\"\n"
msgstr " forget-new - Zapomene, které balÃky jsou \"nové\"\n"
-#: src/main.cc:105
+#: src/main.cc:104
#, c-format
msgid " search - Search for a package by name and/or expression\n"
msgstr " search - Hledá balÃky podle jména a/nebo výrazu\n"
-#: src/main.cc:106
+#: src/main.cc:105
#, c-format
msgid " show - Display detailed information about a package\n"
msgstr " show - Zobrazà podrobné informace o balÃku\n"
-#: src/main.cc:107
+#: src/main.cc:106
#, c-format
msgid " clean - Erase downloaded package files\n"
msgstr " clean - Smaže stažené .deb soubory balÃků\n"
-#: src/main.cc:108
+#: src/main.cc:107
#, c-format
msgid " autoclean - Erase old downloaded package files\n"
msgstr " autoclean - Smaže staré stažené .deb soubory balÃků\n"
-#: src/main.cc:109
+#: src/main.cc:108
#, c-format
msgid " changelog - View a package's changelog\n"
msgstr " changelog - Zobrazà seznam zmÄ›n balÃku\n"
-#: src/main.cc:110
+#: src/main.cc:109
#, c-format
msgid " download - Download the .deb file for a package\n"
msgstr " download - Stáhne .deb soubor balÃku\n"
-#: src/main.cc:112
+#: src/main.cc:111
#, c-format
msgid " Options:\n"
msgstr " Volby:\n"
-#: src/main.cc:113
+#: src/main.cc:112
#, c-format
msgid " -h This help text\n"
msgstr " -h Tato nápověda\n"
-#: src/main.cc:114
+#: src/main.cc:113
#, c-format
msgid " -s Simulate actions, but do not actually perform them.\n"
msgstr " -s Pouze simuluje, nic reálnÄ› neprovádÃ.\n"
-#: src/main.cc:115
+#: src/main.cc:114
#, c-format
msgid ""
" -d Only download packages, do not install or remove anything.\n"
msgstr ""
" -d Stáhne balÃky, ale nic neinstaluje nebo neodstraňuje.\n"
-#: src/main.cc:116
+#: src/main.cc:115
#, c-format
msgid " -P Always prompt for confirmation or actions\n"
msgstr " -P Vždy vyžaduje potvrzenà akcÃ\n"
-#: src/main.cc:117
+#: src/main.cc:116
#, c-format
msgid ""
" -y Assume that the answer to simple yes/no questions is 'yes'\n"
msgstr " -y Na jednoduché ano/ne otázky odpovà automaticky 'ano'\n"
-#: src/main.cc:118
+#: src/main.cc:117
#, c-format
msgid ""
" -F format Specify a format for displaying search results; see the "
@@ -1773,60 +1915,60 @@
msgstr ""
" -F formát Zadejte formát pro zobrazenà výsledků hledánÃ; viz manuál\n"
-#: src/main.cc:119
+#: src/main.cc:118
#, c-format
msgid ""
" -O order Specify how search results should be sorted; see the manual\n"
msgstr ""
" -O řazenà Zadejte, jak se majà výsledky hledánà seřadit; viz manuál\n"
-#: src/main.cc:120
+#: src/main.cc:119
#, c-format
msgid ""
" -w width Specify the display width for formatting search results\n"
msgstr " -w Å¡ÃÅ™ka Zadejte Å¡ÃÅ™ku zobrazenà výsledků hledánÃ\n"
-#: src/main.cc:121
+#: src/main.cc:120
#, c-format
msgid " -f Aggressively try to fix broken packages.\n"
msgstr " -f AgresivnÄ› zkusà opravit poÅ¡kozené balÃky.\n"
-#: src/main.cc:122
+#: src/main.cc:121
#, c-format
msgid " -V Show which versions of packages are to be installed.\n"
msgstr " -V Zobrazà verze balÃků, které se majà instalovat.\n"
-#: src/main.cc:123
+#: src/main.cc:122
#, c-format
msgid ""
" -D Show the dependencies of automatically changed packages.\n"
msgstr " -D Zobrazà závislosti automaticky zmÄ›nÄ›ných balÃků.\n"
-#: src/main.cc:124
+#: src/main.cc:123
#, c-format
msgid " -Z\t\t Show the change in installed size of each package.\n"
msgstr " -Z\t\t Zobrazà zmÄ›nu v instalované velikosti každého balÃku.\n"
-#: src/main.cc:125
+#: src/main.cc:124
#, c-format
msgid ""
" -v Display extra information. (may be supplied multiple times)\n"
msgstr ""
" -v Zobrazà dodateÄné informace. (Můžete zadat nÄ›kolikrát.)\n"
-#: src/main.cc:126
+#: src/main.cc:125
#, c-format
msgid ""
" -t [release] Set the release from which packages should be installed\n"
msgstr ""
" -t [verze] Vybere verzi Debianu, ze které se majà balÃky instalovat\n"
-#: src/main.cc:127
+#: src/main.cc:126
#, c-format
msgid " -o key=val Directly set the configuration option named 'key'\n"
msgstr " -o klÃÄ=hodn Nastavà konfiguraÄnà volbu nazvanou 'klÃÄ'\n"
-#: src/main.cc:128
+#: src/main.cc:127
#, c-format
msgid ""
" --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -1835,57 +1977,65 @@
" --with(out)-recommends\tNastavÃ, zda se majà doporuÄené závislosti\n"
" brát jako silné závislosti\n"
-#: src/main.cc:129
+#: src/main.cc:128
#, c-format
msgid " -S fname: Read the aptitude extended status info from fname.\n"
msgstr " -S jmsou: NaÄÃst rozÅ¡ÃÅ™ené stavové informace ze souboru jmsou.\n"
-#: src/main.cc:130
+#: src/main.cc:129
#, c-format
msgid " -u : Download new package lists on startup.\n"
msgstr " -u : PÅ™i startu stáhnout nové seznamy balÃků.\n"
-#: src/main.cc:131
+#: src/main.cc:130
#, c-format
msgid " -i : Perform an install run on startup.\n"
msgstr " -i : Při startu spustit instalaci.\n"
-#: src/main.cc:133
+#: src/main.cc:132
#, c-format
msgid " This aptitude does not have Super Cow Powers.\n"
msgstr " Tato aptitude nemá schopnosti svaté krávy.\n"
-#: src/main.cc:254
+#: src/main.cc:253
#, c-format
msgid "-o requires an argument of the form key=value, got %s"
msgstr "-o vyžaduje argument ve tvaru klÃÄ=hodnota, zadáno %s"
-#: src/main.cc:300 src/main.cc:309
+#: src/main.cc:299 src/main.cc:308
msgid "WEIRDNESS: unknown option code received\n"
msgstr "PODIVNÉ: obdržen kód neznámé volby\n"
-#: src/main.cc:318
+#: src/main.cc:317
msgid "Only one of -u and -i may be specified\n"
msgstr "Můžete zadat pouze jednu z voleb -u a -i\n"
-#: src/main.cc:326
+#: src/main.cc:325
msgid ""
"-u and -i may not be specified in command-line mode (eg, with 'install')"
msgstr "-u a -i nemohou být použity v řádkovém módu (např. s 'install')"
-#: src/main.cc:337
+#: src/main.cc:342
msgid "-u and -i may not be specified with a command"
msgstr "-u a -i nemohou být použity spoleÄnÄ› s pÅ™Ãkazem"
-#: src/main.cc:392
+#: src/main.cc:399
#, c-format
msgid "Unknown command \"%s\"\n"
msgstr "Neznámý pÅ™Ãkaz \"%s\"\n"
-#: src/main.cc:400
+#: src/main.cc:406 src/main.cc:463
+msgid "Internal error: uncaught 'out of solutions' exception.\n"
+msgstr ""
+
+#: src/main.cc:411 src/main.cc:468
+msgid "Internal error: uncaught 'out of time' exception.\n"
+msgstr ""
+
+#: src/main.cc:418
#, c-format
-msgid "Invalid option for interactive mode: -s\n"
-msgstr "Neplatná volba pro interaktivnà režim: -s\n"
+msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
+msgstr ""
#: src/mine/cmine.cc:93
#, c-format
@@ -1913,7 +2063,7 @@
msgid "Lost"
msgstr "Prohrál"
-#: src/mine/cmine.cc:119 src/ui.cc:1005
+#: src/mine/cmine.cc:119 src/ui.cc:1089
msgid "Minesweeper"
msgstr "Hledánà min"
@@ -2089,7 +2239,7 @@
msgid "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
msgstr "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
-#: src/pkg_columnizer.cc:84 src/ui.cc:1488
+#: src/pkg_columnizer.cc:84 src/ui.cc:1638
msgid "Package"
msgstr "BalÃk"
@@ -2348,13 +2498,14 @@
" BalÃky ze sekce 'base' jsou souÄástà minimálnà instalace systému."
#: src/pkg_grouppolicy.cc:158
+#, fuzzy
msgid ""
"Programs for faxmodems and other communications devices\n"
" Packages in the 'comm' section are used to control modems and other "
"hardware communications devices. This includes software to control faxmodems "
"(for instance, PPP for dial-up internet connections and programs originally "
-"written for that purpose (zmodem/kermit), as well as software to control "
-"cellular phones, interface with FidoNet, and run a BBS."
+"written for that purpose, such as zmodem/kermit), as well as software to "
+"control cellular phones, interface with FidoNet, and run a BBS."
msgstr ""
"Programy pro faxmodemy a jiná komunikaÄnà zaÅ™ÃzenÃ\n"
" BalÃky ze sekce 'comm' se použÃvajà k ovládánà modemů a dalÅ¡Ãch "
@@ -2790,14 +2941,15 @@
"balÃky pÅ™esouvány do hlavnÃho archivu v sekci 'main'."
#: src/pkg_grouppolicy.cc:193
+#, fuzzy
msgid ""
"Programs which are not free software\n"
" Packages in the 'non-free' section are not part of Debian.\n"
" .\n"
" These packages fail to meet one or more of the requirements of the Debian "
-"Free Software Guidelines (see below) You should read the license of programs "
-"in this section to be sure that you are allowed to use them in the way you "
-"intend.\n"
+"Free Software Guidelines (see below). You should read the license of "
+"programs in this section to be sure that you are allowed to use them in the "
+"way you intend.\n"
" .\n"
" For more information about what Debian considers to be Free Software, see "
"http://www.debian.org/social_contract#guidelines"
@@ -2861,11 +3013,12 @@
" K tÄ›mto balÃkům existuje novÄ›jÅ¡Ã verze."
#: src/pkg_grouppolicy.cc:320
+#, fuzzy
msgid ""
"New Packages\n"
" These packages have been added to Debian since the last time you cleared "
-"the list of \"new\" packages. (choose \"Forget new packages\" from the "
-"Actions menu to empty this list)"
+"the list of \"new\" packages (choose \"Forget new packages\" from the "
+"Actions menu to empty this list)."
msgstr ""
"Nové BalÃky\n"
" Tyto balÃky byly pÅ™idány do Debianu od poslednÃho ÄiÅ¡tÄ›nà \"nových\" "
@@ -3113,101 +3266,121 @@
msgid "Versions"
msgstr "Verze"
-#: src/pkg_item.cc:54
+#: src/pkg_item.cc:55
msgid "Yes, I am aware this is a very bad idea"
msgstr "Ano, vÃm, že je to Å¡patný nápad"
#: src/pkg_item.cc:80
-#, c-format
+#, fuzzy, c-format
msgid ""
-"%s is an essential package!\n"
-"\n"
-"Are you sure you want to remove it?\n"
-"Type '%s' if you are."
+"%s is an essential package!%n%nAre you sure you want to remove it?%nType '%"
+"s' if you are."
msgstr ""
"%s je nezbytný balÃk!\n"
"\n"
"Jste si jisti, že jej chcete odstranit?\n"
"Pokud jste, napište '%s'."
-#: src/pkg_item.cc:219
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:625
#, c-format
msgid "Information about %s"
msgstr "Informace o %s"
-#: src/pkg_item.cc:304
-msgid "Available versions of "
+#: src/pkg_item.cc:224 src/pkg_ver_item.cc:627
+#, c-format
+msgid "%s info"
+msgstr ""
+
+#: src/pkg_item.cc:310
+#, fuzzy, c-format
+msgid "Available versions of %s"
msgstr "Dostupné verze "
-#: src/pkg_item.cc:312 src/pkg_ver_item.cc:648
+#: src/pkg_item.cc:313
+#, fuzzy, c-format
+msgid "%s versions"
+msgstr "Verze"
+
+#: src/pkg_item.cc:325 src/pkg_ver_item.cc:655
#, c-format
msgid "Dependencies of %s"
msgstr "Závislosti %s"
-#: src/pkg_item.cc:322 src/pkg_ver_item.cc:657
+#: src/pkg_item.cc:327 src/pkg_ver_item.cc:657
+#, c-format
+msgid "%s deps"
+msgstr ""
+
+#: src/pkg_item.cc:338 src/pkg_ver_item.cc:667
#, c-format
msgid "Packages depending on %s"
msgstr "BalÃky závisejÃcà na %s"
-#: src/pkg_item.cc:373 src/pkg_ver_item.cc:694
+#: src/pkg_item.cc:340 src/pkg_ver_item.cc:669
+#, c-format
+msgid "%s reverse deps"
+msgstr ""
+
+#: src/pkg_item.cc:392 src/pkg_ver_item.cc:707
#, c-format
msgid "Reporting a bug in %s:\n"
msgstr "HlásÃm chybu v %s:\n"
-#: src/pkg_item.cc:395
+#: src/pkg_item.cc:414
+#, fuzzy
msgid ""
-"You are not root and I cannot find any way\n"
-"to become root. To reconfigure this package,\n"
-"install the menu package, the login package,\n"
-"or run aptitude as root."
+"You are not root and I cannot find any way to become root. To reconfigure "
+"this package, install the menu package, the login package, or run aptitude "
+"as root."
msgstr ""
"Nejste root a nevidÃm možnost, jak se jÃm\n"
"stát. Pro rekonfiguraci tohoto balÃku\n"
"nainstalujte balÃky menu a login, nebo\n"
"spusťte aptitude jako root."
-#: src/pkg_item.cc:403
+#: src/pkg_item.cc:422
#, c-format
msgid "Reconfiguring %s\n"
msgstr "Překonfigurovávám %s\n"
-#: src/pkg_item.cc:428
+#: src/pkg_item.cc:447
msgid "Hierarchy editor"
msgstr "Editor hierarchie"
+#: src/pkg_item.cc:447
+#, fuzzy
+msgid "Hierarchy Editor"
+msgstr "Editor hierarchie"
+
#: src/pkg_tree.cc:325
msgid "Search for: "
msgstr "Hledat: "
-#: src/pkg_tree.cc:585
+#: src/pkg_tree.cc:568
msgid "All Packages"
msgstr "VÅ¡echny balÃky"
-#: src/pkg_tree.cc:598 src/pkg_tree.cc:607
+#: src/pkg_tree.cc:581 src/pkg_tree.cc:590
msgid "Building view"
msgstr "Sestavuji pohled"
-#: src/pkg_tree.cc:649
+#: src/pkg_tree.cc:632
#, c-format
msgid "No packages matched the pattern \"%s\"."
msgstr "Žádné balÃky nevyhovujà vzoru \"%s\"."
-#: src/pkg_tree.cc:671
+#: src/pkg_tree.cc:654
msgid "Enter the new package tree limit: "
msgstr "Omezit zobrazenà na: "
-#: src/pkg_tree.cc:705
+#: src/pkg_tree.cc:688
msgid "Enter the new package grouping mechanism for this display: "
msgstr "Seskupovacà mechanizmus: "
-#: src/pkg_tree.cc:713
+#: src/pkg_tree.cc:696
msgid "Enter the new package sorting mechanism for this display: "
msgstr "TÅ™ÃdÃcà mechanizmus: "
-#: src/pkg_ver_item.cc:623
-msgid "Information about "
-msgstr "Informace o "
-
#: src/pkg_view.cc:344
msgid "make_package_view: error in arguments -- two main widgets??"
msgstr "make_package_view: chyba v argumentech -- dva hlavnà widgety??"
@@ -3221,7 +3394,7 @@
msgid "make_package_view: bad argument!"
msgstr "make_package_view: chybný argument!"
-#: src/pkg_view.cc:492
+#: src/pkg_view.cc:495
msgid "make_package_view: no main widget found"
msgstr "make_package_view: nebyl nalezen hlavnà widget"
@@ -3433,6 +3606,74 @@
"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:74
+msgid "The package cache is not available."
+msgstr ""
+
+#: src/solution_dialog.cc:82
+#, fuzzy
+msgid "No packages are broken."
+msgstr "NÄ›které balÃky jsou poÅ¡kozené. Zkusit je opravit?"
+
+#: src/solution_dialog.cc:103
+msgid "No resolution found."
+msgstr ""
+
+#: src/solution_dialog.cc:107
+#, c-format
+msgid ""
+"Time exhausted while searching for a solution (you can select \"Next Solution"
+"\" or press %s to try harder)."
+msgstr ""
+
+#: src/solution_dialog.cc:146
+#, fuzzy
+msgid "Previous"
+msgstr "Poskytuje"
+
+#: src/solution_dialog.cc:147
+#, fuzzy
+msgid "Next"
+msgstr "DalÅ¡Ã"
+
+#: src/solution_dialog.cc:148
+msgid "Apply"
+msgstr ""
+
+#: src/solution_dialog.cc:149
+#, fuzzy
+msgid "Close"
+msgstr "ZavÅ™Ãt"
+
+#: src/solution_fragment.cc:125
+#, fuzzy
+msgid "%BRemove%b the following packages:%n"
+msgstr "NásledujÃcà balÃky jsou POÅ KOZENY:"
+
+#: src/solution_fragment.cc:135
+#, fuzzy
+msgid "%BInstall%b the following packages:%n"
+msgstr "NásledujÃcà balÃky jsou POÅ KOZENY:"
+
+#: src/solution_fragment.cc:148
+msgid "%BKeep%b the following packages at their current version:%n"
+msgstr ""
+
+#: src/solution_fragment.cc:161
+#, fuzzy
+msgid "%BUpgrade%b the following packages:%n"
+msgstr "NásledujÃcà balÃky jsou POÅ KOZENY:"
+
+#: src/solution_fragment.cc:176
+#, fuzzy
+msgid "%BDowngrade%b the following packages:%n"
+msgstr "Stahuji balÃky"
+
+#: src/solution_fragment.cc:190
+#, c-format
+msgid "Score is %d"
+msgstr ""
+
#: src/trust.cc:17 src/trust.cc:19
msgid "WARNING"
msgstr ""
@@ -3444,52 +3685,52 @@
"system."
msgstr ""
-#: src/ui.cc:143
+#: src/ui.cc:164
msgid "Er, there aren't any errors, this shouldn't have happened.."
msgstr "Hmm, nenastaly žádné chyby; to by se nemělo stávat.."
-#: src/ui.cc:149
+#: src/ui.cc:170
msgid "E:"
msgstr ""
-#: src/ui.cc:151
+#: src/ui.cc:172
msgid "W:"
msgstr ""
-#: src/ui.cc:172
+#: src/ui.cc:193
msgid "Search for:"
msgstr "Hledat:"
-#: src/ui.cc:205
+#: src/ui.cc:261
msgid "You already are root!"
msgstr "Již jste root!"
-#: src/ui.cc:303
+#: src/ui.cc:359
msgid ""
"Subprocess exited with an error -- did you type your password correctly?"
msgstr "Podproces skonÄil chybou -- zadali jste správné heslo?"
-#: src/ui.cc:331
+#: src/ui.cc:387
msgid "Loading cache"
msgstr "Nahrávám cache"
-#: src/ui.cc:353
+#: src/ui.cc:409
msgid "Really quit Aptitude?"
msgstr "Opravdu ukonÄit Aptitude?"
-#: src/ui.cc:432
+#: src/ui.cc:488
msgid "Really discard your personal settings and reload the defaults?"
msgstr "Opravdu zahodit osobnà nastavenà a naÄÃst standardnà hodnoty?"
-#: src/ui.cc:532
+#: src/ui.cc:588 src/ui.cc:590 src/ui.cc:618 src/ui.cc:620
msgid "Packages"
msgstr "BalÃky"
-#: src/ui.cc:533 src/ui.cc:560
+#: src/ui.cc:589 src/ui.cc:619
msgid "View available packages and choose actions to perform"
msgstr "Zobrazà dostupné balÃky a akce, které s nimi můžete provádÄ›t"
-#: src/ui.cc:599
+#: src/ui.cc:666
#, fuzzy
msgid ""
"%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
@@ -3505,15 +3746,15 @@
"Nápověda, 'licence'. Toto je svobodný software a budeme rádi, když jej\n"
"budete dále Å¡ÃÅ™it; podrobnosti viz 'licence'."
-#: src/ui.cc:620
+#: src/ui.cc:687
msgid "help.txt"
msgstr "help-cs.txt"
-#: src/ui.cc:636
+#: src/ui.cc:703
msgid "README"
msgstr "README.cs"
-#: src/ui.cc:718
+#: src/ui.cc:785
msgid ""
"%C%BWARNING%b: untrusted versions of the following packages will be "
"installed!%n%nUntrusted packages could %Bcompromise your system's security%"
@@ -3521,60 +3762,70 @@
"this is what you want to do.%n%n"
msgstr ""
-#: src/ui.cc:732
+#: src/ui.cc:799
#, fuzzy
msgid "Really Continue"
msgstr "PokraÄovat"
-#: src/ui.cc:734
+#: src/ui.cc:801
msgid "Abort Installation"
msgstr ""
-#: src/ui.cc:796
+#: src/ui.cc:862
msgid "Preview of package installation"
msgstr "Náhled instalace balÃků"
-#: src/ui.cc:797
+#: src/ui.cc:863
msgid "View and/or adjust the actions that will be performed"
msgstr "Zobrazà a/nebo upravà akce, které se majà vykonat"
-#: src/ui.cc:837
-msgid "Some packages were broken and have been fixed"
+#: src/ui.cc:864
+#, fuzzy
+msgid "Preview"
+msgstr "^PÅ™edchozÃ"
+
+#: src/ui.cc:900
+#, fuzzy
+msgid "Some packages were broken and have been fixed:"
msgstr "NÄ›které balÃky byly poÅ¡kozené, ale podaÅ™ilo se je opravit"
-#: src/ui.cc:839
-msgid "Some broken packages could not be fixed!"
-msgstr "NÄ›které poÅ¡kozené balÃky nemohly být opraveny!"
+#: src/ui.cc:906
+msgid "No solution to these dependency problems exists!"
+msgstr ""
-#: src/ui.cc:847 src/ui.cc:959
-msgid "Some packages are broken. Try to fix them?"
-msgstr "NÄ›které balÃky jsou poÅ¡kozené. Zkusit je opravit?"
+#: src/ui.cc:912
+#, c-format
+msgid ""
+"Ran out of time while trying to resolver dependencies (press \"%s\" to try "
+"harder)"
+msgstr ""
-#: src/ui.cc:860
+#: src/ui.cc:958
+#, fuzzy
msgid ""
-"Installing/removing packages requires administrative privileges, which\n"
-"you currently do not have. Would you like to change to the root account?\n"
+"Installing/removing packages requires administrative privileges, which you "
+"currently do not have. Would you like to change to the root account?"
msgstr ""
"Instalace/odebránà balÃků vyžaduje administrátorská práva, která\n"
"momentálnÄ› nemáte. Chcete se pÅ™epnout na úÄet root?\n"
-#: src/ui.cc:863 src/ui.cc:993
+#: src/ui.cc:961 src/ui.cc:1077
msgid "Become root"
msgstr "Stát se rootem"
-#: src/ui.cc:865 src/ui.cc:995
+#: src/ui.cc:963 src/ui.cc:1079
msgid "Don't become root"
msgstr "Nestát se rootem"
-#: src/ui.cc:870 src/ui.cc:1000
+#: src/ui.cc:968 src/ui.cc:1084
msgid "A package-list update or install run is already taking place."
msgstr "Aktualizace seznamu balÃků nebo jejich instalace již probÃhá."
-#: src/ui.cc:897
+#: src/ui.cc:995
msgid "No packages are scheduled to be installed, removed, or upgraded."
msgstr "Žádné balÃky nejsou oznaÄeny k instalaci, aktualizaci nebo odstranÄ›nÃ."
-#: src/ui.cc:903
+#: src/ui.cc:1001
#, fuzzy
msgid ""
"No packages will be installed, removed or upgraded. Some packages could be "
@@ -3587,164 +3838,179 @@
"aktualizovat.\n"
"Aktualizaci můžete připravit klávesou \"U\"."
-#: src/ui.cc:990
+#: src/ui.cc:1073
+#, fuzzy
msgid ""
-"Updating the package lists requires administrative privileges, which\n"
-"you currently do not have. Would you like to change to the root account?\n"
+"Updating the package lists requires administrative privileges, which you "
+"currently do not have. Would you like to change to the root account?"
msgstr ""
"Aktualizace seznamu balÃků vyžaduje administrátorská práva, která\n"
"momentálnÄ› nemáte. Chcete se pÅ™epnout na úÄet root?\n"
-#: src/ui.cc:1005 src/ui.cc:1198
+#: src/ui.cc:1089 src/ui.cc:1345
msgid "Waste time trying to find mines"
msgstr "Ukrátit Äas hledánÃm min."
-#: src/ui.cc:1012 src/ui.cc:1065
+#: src/ui.cc:1096 src/ui.cc:1149
msgid "Cleaning while a download is in progress is not allowed"
msgstr "Čištěnà během stahovánà nenà dovoleno"
-#: src/ui.cc:1015
+#: src/ui.cc:1099
msgid "Deleting downloaded files"
msgstr "Mažu stažené soubory"
-#: src/ui.cc:1029
+#: src/ui.cc:1113
msgid "Downloaded package files have been deleted"
msgstr "Stažené balÃky byly smazány"
-#: src/ui.cc:1090
+#: src/ui.cc:1174
#, fuzzy, c-format
msgid ""
"Obsolete downloaded package files have been deleted, freeing %sB of disk "
"space."
msgstr "Staré stažené balÃky byly smazány"
-#: src/ui.cc:1174
+#: src/ui.cc:1246
+msgid "All solutions exhausted."
+msgstr ""
+
+#: src/ui.cc:1251 src/ui.cc:1282
+#, fuzzy
+msgid "Ran out of time while trying to find a solution."
+msgstr "Ukrátit Äas hledánÃm min."
+
+#: src/ui.cc:1276
+msgid "Unable to find a solution to apply."
+msgstr ""
+
+#: src/ui.cc:1321
msgid "^Install/remove packages"
msgstr "^Instalovat/odstranit balÃky"
-#: src/ui.cc:1175
+#: src/ui.cc:1322
msgid "Perform all pending installs and removals"
msgstr "Provede vÅ¡echny nevyÅ™Ãzené instalace a odstraňovánÃ"
-#: src/ui.cc:1177
+#: src/ui.cc:1324
msgid "^Update package list"
msgstr "^Aktualizovat seznam balÃků"
-#: src/ui.cc:1178
+#: src/ui.cc:1325
msgid "Check for new versions of packages"
msgstr "ZjistÃ, zda nejsou k dispozici novÄ›jÅ¡Ã verze balÃků"
-#: src/ui.cc:1181
+#: src/ui.cc:1328
msgid "^Forget new packages"
msgstr "^Zapomenout nové balÃky"
-#: src/ui.cc:1182
+#: src/ui.cc:1329
msgid "Forget which packages are \"new\""
msgstr "Zapomene, které balÃky jsou \"nové\""
-#: src/ui.cc:1185
+#: src/ui.cc:1332
msgid "^Clean package cache"
msgstr "VyÄistit ^cache s balÃky"
-#: src/ui.cc:1186
+#: src/ui.cc:1333
msgid "Delete package files which were previously downloaded"
msgstr "Smaže stažené soubory (balÃky) z /var/cache/apt"
-#: src/ui.cc:1189
+#: src/ui.cc:1336
msgid "Clean ^obsolete files"
msgstr "VyÄistit staré s^oubory"
-#: src/ui.cc:1190
+#: src/ui.cc:1337
msgid "Delete package files which can no longer be downloaded"
msgstr "Smaže soubory, které se již nedajà stáhnout"
-#: src/ui.cc:1193
+#: src/ui.cc:1340
msgid "Mark ^Upgradable"
msgstr "OznaÄit aktualizovatelné"
-#: src/ui.cc:1194
+#: src/ui.cc:1341
msgid "Mark all upgradable packages which are not held for upgrade"
msgstr "OznaÄà vÅ¡echny aktualizovatelné balÃky, které nejsou podrženy"
-#: src/ui.cc:1197
+#: src/ui.cc:1344
msgid "^Play Minesweeper"
msgstr "Zahrát si minové ^pole"
-#: src/ui.cc:1200
+#: src/ui.cc:1347
msgid "^Become root"
msgstr "Stát se rootem"
-#: src/ui.cc:1201
+#: src/ui.cc:1348
+#, fuzzy
msgid ""
-"Run 'su' to become root; this will restart the program, but your\n"
-"settings will be preserved"
+"Run 'su' to become root; this will restart the program, but your settings "
+"will be preserved"
msgstr ""
"Pro pÅ™epnutà na uživatele root spusÅ¥te 'su'. TÃm se program restartuje,\n"
"ale nastavenà budou zachována"
-#: src/ui.cc:1204
+#: src/ui.cc:1351
msgid "^Reload package cache"
msgstr "Znovu naÄÃst cache"
-#: src/ui.cc:1205
+#: src/ui.cc:1352
msgid "Reload the package cache"
msgstr "Znovu naÄÃst obsah cache"
-#: src/ui.cc:1211
+#: src/ui.cc:1358
msgid "^Quit"
msgstr "Konec"
-#: src/ui.cc:1212
+#: src/ui.cc:1359
msgid "Exit the program"
msgstr "UkonÄÃ program"
-#: src/ui.cc:1218 src/ui.cc:1487
+#: src/ui.cc:1365 src/ui.cc:1637
msgid "Undo"
msgstr "Zpět"
-#: src/ui.cc:1219
+#: src/ui.cc:1366
msgid "Undo the last package operation or group of operations"
msgstr "Vrátà zpÄ›t poslednà operaci nebo skupinu operacà s balÃky"
-#: src/ui.cc:1226
+#: src/ui.cc:1373
msgid "^Install"
msgstr "^Instalovat"
-#: src/ui.cc:1227
+#: src/ui.cc:1374
msgid "Flag the currently selected package for installation or upgrade"
msgstr "OznaÄà aktuálnÄ› vybraný balÃk pro instalaci nebo aktualizaci"
-#: src/ui.cc:1230
+#: src/ui.cc:1377
msgid "^Remove"
msgstr "Odst^ranit"
-#: src/ui.cc:1231
+#: src/ui.cc:1378
msgid "Flag the currently selected package for removal"
msgstr "OznaÄà aktuálnÄ› vybraný balÃk pro odstranÄ›nÃ"
-#: src/ui.cc:1234
+#: src/ui.cc:1381
msgid "^Purge"
msgstr "VyÄistit"
-#: src/ui.cc:1235
+#: src/ui.cc:1382
msgid ""
"Flag the currently selected package and its configuration files for removal"
msgstr ""
"OznaÄà aktuálnÄ› vybraný balÃk pro odstranÄ›nà vÄetnÄ› konfiguraÄnÃch souborů"
-#: src/ui.cc:1238
+#: src/ui.cc:1385
msgid "^Keep"
msgstr "Ponechat"
-#: src/ui.cc:1239
+#: src/ui.cc:1386
msgid "Cancel any action on the selected package"
msgstr "Na vybraném balÃku zruÅ¡Ã veÅ¡keré akce"
-#: src/ui.cc:1242
+#: src/ui.cc:1389
msgid "^Hold"
msgstr "Přidržet"
-#: src/ui.cc:1243
+#: src/ui.cc:1390
msgid ""
"Cancel any action on the selected package, and protect it from future "
"upgrades"
@@ -3752,250 +4018,254 @@
"Na vybraném balÃku zruÅ¡Ã veÅ¡keré akce a ochránà jej pÅ™ed budoucÃmi "
"aktualizacemi."
-#: src/ui.cc:1246
+#: src/ui.cc:1393
msgid "Mark ^Auto"
msgstr "Spravovat ^automaticky"
-#: src/ui.cc:1247
+#: src/ui.cc:1394
+#, fuzzy
msgid ""
-"Mark the selected package as having been automatically installed;\n"
-"it will automatically be removed if no other packages depend on it"
+"Mark the selected package as having been automatically installed; it will "
+"automatically be removed if no other packages depend on it"
msgstr ""
"OznaÄà vybraný balÃk, jako instalovaný automaticky;\n"
"pokud na nÄ›m nebudou záviset jiné balÃky, bude automaticky odstranÄ›n."
-#: src/ui.cc:1250
+#: src/ui.cc:1397
msgid "Mark ^Manual"
msgstr "Spravovat ruÄnÄ›"
-#: src/ui.cc:1251
+#: src/ui.cc:1398
+#, fuzzy
msgid ""
-"Mark the selected package as having been manually installed;\n"
-"it will not be removed unless you manually remove it"
+"Mark the selected package as having been manually installed; it will not be "
+"removed unless you manually remove it"
msgstr ""
"OznaÄà vybraný balÃk, jako by byl nainstalován ruÄnÄ›;\n"
"takový nebude odstranÄ›n, dokud jej neodstranÃte sami"
-#: src/ui.cc:1254
+#: src/ui.cc:1401
msgid "^Forbid Version"
msgstr "Zakázat ^verzi"
-#: src/ui.cc:1255
+#: src/ui.cc:1402
+#, fuzzy
msgid ""
-"Forbid the candidate version of the selected package from being installed;\n"
+"Forbid the candidate version of the selected package from being installed; "
"newer versions of the package will be installed as usual"
msgstr ""
"Zakáže, aby se nainstalovala kandidátská verze balÃku;\n"
"novÄ›jÅ¡Ã verze balÃku se budou instalovat jako obvykle"
-#: src/ui.cc:1259
+#: src/ui.cc:1406
msgid "I^nformation"
msgstr "I^nformace"
-#: src/ui.cc:1260
+#: src/ui.cc:1407
msgid "Display more information about the selected package"
msgstr "Pro vybraný balÃk zobrazà dalÅ¡Ã informace"
-#: src/ui.cc:1263
+#: src/ui.cc:1410
msgid "^Changelog"
msgstr "^Changelog"
-#: src/ui.cc:1264
+#: src/ui.cc:1411
msgid "Display the Debian changelog of the selected package"
msgstr "U vybraného balÃku zobrazà seznam zmÄ›n provedených správcem balÃku"
-#: src/ui.cc:1271
+#: src/ui.cc:1418
msgid "^Find"
msgstr "Hledat"
-#: src/ui.cc:1272
+#: src/ui.cc:1419
msgid "Search for a package"
msgstr "Hledá balÃk"
-#: src/ui.cc:1275
+#: src/ui.cc:1422
msgid "Find ^Again"
msgstr "Hledat znovu"
-#: src/ui.cc:1276
+#: src/ui.cc:1423
msgid "Repeat the last search"
msgstr "Zopakuje poslednà hledánÃ"
-#: src/ui.cc:1280
+#: src/ui.cc:1427
msgid "^Limit Display"
msgstr "Omezit zobrazenÃ"
-#: src/ui.cc:1281
+#: src/ui.cc:1428
msgid "Apply a filter to the package list"
msgstr "Na seznam balÃků aplikuje výbÄ›rový filtr"
-#: src/ui.cc:1284
+#: src/ui.cc:1431
msgid "^Un-Limit Display"
msgstr "ZruÅ¡it omezenÃ"
-#: src/ui.cc:1285
+#: src/ui.cc:1432
msgid "Remove the filter from the package list"
msgstr "Odstranà filtr aplikovaný na seznam balÃků"
-#: src/ui.cc:1289
+#: src/ui.cc:1436
msgid "Find ^Broken"
msgstr "Hledat porušené"
-#: src/ui.cc:1290
+#: src/ui.cc:1437
msgid "Find the next package with unsatisfied dependencies"
msgstr "Hledá dalÅ¡Ã balÃk s nesplnÄ›nými závislostmi"
-#: src/ui.cc:1297
+#: src/ui.cc:1444
msgid "^UI options"
msgstr "Nastavenà zobrazenÃ"
-#: src/ui.cc:1298
+#: src/ui.cc:1445
msgid "Change the settings which affect the user interface"
msgstr "ZmÄ›nà nastavenÃ, která ovlivňujà uživatelské rozhranÃ"
-#: src/ui.cc:1301
+#: src/ui.cc:1448
msgid "^Dependency handling"
msgstr "Správa závislostÃ"
-#: src/ui.cc:1302
+#: src/ui.cc:1449
msgid "Change the settings which affect how package dependencies are handled"
msgstr "ZmÄ›nà nastavenÃ, která ovlivňujà způsob Å™eÅ¡enà závislostÃ"
-#: src/ui.cc:1305
+#: src/ui.cc:1452
msgid "^Miscellaneous"
msgstr "Různé"
-#: src/ui.cc:1306
+#: src/ui.cc:1453
msgid "Change miscellaneous program settings"
msgstr "Změnà ostatnà nastavenà programu"
-#: src/ui.cc:1311
+#: src/ui.cc:1458
msgid "^Revert options"
msgstr "Původnà nastavenÃ"
-#: src/ui.cc:1312
+#: src/ui.cc:1459
msgid "Reset all settings to the system defaults"
msgstr "Vrátà vÅ¡echna nastavenà do původnÃho stavu"
-#: src/ui.cc:1323
+#: src/ui.cc:1470
msgid "^Next"
msgstr "DalÅ¡Ã"
-#: src/ui.cc:1324
+#: src/ui.cc:1471
msgid "View next display"
msgstr "Zobrazà dalšà pohled"
-#: src/ui.cc:1327
+#: src/ui.cc:1474
msgid "^Prev"
msgstr "^PÅ™edchozÃ"
-#: src/ui.cc:1328
+#: src/ui.cc:1475
msgid "View previous display"
msgstr "Zobrazà předchozà pohled"
-#: src/ui.cc:1331
+#: src/ui.cc:1478
msgid "^Close"
msgstr "ZavÅ™Ãt"
-#: src/ui.cc:1332
+#: src/ui.cc:1479
msgid "Close this display"
msgstr "Zavře tento pohled"
-#: src/ui.cc:1337
+#: src/ui.cc:1484
msgid "New Package ^View"
msgstr "No^vý pohled na balÃky"
-#: src/ui.cc:1338
+#: src/ui.cc:1485
msgid "Create a new default package view"
msgstr "Vytvořà nový standardnà pohled na balÃky"
-#: src/ui.cc:1341
+#: src/ui.cc:1488
msgid "New Categorical ^Browser"
msgstr "Nový prohlÞeÄ kategoriÃ"
-#: src/ui.cc:1343
+#: src/ui.cc:1490
msgid "Browse packages by category"
msgstr "ProhlÞà balÃky podle kategoriÃ"
-#: src/ui.cc:1351
+#: src/ui.cc:1498
msgid "^About"
msgstr "O progr^amu"
-#: src/ui.cc:1352
+#: src/ui.cc:1499
msgid "View information about this program"
msgstr "Zobrazà informace o programu"
-#: src/ui.cc:1355
+#: src/ui.cc:1502
msgid "^Help"
msgstr "Nápověda"
-#: src/ui.cc:1356
+#: src/ui.cc:1503
msgid "View the on-line help"
msgstr "Zobrazà on-line nápovědu"
-#: src/ui.cc:1358
+#: src/ui.cc:1505
msgid "User's ^Manual"
msgstr "Uživatelský ^manuál"
-#: src/ui.cc:1359
+#: src/ui.cc:1506
msgid "View the detailed program manual"
msgstr "Zobrazà podrobný manuál tohoto programu"
-#: src/ui.cc:1362
+#: src/ui.cc:1509
msgid "^FAQ"
msgstr "^FAQ"
-#: src/ui.cc:1363
+#: src/ui.cc:1510
msgid "View a list of frequently asked questions"
msgstr "Zobrazà seznam Äasto kladených otázek"
-#: src/ui.cc:1366
-msgid "^ChangeLog"
-msgstr "^ChangeLog"
+#: src/ui.cc:1513
+msgid "^NEWS"
+msgstr ""
-#: src/ui.cc:1367
-msgid "View the important changes made in each version of the program"
+#: src/ui.cc:1514
+#, fuzzy
+msgid "View the important changes made in each version of "
msgstr "Zobrazà důležité změny mezi jednotlivými verzemi programu"
-#: src/ui.cc:1370
+#: src/ui.cc:1517
msgid "^License"
msgstr "^Licence"
-#: src/ui.cc:1371
+#: src/ui.cc:1518
msgid "View the terms under which you may copy the program"
msgstr "Zobrazà podmÃnky, za kterých můžete program Å¡ÃÅ™it"
-#: src/ui.cc:1486
+#: src/ui.cc:1636
msgid "Actions"
msgstr "Akce"
-#: src/ui.cc:1489
+#: src/ui.cc:1639
msgid "Search"
msgstr "Hledat"
-#: src/ui.cc:1490
+#: src/ui.cc:1640
msgid "Options"
msgstr "Volby"
-#: src/ui.cc:1491
+#: src/ui.cc:1641
msgid "Views"
msgstr "Pohledy"
-#: src/ui.cc:1492
+#: src/ui.cc:1642
msgid "Help"
msgstr "Nápověda"
-#: src/ui.cc:1537
+#: src/ui.cc:1699
#, c-format
msgid ""
"%s: Menu %s: Help %s: Quit %s: Update %s: Download/Install/Remove Pkgs"
msgstr ""
"%s: Menu %s: NápovÄ›da %s: Konec %s Aktualizace %s StaženÃ/Instalace"
-#: src/ui.cc:1799 src/vscreen/vscreen.cc:281
+#: src/ui.cc:1968 src/vscreen/vscreen.cc:281
msgid "yes_key"
msgstr "ano_key"
-#: src/ui.cc:1800 src/vscreen/vscreen.cc:282
+#: src/ui.cc:1969 src/vscreen/vscreen.cc:282
msgid "no_key"
msgstr "ne_key"
@@ -4007,6 +4277,16 @@
msgid "Downloading Changelog"
msgstr "Stahuji Changelog"
+#: src/view_changelog.cc:54
+#, fuzzy
+msgid "Download Changelog"
+msgstr "Stahuji Changelog"
+
+#: src/view_changelog.cc:63
+#, c-format
+msgid "%s changes"
+msgstr ""
+
#: src/vscreen/vscreen.cc:119
#, c-format
msgid "Ouch! Got SIGTERM, dying..\n"
@@ -4035,6 +4315,39 @@
msgid "No"
msgstr "Ne"
+#~ msgid ""
+#~ "Some packages had unmet dependencies. This may mean that you have\n"
+#~ "requested an impossible situation or if you are using the unstable\n"
+#~ "distribution that some required packages have not yet been created\n"
+#~ "or been moved out of Incoming.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "NÄ›které balÃky majà nesplnÄ›né závislosti. To může znamenat, že "
+#~ "požadujete\n"
+#~ "nemožnou situaci, nebo, pokud použÃváte nestabilnà distribuci, že\n"
+#~ "vyžadované balÃky jeÅ¡tÄ› nebyly vytvoÅ™eny nebo pÅ™esunuty z PÅ™Ãchozà "
+#~ "fronty.\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Please insert the following disc into the drive \"%s\":\n"
+#~ "%s"
+#~ msgstr ""
+#~ "NásledujÃcà disk vložte do mechaniky \"%s\":\n"
+#~ "%s"
+
+#~ msgid "Invalid option for interactive mode: -s\n"
+#~ msgstr "Neplatná volba pro interaktivnà režim: -s\n"
+
+#~ msgid "Information about "
+#~ msgstr "Informace o "
+
+#~ msgid "Some broken packages could not be fixed!"
+#~ msgstr "NÄ›které poÅ¡kozené balÃky nemohly být opraveny!"
+
+#~ msgid "^ChangeLog"
+#~ msgstr "^ChangeLog"
+
#~ msgid "Go away, I'm trying to think.\n"
#~ msgstr "Běž pryÄ, zkouÅ¡Ãm pÅ™emýšlet.\n"
Modified: branches/aptitude-0.3/aptitude/po/da.po
==============================================================================
--- branches/aptitude-0.3/aptitude/po/da.po (original)
+++ branches/aptitude-0.3/aptitude/po/da.po Sat Apr 30 13:41:32 2005
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: aptitude 0.2.15.5-2\n"
"Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-01-10 16:26-0800\n"
+"POT-Creation-Date: 2005-04-29 18:11-0400\n"
"PO-Revision-Date: 2004-10-03 11:19+0200\n"
"Last-Translator: Morten Bo Johansen <mojo at mbjnet.dk>\n"
"Language-Team: Danish <dansk at klid.dk>\n"
@@ -156,16 +156,103 @@
msgstr "Afinstallér ubrugte pakker automatisk som matcher dette filter"
#: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:184 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
-#: src/vscreen/vs_util.cc:329
+#: src/ui.cc:218 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
+#: src/vscreen/vs_util.cc:328
msgid "Ok"
msgstr "O.k."
#: src/apt_options.cc:242 src/download_list.cc:71 src/mine/cmine.cc:257
-#: src/mine/cmine.cc:330 src/vscreen/vs_util.cc:329
+#: src/mine/cmine.cc:330 src/vscreen/vs_util.cc:328
msgid "Cancel"
msgstr "Afbryd"
+#: src/broken_indicator.cc:106 src/solution_dialog.cc:97
+msgid "Internal error: unexpected null solution."
+msgstr ""
+
+#: src/broken_indicator.cc:158
+#, fuzzy
+msgid "Suggest "
+msgstr "Foreslår"
+
+#: src/broken_indicator.cc:164
+#, fuzzy, c-format
+msgid "%d installs"
+msgstr "installerede"
+
+#: src/broken_indicator.cc:169
+#, fuzzy
+msgid "1 install"
+msgstr "installerede"
+
+#: src/broken_indicator.cc:173
+#, c-format
+msgid "%d removals"
+msgstr ""
+
+#: src/broken_indicator.cc:178
+msgid "1 removal"
+msgstr ""
+
+#: src/broken_indicator.cc:182
+#, c-format
+msgid "%d keeps"
+msgstr ""
+
+#: src/broken_indicator.cc:187
+msgid "1 keep"
+msgstr ""
+
+#: src/broken_indicator.cc:191
+#, fuzzy, c-format
+msgid "%d upgrades"
+msgstr "opgradér"
+
+#: src/broken_indicator.cc:196
+#, fuzzy
+msgid "1 upgrade"
+msgstr "opgradér"
+
+#: src/broken_indicator.cc:200
+#, fuzzy, c-format
+msgid "%d downgrades"
+msgstr "nedgraderet"
+
+#: src/broken_indicator.cc:205
+#, fuzzy
+msgid "1 downgrade"
+msgstr "nedgraderet"
+
+#: src/broken_indicator.cc:214
+#, c-format
+msgid "%s: Examine"
+msgstr ""
+
+#: src/broken_indicator.cc:216
+#, c-format
+msgid "%s: Apply"
+msgstr ""
+
+#: src/broken_indicator.cc:218
+#, fuzzy, c-format
+msgid "%s: Next"
+msgstr "^Næste"
+
+#: src/broken_indicator.cc:220
+#, c-format
+msgid "%s: Previous"
+msgstr ""
+
+#: src/broken_indicator.cc:233
+#, c-format
+msgid "%CSolution search failed. %s: try harder"
+msgstr ""
+
+#: src/broken_indicator.cc:239
+#, c-format
+msgid "%CUnable to resolve dependencies."
+msgstr ""
+
#: src/cmdline/cmdline_action.cc:36
#, c-format
msgid ""
@@ -238,22 +325,22 @@
msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
msgstr "Pakke %s er ikke opgraderbar, kan ikke forbyde en opgradering\n"
-#: src/cmdline/cmdline_action.cc:213
+#: src/cmdline/cmdline_action.cc:198
#, c-format
msgid "Note: selecting the task \"%s: %s\" for installation\n"
msgstr "Bemærk: vælger opgavepakken \"%s: %s\" til installering\n"
-#: src/cmdline/cmdline_action.cc:240
+#: src/cmdline/cmdline_action.cc:225
#, c-format
msgid "You can only specify a package version with an 'install' command.\n"
msgstr "Man kan kun angive en pakkeversion med kommandoen \"install\".\n"
-#: src/cmdline/cmdline_action.cc:246
+#: src/cmdline/cmdline_action.cc:231
#, c-format
msgid "You can only specify a package archive with an 'install' command.\n"
msgstr "Man kan kun angive et pakkearkiv med kommandoen \"install\".\n"
-#: src/cmdline/cmdline_action.cc:280
+#: src/cmdline/cmdline_action.cc:265
#, c-format
msgid ""
"Couldn't find package \"%s\", and more than 40\n"
@@ -262,7 +349,7 @@
"Kunne ikke finde pakke \"%s\" og mere end 40\n"
"pakker som har \"%s\" i deres navn.\n"
-#: src/cmdline/cmdline_action.cc:283
+#: src/cmdline/cmdline_action.cc:268
#, c-format
msgid ""
"Couldn't find package \"%s\". However, the following\n"
@@ -271,13 +358,13 @@
"Kunne ikke finde pakken \"%s\". Men følgende\n"
"pakker har \"%s\" i deres navn:\n"
-#: src/cmdline/cmdline_action.cc:307
+#: src/cmdline/cmdline_action.cc:292
#, c-format
msgid "Couldn't find any package whose name or description matched \"%s\"\n"
msgstr ""
"Kunne ikke finde nogen pakke, hvis navn eller beskrivelse passer på \"%s\"\n"
-#: src/cmdline/cmdline_action.cc:309
+#: src/cmdline/cmdline_action.cc:294
#, c-format
msgid ""
"Couldn't find any package matching \"%s\", and more than 40\n"
@@ -286,7 +373,7 @@
"Kunne ikke finde nogen pakke som passer på \"%s\" og mere end 40\n"
"pakker som har \"%s\" i deres navn.\n"
-#: src/cmdline/cmdline_action.cc:312
+#: src/cmdline/cmdline_action.cc:297
#, c-format
msgid ""
"Couldn't find any package matching \"%s\". However, the following\n"
@@ -330,13 +417,13 @@
msgid "Freed %sB of disk space\n"
msgstr "Vil frigøre %sB diskplads"
-#: src/cmdline/cmdline_do_action.cc:67
+#: src/cmdline/cmdline_do_action.cc:71
#, c-format
msgid "Invalid operation %s"
msgstr "Ugyldig operation %s"
-#: src/cmdline/cmdline_do_action.cc:206 src/cmdline/cmdline_simulate.cc:30
-#: src/cmdline/cmdline_upgrade.cc:89
+#: src/cmdline/cmdline_do_action.cc:201 src/cmdline/cmdline_simulate.cc:31
+#: src/cmdline/cmdline_upgrade.cc:91
#, c-format
msgid "Abort.\n"
msgstr "Afbryd.\n"
@@ -346,7 +433,7 @@
msgid "download: you must specify at least one package to download\n"
msgstr "download: du skal angive mindst én pakke til download\n"
-#: src/cmdline/cmdline_download.cc:43 src/download.cc:342
+#: src/cmdline/cmdline_download.cc:43 src/download.cc:344
msgid "Couldn't read source list"
msgstr "Kunne ikke læse liste over pakkekilder"
@@ -412,97 +499,97 @@
msgstr ""
"Hvad det er? Det er en elefant der bliver ædt af en slange, selvfølgelig.\n"
-#: src/cmdline/cmdline_prompt.cc:44
+#: src/cmdline/cmdline_prompt.cc:45
msgid "Couldn't read list of sources"
msgstr "Kunne ikke læse liste over pakkekilder"
-#: src/cmdline/cmdline_prompt.cc:219 src/cmdline/cmdline_show_broken.cc:73
+#: src/cmdline/cmdline_prompt.cc:220 src/cmdline/cmdline_show_broken.cc:73
#, c-format
msgid "but %s is to be installed."
msgstr "men %s vil blive installeret."
-#: src/cmdline/cmdline_prompt.cc:222 src/cmdline/cmdline_show_broken.cc:76
+#: src/cmdline/cmdline_prompt.cc:223 src/cmdline/cmdline_show_broken.cc:76
#, c-format
msgid "but %s is installed and it is kept back."
msgstr "men %s er installeret, og den er tilbageholdt."
-#: src/cmdline/cmdline_prompt.cc:225 src/cmdline/cmdline_show_broken.cc:79
+#: src/cmdline/cmdline_prompt.cc:226 src/cmdline/cmdline_show_broken.cc:79
#, c-format
msgid "but %s is installed."
msgstr "men %s er installeret."
-#: src/cmdline/cmdline_prompt.cc:229 src/cmdline/cmdline_show_broken.cc:83
+#: src/cmdline/cmdline_prompt.cc:230 src/cmdline/cmdline_show_broken.cc:83
#, c-format
msgid "but it is not installable"
msgstr "men den kan ikke installeres"
-#: src/cmdline/cmdline_prompt.cc:233 src/cmdline/cmdline_show_broken.cc:87
+#: src/cmdline/cmdline_prompt.cc:234 src/cmdline/cmdline_show_broken.cc:87
#, c-format
msgid " which is a virtual package."
msgstr " som er en virtuel pakker"
-#: src/cmdline/cmdline_prompt.cc:236 src/cmdline/cmdline_show_broken.cc:90
+#: src/cmdline/cmdline_prompt.cc:237 src/cmdline/cmdline_show_broken.cc:90
#, c-format
msgid " or"
msgstr " eller"
-#: src/cmdline/cmdline_prompt.cc:248
+#: src/cmdline/cmdline_prompt.cc:249
msgid "The following packages are BROKEN:"
msgstr "Følgende pakker er BRUDTE:"
-#: src/cmdline/cmdline_prompt.cc:249
+#: src/cmdline/cmdline_prompt.cc:250
msgid "The following packages are unused and will be REMOVED:"
msgstr "Følgende pakker er ikke i brug og vil blive AFINSTALLERET:"
-#: src/cmdline/cmdline_prompt.cc:250
+#: src/cmdline/cmdline_prompt.cc:251
msgid "The following packages have been automatically kept back:"
msgstr "Følgende pakker er automatisk blevet tilbageholdt:"
-#: src/cmdline/cmdline_prompt.cc:251
+#: src/cmdline/cmdline_prompt.cc:252
msgid "The following NEW packages will be automatically installed:"
msgstr "Følgende NYE pakker vil automatisk blive installeret:"
-#: src/cmdline/cmdline_prompt.cc:252
+#: src/cmdline/cmdline_prompt.cc:253
msgid "The following packages will be automatically REMOVED:"
msgstr "Følgende pakker vil automatisk blive AFINSTALLERET:"
-#: src/cmdline/cmdline_prompt.cc:253
+#: src/cmdline/cmdline_prompt.cc:254
msgid "The following packages will be DOWNGRADED:"
msgstr "Følgende pakker vil blive NEDGRADERET:"
-#: src/cmdline/cmdline_prompt.cc:254
+#: src/cmdline/cmdline_prompt.cc:255
msgid "The following packages have been kept back:"
msgstr "Følgende pakker er blevet tilbageholdt:"
-#: src/cmdline/cmdline_prompt.cc:255
+#: src/cmdline/cmdline_prompt.cc:256
msgid "The following packages will be REINSTALLED:"
msgstr "Følgende pakker vil blive GENINSTALLERET:"
-#: src/cmdline/cmdline_prompt.cc:256
+#: src/cmdline/cmdline_prompt.cc:257
msgid "The following NEW packages will be installed:"
msgstr "Følgende NYE pakker vil blive installeret:"
-#: src/cmdline/cmdline_prompt.cc:257
+#: src/cmdline/cmdline_prompt.cc:258
msgid "The following packages will be REMOVED:"
msgstr "Følgende pakker vil blive AFINSTALLERET:"
-#: src/cmdline/cmdline_prompt.cc:258
+#: src/cmdline/cmdline_prompt.cc:259
msgid "The following packages will be upgraded:"
msgstr "Følgende pakker vil blive opgraderet:"
-#: src/cmdline/cmdline_prompt.cc:307
+#: src/cmdline/cmdline_prompt.cc:311
#, c-format
msgid "The following ESSENTIAL packages will be REMOVED!\n"
msgstr "Følgende ESSENTIELLE pakker vil blive AFINSTALLERET!\n"
-#: src/cmdline/cmdline_prompt.cc:316
+#: src/cmdline/cmdline_prompt.cc:320
#, c-format
msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
msgstr ""
"Følgende ESSENTIELLE pakkers afhængigheder vil blive BRUDT af denne "
"handling:\n"
-#: src/cmdline/cmdline_prompt.cc:326
+#: src/cmdline/cmdline_prompt.cc:330
#, c-format
msgid ""
"WARNING: Performing this action will probably cause your system to break!\n"
@@ -511,96 +598,99 @@
"ADVARSEL: Udførelsen af denne handling vil nok ødelægge dit system!\n"
" Fortsæt IKKE, medmindre du ved PRÆCIS hvad det er du gør!\n"
-#: src/cmdline/cmdline_prompt.cc:328
+#: src/cmdline/cmdline_prompt.cc:332
msgid "I am aware that this is a very bad idea"
msgstr "jeg er klar over at dette er en meget dårlig idé"
-#: src/cmdline/cmdline_prompt.cc:331
+#: src/cmdline/cmdline_prompt.cc:335
#, c-format
msgid "To continue, type the phrase \"%s\":\n"
msgstr "For at fortsætte, indtast sætningen \"%s\":\n"
-#: src/cmdline/cmdline_prompt.cc:434
+#: src/cmdline/cmdline_prompt.cc:438
#, c-format
msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
msgstr "Følgende pakker ANBEFALES installeret, men vil IKKE blive det:\n"
-#: src/cmdline/cmdline_prompt.cc:440
+#: src/cmdline/cmdline_prompt.cc:444
#, c-format
msgid "The following packages are SUGGESTED but will NOT be installed:\n"
msgstr "Følgende pakker FORESLÅS installeret, men vil IKKE blive det:\n"
-#: src/cmdline/cmdline_prompt.cc:445
+#: src/cmdline/cmdline_prompt.cc:449
#, c-format
msgid "No packages will be installed, upgraded, or removed.\n"
msgstr "Ingen pakker vil blive installeret, opgraderet eller afinstalleret.\n"
-#: src/cmdline/cmdline_prompt.cc:447
+#: src/cmdline/cmdline_prompt.cc:451
#, c-format
msgid "%lu packages upgraded, %lu newly installed, "
msgstr "%lu pakker opgraderet, %lu nyinstalleret, "
-#: src/cmdline/cmdline_prompt.cc:451
+#: src/cmdline/cmdline_prompt.cc:455
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu geninstalleret, "
-#: src/cmdline/cmdline_prompt.cc:453
+#: src/cmdline/cmdline_prompt.cc:457
#, c-format
msgid "%lu downgraded, "
msgstr "%lu nedgraderet, "
-#: src/cmdline/cmdline_prompt.cc:455
+#: src/cmdline/cmdline_prompt.cc:459
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu til afinstallering og %lu ikke opgraderet.\n"
-#: src/cmdline/cmdline_prompt.cc:462
+#: src/cmdline/cmdline_prompt.cc:466
#, c-format
msgid "Need to get %sB/%sB of archives. "
msgstr "Skal hente %sB/%sB arkiver. "
-#: src/cmdline/cmdline_prompt.cc:465
+#: src/cmdline/cmdline_prompt.cc:469
#, c-format
msgid "Need to get %sB of archives. "
msgstr "Skal hente %sB arkiver. "
-#: src/cmdline/cmdline_prompt.cc:472
+#: src/cmdline/cmdline_prompt.cc:476
#, c-format
msgid "After unpacking %sB will be used.\n"
msgstr "Efter udpakning vil %sB blive brugt.\n"
-#: src/cmdline/cmdline_prompt.cc:475
+#: src/cmdline/cmdline_prompt.cc:479
#, c-format
msgid "After unpacking %sB will be freed.\n"
msgstr "Efter udpakning vil %sB blive frigjort.\n"
-#: src/cmdline/cmdline_prompt.cc:521
+#: src/cmdline/cmdline_prompt.cc:524
#, c-format
msgid "Bad action character '%c'\n"
msgstr "Forkert tegn \"%c\" til handling\n"
-#: src/cmdline/cmdline_prompt.cc:596
+#: src/cmdline/cmdline_prompt.cc:595
#, c-format
msgid "No packages to show -- enter the package names on the line after 'i'.\n"
msgstr "Ingen pakker at vise - angiv pakkenavne på linjen efter \"i\".\n"
-#: src/cmdline/cmdline_prompt.cc:598 src/cmdline/cmdline_prompt.cc:629
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:597
msgid "Press Return to continue."
msgstr "Tryk retur for at fortsætte."
-#: src/cmdline/cmdline_prompt.cc:625
+#: src/cmdline/cmdline_prompt.cc:623
#, c-format
msgid "No packages found -- enter the package names on the line after 'c'.\n"
msgstr "Ingen pakker fundet - angiv pakkenavne på linjen efter \"c\".\n"
-#: src/cmdline/cmdline_prompt.cc:665
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:627
+#, fuzzy
+msgid "Press Return to continue"
+msgstr "Tryk retur for at fortsætte."
+
+#: src/cmdline/cmdline_prompt.cc:675
msgid "Do you want to continue? [Y/n/?] "
msgstr "Vil du fortsætte) [Y/n?] "
-#: src/cmdline/cmdline_prompt.cc:690
+#: src/cmdline/cmdline_prompt.cc:700
#, c-format
msgid ""
"\n"
@@ -611,7 +701,7 @@
"Oplysning om afhængigheder vil blive vist\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:692
+#: src/cmdline/cmdline_prompt.cc:702
#, c-format
msgid ""
"\n"
@@ -622,7 +712,7 @@
"Oplysning om afhængigheder vil ikke blive vist\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:698
+#: src/cmdline/cmdline_prompt.cc:708
#, c-format
msgid ""
"\n"
@@ -633,7 +723,7 @@
"Versioner vil blive vist.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:700
+#: src/cmdline/cmdline_prompt.cc:710
#, c-format
msgid ""
"\n"
@@ -644,7 +734,7 @@
"Versioner vil ikke blive vist.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:705
+#: src/cmdline/cmdline_prompt.cc:715
#, c-format
msgid ""
"\n"
@@ -655,7 +745,7 @@
"Størrelsesændringer vil blive vist.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:717
#, c-format
msgid ""
"\n"
@@ -666,7 +756,7 @@
"Størrelsesændringer vil ikke blive vist.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:737
#, c-format
msgid ""
"Commands:\n"
@@ -715,33 +805,83 @@
" _ : Udrens\n"
" = : Tilbagehold\n"
-#: src/cmdline/cmdline_prompt.cc:751
+#: src/cmdline/cmdline_prompt.cc:761
#, c-format
msgid "Invalid response. Please enter a valid command or '?' for help.\n"
msgstr "Ugyldigt svar. Anfør en gyldig kommando eller \"?\" for hjælp.\n"
+#: src/cmdline/cmdline_resolver.cc:84
+#, c-format
+msgid "y: %F%nn: %F%nq: %F%n,: %F%n.: %F%n"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:90
+msgid "accept the proposed changes"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:92
+msgid "reject the proposed changes and search for another solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:94
+#, fuzzy
+msgid "give up and quit the program"
+msgstr "Afslut programmet"
+
+#: src/cmdline/cmdline_resolver.cc:96
+msgid "move to the next solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:98
+msgid "move to the previous solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:131
+#, fuzzy
+msgid "The following actions will resolve these dependencies:"
+msgstr "Følgende pakker har uopfyldte afhængigheder:\n"
+
+#: src/cmdline/cmdline_resolver.cc:146
+msgid "Accept this solution? [Y/n/q/?]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:174
+msgid "Abandoning all efforts to resolve these dependencies."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:184
+#, fuzzy
+msgid "The following commands are available:"
+msgstr "Følgende pakker er BRUDTE:"
+
+#: src/cmdline/cmdline_resolver.cc:188
+#, fuzzy
+msgid "Invalid response; please enter one of the following commands:"
+msgstr "Ugyldigt svar. Anfør en gyldig kommando eller \"?\" for hjælp.\n"
+
+#: src/cmdline/cmdline_resolver.cc:198
+msgid "No solution found within the allotted time. Try harder? [Y/n]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:226
+#, fuzzy
+msgid "Invalid response; please enter 'y' or 'n'."
+msgstr "Ugyldigt svar. Anfør en gyldig kommando eller \"?\" for hjælp.\n"
+
+#: src/cmdline/cmdline_resolver.cc:235
+msgid "Unable to resolve dependencies! Giving up..."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:240
+msgid "No more solutions."
+msgstr ""
+
#: src/cmdline/cmdline_search.cc:78
#, c-format
msgid "search: You must provide at least one search term\n"
msgstr "søg: du skal indtaste mindst én søgeterm\n"
-#: src/cmdline/cmdline_show_broken.cc:114
-#, c-format
-msgid ""
-"Some packages had unmet dependencies. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming.\n"
-"\n"
-msgstr ""
-"Visse pakker har uopfyldte afhængigheder. Dette kan betyde at du har ønsket\n"
-"noget som ikke kan opfyldes, eller hvis du bruger distributionen \"unstable"
-"\"\n"
-"at visse påkrævede pakker enten endnu ikke er lavet eller at de er blevet\n"
-"flyttet ud af \"Incoming\".\n"
-"\n"
-
-#: src/cmdline/cmdline_show_broken.cc:115
+#: src/cmdline/cmdline_show_broken.cc:113
#, c-format
msgid "The following packages have unmet dependencies:\n"
msgstr "Følgende pakker har uopfyldte afhængigheder:\n"
@@ -939,12 +1079,12 @@
msgid "Description: "
msgstr "Beskrivelse: "
-#: src/cmdline/cmdline_simulate.cc:36
+#: src/cmdline/cmdline_simulate.cc:37
#, c-format
msgid "Would download/install/remove packages.\n"
msgstr "Ville hente/installere/afinstallere pakker.\n"
-#: src/cmdline/cmdline_simulate.cc:47
+#: src/cmdline/cmdline_simulate.cc:48
msgid "Internal Error, Ordering didn't finish"
msgstr "Intern fejl, kunne ikke gennemføre ordre"
@@ -986,28 +1126,24 @@
msgid "UNAVAILABLE"
msgstr "UTILGÆNGELIG"
-#: src/download_bar.cc:57 src/download_list.cc:265
+#: src/download_bar.cc:56 src/download_list.cc:263 src/download_screen.cc:57
#, c-format
-msgid ""
-"Please insert the following disc into the drive \"%s\":\n"
-"%s"
-msgstr ""
-"Indsæt venligst den følgende disk i drevet \"%s\":\n"
-"%s"
+msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
+msgstr "Venligst indsæt disken navngivet \"%s\" ind i drev \"%s\""
-#: src/download_bar.cc:76 src/generic/acqprogress.cc:63
+#: src/download_bar.cc:77 src/generic/acqprogress.cc:63
msgid "Hit "
msgstr "Fundet "
-#: src/download_bar.cc:89
+#: src/download_bar.cc:90
msgid "Downloading "
msgstr "Henter "
-#: src/download_bar.cc:102
+#: src/download_bar.cc:103
msgid "Got "
msgstr "Fik "
-#: src/download_bar.cc:156
+#: src/download_bar.cc:157
msgid "Downloading..."
msgstr "Henter ..."
@@ -1015,7 +1151,7 @@
msgid "Couldn't read list of package sources"
msgstr "Kunne ikke læse liste over pakkekilder"
-#: src/download.cc:104 src/download.cc:321
+#: src/download.cc:104 src/download.cc:322
msgid "Couldn't lock list directory..are you root?"
msgstr "Kunne ikke låse katalog med lister ... er du root?"
@@ -1027,29 +1163,33 @@
msgid "View the progress of the package list update"
msgstr "Vis udvikling ved opdatering af pakkelisten"
-#: src/download.cc:159
+#: src/download.cc:113
+msgid "List Update"
+msgstr ""
+
+#: src/download.cc:160
msgid "Couldn't clean out list directories"
msgstr "Kunne ikke tømme kataloger for lister"
-#: src/download.cc:176 src/ui.cc:1068
+#: src/download.cc:177 src/ui.cc:1152
msgid "Deleting obsolete downloaded files"
msgstr "Sletter hentede filer som er forældede"
-#: src/download.cc:181
+#: src/download.cc:182
#, c-format
msgid "Deleting obsolete downloaded files\n"
msgstr "Sletter hentede filer som er forældede\n"
-#: src/download.cc:223
+#: src/download.cc:224
#, c-format
msgid "Unable to open %s to log actions"
msgstr "Kunne ikke åbne %s til at logge handlinger"
-#: src/download.cc:229
+#: src/download.cc:230
msgid "log report"
msgstr "log-rapport"
-#: src/download.cc:230
+#: src/download.cc:231
#, c-format
msgid ""
"IMPORTANT: this log only lists intended actions; actions which fail due to\n"
@@ -1059,77 +1199,77 @@
"VIGTIGT: denne log opregner kun påtænkte handlinger; handlinger som slår\n"
"fejl pga. problemer med dpkg kan muligvis ikke fuldføres.\n"
-#: src/download.cc:231
+#: src/download.cc:232
#, c-format
msgid "Will install %li packages, and remove %li packages.\n"
msgstr "Vil installere %li pakker, og afinstallere %li pakker.\n"
-#: src/download.cc:233
+#: src/download.cc:234
#, c-format
msgid "%sB of disk space will be used\n"
msgstr "%sB diskplads vil blive brugt\n"
-#: src/download.cc:236
+#: src/download.cc:237
#, c-format
msgid "%sB bytes of disk space will be freed\n"
msgstr "%sB diskplads vil blive frigjort\n"
-#: src/download.cc:244
+#: src/download.cc:245
#, c-format
msgid "[UPGRADE] %s %s -> %s\n"
msgstr "[OPGRADER] %s %s -> %s\n"
-#: src/download.cc:248
+#: src/download.cc:249
#, c-format
msgid "[DOWNGRADE] %s %s -> %s\n"
msgstr "[NEDGRADER] %s %s -> %s\n"
-#: src/download.cc:258
+#: src/download.cc:259
msgid "REMOVE"
msgstr "AFINSTALLÉR"
-#: src/download.cc:264
+#: src/download.cc:265
msgid "INSTALL"
msgstr "INSTALLÉR"
-#: src/download.cc:267
+#: src/download.cc:268
msgid "REINSTALL"
msgstr "GENINSTALLÉR"
-#: src/download.cc:270
+#: src/download.cc:271
msgid "HOLD"
msgstr "TILBAGEHOLD"
-#: src/download.cc:273
+#: src/download.cc:274
msgid "BROKEN"
msgstr "BRUDTE"
-#: src/download.cc:276
+#: src/download.cc:277
msgid "REMOVE, NOT USED"
msgstr "AFINSTALLÉR, UBRUGTE"
-#: src/download.cc:279
+#: src/download.cc:280
msgid "REMOVE, DEPENDENCIES"
msgstr "AFINSTALLÉR, AFHÆNGIGHEDER"
-#: src/download.cc:282
+#: src/download.cc:283
msgid "INSTALL, DEPENDENCIES"
msgstr "INSTALLÉR, AFHÆNGIGHEDER"
-#: src/download.cc:285
+#: src/download.cc:286
msgid "HOLD, DEPENDENCIES"
msgstr "TILBAGEHOLD, AFHÆNGIGHEDER"
-#: src/download.cc:287
+#: src/download.cc:288
msgid "????????"
msgstr "????????"
-#: src/download.cc:291
+#: src/download.cc:292
#, c-format
msgid "[%s] %s\n"
msgstr "[%s] %s\n"
-#: src/download.cc:294
+#: src/download.cc:295
#, c-format
msgid ""
"===============================================================================\n"
@@ -1140,33 +1280,38 @@
"\n"
"Log færdig.\n"
-#: src/download.cc:329
+#: src/download.cc:330
msgid "Downloading packages"
msgstr "Henter pakker"
-#: src/download.cc:330
+#: src/download.cc:331
msgid "View the progress of the package download"
msgstr "Vis udvikling ved download af pakker"
-#: src/download.cc:352
+#: src/download.cc:332
+#, fuzzy
+msgid "Package Download"
+msgstr "Pakke: "
+
+#: src/download.cc:354
msgid "Internal error: couldn't generate list of packages to download"
msgstr "Intern fejl: kunne ikke lave en liste over pakker til download"
-#: src/download.cc:413
+#: src/download.cc:415
msgid "Unable to correct for unavailable packages"
msgstr "Kan ikke korrigere for utilgængelige pakker"
-#: src/download.cc:465
+#: src/download.cc:467
msgid ""
"Ack! Something bad happened while installing packages. Trying to recover:"
msgstr ""
"Uff! Der skete noget slemt ved installering af pakker. Prøver at genskabe:"
-#: src/download.cc:475 src/pkg_item.cc:413
+#: src/download.cc:477 src/pkg_item.cc:432
msgid "Press return to continue.\n"
msgstr "Tryk retur for at fortsætte.\n"
-#: src/download.cc:506
+#: src/download.cc:508
msgid ""
"Could not regain the system lock! (Perhaps another apt or dpkg is running?)"
msgstr ""
@@ -1227,11 +1372,6 @@
msgid "[ERROR]"
msgstr "[FEJL]"
-#: src/download_screen.cc:57
-#, c-format
-msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
-msgstr "Venligst indsæt disken navngivet \"%s\" ind i drev \"%s\""
-
#: src/download_screen.cc:181
#, c-format
msgid "Downloaded %sB in %ss (%sB/s)."
@@ -1271,109 +1411,109 @@
"Skift disk: Indsæt venligst disken navngivet \"%s\" i drev \"%s\" og tryk "
"retur\n"
-#: src/generic/aptcache.cc:245
+#: src/generic/aptcache.cc:253
msgid "Can't open Aptitude extended state file"
msgstr "Kan ikke åbne Aptitudes fil for udvidet tilstand"
-#: src/generic/aptcache.cc:252 src/generic/aptcache.cc:305
-#: src/generic/aptcache.cc:307
+#: src/generic/aptcache.cc:260 src/generic/aptcache.cc:313
+#: src/generic/aptcache.cc:315
msgid "Reading extended state information"
msgstr "Læser information om udvidet tilstand"
-#: src/generic/aptcache.cc:313 src/generic/aptcache.cc:387
-#: src/generic/aptcache.cc:390
+#: src/generic/aptcache.cc:321 src/generic/aptcache.cc:395
+#: src/generic/aptcache.cc:398
msgid "Initializing package states"
msgstr "klargører pakketilstande"
-#: src/generic/aptcache.cc:501
+#: src/generic/aptcache.cc:509
msgid "Cannot open Aptitude state file"
msgstr "Kan ikke åbne Aptitudes tilstandsfil"
-#: src/generic/aptcache.cc:505 src/generic/aptcache.cc:560
-#: src/generic/aptcache.cc:563
+#: src/generic/aptcache.cc:513 src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:571
msgid "Writing extended state information"
msgstr "Skriver information om udvidet tilstand"
-#: src/generic/aptcache.cc:542
+#: src/generic/aptcache.cc:550
#, c-format
msgid "Internal buffer overflow on package \"%s\" while writing state file"
msgstr "Internt bufferoverløb på pakke \"%s\" under skrivning af statusfil"
-#: src/generic/aptcache.cc:551
+#: src/generic/aptcache.cc:559
msgid "Couldn't write state file"
msgstr "Kunne ikke skrive tilstandsfil"
-#: src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:576
msgid "Error writing state file"
msgstr "Fejl ved skrivning til tilstandsfil"
-#: src/generic/aptcache.cc:584
+#: src/generic/aptcache.cc:592
msgid "couldn't replace old state file"
msgstr "kunne ikke erstatte gammel tilstandsfil"
-#: src/generic/aptcache.cc:960
+#: src/generic/aptcache.cc:1000
msgid "Unable to correct dependencies, some packages cannot be installed"
msgstr "Kunne ikke reparere afhængigheder, visse pakker kan ikke installeres"
-#: src/generic/aptcache.cc:1325
+#: src/generic/aptcache.cc:1546
msgid "The list of sources could not be read."
msgstr "Kildelisten til pakker kunne ikke læses"
-#: src/generic/aptcache.cc:1332
+#: src/generic/aptcache.cc:1553
msgid "The package lists or status file could not be parsed or opened."
msgstr "Pakkelisterne eller statusfilen kunne hverken fortolkes eller åbnes"
-#: src/generic/aptcache.cc:1335
+#: src/generic/aptcache.cc:1556
msgid "You may want to update the package lists to correct these missing files"
msgstr "En opdatering af pakkelisterne vil måske korrigere for manglende filer"
-#: src/generic/apt.cc:141
+#: src/generic/apt.cc:142
#, c-format
msgid "Unable to open %s for writing"
msgstr "Kunne ikke åbne %s til skrivning"
-#: src/generic/apt.cc:151
+#: src/generic/apt.cc:152
#, c-format
msgid "Unable to replace %s with new configuration file"
msgstr "Kunne ikke erstatte %s med ny opsætningsfil"
-#: src/generic/apt.cc:226
+#: src/generic/apt.cc:227
msgid "Warning: could not lock the cache file. Opening in read-only mode"
msgstr "Advarsel: kunne ikke låse cachefil. Åbner skrivebeskyttet"
-#: src/generic/matchers.cc:780
+#: src/generic/matchers.cc:797
msgid "Unmatched '('"
msgstr "Ubalanceret '('"
-#: src/generic/matchers.cc:870 src/generic/matchers.cc:949
+#: src/generic/matchers.cc:887 src/generic/matchers.cc:968
#, c-format
msgid "Unknown dependency type: %s"
msgstr "Ukendt afhængighedstype: %s"
-#: src/generic/matchers.cc:931
+#: src/generic/matchers.cc:950
#, c-format
msgid "Unknown action type: %s"
msgstr "Ukendt handlingstype: %s"
-#: src/generic/matchers.cc:998
+#: src/generic/matchers.cc:1017
#, c-format
msgid "Unknown priority %s"
msgstr "Ukendt prioritetstype: %s"
-#: src/generic/matchers.cc:1020
+#: src/generic/matchers.cc:1039
#, c-format
msgid "Unknown pattern type: %c"
msgstr "Ukendt mønstertype: %c"
-#: src/generic/matchers.cc:1065
+#: src/generic/matchers.cc:1084
msgid "Unexpected empty expression"
msgstr "Uventet tomt udtryk"
-#: src/generic/matchers.cc:1100
+#: src/generic/matchers.cc:1119
msgid "Badly formed expression"
msgstr "Forkert udformet udtryk"
-#: src/generic/matchers.cc:1129
+#: src/generic/matchers.cc:1148
msgid "Unexpected ')'"
msgstr "Uventet ')'"
@@ -1396,7 +1536,7 @@
msgid "Can't get value of $HOME, using TMPDIR (insecure)"
msgstr "Kan ikke finde værdi på $HOME, bruger TMPDIR (utrygt)"
-#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:60
+#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:61
#, c-format
msgid "ChangeLog of %s"
msgstr "ChangeLog for %s"
@@ -1598,17 +1738,17 @@
msgid "Invalid sorting policy type '%s'"
msgstr "Ugyldig type '%s' på sorteringsmetode"
-#: src/main.cc:68
+#: src/main.cc:67
#, c-format
msgid "%s %s compiled at %s %s\n"
msgstr "%s %s oversat på %s %s\n"
-#: src/main.cc:71
+#: src/main.cc:70
#, c-format
msgid "Compiler: g++ %s\n"
msgstr "Oversætter: g++ %s\n"
-#: src/main.cc:74
+#: src/main.cc:73
#, c-format
msgid ""
"\n"
@@ -1617,7 +1757,7 @@
"\n"
"NCurses, version: %s\n"
-#: src/main.cc:76
+#: src/main.cc:75
#, c-format
msgid ""
"\n"
@@ -1626,22 +1766,22 @@
"\n"
"Curses, version: %s\n"
-#: src/main.cc:78
+#: src/main.cc:77
#, c-format
msgid "libsigc++ version: %s\n"
msgstr "libsigc++ version: %s\n"
-#: src/main.cc:84
+#: src/main.cc:83
#, c-format
msgid "Usage: aptitude [-S fname] [-u|-i]"
msgstr "Brug: aptitude [-S fname] [-u|-i]"
-#: src/main.cc:86
+#: src/main.cc:85
#, c-format
msgid " aptitude [options] <action> ..."
msgstr " aptitude [tilvalg] <handling> ..."
-#: src/main.cc:88
+#: src/main.cc:87
#, c-format
msgid ""
" Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -1650,42 +1790,42 @@
" Handlinger (er ingen angivet, vil aptitude gå i interaktiv tilstand):\n"
"\n"
-#: src/main.cc:89
+#: src/main.cc:88
#, c-format
msgid " install - Install/upgrade packages\n"
msgstr " install - Installér/opgradér pakker\n"
-#: src/main.cc:90
+#: src/main.cc:89
#, c-format
msgid " remove - Remove packages\n"
msgstr " remove - Afinstallér pakker\n"
-#: src/main.cc:91
+#: src/main.cc:90
#, c-format
msgid " purge - Remove packages and their configuration files\n"
msgstr " purge - Afinstallér pakker og deres opsætningsfiler\n"
-#: src/main.cc:92
+#: src/main.cc:91
#, c-format
msgid " hold - Place packages on hold\n"
msgstr " hold - Tilbagehold en pakke\n"
-#: src/main.cc:93
+#: src/main.cc:92
#, c-format
msgid " unhold - Cancel a hold command for a package\n"
msgstr " unhold - Fortryd tilbageholdelse af en pakke\n"
-#: src/main.cc:94
+#: src/main.cc:93
#, c-format
msgid " markauto - Mark packages as having been automatically installed\n"
msgstr " markauto - Marker pakker som værende automatisk installeret\n"
-#: src/main.cc:95
+#: src/main.cc:94
#, c-format
msgid " unmarkauto - Mark packages as having been manually installed\n"
msgstr " unmarkauto - Marker pakker som værende manuelt installeret\n"
-#: src/main.cc:100
+#: src/main.cc:99
#, c-format
msgid ""
" forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -1694,17 +1834,17 @@
" forbid-version - Forbyd aptitude at opgradere til en specifik "
"pakkeversion.\n"
-#: src/main.cc:101
+#: src/main.cc:100
#, c-format
msgid " update - Download lists of new/upgradable packages\n"
msgstr " update - Hent lister over nye/opgradérbare pakker\n"
-#: src/main.cc:102
+#: src/main.cc:101
#, c-format
msgid " upgrade - Perform a safe upgrade\n"
msgstr " upgrade - Udfør en sikker opgradering\n"
-#: src/main.cc:103
+#: src/main.cc:102
#, c-format
msgid ""
" dist-upgrade - Perform an upgrade, possibly installing and removing "
@@ -1713,75 +1853,75 @@
" dist-upgrade - Udfør en opgradering, pakker vil muligvis blive installeret "
"og afinstalleret\n"
-#: src/main.cc:104
+#: src/main.cc:103
#, c-format
msgid " forget-new - Forget what packages are \"new\"\n"
msgstr " forget-new - Glem hvilke pakker der er \"nye\"\n"
-#: src/main.cc:105
+#: src/main.cc:104
#, c-format
msgid " search - Search for a package by name and/or expression\n"
msgstr " search - Søg efter en pakke efter navn og/eller udtryk\n"
-#: src/main.cc:106
+#: src/main.cc:105
#, c-format
msgid " show - Display detailed information about a package\n"
msgstr " show - Vis detaljerede oplysninger om en pakke\n"
-#: src/main.cc:107
+#: src/main.cc:106
#, c-format
msgid " clean - Erase downloaded package files\n"
msgstr " clean - Slet hentede pakkefiler\n"
-#: src/main.cc:108
+#: src/main.cc:107
#, c-format
msgid " autoclean - Erase old downloaded package files\n"
msgstr " autoclean - Slet gamle, hentede pakkefiler\n"
-#: src/main.cc:109
+#: src/main.cc:108
#, c-format
msgid " changelog - View a package's changelog\n"
msgstr " changelog - Vis en pakkes ændringslog\n"
-#: src/main.cc:110
+#: src/main.cc:109
#, c-format
msgid " download - Download the .deb file for a package\n"
msgstr " download - Hent en pakkes .deb-fil\n"
-#: src/main.cc:112
+#: src/main.cc:111
#, c-format
msgid " Options:\n"
msgstr " Tilvalg:\n"
-#: src/main.cc:113
+#: src/main.cc:112
#, c-format
msgid " -h This help text\n"
msgstr " -h Denne hjælpetekst\n"
-#: src/main.cc:114
+#: src/main.cc:113
#, c-format
msgid " -s Simulate actions, but do not actually perform them.\n"
msgstr " -s Simulér handlinger uden faktisk at udføre dem.\n"
-#: src/main.cc:115
+#: src/main.cc:114
#, c-format
msgid ""
" -d Only download packages, do not install or remove anything.\n"
msgstr ""
" -d Hent kun pakker, installér eller afinstallér ikke noget.\n"
-#: src/main.cc:116
+#: src/main.cc:115
#, c-format
msgid " -P Always prompt for confirmation or actions\n"
msgstr " -P Spørg altid om bekræftelse eller handlinger\n"
-#: src/main.cc:117
+#: src/main.cc:116
#, c-format
msgid ""
" -y Assume that the answer to simple yes/no questions is 'yes'\n"
msgstr " -y Antag at svaret til simple ja/nej-spørgsmål er 'ja'\n"
-#: src/main.cc:118
+#: src/main.cc:117
#, c-format
msgid ""
" -F format Specify a format for displaying search results; see the "
@@ -1789,63 +1929,63 @@
msgstr ""
" -F format Anfør et format til visning af søgeresultater; se manualen\n"
-#: src/main.cc:119
+#: src/main.cc:118
#, c-format
msgid ""
" -O order Specify how search results should be sorted; see the manual\n"
msgstr ""
" -O order Anfør sorteringsorden for søgeresultater; se manualen\n"
-#: src/main.cc:120
+#: src/main.cc:119
#, c-format
msgid ""
" -w width Specify the display width for formatting search results\n"
msgstr ""
" -w width Angiv en skærmbredde til formatering af søgeresultater\n"
-#: src/main.cc:121
+#: src/main.cc:120
#, c-format
msgid " -f Aggressively try to fix broken packages.\n"
msgstr ""
" -f Prøv aggressivt at reparere brudte pakkeafhængigheder.\n"
-#: src/main.cc:122
+#: src/main.cc:121
#, c-format
msgid " -V Show which versions of packages are to be installed.\n"
msgstr " -V Vis hvilke versioner af pakker der skal installeres.\n"
-#: src/main.cc:123
+#: src/main.cc:122
#, c-format
msgid ""
" -D Show the dependencies of automatically changed packages.\n"
msgstr ""
" -D Vis afhængigheder for pakker der er ændret automatisk.\n"
-#: src/main.cc:124
+#: src/main.cc:123
#, c-format
msgid " -Z\t\t Show the change in installed size of each package.\n"
msgstr ""
" -Z\t\t Vis ændring i hver pakkes pladsforbrug efter installering.\n"
-#: src/main.cc:125
+#: src/main.cc:124
#, c-format
msgid ""
" -v Display extra information. (may be supplied multiple times)\n"
msgstr " -v Vis ekstra information (kan anføres flere gange).\n"
-#: src/main.cc:126
+#: src/main.cc:125
#, c-format
msgid ""
" -t [release] Set the release from which packages should be installed\n"
msgstr " -t [udgave] Angiv hvilken udgave pakker skal installeres fra\n"
-#: src/main.cc:127
+#: src/main.cc:126
#, c-format
msgid " -o key=val Directly set the configuration option named 'key'\n"
msgstr ""
" -o nøgle=værdi Tildel værdi direkte til opsætningstilvalget \"nøgle\"\n"
-#: src/main.cc:128
+#: src/main.cc:127
#, c-format
msgid ""
" --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -1854,58 +1994,66 @@
" --with(out)-recommends\tAngiv om anbefalede pakker skal behandles som\n"
" stærke afhængigheder\n"
-#: src/main.cc:129
+#: src/main.cc:128
#, c-format
msgid " -S fname: Read the aptitude extended status info from fname.\n"
msgstr " -S fname: læs aptitudes udvidede statusinfo fra fnavn.\n"
-#: src/main.cc:130
+#: src/main.cc:129
#, c-format
msgid " -u : Download new package lists on startup.\n"
msgstr " -u : Hent nye pakkelister under start\n"
-#: src/main.cc:131
+#: src/main.cc:130
#, c-format
msgid " -i : Perform an install run on startup.\n"
msgstr " -i : Udfør en installeringskørsel ved opstart\n"
-#: src/main.cc:133
+#: src/main.cc:132
#, c-format
msgid " This aptitude does not have Super Cow Powers.\n"
msgstr " Denne aptitude har ikke \"Super Cow Powers\".\n"
-#: src/main.cc:254
+#: src/main.cc:253
#, c-format
msgid "-o requires an argument of the form key=value, got %s"
msgstr "-o kræver et argument på formen taste=værdi, modtog %s"
-#: src/main.cc:300 src/main.cc:309
+#: src/main.cc:299 src/main.cc:308
msgid "WEIRDNESS: unknown option code received\n"
msgstr "MYSTISK: modtog en ukendt kode for tilvalg\n"
-#: src/main.cc:318
+#: src/main.cc:317
msgid "Only one of -u and -i may be specified\n"
msgstr "Kun -u eller -i må angives\n"
-#: src/main.cc:326
+#: src/main.cc:325
msgid ""
"-u and -i may not be specified in command-line mode (eg, with 'install')"
msgstr ""
"-u og -i må ikke angives i kommandolinjetilstand (f.eks. med 'install')"
-#: src/main.cc:337
+#: src/main.cc:342
msgid "-u and -i may not be specified with a command"
msgstr "-u og -i må ikke angives i en kommando"
-#: src/main.cc:392
+#: src/main.cc:399
#, c-format
msgid "Unknown command \"%s\"\n"
msgstr "Ukendt kommando \"%s\"\n"
-#: src/main.cc:400
+#: src/main.cc:406 src/main.cc:463
+msgid "Internal error: uncaught 'out of solutions' exception.\n"
+msgstr ""
+
+#: src/main.cc:411 src/main.cc:468
+msgid "Internal error: uncaught 'out of time' exception.\n"
+msgstr ""
+
+#: src/main.cc:418
#, c-format
-msgid "Invalid option for interactive mode: -s\n"
-msgstr "Ugyldigt tilvalg for interaktiv tilstand: -s\n"
+msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
+msgstr ""
#: src/mine/cmine.cc:93
#, c-format
@@ -1933,7 +2081,7 @@
msgid "Lost"
msgstr "Tabte"
-#: src/mine/cmine.cc:119 src/ui.cc:1005
+#: src/mine/cmine.cc:119 src/ui.cc:1089
msgid "Minesweeper"
msgstr "Minestryger"
@@ -2110,7 +2258,7 @@
msgid "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
msgstr "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
-#: src/pkg_columnizer.cc:84 src/ui.cc:1488
+#: src/pkg_columnizer.cc:84 src/ui.cc:1638
msgid "Package"
msgstr "Pakke"
@@ -2369,13 +2517,14 @@
" Pakker i afsnittet \"base\" bruges ved den første systeminstallering."
#: src/pkg_grouppolicy.cc:158
+#, fuzzy
msgid ""
"Programs for faxmodems and other communications devices\n"
" Packages in the 'comm' section are used to control modems and other "
"hardware communications devices. This includes software to control faxmodems "
"(for instance, PPP for dial-up internet connections and programs originally "
-"written for that purpose (zmodem/kermit), as well as software to control "
-"cellular phones, interface with FidoNet, and run a BBS."
+"written for that purpose, such as zmodem/kermit), as well as software to "
+"control cellular phones, interface with FidoNet, and run a BBS."
msgstr ""
"Programmer til faxmodemer og anden hardware til telekommunikation\n"
" Pakker i afsnittet \"comm\" bruges til at kontrollere modemer og anden "
@@ -2825,14 +2974,15 @@
"befinder sig derfor nu i \"main\"."
#: src/pkg_grouppolicy.cc:193
+#, fuzzy
msgid ""
"Programs which are not free software\n"
" Packages in the 'non-free' section are not part of Debian.\n"
" .\n"
" These packages fail to meet one or more of the requirements of the Debian "
-"Free Software Guidelines (see below) You should read the license of programs "
-"in this section to be sure that you are allowed to use them in the way you "
-"intend.\n"
+"Free Software Guidelines (see below). You should read the license of "
+"programs in this section to be sure that you are allowed to use them in the "
+"way you intend.\n"
" .\n"
" For more information about what Debian considers to be Free Software, see "
"http://www.debian.org/social_contract#guidelines"
@@ -2895,11 +3045,12 @@
" En nyere version af disse pakker er tilgængelig."
#: src/pkg_grouppolicy.cc:320
+#, fuzzy
msgid ""
"New Packages\n"
" These packages have been added to Debian since the last time you cleared "
-"the list of \"new\" packages. (choose \"Forget new packages\" from the "
-"Actions menu to empty this list)"
+"the list of \"new\" packages (choose \"Forget new packages\" from the "
+"Actions menu to empty this list)."
msgstr ""
"Nye Pakker\n"
" Disse pakker er føjet til Debian siden sidste gang du nulstillede listen "
@@ -3152,101 +3303,121 @@
msgid "Versions"
msgstr "Versioner"
-#: src/pkg_item.cc:54
+#: src/pkg_item.cc:55
msgid "Yes, I am aware this is a very bad idea"
msgstr "Ja, jeg er klar over at dette er en meget dårlig idé"
#: src/pkg_item.cc:80
-#, c-format
+#, fuzzy, c-format
msgid ""
-"%s is an essential package!\n"
-"\n"
-"Are you sure you want to remove it?\n"
-"Type '%s' if you are."
+"%s is an essential package!%n%nAre you sure you want to remove it?%nType '%"
+"s' if you are."
msgstr ""
"%s er en essentiel pakke!\n"
"\n"
"Er du sikker på at du vil afinstallere den?\n"
"Tast '%s' hvis du er sikker."
-#: src/pkg_item.cc:219
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:625
#, c-format
msgid "Information about %s"
msgstr "Oplysninger om %s"
-#: src/pkg_item.cc:304
-msgid "Available versions of "
+#: src/pkg_item.cc:224 src/pkg_ver_item.cc:627
+#, c-format
+msgid "%s info"
+msgstr ""
+
+#: src/pkg_item.cc:310
+#, fuzzy, c-format
+msgid "Available versions of %s"
msgstr "Tilgængelige versioner af "
-#: src/pkg_item.cc:312 src/pkg_ver_item.cc:648
+#: src/pkg_item.cc:313
+#, fuzzy, c-format
+msgid "%s versions"
+msgstr "Versioner"
+
+#: src/pkg_item.cc:325 src/pkg_ver_item.cc:655
#, c-format
msgid "Dependencies of %s"
msgstr "Afhængigheder for %s"
-#: src/pkg_item.cc:322 src/pkg_ver_item.cc:657
+#: src/pkg_item.cc:327 src/pkg_ver_item.cc:657
+#, c-format
+msgid "%s deps"
+msgstr ""
+
+#: src/pkg_item.cc:338 src/pkg_ver_item.cc:667
#, c-format
msgid "Packages depending on %s"
msgstr "Pakker der afhænger af %s"
-#: src/pkg_item.cc:373 src/pkg_ver_item.cc:694
+#: src/pkg_item.cc:340 src/pkg_ver_item.cc:669
+#, c-format
+msgid "%s reverse deps"
+msgstr ""
+
+#: src/pkg_item.cc:392 src/pkg_ver_item.cc:707
#, c-format
msgid "Reporting a bug in %s:\n"
msgstr "Rapporterer en programfejl i %s:\n"
-#: src/pkg_item.cc:395
+#: src/pkg_item.cc:414
+#, fuzzy
msgid ""
-"You are not root and I cannot find any way\n"
-"to become root. To reconfigure this package,\n"
-"install the menu package, the login package,\n"
-"or run aptitude as root."
+"You are not root and I cannot find any way to become root. To reconfigure "
+"this package, install the menu package, the login package, or run aptitude "
+"as root."
msgstr ""
"Du er ikke root, og det lykkedes ikke at en finde\n"
"en måde at blive det på. For at genopsætte denne\n"
"pakke skal pakkerne \"menu\" og \"login\"\n"
"installeres eller aptitude skal køres som root."
-#: src/pkg_item.cc:403
+#: src/pkg_item.cc:422
#, c-format
msgid "Reconfiguring %s\n"
msgstr "Genopsætter %s\n"
-#: src/pkg_item.cc:428
+#: src/pkg_item.cc:447
msgid "Hierarchy editor"
msgstr "Hierarkiredigering"
+#: src/pkg_item.cc:447
+#, fuzzy
+msgid "Hierarchy Editor"
+msgstr "Hierarkiredigering"
+
#: src/pkg_tree.cc:325
msgid "Search for: "
msgstr "Søg efter: "
-#: src/pkg_tree.cc:585
+#: src/pkg_tree.cc:568
msgid "All Packages"
msgstr "Alle pakker"
-#: src/pkg_tree.cc:598 src/pkg_tree.cc:607
+#: src/pkg_tree.cc:581 src/pkg_tree.cc:590
msgid "Building view"
msgstr "Danner skærmbillede"
-#: src/pkg_tree.cc:649
+#: src/pkg_tree.cc:632
#, c-format
msgid "No packages matched the pattern \"%s\"."
msgstr "Ingen pakker passer med mønstret \"%s\"."
-#: src/pkg_tree.cc:671
+#: src/pkg_tree.cc:654
msgid "Enter the new package tree limit: "
msgstr "Indtast en ny grænse for træet over pakker: "
-#: src/pkg_tree.cc:705
+#: src/pkg_tree.cc:688
msgid "Enter the new package grouping mechanism for this display: "
msgstr "Indtast den nye måde at gruppere pakker på for dette skærmbillede: "
-#: src/pkg_tree.cc:713
+#: src/pkg_tree.cc:696
msgid "Enter the new package sorting mechanism for this display: "
msgstr "Indtast en ny sorteringsmetode for pakker i dette skærmbillede: "
-#: src/pkg_ver_item.cc:623
-msgid "Information about "
-msgstr "Oplysning om "
-
#: src/pkg_view.cc:344
msgid "make_package_view: error in arguments -- two main widgets??"
msgstr "make_package_view: fejl i parametre - to \"main widgets\"??"
@@ -3262,7 +3433,7 @@
msgid "make_package_view: bad argument!"
msgstr "make_package_view: forkert argument!"
-#: src/pkg_view.cc:492
+#: src/pkg_view.cc:495
msgid "make_package_view: no main widget found"
msgstr "make_package_view: ingen \"main widget\" fundet"
@@ -3480,6 +3651,74 @@
"Følgende pakker afhænger af version %B%s%b af %B%s%b og vil blive brudte "
"hvis den bliver %s."
+#: src/solution_dialog.cc:74
+msgid "The package cache is not available."
+msgstr ""
+
+#: src/solution_dialog.cc:82
+#, fuzzy
+msgid "No packages are broken."
+msgstr "Visse pakkeafhængigheder er brudte. Prøv at reparere dem?"
+
+#: src/solution_dialog.cc:103
+msgid "No resolution found."
+msgstr ""
+
+#: src/solution_dialog.cc:107
+#, c-format
+msgid ""
+"Time exhausted while searching for a solution (you can select \"Next Solution"
+"\" or press %s to try harder)."
+msgstr ""
+
+#: src/solution_dialog.cc:146
+#, fuzzy
+msgid "Previous"
+msgstr "Giver"
+
+#: src/solution_dialog.cc:147
+#, fuzzy
+msgid "Next"
+msgstr "^Næste"
+
+#: src/solution_dialog.cc:148
+msgid "Apply"
+msgstr ""
+
+#: src/solution_dialog.cc:149
+#, fuzzy
+msgid "Close"
+msgstr "^Luk"
+
+#: src/solution_fragment.cc:125
+#, fuzzy
+msgid "%BRemove%b the following packages:%n"
+msgstr "Følgende pakker er BRUDTE:"
+
+#: src/solution_fragment.cc:135
+#, fuzzy
+msgid "%BInstall%b the following packages:%n"
+msgstr "Følgende pakker er BRUDTE:"
+
+#: src/solution_fragment.cc:148
+msgid "%BKeep%b the following packages at their current version:%n"
+msgstr ""
+
+#: src/solution_fragment.cc:161
+#, fuzzy
+msgid "%BUpgrade%b the following packages:%n"
+msgstr "Følgende pakker er BRUDTE:"
+
+#: src/solution_fragment.cc:176
+#, fuzzy
+msgid "%BDowngrade%b the following packages:%n"
+msgstr "Henter pakker"
+
+#: src/solution_fragment.cc:190
+#, c-format
+msgid "Score is %d"
+msgstr ""
+
#: src/trust.cc:17 src/trust.cc:19
msgid "WARNING"
msgstr ""
@@ -3491,53 +3730,53 @@
"system."
msgstr ""
-#: src/ui.cc:143
+#: src/ui.cc:164
msgid "Er, there aren't any errors, this shouldn't have happened.."
msgstr "Hov, der er ingen fejl, dette burde ikke være sket ..."
-#: src/ui.cc:149
+#: src/ui.cc:170
msgid "E:"
msgstr ""
-#: src/ui.cc:151
+#: src/ui.cc:172
msgid "W:"
msgstr ""
-#: src/ui.cc:172
+#: src/ui.cc:193
msgid "Search for:"
msgstr "Søg efter:"
-#: src/ui.cc:205
+#: src/ui.cc:261
msgid "You already are root!"
msgstr "Du er allerede root!"
-#: src/ui.cc:303
+#: src/ui.cc:359
msgid ""
"Subprocess exited with an error -- did you type your password correctly?"
msgstr ""
"Underprocessen afsluttedes med en fejl - skrev du dit password rigtigt?"
-#: src/ui.cc:331
+#: src/ui.cc:387
msgid "Loading cache"
msgstr "Indlæser cache ..."
-#: src/ui.cc:353
+#: src/ui.cc:409
msgid "Really quit Aptitude?"
msgstr "Afslut Aptitude?"
-#: src/ui.cc:432
+#: src/ui.cc:488
msgid "Really discard your personal settings and reload the defaults?"
msgstr "Vil du forkaste dine egne indstillinger og genindlæse de forvalgte?"
-#: src/ui.cc:532
+#: src/ui.cc:588 src/ui.cc:590 src/ui.cc:618 src/ui.cc:620
msgid "Packages"
msgstr "Pakker"
-#: src/ui.cc:533 src/ui.cc:560
+#: src/ui.cc:589 src/ui.cc:619
msgid "View available packages and choose actions to perform"
msgstr "Se tilgængelige pakker og vælg hvilke handlinger der skal udføres"
-#: src/ui.cc:599
+#: src/ui.cc:666
#, fuzzy
msgid ""
"%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
@@ -3553,15 +3792,15 @@
"Hjælpemenuen. Dette er fri software, og du er velkommen til at\n"
"gendistribuere det under visse betingelser; se 'Licens' for detaljer."
-#: src/ui.cc:620
+#: src/ui.cc:687
msgid "help.txt"
msgstr "help.txt"
-#: src/ui.cc:636
+#: src/ui.cc:703
msgid "README"
msgstr "README"
-#: src/ui.cc:718
+#: src/ui.cc:785
msgid ""
"%C%BWARNING%b: untrusted versions of the following packages will be "
"installed!%n%nUntrusted packages could %Bcompromise your system's security%"
@@ -3569,60 +3808,70 @@
"this is what you want to do.%n%n"
msgstr ""
-#: src/ui.cc:732
+#: src/ui.cc:799
#, fuzzy
msgid "Really Continue"
msgstr "Fortsæt"
-#: src/ui.cc:734
+#: src/ui.cc:801
msgid "Abort Installation"
msgstr ""
-#: src/ui.cc:796
+#: src/ui.cc:862
msgid "Preview of package installation"
msgstr "Forhåndsvisning af pakkeinstallering"
-#: src/ui.cc:797
+#: src/ui.cc:863
msgid "View and/or adjust the actions that will be performed"
msgstr "Vis og/eller korrigér de handlinger der skal udføres"
-#: src/ui.cc:837
-msgid "Some packages were broken and have been fixed"
+#: src/ui.cc:864
+#, fuzzy
+msgid "Preview"
+msgstr "^Forrige"
+
+#: src/ui.cc:900
+#, fuzzy
+msgid "Some packages were broken and have been fixed:"
msgstr "Visse pakkeafhængigheder var brudte og er blevet repareret"
-#: src/ui.cc:839
-msgid "Some broken packages could not be fixed!"
-msgstr "Visse brudte pakkeafhængigheder kunne ikke repareres!"
+#: src/ui.cc:906
+msgid "No solution to these dependency problems exists!"
+msgstr ""
-#: src/ui.cc:847 src/ui.cc:959
-msgid "Some packages are broken. Try to fix them?"
-msgstr "Visse pakkeafhængigheder er brudte. Prøv at reparere dem?"
+#: src/ui.cc:912
+#, c-format
+msgid ""
+"Ran out of time while trying to resolver dependencies (press \"%s\" to try "
+"harder)"
+msgstr ""
-#: src/ui.cc:860
+#: src/ui.cc:958
+#, fuzzy
msgid ""
-"Installing/removing packages requires administrative privileges, which\n"
-"you currently do not have. Would you like to change to the root account?\n"
+"Installing/removing packages requires administrative privileges, which you "
+"currently do not have. Would you like to change to the root account?"
msgstr ""
"Installering/afinstallering af pakker kræver administrative rettigheder,\n"
"som du ikke har lige nu. Vil du ændre bruger til root?\n"
-#: src/ui.cc:863 src/ui.cc:993
+#: src/ui.cc:961 src/ui.cc:1077
msgid "Become root"
msgstr "Bliv root"
-#: src/ui.cc:865 src/ui.cc:995
+#: src/ui.cc:963 src/ui.cc:1079
msgid "Don't become root"
msgstr "Bliv ikke root"
-#: src/ui.cc:870 src/ui.cc:1000
+#: src/ui.cc:968 src/ui.cc:1084
msgid "A package-list update or install run is already taking place."
msgstr "En opdatering af pakkelister/installeringskørsel foregår allerede."
-#: src/ui.cc:897
+#: src/ui.cc:995
msgid "No packages are scheduled to be installed, removed, or upgraded."
msgstr "Ingen pakker vil blive installeret, opgraderet eller afinstalleret."
-#: src/ui.cc:903
+#: src/ui.cc:1001
#, fuzzy
msgid ""
"No packages will be installed, removed or upgraded. Some packages could be "
@@ -3634,164 +3883,179 @@
"Visse pakker kunne opgraderes, men du har valgt ikke at opgradere dem.\n"
"Tast \"U\" for at igangsætte en opgradering."
-#: src/ui.cc:990
+#: src/ui.cc:1073
+#, fuzzy
msgid ""
-"Updating the package lists requires administrative privileges, which\n"
-"you currently do not have. Would you like to change to the root account?\n"
+"Updating the package lists requires administrative privileges, which you "
+"currently do not have. Would you like to change to the root account?"
msgstr ""
"Opdatering af pakkelisterne kræver administrative rettigheder,\n"
"som du ikke har lige nu. Vil du ændre bruger til root?\n"
-#: src/ui.cc:1005 src/ui.cc:1198
+#: src/ui.cc:1089 src/ui.cc:1345
msgid "Waste time trying to find mines"
msgstr "Spild tid mens du prøver at finde miner"
-#: src/ui.cc:1012 src/ui.cc:1065
+#: src/ui.cc:1096 src/ui.cc:1149
msgid "Cleaning while a download is in progress is not allowed"
msgstr "Tømning er ikke tilladt mens der hentes filer"
-#: src/ui.cc:1015
+#: src/ui.cc:1099
msgid "Deleting downloaded files"
msgstr "Sletter hentede filer"
-#: src/ui.cc:1029
+#: src/ui.cc:1113
msgid "Downloaded package files have been deleted"
msgstr "Hentede pakkefiler er blevet slettet"
-#: src/ui.cc:1090
+#: src/ui.cc:1174
#, fuzzy, c-format
msgid ""
"Obsolete downloaded package files have been deleted, freeing %sB of disk "
"space."
msgstr "Hentede, forældede pakkefiler er blevet slettet"
-#: src/ui.cc:1174
+#: src/ui.cc:1246
+msgid "All solutions exhausted."
+msgstr ""
+
+#: src/ui.cc:1251 src/ui.cc:1282
+#, fuzzy
+msgid "Ran out of time while trying to find a solution."
+msgstr "Spild tid mens du prøver at finde miner"
+
+#: src/ui.cc:1276
+msgid "Unable to find a solution to apply."
+msgstr ""
+
+#: src/ui.cc:1321
msgid "^Install/remove packages"
msgstr "^Installér/afinstallér pakker"
-#: src/ui.cc:1175
+#: src/ui.cc:1322
msgid "Perform all pending installs and removals"
msgstr "Udfør alle afventende installeringer og afinstalleringer"
-#: src/ui.cc:1177
+#: src/ui.cc:1324
msgid "^Update package list"
msgstr "^Opdatér pakkeliste"
-#: src/ui.cc:1178
+#: src/ui.cc:1325
msgid "Check for new versions of packages"
msgstr "Check efter nye versioner af pakker"
-#: src/ui.cc:1181
+#: src/ui.cc:1328
msgid "^Forget new packages"
msgstr "^Glem nye pakker"
-#: src/ui.cc:1182
+#: src/ui.cc:1329
msgid "Forget which packages are \"new\""
msgstr "Glem hvilke pakker der er \"nye\""
-#: src/ui.cc:1185
+#: src/ui.cc:1332
msgid "^Clean package cache"
msgstr "^Tøm pakkecache"
-#: src/ui.cc:1186
+#: src/ui.cc:1333
msgid "Delete package files which were previously downloaded"
msgstr "Slet tidligere hentede pakkefiler"
-#: src/ui.cc:1189
+#: src/ui.cc:1336
msgid "Clean ^obsolete files"
msgstr "Slet ^forældede filer"
-#: src/ui.cc:1190
+#: src/ui.cc:1337
msgid "Delete package files which can no longer be downloaded"
msgstr "Slet pakkefiler som ikke længere kan hentes"
-#: src/ui.cc:1193
+#: src/ui.cc:1340
msgid "Mark ^Upgradable"
msgstr "^Marker opgradérbare"
-#: src/ui.cc:1194
+#: src/ui.cc:1341
msgid "Mark all upgradable packages which are not held for upgrade"
msgstr "Marker alle ikke-tilbageholdte pakker til opgradering"
-#: src/ui.cc:1197
+#: src/ui.cc:1344
msgid "^Play Minesweeper"
msgstr "^Spil minestryger"
-#: src/ui.cc:1200
+#: src/ui.cc:1347
msgid "^Become root"
msgstr "Bliv ^root"
-#: src/ui.cc:1201
+#: src/ui.cc:1348
+#, fuzzy
msgid ""
-"Run 'su' to become root; this will restart the program, but your\n"
-"settings will be preserved"
+"Run 'su' to become root; this will restart the program, but your settings "
+"will be preserved"
msgstr ""
"Kør \"su\" for at blive root. Dette vil genstarte programmet, men dine\n"
"indstillinger vil blive bevaret"
-#: src/ui.cc:1204
+#: src/ui.cc:1351
msgid "^Reload package cache"
msgstr "^Genindlæs pakkecache"
-#: src/ui.cc:1205
+#: src/ui.cc:1352
msgid "Reload the package cache"
msgstr "Genindlæs pakkecachen"
-#: src/ui.cc:1211
+#: src/ui.cc:1358
msgid "^Quit"
msgstr "^Afslut"
-#: src/ui.cc:1212
+#: src/ui.cc:1359
msgid "Exit the program"
msgstr "Afslut programmet"
-#: src/ui.cc:1218 src/ui.cc:1487
+#: src/ui.cc:1365 src/ui.cc:1637
msgid "Undo"
msgstr "Fortryd"
-#: src/ui.cc:1219
+#: src/ui.cc:1366
msgid "Undo the last package operation or group of operations"
msgstr "Fortryd den sidste pakkehandling eller gruppe af handlinger"
-#: src/ui.cc:1226
+#: src/ui.cc:1373
msgid "^Install"
msgstr "^Installér"
-#: src/ui.cc:1227
+#: src/ui.cc:1374
msgid "Flag the currently selected package for installation or upgrade"
msgstr "Markér den aktuelt valgte pakke til installering eller opgradering"
-#: src/ui.cc:1230
+#: src/ui.cc:1377
msgid "^Remove"
msgstr "^Afinstallér"
-#: src/ui.cc:1231
+#: src/ui.cc:1378
msgid "Flag the currently selected package for removal"
msgstr "Markér den aktuelt valgte pakke til afinstallering"
-#: src/ui.cc:1234
+#: src/ui.cc:1381
msgid "^Purge"
msgstr "^Udrens"
-#: src/ui.cc:1235
+#: src/ui.cc:1382
msgid ""
"Flag the currently selected package and its configuration files for removal"
msgstr ""
"Markér den aktuelt valgte pakke og dens opsætningsfiler til afinstallering"
-#: src/ui.cc:1238
+#: src/ui.cc:1385
msgid "^Keep"
msgstr "^Behold"
-#: src/ui.cc:1239
+#: src/ui.cc:1386
msgid "Cancel any action on the selected package"
msgstr "Fortryd alle handlinger på den valgte pakke"
-#: src/ui.cc:1242
+#: src/ui.cc:1389
msgid "^Hold"
msgstr "^Tilbagehold"
-#: src/ui.cc:1243
+#: src/ui.cc:1390
msgid ""
"Cancel any action on the selected package, and protect it from future "
"upgrades"
@@ -3799,251 +4063,255 @@
"Fortryd alle handlinger på den valgte pakke og beskyt den mod\n"
"fremtidige opgraderinger"
-#: src/ui.cc:1246
+#: src/ui.cc:1393
msgid "Mark ^Auto"
msgstr "Markér a^uto"
-#: src/ui.cc:1247
+#: src/ui.cc:1394
+#, fuzzy
msgid ""
-"Mark the selected package as having been automatically installed;\n"
-"it will automatically be removed if no other packages depend on it"
+"Mark the selected package as having been automatically installed; it will "
+"automatically be removed if no other packages depend on it"
msgstr ""
"Markér den valgte pakke som værende automatisk installeret;\n"
"den vil blive afinstalleret automatisk hvis ingen andre pakker\n"
"afhænger af den"
-#: src/ui.cc:1250
+#: src/ui.cc:1397
msgid "Mark ^Manual"
msgstr "Markér ^manuel"
-#: src/ui.cc:1251
+#: src/ui.cc:1398
+#, fuzzy
msgid ""
-"Mark the selected package as having been manually installed;\n"
-"it will not be removed unless you manually remove it"
+"Mark the selected package as having been manually installed; it will not be "
+"removed unless you manually remove it"
msgstr ""
"Markér den valgte pakke som værende manuelt installeret;\n"
"den vil ikke blive afinstalleret, medmindre du gør det manuelt"
-#: src/ui.cc:1254
+#: src/ui.cc:1401
msgid "^Forbid Version"
msgstr "^Forbyd version"
-#: src/ui.cc:1255
+#: src/ui.cc:1402
+#, fuzzy
msgid ""
-"Forbid the candidate version of the selected package from being installed;\n"
+"Forbid the candidate version of the selected package from being installed; "
"newer versions of the package will be installed as usual"
msgstr ""
"Forbyd at kandidat-versionen af den valgte pakke bliver installeret;\n"
"nyere versioner af pakken vil blive installeret som sædvanlig"
-#: src/ui.cc:1259
+#: src/ui.cc:1406
msgid "I^nformation"
msgstr "^Oplysning"
-#: src/ui.cc:1260
+#: src/ui.cc:1407
msgid "Display more information about the selected package"
msgstr "Vis flere oplysninger om den valgte pakke"
-#: src/ui.cc:1263
+#: src/ui.cc:1410
msgid "^Changelog"
msgstr "^Programændringer"
-#: src/ui.cc:1264
+#: src/ui.cc:1411
msgid "Display the Debian changelog of the selected package"
msgstr "Vis Debians logfil over programændringer for den valgte pakke"
-#: src/ui.cc:1271
+#: src/ui.cc:1418
msgid "^Find"
msgstr "^Find"
-#: src/ui.cc:1272
+#: src/ui.cc:1419
msgid "Search for a package"
msgstr "Søg efter en pakke"
-#: src/ui.cc:1275
+#: src/ui.cc:1422
msgid "Find ^Again"
msgstr "Find ^igen"
-#: src/ui.cc:1276
+#: src/ui.cc:1423
msgid "Repeat the last search"
msgstr "Gentag sidste søgning"
-#: src/ui.cc:1280
+#: src/ui.cc:1427
msgid "^Limit Display"
msgstr "^Afgræns visning"
-#: src/ui.cc:1281
+#: src/ui.cc:1428
msgid "Apply a filter to the package list"
msgstr "Anvend et filter på pakkelisten"
-#: src/ui.cc:1284
+#: src/ui.cc:1431
msgid "^Un-Limit Display"
msgstr "^Uafgrænset visning"
-#: src/ui.cc:1285
+#: src/ui.cc:1432
msgid "Remove the filter from the package list"
msgstr "Fjern filteret fra pakkelisten"
-#: src/ui.cc:1289
+#: src/ui.cc:1436
msgid "Find ^Broken"
msgstr "Find ^brudte"
-#: src/ui.cc:1290
+#: src/ui.cc:1437
msgid "Find the next package with unsatisfied dependencies"
msgstr "Find næste pakke med uopfyldte afhængigheder"
-#: src/ui.cc:1297
+#: src/ui.cc:1444
msgid "^UI options"
msgstr "^Brugergrænseflade"
-#: src/ui.cc:1298
+#: src/ui.cc:1445
msgid "Change the settings which affect the user interface"
msgstr "Ændr indstillinger som påvirker brugergrænsefladen"
-#: src/ui.cc:1301
+#: src/ui.cc:1448
msgid "^Dependency handling"
msgstr "^Afhængigheder"
-#: src/ui.cc:1302
+#: src/ui.cc:1449
msgid "Change the settings which affect how package dependencies are handled"
msgstr "Ændr indstillinger som påvirker håndteringen af pakkeafhængigheder"
-#: src/ui.cc:1305
+#: src/ui.cc:1452
msgid "^Miscellaneous"
msgstr "^Diverse"
-#: src/ui.cc:1306
+#: src/ui.cc:1453
msgid "Change miscellaneous program settings"
msgstr "Ændr diverse programindstillinger"
-#: src/ui.cc:1311
+#: src/ui.cc:1458
msgid "^Revert options"
msgstr "^Nulstil indstillinger"
-#: src/ui.cc:1312
+#: src/ui.cc:1459
msgid "Reset all settings to the system defaults"
msgstr "Nulstil alle indstillinger til systemets forvalgte"
-#: src/ui.cc:1323
+#: src/ui.cc:1470
msgid "^Next"
msgstr "^Næste"
-#: src/ui.cc:1324
+#: src/ui.cc:1471
msgid "View next display"
msgstr "Vis næste skærmbillede"
-#: src/ui.cc:1327
+#: src/ui.cc:1474
msgid "^Prev"
msgstr "^Forrige"
-#: src/ui.cc:1328
+#: src/ui.cc:1475
msgid "View previous display"
msgstr "Vis forrige skærmbillede"
-#: src/ui.cc:1331
+#: src/ui.cc:1478
msgid "^Close"
msgstr "^Luk"
-#: src/ui.cc:1332
+#: src/ui.cc:1479
msgid "Close this display"
msgstr "Luk dette skærmbillede"
-#: src/ui.cc:1337
+#: src/ui.cc:1484
msgid "New Package ^View"
msgstr "Ny pakke^oversigt"
-#: src/ui.cc:1338
+#: src/ui.cc:1485
msgid "Create a new default package view"
msgstr "Lav en ny standard for pakkeoversigt"
-#: src/ui.cc:1341
+#: src/ui.cc:1488
msgid "New Categorical ^Browser"
msgstr "Ny ^kategorivisning"
-#: src/ui.cc:1343
+#: src/ui.cc:1490
msgid "Browse packages by category"
msgstr "Vis pakker efter kategori"
-#: src/ui.cc:1351
+#: src/ui.cc:1498
msgid "^About"
msgstr "^Om"
-#: src/ui.cc:1352
+#: src/ui.cc:1499
msgid "View information about this program"
msgstr "Vis information om dette program"
-#: src/ui.cc:1355
+#: src/ui.cc:1502
msgid "^Help"
msgstr "^Hjælp"
-#: src/ui.cc:1356
+#: src/ui.cc:1503
msgid "View the on-line help"
msgstr "Læs online-hjælpen"
-#: src/ui.cc:1358
+#: src/ui.cc:1505
msgid "User's ^Manual"
msgstr "^Brugervejledning"
-#: src/ui.cc:1359
+#: src/ui.cc:1506
msgid "View the detailed program manual"
msgstr "Vis den detaljerede program-manual"
-#: src/ui.cc:1362
+#: src/ui.cc:1509
msgid "^FAQ"
msgstr "^FAQ"
-#: src/ui.cc:1363
+#: src/ui.cc:1510
msgid "View a list of frequently asked questions"
msgstr "Vis en liste over ofte stillede spørgsmål"
-#: src/ui.cc:1366
-msgid "^ChangeLog"
-msgstr "^Programændringer"
+#: src/ui.cc:1513
+msgid "^NEWS"
+msgstr ""
-#: src/ui.cc:1367
-msgid "View the important changes made in each version of the program"
+#: src/ui.cc:1514
+#, fuzzy
+msgid "View the important changes made in each version of "
msgstr "Vis vigtige ændringer lavet i hver version af programmet"
-#: src/ui.cc:1370
+#: src/ui.cc:1517
msgid "^License"
msgstr "^Licens"
-#: src/ui.cc:1371
+#: src/ui.cc:1518
msgid "View the terms under which you may copy the program"
msgstr "Læs betingelserne for kopiering af dette program"
-#: src/ui.cc:1486
+#: src/ui.cc:1636
msgid "Actions"
msgstr "Handlinger"
-#: src/ui.cc:1489
+#: src/ui.cc:1639
msgid "Search"
msgstr "Søg"
-#: src/ui.cc:1490
+#: src/ui.cc:1640
msgid "Options"
msgstr "Indstillinger"
-#: src/ui.cc:1491
+#: src/ui.cc:1641
msgid "Views"
msgstr "Skærmbilleder"
-#: src/ui.cc:1492
+#: src/ui.cc:1642
msgid "Help"
msgstr "Hjælp"
-#: src/ui.cc:1537
+#: src/ui.cc:1699
#, c-format
msgid ""
"%s: Menu %s: Help %s: Quit %s: Update %s: Download/Install/Remove Pkgs"
msgstr ""
"%s: Menu %s: Hjælp %s: Afslut %s: Opdatér %s: Hent/Installér/Afinstallér"
-#: src/ui.cc:1799 src/vscreen/vscreen.cc:281
+#: src/ui.cc:1968 src/vscreen/vscreen.cc:281
msgid "yes_key"
msgstr "ja_taste"
-#: src/ui.cc:1800 src/vscreen/vscreen.cc:282
+#: src/ui.cc:1969 src/vscreen/vscreen.cc:282
msgid "no_key"
msgstr "nej_taste"
@@ -4056,6 +4324,16 @@
msgid "Downloading Changelog"
msgstr "Henter Changelog"
+#: src/view_changelog.cc:54
+#, fuzzy
+msgid "Download Changelog"
+msgstr "Henter Changelog"
+
+#: src/view_changelog.cc:63
+#, c-format
+msgid "%s changes"
+msgstr ""
+
#: src/vscreen/vscreen.cc:119
#, c-format
msgid "Ouch! Got SIGTERM, dying..\n"
@@ -4084,6 +4362,41 @@
msgid "No"
msgstr "Nej"
+#~ msgid ""
+#~ "Some packages had unmet dependencies. This may mean that you have\n"
+#~ "requested an impossible situation or if you are using the unstable\n"
+#~ "distribution that some required packages have not yet been created\n"
+#~ "or been moved out of Incoming.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Visse pakker har uopfyldte afhængigheder. Dette kan betyde at du har "
+#~ "ønsket\n"
+#~ "noget som ikke kan opfyldes, eller hvis du bruger distributionen "
+#~ "\"unstable\"\n"
+#~ "at visse påkrævede pakker enten endnu ikke er lavet eller at de er "
+#~ "blevet\n"
+#~ "flyttet ud af \"Incoming\".\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Please insert the following disc into the drive \"%s\":\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Indsæt venligst den følgende disk i drevet \"%s\":\n"
+#~ "%s"
+
+#~ msgid "Invalid option for interactive mode: -s\n"
+#~ msgstr "Ugyldigt tilvalg for interaktiv tilstand: -s\n"
+
+#~ msgid "Information about "
+#~ msgstr "Oplysning om "
+
+#~ msgid "Some broken packages could not be fixed!"
+#~ msgstr "Visse brudte pakkeafhængigheder kunne ikke repareres!"
+
+#~ msgid "^ChangeLog"
+#~ msgstr "^Programændringer"
+
#~ msgid "Go away, I'm trying to think.\n"
#~ msgstr "Forsvind, jeg forsøger at samle tankerne.\n"
Modified: branches/aptitude-0.3/aptitude/po/de.po
==============================================================================
--- branches/aptitude-0.3/aptitude/po/de.po (original)
+++ branches/aptitude-0.3/aptitude/po/de.po Sat Apr 30 13:41:32 2005
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: aptitude 0.2.15.5\n"
"Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-01-10 16:26-0800\n"
+"POT-Creation-Date: 2005-04-29 18:11-0400\n"
"PO-Revision-Date: 2004-12-01 18:09GMT\n"
"Last-Translator: Dennis Stampfer <seppy at debian.org>\n"
"Language-Team: Debian German <debian-l10n-german at lists.debian.org>\n"
@@ -152,16 +152,103 @@
"Nicht verwendete Pakete autom. entfernen, die auf dieses Muster passen:"
#: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:184 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
-#: src/vscreen/vs_util.cc:329
+#: src/ui.cc:218 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
+#: src/vscreen/vs_util.cc:328
msgid "Ok"
msgstr "OK"
#: src/apt_options.cc:242 src/download_list.cc:71 src/mine/cmine.cc:257
-#: src/mine/cmine.cc:330 src/vscreen/vs_util.cc:329
+#: src/mine/cmine.cc:330 src/vscreen/vs_util.cc:328
msgid "Cancel"
msgstr "Abbrechen"
+#: src/broken_indicator.cc:106 src/solution_dialog.cc:97
+msgid "Internal error: unexpected null solution."
+msgstr ""
+
+#: src/broken_indicator.cc:158
+#, fuzzy
+msgid "Suggest "
+msgstr "Schlägt vor"
+
+#: src/broken_indicator.cc:164
+#, fuzzy, c-format
+msgid "%d installs"
+msgstr "install"
+
+#: src/broken_indicator.cc:169
+#, fuzzy
+msgid "1 install"
+msgstr "install"
+
+#: src/broken_indicator.cc:173
+#, c-format
+msgid "%d removals"
+msgstr ""
+
+#: src/broken_indicator.cc:178
+msgid "1 removal"
+msgstr ""
+
+#: src/broken_indicator.cc:182
+#, c-format
+msgid "%d keeps"
+msgstr ""
+
+#: src/broken_indicator.cc:187
+msgid "1 keep"
+msgstr ""
+
+#: src/broken_indicator.cc:191
+#, fuzzy, c-format
+msgid "%d upgrades"
+msgstr "aktualis."
+
+#: src/broken_indicator.cc:196
+#, fuzzy
+msgid "1 upgrade"
+msgstr "aktualis."
+
+#: src/broken_indicator.cc:200
+#, fuzzy, c-format
+msgid "%d downgrades"
+msgstr "deaktualisiert"
+
+#: src/broken_indicator.cc:205
+#, fuzzy
+msgid "1 downgrade"
+msgstr "deaktualisiert"
+
+#: src/broken_indicator.cc:214
+#, c-format
+msgid "%s: Examine"
+msgstr ""
+
+#: src/broken_indicator.cc:216
+#, c-format
+msgid "%s: Apply"
+msgstr ""
+
+#: src/broken_indicator.cc:218
+#, fuzzy, c-format
+msgid "%s: Next"
+msgstr "^Nächste"
+
+#: src/broken_indicator.cc:220
+#, c-format
+msgid "%s: Previous"
+msgstr ""
+
+#: src/broken_indicator.cc:233
+#, c-format
+msgid "%CSolution search failed. %s: try harder"
+msgstr ""
+
+#: src/broken_indicator.cc:239
+#, c-format
+msgid "%CUnable to resolve dependencies."
+msgstr ""
+
#: src/cmdline/cmdline_action.cc:36
#, c-format
msgid ""
@@ -236,24 +323,24 @@
msgstr ""
"Paket %s kann nicht aktualisiert werden, kann also kein Upgrade verbieten\n"
-#: src/cmdline/cmdline_action.cc:213
+#: src/cmdline/cmdline_action.cc:198
#, c-format
msgid "Note: selecting the task \"%s: %s\" for installation\n"
msgstr "Hinweis: Wähle den Task »%s: %s« zur Installation aus.\n"
-#: src/cmdline/cmdline_action.cc:240
+#: src/cmdline/cmdline_action.cc:225
#, c-format
msgid "You can only specify a package version with an 'install' command.\n"
msgstr ""
"Sie können die Version eines Pakets nur bei einem »install«-Befehl angeben.\n"
-#: src/cmdline/cmdline_action.cc:246
+#: src/cmdline/cmdline_action.cc:231
#, c-format
msgid "You can only specify a package archive with an 'install' command.\n"
msgstr ""
"Sie können das Archiv eines Pakets nur bei einem »install«-Befehl angeben.\n"
-#: src/cmdline/cmdline_action.cc:280
+#: src/cmdline/cmdline_action.cc:265
#, c-format
msgid ""
"Couldn't find package \"%s\", and more than 40\n"
@@ -262,7 +349,7 @@
"Konnte Paket »%s« nicht finden, und mehr als 40 Pakete\n"
"enthalten »%s« in ihrem Namen:\n"
-#: src/cmdline/cmdline_action.cc:283
+#: src/cmdline/cmdline_action.cc:268
#, c-format
msgid ""
"Couldn't find package \"%s\". However, the following\n"
@@ -271,13 +358,13 @@
"Konnte Paket »%s« nicht finden, aber die folgenden Pakete\n"
"enthalten »%s« in ihrem Namen:\n"
-#: src/cmdline/cmdline_action.cc:307
+#: src/cmdline/cmdline_action.cc:292
#, c-format
msgid "Couldn't find any package whose name or description matched \"%s\"\n"
msgstr ""
"Konnte kein Paket finden, dessen Name oder Beschreibung auf »%s« passt.\n"
-#: src/cmdline/cmdline_action.cc:309
+#: src/cmdline/cmdline_action.cc:294
#, c-format
msgid ""
"Couldn't find any package matching \"%s\", and more than 40\n"
@@ -286,7 +373,7 @@
"Konnte kein Paket finden, das auf »%s« passt, und mehr als 40\n"
"Pakete enthalten »%s« in ihrer Beschreibung.\n"
-#: src/cmdline/cmdline_action.cc:312
+#: src/cmdline/cmdline_action.cc:297
#, c-format
msgid ""
"Couldn't find any package matching \"%s\". However, the following\n"
@@ -334,13 +421,13 @@
msgstr "Werde %sB freigeben"
# Should never happen.
-#: src/cmdline/cmdline_do_action.cc:67
+#: src/cmdline/cmdline_do_action.cc:71
#, c-format
msgid "Invalid operation %s"
msgstr "Ungültige Operation: %s"
-#: src/cmdline/cmdline_do_action.cc:206 src/cmdline/cmdline_simulate.cc:30
-#: src/cmdline/cmdline_upgrade.cc:89
+#: src/cmdline/cmdline_do_action.cc:201 src/cmdline/cmdline_simulate.cc:31
+#: src/cmdline/cmdline_upgrade.cc:91
#, c-format
msgid "Abort.\n"
msgstr "Abbruch.\n"
@@ -350,7 +437,7 @@
msgid "download: you must specify at least one package to download\n"
msgstr "download: Sie sollten ein Paket zum Herunterladen angeben.\n"
-#: src/cmdline/cmdline_download.cc:43 src/download.cc:342
+#: src/cmdline/cmdline_download.cc:43 src/download.cc:344
msgid "Couldn't read source list"
msgstr "Konnte Liste der Quellen nicht lesen"
@@ -418,99 +505,99 @@
"Was das ist? Natürlich ein Elefant, der von einer Schlange gefressen wurde.\n"
"Hier ist Dein Schild.\n"
-#: src/cmdline/cmdline_prompt.cc:44
+#: src/cmdline/cmdline_prompt.cc:45
msgid "Couldn't read list of sources"
msgstr "Konnte Liste der Paketquellen nicht lesen"
-#: src/cmdline/cmdline_prompt.cc:219 src/cmdline/cmdline_show_broken.cc:73
+#: src/cmdline/cmdline_prompt.cc:220 src/cmdline/cmdline_show_broken.cc:73
#, c-format
msgid "but %s is to be installed."
msgstr "aber %s soll installiert werden."
-#: src/cmdline/cmdline_prompt.cc:222 src/cmdline/cmdline_show_broken.cc:76
+#: src/cmdline/cmdline_prompt.cc:223 src/cmdline/cmdline_show_broken.cc:76
#, c-format
msgid "but %s is installed and it is kept back."
msgstr "aber %s ist installiert und wird zurückgehalten."
-#: src/cmdline/cmdline_prompt.cc:225 src/cmdline/cmdline_show_broken.cc:79
+#: src/cmdline/cmdline_prompt.cc:226 src/cmdline/cmdline_show_broken.cc:79
#, c-format
msgid "but %s is installed."
msgstr "aber %s ist installiert."
-#: src/cmdline/cmdline_prompt.cc:229 src/cmdline/cmdline_show_broken.cc:83
+#: src/cmdline/cmdline_prompt.cc:230 src/cmdline/cmdline_show_broken.cc:83
#, c-format
msgid "but it is not installable"
msgstr "ist aber nicht installationsfähig"
# FIXME: do something sensible here!
# FIXME: do something sensible here!
-#: src/cmdline/cmdline_prompt.cc:233 src/cmdline/cmdline_show_broken.cc:87
+#: src/cmdline/cmdline_prompt.cc:234 src/cmdline/cmdline_show_broken.cc:87
#, c-format
msgid " which is a virtual package."
msgstr ", welches ein virtuelles Paket ist."
-#: src/cmdline/cmdline_prompt.cc:236 src/cmdline/cmdline_show_broken.cc:90
+#: src/cmdline/cmdline_prompt.cc:237 src/cmdline/cmdline_show_broken.cc:90
#, c-format
msgid " or"
msgstr " oder"
-#: src/cmdline/cmdline_prompt.cc:248
+#: src/cmdline/cmdline_prompt.cc:249
msgid "The following packages are BROKEN:"
msgstr "Die folgenden Pakete sind KAPUTT:"
-#: src/cmdline/cmdline_prompt.cc:249
+#: src/cmdline/cmdline_prompt.cc:250
msgid "The following packages are unused and will be REMOVED:"
msgstr "Die folgenden Pakete sind nicht verwendet und werden ENTFERNT:"
-#: src/cmdline/cmdline_prompt.cc:250
+#: src/cmdline/cmdline_prompt.cc:251
msgid "The following packages have been automatically kept back:"
msgstr "Die folgenden Pakete werden automatisch zurückgehalten:"
-#: src/cmdline/cmdline_prompt.cc:251
+#: src/cmdline/cmdline_prompt.cc:252
msgid "The following NEW packages will be automatically installed:"
msgstr "Die folgenden Pakete werden zusätzlich automatisch installiert:"
-#: src/cmdline/cmdline_prompt.cc:252
+#: src/cmdline/cmdline_prompt.cc:253
msgid "The following packages will be automatically REMOVED:"
msgstr "Die folgenden Pakete werden automatisch ENTFERNT:"
-#: src/cmdline/cmdline_prompt.cc:253
+#: src/cmdline/cmdline_prompt.cc:254
msgid "The following packages will be DOWNGRADED:"
msgstr ""
"Die folgenden Pakete werden durch eine ÄLTERE VERSION ERSETZT (Downgrade):"
-#: src/cmdline/cmdline_prompt.cc:254
+#: src/cmdline/cmdline_prompt.cc:255
msgid "The following packages have been kept back:"
msgstr "Die folgenden Pakete werden zurückgehalten:"
-#: src/cmdline/cmdline_prompt.cc:255
+#: src/cmdline/cmdline_prompt.cc:256
msgid "The following packages will be REINSTALLED:"
msgstr "Die folgenden Pakete werden ERNEUT INSTALLIERT:"
-#: src/cmdline/cmdline_prompt.cc:256
+#: src/cmdline/cmdline_prompt.cc:257
msgid "The following NEW packages will be installed:"
msgstr "Die folgenden Pakete werden zusätzlich installiert:"
-#: src/cmdline/cmdline_prompt.cc:257
+#: src/cmdline/cmdline_prompt.cc:258
msgid "The following packages will be REMOVED:"
msgstr "Die folgenden Pakete werden ENTFERNT:"
-#: src/cmdline/cmdline_prompt.cc:258
+#: src/cmdline/cmdline_prompt.cc:259
msgid "The following packages will be upgraded:"
msgstr "Die folgenden Pakete werden aktualisiert:"
-#: src/cmdline/cmdline_prompt.cc:307
+#: src/cmdline/cmdline_prompt.cc:311
#, c-format
msgid "The following ESSENTIAL packages will be REMOVED!\n"
msgstr "Die folgenden ESSENTIELLEN Pakete werden ENTFERNT!\n"
-#: src/cmdline/cmdline_prompt.cc:316
+#: src/cmdline/cmdline_prompt.cc:320
#, c-format
msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
msgstr ""
"Die folgenden ESSENTIELLEN Pakete werden nach dieser Änderung KAPUTT sein:\n"
-#: src/cmdline/cmdline_prompt.cc:326
+#: src/cmdline/cmdline_prompt.cc:330
#, c-format
msgid ""
"WARNING: Performing this action will probably cause your system to break!\n"
@@ -520,97 +607,100 @@
"beschädigen!\n"
" BRECHEN SIE AB, wenn Sie nicht GENAU wissen, was Sie tun!\n"
-#: src/cmdline/cmdline_prompt.cc:328
+#: src/cmdline/cmdline_prompt.cc:332
msgid "I am aware that this is a very bad idea"
msgstr "Mir ist klar, dass das eine sehr schlechte Idee ist."
-#: src/cmdline/cmdline_prompt.cc:331
+#: src/cmdline/cmdline_prompt.cc:335
#, c-format
msgid "To continue, type the phrase \"%s\":\n"
msgstr "Geben Sie zum Bestätigen den Satz »%s« ein:\n"
-#: src/cmdline/cmdline_prompt.cc:434
+#: src/cmdline/cmdline_prompt.cc:438
#, c-format
msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
msgstr "Die folgenden Pakete werden EMPFOHLEN, aber NICHT installiert:\n"
-#: src/cmdline/cmdline_prompt.cc:440
+#: src/cmdline/cmdline_prompt.cc:444
#, c-format
msgid "The following packages are SUGGESTED but will NOT be installed:\n"
msgstr ""
"Die folgenden Pakete wurden VORGESCHLAGEN, werden aber NICHT installiert:\n"
-#: src/cmdline/cmdline_prompt.cc:445
+#: src/cmdline/cmdline_prompt.cc:449
#, c-format
msgid "No packages will be installed, upgraded, or removed.\n"
msgstr "Es werden keine Pakete installiert, aktualisiert oder entfernt.\n"
-#: src/cmdline/cmdline_prompt.cc:447
+#: src/cmdline/cmdline_prompt.cc:451
#, c-format
msgid "%lu packages upgraded, %lu newly installed, "
msgstr "%lu Pakete aktualisiert, %lu zusätzlich installiert, "
-#: src/cmdline/cmdline_prompt.cc:451
+#: src/cmdline/cmdline_prompt.cc:455
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu erneut installiert, "
-#: src/cmdline/cmdline_prompt.cc:453
+#: src/cmdline/cmdline_prompt.cc:457
#, c-format
msgid "%lu downgraded, "
msgstr "%lu deaktualisiert, "
-#: src/cmdline/cmdline_prompt.cc:455
+#: src/cmdline/cmdline_prompt.cc:459
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu werden entfernt und %lu nicht aktualisiert.\n"
-#: src/cmdline/cmdline_prompt.cc:462
+#: src/cmdline/cmdline_prompt.cc:466
#, c-format
msgid "Need to get %sB/%sB of archives. "
msgstr "Muss %sB/%sB an Archiven herunterladen."
-#: src/cmdline/cmdline_prompt.cc:465
+#: src/cmdline/cmdline_prompt.cc:469
#, c-format
msgid "Need to get %sB of archives. "
msgstr "Muss %sB an Archiven herunterladen."
-#: src/cmdline/cmdline_prompt.cc:472
+#: src/cmdline/cmdline_prompt.cc:476
#, c-format
msgid "After unpacking %sB will be used.\n"
msgstr "Nach dem Entpacken werden %sB zusätzlich belegt sein.\n"
-#: src/cmdline/cmdline_prompt.cc:475
+#: src/cmdline/cmdline_prompt.cc:479
#, c-format
msgid "After unpacking %sB will be freed.\n"
msgstr "Nach dem Entpacken werden %sB frei werden.\n"
-#: src/cmdline/cmdline_prompt.cc:521
+#: src/cmdline/cmdline_prompt.cc:524
#, c-format
msgid "Bad action character '%c'\n"
msgstr "Ungültiger Befehlsbuchstabe '%c'\n"
-#: src/cmdline/cmdline_prompt.cc:596
+#: src/cmdline/cmdline_prompt.cc:595
#, c-format
msgid "No packages to show -- enter the package names on the line after 'i'.\n"
msgstr "Keine Pakete zum Anzeigen -- geben Sie Paketnamen nach dem 'i' an.\n"
-#: src/cmdline/cmdline_prompt.cc:598 src/cmdline/cmdline_prompt.cc:629
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:597
msgid "Press Return to continue."
msgstr "Drücken Sie zum Fortsetzen die Eingabetaste."
-#: src/cmdline/cmdline_prompt.cc:625
+#: src/cmdline/cmdline_prompt.cc:623
#, c-format
msgid "No packages found -- enter the package names on the line after 'c'.\n"
msgstr "Keine Pakete zum Anzeigen -- geben Sie Paketnamen nach dem 'c' an.\n"
-#: src/cmdline/cmdline_prompt.cc:665
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:627
+#, fuzzy
+msgid "Press Return to continue"
+msgstr "Drücken Sie zum Fortsetzen die Eingabetaste."
+
+#: src/cmdline/cmdline_prompt.cc:675
msgid "Do you want to continue? [Y/n/?] "
msgstr "Wollen Sie fortsetzen? [Y/n/?] "
-#: src/cmdline/cmdline_prompt.cc:690
+#: src/cmdline/cmdline_prompt.cc:700
#, c-format
msgid ""
"\n"
@@ -621,7 +711,7 @@
"Abhängigkeiten werden angezeigt.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:692
+#: src/cmdline/cmdline_prompt.cc:702
#, c-format
msgid ""
"\n"
@@ -632,7 +722,7 @@
"Abhängigkeiten werden nicht angezeigt.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:698
+#: src/cmdline/cmdline_prompt.cc:708
#, c-format
msgid ""
"\n"
@@ -643,7 +733,7 @@
"Versionen werden angezeigt.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:700
+#: src/cmdline/cmdline_prompt.cc:710
#, c-format
msgid ""
"\n"
@@ -654,7 +744,7 @@
"Versionen werden nicht angezeigt.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:705
+#: src/cmdline/cmdline_prompt.cc:715
#, c-format
msgid ""
"\n"
@@ -665,7 +755,7 @@
"Größenveränderungen werden angezeigt.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:717
#, c-format
msgid ""
"\n"
@@ -676,7 +766,7 @@
"Größenveränderungen werden nicht angezeigt.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:737
#, c-format
msgid ""
"Commands:\n"
@@ -727,37 +817,89 @@
" _ : Vollständig entfernen (»purge«, auch Konfigurationsdateien löschen)\n"
" = : Zurückhalten\n"
-#: src/cmdline/cmdline_prompt.cc:751
+#: src/cmdline/cmdline_prompt.cc:761
#, c-format
msgid "Invalid response. Please enter a valid command or '?' for help.\n"
msgstr ""
"Ungültige Antwort. Bitte geben Sie einen gültigen Befehl oder »?« für Hilfe "
"ein.\n"
+#: src/cmdline/cmdline_resolver.cc:84
+#, c-format
+msgid "y: %F%nn: %F%nq: %F%n,: %F%n.: %F%n"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:90
+msgid "accept the proposed changes"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:92
+msgid "reject the proposed changes and search for another solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:94
+#, fuzzy
+msgid "give up and quit the program"
+msgstr "Aptitude verlassen"
+
+#: src/cmdline/cmdline_resolver.cc:96
+msgid "move to the next solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:98
+msgid "move to the previous solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:131
+#, fuzzy
+msgid "The following actions will resolve these dependencies:"
+msgstr "Die folgenden Pakete haben verletzte Abhängigkeiten:\n"
+
+#: src/cmdline/cmdline_resolver.cc:146
+msgid "Accept this solution? [Y/n/q/?]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:174
+msgid "Abandoning all efforts to resolve these dependencies."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:184
+#, fuzzy
+msgid "The following commands are available:"
+msgstr "Die folgenden Pakete sind KAPUTT:"
+
+#: src/cmdline/cmdline_resolver.cc:188
+#, 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:198
+msgid "No solution found within the allotted time. Try harder? [Y/n]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:226
+#, 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:235
+msgid "Unable to resolve dependencies! Giving up..."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:240
+msgid "No more solutions."
+msgstr ""
+
#: src/cmdline/cmdline_search.cc:78
#, c-format
msgid "search: You must provide at least one search term\n"
msgstr "search: Sie müssen einen Suchbegriff angeben\n"
-# Use apt-get's familiar error message,
-# Use apt-get's familiar error message,
-# Use apt-get's familiar error message,
-#: src/cmdline/cmdline_show_broken.cc:114
-#, c-format
-msgid ""
-"Some packages had unmet dependencies. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming.\n"
-"\n"
-msgstr ""
-"Die Abhängigkeiten einiger Pakete sind nicht erfüllt. Das kann bedeuten,\n"
-"dass Sie eine unmögliche Auswahl getroffen haben oder (falls Sie die\n"
-"»unstable«-Distribution verwenden), dass einige erforderliche Pakete\n"
-"fehlen oder aktualisiert werden müssen.\n"
-"\n"
-
-#: src/cmdline/cmdline_show_broken.cc:115
+#: src/cmdline/cmdline_show_broken.cc:113
#, c-format
msgid "The following packages have unmet dependencies:\n"
msgstr "Die folgenden Pakete haben verletzte Abhängigkeiten:\n"
@@ -955,12 +1097,12 @@
msgid "Description: "
msgstr "Beschreibung: "
-#: src/cmdline/cmdline_simulate.cc:36
+#: src/cmdline/cmdline_simulate.cc:37
#, c-format
msgid "Would download/install/remove packages.\n"
msgstr "Würde Pakete herunterladen/installieren/entfernen.\n"
-#: src/cmdline/cmdline_simulate.cc:47
+#: src/cmdline/cmdline_simulate.cc:48
msgid "Internal Error, Ordering didn't finish"
msgstr "Interner Fehler: Sortierung nicht abgeschlossen"
@@ -1007,28 +1149,24 @@
msgid "UNAVAILABLE"
msgstr "NICHT VERFÃœGBAR"
-#: src/download_bar.cc:57 src/download_list.cc:265
+#: src/download_bar.cc:56 src/download_list.cc:263 src/download_screen.cc:57
#, c-format
-msgid ""
-"Please insert the following disc into the drive \"%s\":\n"
-"%s"
-msgstr ""
-"Bitte legen Sie folgenden Datenträger in das Laufwerk »%s« ein:\n"
-"%s"
+msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
+msgstr "Bitte legen Sie den Datenträger »%s« in das Laufwerk »%s« ein"
-#: src/download_bar.cc:76 src/generic/acqprogress.cc:63
+#: src/download_bar.cc:77 src/generic/acqprogress.cc:63
msgid "Hit "
msgstr "Treffer "
-#: src/download_bar.cc:89
+#: src/download_bar.cc:90
msgid "Downloading "
msgstr "Herunterladen von "
-#: src/download_bar.cc:102
+#: src/download_bar.cc:103
msgid "Got "
msgstr "Habe "
-#: src/download_bar.cc:156
+#: src/download_bar.cc:157
msgid "Downloading..."
msgstr "Ladend..."
@@ -1038,7 +1176,7 @@
msgid "Couldn't read list of package sources"
msgstr "Konnte Liste der Paketquellen nicht lesen"
-#: src/download.cc:104 src/download.cc:321
+#: src/download.cc:104 src/download.cc:322
msgid "Couldn't lock list directory..are you root?"
msgstr "Konnte Listenverzeichnis nicht sperren. Sind Sie »root«?"
@@ -1050,29 +1188,33 @@
msgid "View the progress of the package list update"
msgstr "Den Fortschritt des Paketlistendownloads anzeigen"
-#: src/download.cc:159
+#: src/download.cc:113
+msgid "List Update"
+msgstr ""
+
+#: src/download.cc:160
msgid "Couldn't clean out list directories"
msgstr "Konnte Listenverzeichnisse nicht aufräumen"
-#: src/download.cc:176 src/ui.cc:1068
+#: src/download.cc:177 src/ui.cc:1152
msgid "Deleting obsolete downloaded files"
msgstr "Lösche veraltete heruntergeladene Dateien"
-#: src/download.cc:181
+#: src/download.cc:182
#, c-format
msgid "Deleting obsolete downloaded files\n"
msgstr "Lösche veraltete heruntergeladene Dateien\n"
-#: src/download.cc:223
+#: src/download.cc:224
#, c-format
msgid "Unable to open %s to log actions"
msgstr "%s konnte nicht geöffnet werden um Aktionen zu protokollieren"
-#: src/download.cc:229
+#: src/download.cc:230
msgid "log report"
msgstr "Protokoll"
-#: src/download.cc:230
+#: src/download.cc:231
#, c-format
msgid ""
"IMPORTANT: this log only lists intended actions; actions which fail due to\n"
@@ -1084,77 +1226,77 @@
"dpkg-Problemen fehlschlagen sind vielleicht nicht abgeschlossen.\n"
"\n"
-#: src/download.cc:231
+#: src/download.cc:232
#, c-format
msgid "Will install %li packages, and remove %li packages.\n"
msgstr "Werde %li Pakete installieren und %li Pakete entfernen.\n"
-#: src/download.cc:233
+#: src/download.cc:234
#, c-format
msgid "%sB of disk space will be used\n"
msgstr "%sB werden auf der Festplatte belegt werden\n"
-#: src/download.cc:236
+#: src/download.cc:237
#, c-format
msgid "%sB bytes of disk space will be freed\n"
msgstr "%sB werden auf der Festplatte freigegeben werden\n"
-#: src/download.cc:244
+#: src/download.cc:245
#, c-format
msgid "[UPGRADE] %s %s -> %s\n"
msgstr "[UPGRADE] %s %s -> %s\n"
-#: src/download.cc:248
+#: src/download.cc:249
#, c-format
msgid "[DOWNGRADE] %s %s -> %s\n"
msgstr "[DOWNGRADE] %s %s -> %s\n"
-#: src/download.cc:258
+#: src/download.cc:259
msgid "REMOVE"
msgstr "ENTFERNEN"
-#: src/download.cc:264
+#: src/download.cc:265
msgid "INSTALL"
msgstr "INSTALLIEREN"
-#: src/download.cc:267
+#: src/download.cc:268
msgid "REINSTALL"
msgstr "NEUINST."
-#: src/download.cc:270
+#: src/download.cc:271
msgid "HOLD"
msgstr "HALTEN"
-#: src/download.cc:273
+#: src/download.cc:274
msgid "BROKEN"
msgstr "KAPUTT"
-#: src/download.cc:276
+#: src/download.cc:277
msgid "REMOVE, NOT USED"
msgstr "ENTFERNEN, NICHT VERWENDET"
-#: src/download.cc:279
+#: src/download.cc:280
msgid "REMOVE, DEPENDENCIES"
msgstr "ENTFERNEN, ABHÄNGIGKEITEN"
-#: src/download.cc:282
+#: src/download.cc:283
msgid "INSTALL, DEPENDENCIES"
msgstr "INSTALLIEREN, ABHÄNGIGKEITEN"
-#: src/download.cc:285
+#: src/download.cc:286
msgid "HOLD, DEPENDENCIES"
msgstr "HALTEN, ABHÄNGIGKEITEN"
-#: src/download.cc:287
+#: src/download.cc:288
msgid "????????"
msgstr "????????"
-#: src/download.cc:291
+#: src/download.cc:292
#, c-format
msgid "[%s] %s\n"
msgstr "[%s] %s\n"
-#: src/download.cc:294
+#: src/download.cc:295
#, c-format
msgid ""
"===============================================================================\n"
@@ -1165,35 +1307,40 @@
"\n"
"Protokoll abgeschlossen.\n"
-#: src/download.cc:329
+#: src/download.cc:330
msgid "Downloading packages"
msgstr "Herunterladen von Paketen"
-#: src/download.cc:330
+#: src/download.cc:331
msgid "View the progress of the package download"
msgstr "Den Fortschritt des Paketdownloads anzeigen"
-#: src/download.cc:352
+#: src/download.cc:332
+#, fuzzy
+msgid "Package Download"
+msgstr "Paket: "
+
+#: src/download.cc:354
msgid "Internal error: couldn't generate list of packages to download"
msgstr ""
"Interner Fehler: Liste der herunterzuladenden Pakete konnte nicht erzeugt "
"werden"
-#: src/download.cc:413
+#: src/download.cc:415
msgid "Unable to correct for unavailable packages"
msgstr "Konnte nicht verfügbare Pakete nicht ersetzen"
-#: src/download.cc:465
+#: src/download.cc:467
msgid ""
"Ack! Something bad happened while installing packages. Trying to recover:"
msgstr ""
"Während der Paketinstallation sind Probleme aufgetreten. Versuche zu lösen:"
-#: src/download.cc:475 src/pkg_item.cc:413
+#: src/download.cc:477 src/pkg_item.cc:432
msgid "Press return to continue.\n"
msgstr "Drücken Sie zum Fortsetzen die Eingabetaste.\n"
-#: src/download.cc:506
+#: src/download.cc:508
msgid ""
"Could not regain the system lock! (Perhaps another apt or dpkg is running?)"
msgstr ""
@@ -1255,11 +1402,6 @@
msgid "[ERROR]"
msgstr "[FEHLER]"
-#: src/download_screen.cc:57
-#, c-format
-msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
-msgstr "Bitte legen Sie den Datenträger »%s« in das Laufwerk »%s« ein"
-
#: src/download_screen.cc:181
#, c-format
msgid "Downloaded %sB in %ss (%sB/s)."
@@ -1299,116 +1441,116 @@
"Medienwechsel: Bitte legen Sie den Datenträger »%s« in das Laufwerk »%s« ein "
"und drücken Sie die Eingabetaste.\n"
-#: src/generic/aptcache.cc:245
+#: src/generic/aptcache.cc:253
msgid "Can't open Aptitude extended state file"
msgstr "Kann Aptitudes erweiterte Statusdatei nicht öffnen"
-#: src/generic/aptcache.cc:252 src/generic/aptcache.cc:305
-#: src/generic/aptcache.cc:307
+#: src/generic/aptcache.cc:260 src/generic/aptcache.cc:313
+#: src/generic/aptcache.cc:315
msgid "Reading extended state information"
msgstr "Lese erweiterte Statusinformationen"
-#: src/generic/aptcache.cc:313 src/generic/aptcache.cc:387
-#: src/generic/aptcache.cc:390
+#: src/generic/aptcache.cc:321 src/generic/aptcache.cc:395
+#: src/generic/aptcache.cc:398
msgid "Initializing package states"
msgstr "Initialisiere Paketstatus"
-#: src/generic/aptcache.cc:501
+#: src/generic/aptcache.cc:509
msgid "Cannot open Aptitude state file"
msgstr "Kann Aptitudes Statusdatei nicht öffnen"
-#: src/generic/aptcache.cc:505 src/generic/aptcache.cc:560
-#: src/generic/aptcache.cc:563
+#: src/generic/aptcache.cc:513 src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:571
msgid "Writing extended state information"
msgstr "Schreibe erweiterte Statusinformation"
-#: src/generic/aptcache.cc:542
+#: src/generic/aptcache.cc:550
#, 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/aptcache.cc:551
+#: src/generic/aptcache.cc:559
msgid "Couldn't write state file"
msgstr "Konnte Statusdatei nicht schreiben"
-#: src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:576
msgid "Error writing state file"
msgstr "Fehler beim Schreiben der Statusdatei"
-#: src/generic/aptcache.cc:584
+#: src/generic/aptcache.cc:592
msgid "couldn't replace old state file"
msgstr "Konnte alte Statusdatei nicht ersetzen"
-#: src/generic/aptcache.cc:960
+#: src/generic/aptcache.cc:1000
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/aptcache.cc:1325
+#: src/generic/aptcache.cc:1546
msgid "The list of sources could not be read."
msgstr "Die Liste der Quellen konnte nicht gelesen werden."
-#: src/generic/aptcache.cc:1332
+#: src/generic/aptcache.cc:1553
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/aptcache.cc:1335
+#: src/generic/aptcache.cc:1556
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 "
"zu ergänzen"
-#: src/generic/apt.cc:141
+#: src/generic/apt.cc:142
#, c-format
msgid "Unable to open %s for writing"
msgstr "%s konnte nicht zum schreiben geöffnet werden"
-#: src/generic/apt.cc:151
+#: src/generic/apt.cc:152
#, c-format
msgid "Unable to replace %s with new configuration file"
msgstr "Konnte %s nicht durch neue Konfigurationsdatei ersetzen"
-#: src/generic/apt.cc:226
+#: src/generic/apt.cc:227
msgid "Warning: could not lock the cache file. Opening in read-only mode"
msgstr ""
"Warnung: Konnte Cache-Datei nicht sperren. Öffne Sie jetzt schreibgeschützt"
-#: src/generic/matchers.cc:780
+#: src/generic/matchers.cc:797
msgid "Unmatched '('"
msgstr "Offene '('"
-#: src/generic/matchers.cc:870 src/generic/matchers.cc:949
+#: src/generic/matchers.cc:887 src/generic/matchers.cc:968
#, c-format
msgid "Unknown dependency type: %s"
msgstr "Unbekannter Abhängigkeitstyp: %s"
-#: src/generic/matchers.cc:931
+#: src/generic/matchers.cc:950
#, c-format
msgid "Unknown action type: %s"
msgstr "Unbekannter Aktionstyp %s"
-#: src/generic/matchers.cc:998
+#: src/generic/matchers.cc:1017
#, c-format
msgid "Unknown priority %s"
msgstr "Unbekannte Priorität %s"
-#: src/generic/matchers.cc:1020
+#: src/generic/matchers.cc:1039
#, c-format
msgid "Unknown pattern type: %c"
msgstr "Unbekannter Mustertyp: %c"
-#: src/generic/matchers.cc:1065
+#: src/generic/matchers.cc:1084
msgid "Unexpected empty expression"
msgstr "Unerwarteter leerer Ausdruck"
-#: src/generic/matchers.cc:1100
+#: src/generic/matchers.cc:1119
msgid "Badly formed expression"
msgstr "Ungültiger Ausdruck"
-#: src/generic/matchers.cc:1129
+#: src/generic/matchers.cc:1148
msgid "Unexpected ')'"
msgstr "Unerwartete ')'"
@@ -1431,7 +1573,7 @@
msgid "Can't get value of $HOME, using TMPDIR (insecure)"
msgstr "Kann Wert von $HOME nicht lesen, verwende TMPDIR (unsicher)"
-#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:60
+#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:61
#, c-format
msgid "ChangeLog of %s"
msgstr "ChangeLog für %s"
@@ -1638,17 +1780,17 @@
msgid "Invalid sorting policy type '%s'"
msgstr "Ungültiger Sortierregel-Typ '%s'"
-#: src/main.cc:68
+#: src/main.cc:67
#, c-format
msgid "%s %s compiled at %s %s\n"
msgstr "%s %s kompiliert am %s %s\n"
-#: src/main.cc:71
+#: src/main.cc:70
#, c-format
msgid "Compiler: g++ %s\n"
msgstr "Compiler: g++ %s\n"
-#: src/main.cc:74
+#: src/main.cc:73
#, c-format
msgid ""
"\n"
@@ -1657,7 +1799,7 @@
"\n"
"NCurses-Version: %s\n"
-#: src/main.cc:76
+#: src/main.cc:75
#, c-format
msgid ""
"\n"
@@ -1666,81 +1808,81 @@
"\n"
"Curses-Version: %s\n"
-#: src/main.cc:78
+#: src/main.cc:77
#, c-format
msgid "libsigc++ version: %s\n"
msgstr "libsigc++-Version: %s\n"
-#: src/main.cc:84
+#: src/main.cc:83
#, c-format
msgid "Usage: aptitude [-S fname] [-u|-i]"
msgstr "Verwendung: aptitude [-S dname] [-u|-i]"
-#: src/main.cc:86
+#: src/main.cc:85
#, c-format
msgid " aptitude [options] <action> ..."
msgstr " aptitude [Optionen] <Aktion> ..."
-#: src/main.cc:88
+#: src/main.cc:87
#, c-format
msgid ""
" Actions (if none is specified, aptitude will enter interactive mode):\n"
"\n"
msgstr "Aktionen (wenn keine angegeben wird, startet Aptitude interaktiv):\n"
-#: src/main.cc:89
+#: src/main.cc:88
#, c-format
msgid " install - Install/upgrade packages\n"
msgstr " install Installiere/Aktualisiere Pakete\n"
-#: src/main.cc:90
+#: src/main.cc:89
#, c-format
msgid " remove - Remove packages\n"
msgstr " remove Entferne Pakete\n"
-#: src/main.cc:91
+#: src/main.cc:90
#, c-format
msgid " purge - Remove packages and their configuration files\n"
msgstr " purge Entferne Pakete und ihre Konfigurationsdateien\n"
-#: src/main.cc:92
+#: src/main.cc:91
#, c-format
msgid " hold - Place packages on hold\n"
msgstr " hold Pakete auf »zurückhalten« setzen\n"
-#: src/main.cc:93
+#: src/main.cc:92
#, c-format
msgid " unhold - Cancel a hold command for a package\n"
msgstr " unhold Einen »hold«-Befehl zurücknehmen\n"
-#: src/main.cc:94
+#: src/main.cc:93
#, c-format
msgid " markauto - Mark packages as having been automatically installed\n"
msgstr " markauto Pakete als automatisch installiert markieren\n"
-#: src/main.cc:95
+#: src/main.cc:94
#, c-format
msgid " unmarkauto - Mark packages as having been manually installed\n"
msgstr " unmarkauto Pakete als manuell installiert markieren\n"
-#: src/main.cc:100
+#: src/main.cc:99
#, c-format
msgid ""
" forbid-version - Forbid aptitude from upgrading to a specific package "
"version.\n"
msgstr " forbid-version Upgrade auf eine bestimmte Paketversion verbieten\n"
-#: src/main.cc:101
+#: src/main.cc:100
#, c-format
msgid " update - Download lists of new/upgradable packages\n"
msgstr " update Neue Listen neuer/aktualisierbarer Paketen laden\n"
-#: src/main.cc:102
+#: src/main.cc:101
#, c-format
msgid " upgrade - Perform a safe upgrade\n"
msgstr " upgrade Sicheres Upgrade durchführen\n"
-#: src/main.cc:103
+#: src/main.cc:102
#, c-format
msgid ""
" dist-upgrade - Perform an upgrade, possibly installing and removing "
@@ -1749,58 +1891,58 @@
" dist-upgrade Upgrade durchführen, dabei ggf. Pakete installieren/"
"entfernen\n"
-#: src/main.cc:104
+#: src/main.cc:103
#, c-format
msgid " forget-new - Forget what packages are \"new\"\n"
msgstr " forget-new Vergessen welche Pakete »neu« sind\n"
-#: src/main.cc:105
+#: src/main.cc:104
#, c-format
msgid " search - Search for a package by name and/or expression\n"
msgstr " search Pakete nach Namen oder Ausdruck suchen\n"
-#: src/main.cc:106
+#: src/main.cc:105
#, c-format
msgid " show - Display detailed information about a package\n"
msgstr " show Details über ein Paket anzeigen\n"
-#: src/main.cc:107
+#: src/main.cc:106
#, c-format
msgid " clean - Erase downloaded package files\n"
msgstr " clean Heruntergeladene Pakete löschen\n"
-#: src/main.cc:108
+#: src/main.cc:107
#, c-format
msgid " autoclean - Erase old downloaded package files\n"
msgstr " autoclean Alte heruntergeladene Pakete löschen\n"
-#: src/main.cc:109
+#: src/main.cc:108
#, c-format
msgid " changelog - View a package's changelog\n"
msgstr " changelog Änderungsprotokoll eines Pakets\n"
-#: src/main.cc:110
+#: src/main.cc:109
#, c-format
msgid " download - Download the .deb file for a package\n"
msgstr " download Die .deb-Datei eines Pakets herunterladen\n"
-#: src/main.cc:112
+#: src/main.cc:111
#, c-format
msgid " Options:\n"
msgstr "Optionen:\n"
-#: src/main.cc:113
+#: src/main.cc:112
#, c-format
msgid " -h This help text\n"
msgstr " -h Dieser Hilfetext\n"
-#: src/main.cc:114
+#: src/main.cc:113
#, c-format
msgid " -s Simulate actions, but do not actually perform them.\n"
msgstr ""
" -s Aktionen simulieren, aber nicht wirklich durchführen.\n"
-#: src/main.cc:115
+#: src/main.cc:114
#, c-format
msgid ""
" -d Only download packages, do not install or remove anything.\n"
@@ -1808,12 +1950,12 @@
" -d Pakete nur herunterladen, nichts installieren oder "
"entfernen.\n"
-#: src/main.cc:116
+#: src/main.cc:115
#, c-format
msgid " -P Always prompt for confirmation or actions\n"
msgstr " -P Immer zur Bestätigung nachfragen\n"
-#: src/main.cc:117
+#: src/main.cc:116
#, c-format
msgid ""
" -y Assume that the answer to simple yes/no questions is 'yes'\n"
@@ -1821,7 +1963,7 @@
" -y Annehmen, dass die Antwort auf einfache ja/nein-Fragen \"ja"
"\" ist\n"
-#: src/main.cc:118
+#: src/main.cc:117
#, c-format
msgid ""
" -F format Specify a format for displaying search results; see the "
@@ -1829,7 +1971,7 @@
msgstr ""
" -F format Format für die Suchergebnisse angeben; vgl. Anleitung\n"
-#: src/main.cc:119
+#: src/main.cc:118
#, c-format
msgid ""
" -O order Specify how search results should be sorted; see the manual\n"
@@ -1837,37 +1979,37 @@
" -O order Wie die Suchergebnisse sortiert werden sollen; vgl. "
"Anleitung\n"
-#: src/main.cc:120
+#: src/main.cc:119
#, c-format
msgid ""
" -w width Specify the display width for formatting search results\n"
msgstr ""
" -w breite Die Breite für die Formatierung der Suchergebnisse angeben\n"
-#: src/main.cc:121
+#: src/main.cc:120
#, c-format
msgid " -f Aggressively try to fix broken packages.\n"
msgstr " -f Aggressiv versuchen kaputte Pakete zu reparieren.\n"
-#: src/main.cc:122
+#: src/main.cc:121
#, c-format
msgid " -V Show which versions of packages are to be installed.\n"
msgstr ""
" -V Anzeigen, welche Version eines Pakets installiert wird\n"
-#: src/main.cc:123
+#: src/main.cc:122
#, c-format
msgid ""
" -D Show the dependencies of automatically changed packages.\n"
msgstr ""
" -D Abhängigkeiten automatisch veränderter Pakete anzeigen\n"
-#: src/main.cc:124
+#: src/main.cc:123
#, c-format
msgid " -Z\t\t Show the change in installed size of each package.\n"
msgstr " -Z Größenveränderung der einzelnen Pakete anzeigen\n"
-#: src/main.cc:125
+#: src/main.cc:124
#, c-format
msgid ""
" -v Display extra information. (may be supplied multiple times)\n"
@@ -1875,7 +2017,7 @@
" -v Mehr Informationen ausgeben (kann mehrfach verwendet "
"werden)\n"
-#: src/main.cc:126
+#: src/main.cc:125
#, c-format
msgid ""
" -t [release] Set the release from which packages should be installed\n"
@@ -1883,12 +2025,12 @@
" -t [release] Das »Release«, aus dem Pakete installiert werden sollen\n"
" (z.B. stable, unstable, sarge, ...)\n"
-#: src/main.cc:127
+#: src/main.cc:126
#, c-format
msgid " -o key=val Directly set the configuration option named 'key'\n"
msgstr " -o schl=wert Die Einstellung 'schl' direkt setzen\n"
-#: src/main.cc:128
+#: src/main.cc:127
#, c-format
msgid ""
" --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -1898,61 +2040,69 @@
" Angeben, ob »Empfehlungen« wie starke\n"
" Abhängigkeiten gehandhabt werden sollen\n"
-#: src/main.cc:129
+#: src/main.cc:128
#, c-format
msgid " -S fname: Read the aptitude extended status info from fname.\n"
msgstr ""
" -S fname Die erweiterten Aptitude-Statusinformationen aus »fname« "
"laden\n"
-#: src/main.cc:130
+#: src/main.cc:129
#, c-format
msgid " -u : Download new package lists on startup.\n"
msgstr " -u Neue Paketlisten beim Start laden.\n"
-#: src/main.cc:131
+#: src/main.cc:130
#, c-format
msgid " -i : Perform an install run on startup.\n"
msgstr " -i Installationslauf am Anfang durchführen.\n"
-#: src/main.cc:133
+#: src/main.cc:132
#, c-format
msgid " This aptitude does not have Super Cow Powers.\n"
msgstr " Dieses Aptitude hat keine Super-Kuh-Kräfte.\n"
-#: src/main.cc:254
+#: src/main.cc:253
#, c-format
msgid "-o requires an argument of the form key=value, got %s"
msgstr "-o erfordert ein Argument der Form schlüssel=wert, erhielt »%s«"
-#: src/main.cc:300 src/main.cc:309
+#: src/main.cc:299 src/main.cc:308
msgid "WEIRDNESS: unknown option code received\n"
msgstr "MERKWÃœRDIG: unbekannten Optionscode erhalten\n"
-#: src/main.cc:318
+#: src/main.cc:317
msgid "Only one of -u and -i may be specified\n"
msgstr "Es dürfen nur entweder -u oder -i angegeben werden\n"
-#: src/main.cc:326
+#: src/main.cc:325
msgid ""
"-u and -i may not be specified in command-line mode (eg, with 'install')"
msgstr ""
"-u und -i dürfen nicht im Kommandozeilenmodus verwendet werden (z.B. mit "
"'install')"
-#: src/main.cc:337
+#: src/main.cc:342
msgid "-u and -i may not be specified with a command"
msgstr "-u und -i dürfen nicht mit einem Kommando verwendet werden"
-#: src/main.cc:392
+#: src/main.cc:399
#, c-format
msgid "Unknown command \"%s\"\n"
msgstr "Unbekanntes Kommando »%s«\n"
-#: src/main.cc:400
+#: src/main.cc:406 src/main.cc:463
+msgid "Internal error: uncaught 'out of solutions' exception.\n"
+msgstr ""
+
+#: src/main.cc:411 src/main.cc:468
+msgid "Internal error: uncaught 'out of time' exception.\n"
+msgstr ""
+
+#: src/main.cc:418
#, c-format
-msgid "Invalid option for interactive mode: -s\n"
-msgstr "Unbekannte Option für den Interaktiven Modus: -s\n"
+msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
+msgstr ""
#: src/mine/cmine.cc:93
#, c-format
@@ -1980,7 +2130,7 @@
msgid "Lost"
msgstr "Verloren"
-#: src/mine/cmine.cc:119 src/ui.cc:1005
+#: src/mine/cmine.cc:119 src/ui.cc:1089
msgid "Minesweeper"
msgstr "Minesweeper"
@@ -2192,7 +2342,7 @@
msgid "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
msgstr "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
-#: src/pkg_columnizer.cc:84 src/ui.cc:1488
+#: src/pkg_columnizer.cc:84 src/ui.cc:1638
msgid "Package"
msgstr "Paket"
@@ -2456,13 +2606,14 @@
" Pakete im Bereich »base« sind Teil der Erstinstallation von Debian."
#: src/pkg_grouppolicy.cc:158
+#, fuzzy
msgid ""
"Programs for faxmodems and other communications devices\n"
" Packages in the 'comm' section are used to control modems and other "
"hardware communications devices. This includes software to control faxmodems "
"(for instance, PPP for dial-up internet connections and programs originally "
-"written for that purpose (zmodem/kermit), as well as software to control "
-"cellular phones, interface with FidoNet, and run a BBS."
+"written for that purpose, such as zmodem/kermit), as well as software to "
+"control cellular phones, interface with FidoNet, and run a BBS."
msgstr ""
"Programme für Faxmodems und andere Kommunikationsgeräte\n"
" Pakete im Bereich »comm« werden verwendet, um Modems und andere "
@@ -2906,14 +3057,15 @@
"die früher in »non-us« beheimatet waren, sind jetzt »main«."
#: src/pkg_grouppolicy.cc:193
+#, fuzzy
msgid ""
"Programs which are not free software\n"
" Packages in the 'non-free' section are not part of Debian.\n"
" .\n"
" These packages fail to meet one or more of the requirements of the Debian "
-"Free Software Guidelines (see below) You should read the license of programs "
-"in this section to be sure that you are allowed to use them in the way you "
-"intend.\n"
+"Free Software Guidelines (see below). You should read the license of "
+"programs in this section to be sure that you are allowed to use them in the "
+"way you intend.\n"
" .\n"
" For more information about what Debian considers to be Free Software, see "
"http://www.debian.org/social_contract#guidelines"
@@ -2975,11 +3127,12 @@
" Eine neuere Version dieser Pakete ist verfügbar."
#: src/pkg_grouppolicy.cc:320
+#, fuzzy
msgid ""
"New Packages\n"
" These packages have been added to Debian since the last time you cleared "
-"the list of \"new\" packages. (choose \"Forget new packages\" from the "
-"Actions menu to empty this list)"
+"the list of \"new\" packages (choose \"Forget new packages\" from the "
+"Actions menu to empty this list)."
msgstr ""
"Neue Pakete\n"
" Diese Pakete sind neu zu Debian hinzugekommen, seit Sie das letzte Mal die "
@@ -3232,17 +3385,15 @@
msgid "Versions"
msgstr "Versionen"
-#: src/pkg_item.cc:54
+#: src/pkg_item.cc:55
msgid "Yes, I am aware this is a very bad idea"
msgstr "Mir·ist·klar,·dass·das·eine·sehr·schlechte·Idee·ist."
#: src/pkg_item.cc:80
-#, c-format
+#, fuzzy, c-format
msgid ""
-"%s is an essential package!\n"
-"\n"
-"Are you sure you want to remove it?\n"
-"Type '%s' if you are."
+"%s is an essential package!%n%nAre you sure you want to remove it?%nType '%"
+"s' if you are."
msgstr ""
"%s ist ein essentielles Paket!\n"
"\n"
@@ -3250,77 +3401,103 @@
"Geben Sie '%s' ein."
# ummmm...
-#: src/pkg_item.cc:219
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:625
#, c-format
msgid "Information about %s"
msgstr "Informationen über %s"
-#: src/pkg_item.cc:304
-msgid "Available versions of "
+#: src/pkg_item.cc:224 src/pkg_ver_item.cc:627
+#, c-format
+msgid "%s info"
+msgstr ""
+
+#: src/pkg_item.cc:310
+#, fuzzy, c-format
+msgid "Available versions of %s"
msgstr "Verfügbare Versionen von "
-#: src/pkg_item.cc:312 src/pkg_ver_item.cc:648
+#: src/pkg_item.cc:313
+#, fuzzy, c-format
+msgid "%s versions"
+msgstr "Versionen"
+
+#: src/pkg_item.cc:325 src/pkg_ver_item.cc:655
#, c-format
msgid "Dependencies of %s"
msgstr "Abhängigkeiten von %s"
-#: src/pkg_item.cc:322 src/pkg_ver_item.cc:657
+#: src/pkg_item.cc:327 src/pkg_ver_item.cc:657
+#, c-format
+msgid "%s deps"
+msgstr ""
+
+#: src/pkg_item.cc:338 src/pkg_ver_item.cc:667
#, c-format
msgid "Packages depending on %s"
msgstr "Pakete, die von %s abhängen"
-#: src/pkg_item.cc:373 src/pkg_ver_item.cc:694
+#: src/pkg_item.cc:340 src/pkg_ver_item.cc:669
+#, c-format
+msgid "%s reverse deps"
+msgstr ""
+
+#: src/pkg_item.cc:392 src/pkg_ver_item.cc:707
#, c-format
msgid "Reporting a bug in %s:\n"
msgstr "Einen Fehler in %s melden:\n"
-#: src/pkg_item.cc:395
+#: src/pkg_item.cc:414
+#, fuzzy
msgid ""
-"You are not root and I cannot find any way\n"
-"to become root. To reconfigure this package,\n"
-"install the menu package, the login package,\n"
-"or run aptitude as root."
+"You are not root and I cannot find any way to become root. To reconfigure "
+"this package, install the menu package, the login package, or run aptitude "
+"as root."
msgstr ""
"Sie sind nicht root und ich kann keinen Weg finden,\n"
"root zu werden. Um dieses Paket neu zu konfigurieren,\n"
"installieren Sie die Pakete »menu« und »login«\n"
"oder führen Sie Aptitude als root aus."
-#: src/pkg_item.cc:403
+#: src/pkg_item.cc:422
#, c-format
msgid "Reconfiguring %s\n"
msgstr "Neukonfigurieren von %s\n"
-#: src/pkg_item.cc:428
+#: src/pkg_item.cc:447
msgid "Hierarchy editor"
msgstr "Hierarchie-Editor"
+#: src/pkg_item.cc:447
+#, fuzzy
+msgid "Hierarchy Editor"
+msgstr "Hierarchie-Editor"
+
#: src/pkg_tree.cc:325
msgid "Search for: "
msgstr "Suche nach: "
-#: src/pkg_tree.cc:585
+#: src/pkg_tree.cc:568
msgid "All Packages"
msgstr "Alle Pakete"
-#: src/pkg_tree.cc:598 src/pkg_tree.cc:607
+#: src/pkg_tree.cc:581 src/pkg_tree.cc:590
msgid "Building view"
msgstr "Ansicht aufbauen"
-#: src/pkg_tree.cc:649
+#: src/pkg_tree.cc:632
#, c-format
msgid "No packages matched the pattern \"%s\"."
msgstr "Keine Pakete passen zum Suchmuster »%s«."
# (Verb for "enter" in computer contexts appears to be "eingeben", which makes
# some sense..)
-#: src/pkg_tree.cc:671
+#: src/pkg_tree.cc:654
msgid "Enter the new package tree limit: "
msgstr "Suchmuster zum Filtern des Paketbaums: "
# (Verb for "enter" in computer contexts appears to be "eingeben", which makes
# some sense..)
-#: src/pkg_tree.cc:705
+#: src/pkg_tree.cc:688
msgid "Enter the new package grouping mechanism for this display: "
msgstr ""
"Geben Sie bitte den neuen Paketgruppierungs-Mechanismus für diese Ansicht "
@@ -3328,16 +3505,11 @@
# (Verb for "enter" in computer contexts appears to be "eingeben", which makes
# some sense..)
-#: src/pkg_tree.cc:713
+#: src/pkg_tree.cc:696
msgid "Enter the new package sorting mechanism for this display: "
msgstr ""
"Geben Sie bitte den neuen Paketsortierungs-Mechanismus für dies Ansicht ein: "
-# ummmm...
-#: src/pkg_ver_item.cc:623
-msgid "Information about "
-msgstr "Information über "
-
#: src/pkg_view.cc:344
msgid "make_package_view: error in arguments -- two main widgets??"
msgstr "make_package_view: error in arguments -- two main widgets??"
@@ -3352,7 +3524,7 @@
msgid "make_package_view: bad argument!"
msgstr "make_package_view: bad argument!"
-#: src/pkg_view.cc:492
+#: src/pkg_view.cc:495
msgid "make_package_view: no main widget found"
msgstr "make_package_view: no main widget found"
@@ -3577,6 +3749,74 @@
"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:74
+msgid "The package cache is not available."
+msgstr ""
+
+#: src/solution_dialog.cc:82
+#, fuzzy
+msgid "No packages are broken."
+msgstr "Manche Pakete sind kaputt. Versuchen, das zu reparieren?"
+
+#: src/solution_dialog.cc:103
+msgid "No resolution found."
+msgstr ""
+
+#: src/solution_dialog.cc:107
+#, c-format
+msgid ""
+"Time exhausted while searching for a solution (you can select \"Next Solution"
+"\" or press %s to try harder)."
+msgstr ""
+
+#: src/solution_dialog.cc:146
+#, fuzzy
+msgid "Previous"
+msgstr "Liefert"
+
+#: src/solution_dialog.cc:147
+#, fuzzy
+msgid "Next"
+msgstr "^Nächste"
+
+#: src/solution_dialog.cc:148
+msgid "Apply"
+msgstr ""
+
+#: src/solution_dialog.cc:149
+#, fuzzy
+msgid "Close"
+msgstr "^Schließen"
+
+#: src/solution_fragment.cc:125
+#, fuzzy
+msgid "%BRemove%b the following packages:%n"
+msgstr "Die folgenden Pakete sind KAPUTT:"
+
+#: src/solution_fragment.cc:135
+#, fuzzy
+msgid "%BInstall%b the following packages:%n"
+msgstr "Die folgenden Pakete sind KAPUTT:"
+
+#: src/solution_fragment.cc:148
+msgid "%BKeep%b the following packages at their current version:%n"
+msgstr ""
+
+#: src/solution_fragment.cc:161
+#, fuzzy
+msgid "%BUpgrade%b the following packages:%n"
+msgstr "Die folgenden Pakete sind KAPUTT:"
+
+#: src/solution_fragment.cc:176
+#, fuzzy
+msgid "%BDowngrade%b the following packages:%n"
+msgstr "Herunterladen von Paketen"
+
+#: src/solution_fragment.cc:190
+#, c-format
+msgid "Score is %d"
+msgstr ""
+
#: src/trust.cc:17 src/trust.cc:19
msgid "WARNING"
msgstr ""
@@ -3588,53 +3828,53 @@
"system."
msgstr ""
-#: src/ui.cc:143
+#: src/ui.cc:164
msgid "Er, there aren't any errors, this shouldn't have happened.."
msgstr "Er, es gab keine Fehler, das sollte nicht passieren.."
-#: src/ui.cc:149
+#: src/ui.cc:170
msgid "E:"
msgstr ""
-#: src/ui.cc:151
+#: src/ui.cc:172
msgid "W:"
msgstr ""
-#: src/ui.cc:172
+#: src/ui.cc:193
msgid "Search for:"
msgstr "Suchen nach:"
-#: src/ui.cc:205
+#: src/ui.cc:261
msgid "You already are root!"
msgstr "Sie sind bereits root!"
-#: src/ui.cc:303
+#: src/ui.cc:359
msgid ""
"Subprocess exited with an error -- did you type your password correctly?"
msgstr "Unterprozess mit Fehler beendet -- richtiges Passwort?"
-#: src/ui.cc:331
+#: src/ui.cc:387
msgid "Loading cache"
msgstr "Lade Cache"
-#: src/ui.cc:353
+#: src/ui.cc:409
msgid "Really quit Aptitude?"
msgstr "Aptitude wirklich beenden?"
-#: src/ui.cc:432
+#: src/ui.cc:488
msgid "Really discard your personal settings and reload the defaults?"
msgstr ""
"Wirklich ihre persönlichen Einstellungen verwerfen und Standardwerte laden?"
-#: src/ui.cc:532
+#: src/ui.cc:588 src/ui.cc:590 src/ui.cc:618 src/ui.cc:620
msgid "Packages"
msgstr "Pakete"
-#: src/ui.cc:533 src/ui.cc:560
+#: src/ui.cc:589 src/ui.cc:619
msgid "View available packages and choose actions to perform"
msgstr "Verfügbare Pakete anzeigen und Änderungen vornehmen"
-#: src/ui.cc:599
+#: src/ui.cc:666
#, fuzzy
msgid ""
"%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
@@ -3653,15 +3893,15 @@
"unter bestimmten Bedingungen weiterzuvertreiben; Details dazu finden Sie\n"
"ebenfalls unter »Lizenz«."
-#: src/ui.cc:620
+#: src/ui.cc:687
msgid "help.txt"
msgstr "help-de.txt"
-#: src/ui.cc:636
+#: src/ui.cc:703
msgid "README"
msgstr "README"
-#: src/ui.cc:718
+#: src/ui.cc:785
msgid ""
"%C%BWARNING%b: untrusted versions of the following packages will be "
"installed!%n%nUntrusted packages could %Bcompromise your system's security%"
@@ -3669,62 +3909,72 @@
"this is what you want to do.%n%n"
msgstr ""
-#: src/ui.cc:732
+#: src/ui.cc:799
#, fuzzy
msgid "Really Continue"
msgstr "Weiter"
-#: src/ui.cc:734
+#: src/ui.cc:801
msgid "Abort Installation"
msgstr ""
-#: src/ui.cc:796
+#: src/ui.cc:862
msgid "Preview of package installation"
msgstr "Vorschau der Paketinstallation"
-#: src/ui.cc:797
+#: src/ui.cc:863
msgid "View and/or adjust the actions that will be performed"
msgstr "Anzeigen und anpassen der geplanten Aktionen"
-#: src/ui.cc:837
-msgid "Some packages were broken and have been fixed"
+#: src/ui.cc:864
+#, fuzzy
+msgid "Preview"
+msgstr "^Vorherige"
+
+#: src/ui.cc:900
+#, fuzzy
+msgid "Some packages were broken and have been fixed:"
msgstr "Manche Pakete waren kaputt und wurden repariert"
-#: src/ui.cc:839
-msgid "Some broken packages could not be fixed!"
-msgstr "Manche kaputten Pakete konnten nicht repariert werden!"
+#: src/ui.cc:906
+msgid "No solution to these dependency problems exists!"
+msgstr ""
-#: src/ui.cc:847 src/ui.cc:959
-msgid "Some packages are broken. Try to fix them?"
-msgstr "Manche Pakete sind kaputt. Versuchen, das zu reparieren?"
+#: src/ui.cc:912
+#, c-format
+msgid ""
+"Ran out of time while trying to resolver dependencies (press \"%s\" to try "
+"harder)"
+msgstr ""
-#: src/ui.cc:860
+#: src/ui.cc:958
+#, fuzzy
msgid ""
-"Installing/removing packages requires administrative privileges, which\n"
-"you currently do not have. Would you like to change to the root account?\n"
+"Installing/removing packages requires administrative privileges, which you "
+"currently do not have. Would you like to change to the root account?"
msgstr ""
"Zum Installieren/Entfernen von Paketen sind Administrationsrechte nötig,\n"
"die Sie derzeit nicht haben. Wollen Sie zum root-Account wechseln?\n"
-#: src/ui.cc:863 src/ui.cc:993
+#: src/ui.cc:961 src/ui.cc:1077
msgid "Become root"
msgstr "»root« werden"
-#: src/ui.cc:865 src/ui.cc:995
+#: src/ui.cc:963 src/ui.cc:1079
msgid "Don't become root"
msgstr "Nicht »root« werden"
-#: src/ui.cc:870 src/ui.cc:1000
+#: src/ui.cc:968 src/ui.cc:1084
msgid "A package-list update or install run is already taking place."
msgstr "Ein Aktualisierungs oder Installationsvorgang findet gerade statt."
-#: src/ui.cc:897
+#: src/ui.cc:995
msgid "No packages are scheduled to be installed, removed, or upgraded."
msgstr ""
"Es wurden keine Pakete zum Installieren, Entfernen oder Aktualisieren "
"ausgewählt."
-#: src/ui.cc:903
+#: src/ui.cc:1001
#, fuzzy
msgid ""
"No packages will be installed, removed or upgraded. Some packages could be "
@@ -3737,170 +3987,185 @@
"ausgewählt.\n"
"Geben Sie »Umschalt+U« ein, um diese Pakete zu aktualisieren."
-#: src/ui.cc:990
+#: src/ui.cc:1073
+#, fuzzy
msgid ""
-"Updating the package lists requires administrative privileges, which\n"
-"you currently do not have. Would you like to change to the root account?\n"
+"Updating the package lists requires administrative privileges, which you "
+"currently do not have. Would you like to change to the root account?"
msgstr ""
"Zum Aktualisieren der Paketliste sind Administrationsrechte nötig,\n"
"die Sie derzeit nicht haben. Wollen Sie zum root-Account wechseln?\n"
-#: src/ui.cc:1005 src/ui.cc:1198
+#: src/ui.cc:1089 src/ui.cc:1345
msgid "Waste time trying to find mines"
msgstr "Zeit verschwenden (Minensuchspiel)"
# Erk! That's weird!
-#: src/ui.cc:1012 src/ui.cc:1065
+#: src/ui.cc:1096 src/ui.cc:1149
msgid "Cleaning while a download is in progress is not allowed"
msgstr "Aufräumen, während ein Download läuft, ist nicht erlaubt"
-#: src/ui.cc:1015
+#: src/ui.cc:1099
msgid "Deleting downloaded files"
msgstr "Lösche heruntergeladene Dateien"
-#: src/ui.cc:1029
+#: src/ui.cc:1113
msgid "Downloaded package files have been deleted"
msgstr "Heruntergeladene Dateien wurden gelöscht"
-#: src/ui.cc:1090
+#: src/ui.cc:1174
#, fuzzy, c-format
msgid ""
"Obsolete downloaded package files have been deleted, freeing %sB of disk "
"space."
msgstr "Veraltete heruntergeladene Paketdateien wurden gelöscht"
-#: src/ui.cc:1174
+#: src/ui.cc:1246
+msgid "All solutions exhausted."
+msgstr ""
+
+#: src/ui.cc:1251 src/ui.cc:1282
+#, fuzzy
+msgid "Ran out of time while trying to find a solution."
+msgstr "Zeit verschwenden (Minensuchspiel)"
+
+#: src/ui.cc:1276
+msgid "Unable to find a solution to apply."
+msgstr ""
+
+#: src/ui.cc:1321
msgid "^Install/remove packages"
msgstr "^Installieren/Entfernen von Paketen"
-#: src/ui.cc:1175
+#: src/ui.cc:1322
msgid "Perform all pending installs and removals"
msgstr "Durchführen geplanter Installations- und Löschvorgänge"
-#: src/ui.cc:1177
+#: src/ui.cc:1324
msgid "^Update package list"
msgstr "Paketliste ^aktualisieren"
-#: src/ui.cc:1178
+#: src/ui.cc:1325
msgid "Check for new versions of packages"
msgstr "Nach neuen oder aktualisierten Paketen suchen"
# FIXME: this is a bad name for the menu item.
-#: src/ui.cc:1181
+#: src/ui.cc:1328
msgid "^Forget new packages"
msgstr "Neue Pakete ^vergessen"
-#: src/ui.cc:1182
+#: src/ui.cc:1329
msgid "Forget which packages are \"new\""
msgstr "Vergessen, welche Pakete »neu« sind"
-#: src/ui.cc:1185
+#: src/ui.cc:1332
msgid "^Clean package cache"
msgstr "Paketcache komplett leeren"
-#: src/ui.cc:1186
+#: src/ui.cc:1333
msgid "Delete package files which were previously downloaded"
msgstr "Alle Paketdateien aus dem Paketcache löschen"
-#: src/ui.cc:1189
+#: src/ui.cc:1336
msgid "Clean ^obsolete files"
msgstr "Nur ^veraltete Paketdateien löschen"
-#: src/ui.cc:1190
+#: src/ui.cc:1337
msgid "Delete package files which can no longer be downloaded"
msgstr ""
"Nur solche Paketdateien aus dem Cache löschen,\n"
"die nicht mehr heruntergeladen werden können"
-#: src/ui.cc:1193
+#: src/ui.cc:1340
msgid "Mark ^Upgradable"
msgstr "Aktualisierbare ^markieren"
-#: src/ui.cc:1194
+#: src/ui.cc:1341
msgid "Mark all upgradable packages which are not held for upgrade"
msgstr ""
"Alle aktualisierbaren Pakete, die nicht zurückgehalten werden, zum Upgrade "
"markieren"
-#: src/ui.cc:1197
+#: src/ui.cc:1344
msgid "^Play Minesweeper"
msgstr "^Minesweeper spielen"
-#: src/ui.cc:1200
+#: src/ui.cc:1347
msgid "^Become root"
msgstr "^Root werden"
-#: src/ui.cc:1201
+#: src/ui.cc:1348
+#, fuzzy
msgid ""
-"Run 'su' to become root; this will restart the program, but your\n"
-"settings will be preserved"
+"Run 'su' to become root; this will restart the program, but your settings "
+"will be preserved"
msgstr ""
"'su' ausführen um root zu werden. Dies wird das Programm neu starten, aber\n"
"Ihre Einstellungen werden erhalten bleiben."
-#: src/ui.cc:1204
+#: src/ui.cc:1351
msgid "^Reload package cache"
msgstr "Paketcache ^neu laden"
-#: src/ui.cc:1205
+#: src/ui.cc:1352
msgid "Reload the package cache"
msgstr "Paketcache neu laden"
-#: src/ui.cc:1211
+#: src/ui.cc:1358
msgid "^Quit"
msgstr "^Beenden"
-#: src/ui.cc:1212
+#: src/ui.cc:1359
msgid "Exit the program"
msgstr "Aptitude verlassen"
-#: src/ui.cc:1218 src/ui.cc:1487
+#: src/ui.cc:1365 src/ui.cc:1637
msgid "Undo"
msgstr "Rückgängig"
-#: src/ui.cc:1219
+#: src/ui.cc:1366
msgid "Undo the last package operation or group of operations"
msgstr "Die letzte Operation oder Gruppe von Operationen rückgängig machen"
-#: src/ui.cc:1226
+#: src/ui.cc:1373
msgid "^Install"
msgstr "^Installieren"
-#: src/ui.cc:1227
+#: src/ui.cc:1374
msgid "Flag the currently selected package for installation or upgrade"
msgstr "Das ausgewählte Paket zur Installation oder zum Upgrade auswählen"
-#: src/ui.cc:1230
+#: src/ui.cc:1377
msgid "^Remove"
msgstr "^Entfernen"
-#: src/ui.cc:1231
+#: src/ui.cc:1378
msgid "Flag the currently selected package for removal"
msgstr "Das ausgewählte Paket zum Entfernen auswählen"
-#: src/ui.cc:1234
+#: src/ui.cc:1381
msgid "^Purge"
msgstr "^Vollständig entfernen"
-#: src/ui.cc:1235
+#: src/ui.cc:1382
msgid ""
"Flag the currently selected package and its configuration files for removal"
msgstr ""
"Das ausgewählte Paket und seine Konfigurationsdateien zum Entfernen markieren"
-#: src/ui.cc:1238
+#: src/ui.cc:1385
msgid "^Keep"
msgstr "^Beibehalten"
-#: src/ui.cc:1239
+#: src/ui.cc:1386
msgid "Cancel any action on the selected package"
msgstr "Alle Aktionen mit dem gewählten Paket zurücknehmen"
-#: src/ui.cc:1242
+#: src/ui.cc:1389
msgid "^Hold"
msgstr "^Zurückhalten"
-#: src/ui.cc:1243
+#: src/ui.cc:1390
msgid ""
"Cancel any action on the selected package, and protect it from future "
"upgrades"
@@ -3908,243 +4173,247 @@
"Geplante Vorgänge mit dem gewählten Paket zurücknehmen und\n"
"es vor zukünftigen Upgrades schützen"
-#: src/ui.cc:1246
+#: src/ui.cc:1393
msgid "Mark ^Auto"
msgstr "Als ^automatisch markieren"
-#: src/ui.cc:1247
+#: src/ui.cc:1394
+#, fuzzy
msgid ""
-"Mark the selected package as having been automatically installed;\n"
-"it will automatically be removed if no other packages depend on it"
+"Mark the selected package as having been automatically installed; it will "
+"automatically be removed if no other packages depend on it"
msgstr ""
"Dieses Paket als automatisch installiert markieren;\n"
"es wird dann automatisch gelöscht, wenn keine anderen Pakete mehr davon "
"abhängen"
-#: src/ui.cc:1250
+#: src/ui.cc:1397
msgid "Mark ^Manual"
msgstr "Als ^manuell markieren"
-#: src/ui.cc:1251
+#: src/ui.cc:1398
+#, fuzzy
msgid ""
-"Mark the selected package as having been manually installed;\n"
-"it will not be removed unless you manually remove it"
+"Mark the selected package as having been manually installed; it will not be "
+"removed unless you manually remove it"
msgstr ""
"Dieses Paket als manuell installiert markieren;\n"
"es wird dann nur noch auf Ihren Wunsch hin gelöscht."
-#: src/ui.cc:1254
+#: src/ui.cc:1401
msgid "^Forbid Version"
msgstr "Version verbieten"
-#: src/ui.cc:1255
+#: src/ui.cc:1402
+#, fuzzy
msgid ""
-"Forbid the candidate version of the selected package from being installed;\n"
+"Forbid the candidate version of the selected package from being installed; "
"newer versions of the package will be installed as usual"
msgstr ""
"Die Installation der anstehenden Version dieses Pakets verbieten;\n"
"noch neuere Versionen werden wie üblich installiert werden"
# ummmm...
-#: src/ui.cc:1259
+#: src/ui.cc:1406
msgid "I^nformation"
msgstr "Informationen"
-#: src/ui.cc:1260
+#: src/ui.cc:1407
msgid "Display more information about the selected package"
msgstr "Mehr Informationen zum gewählten Paket"
-#: src/ui.cc:1263
+#: src/ui.cc:1410
msgid "^Changelog"
msgstr "^ChangeLog"
-#: src/ui.cc:1264
+#: src/ui.cc:1411
msgid "Display the Debian changelog of the selected package"
msgstr "Das Debian-Änderungsprotokoll für das gewählte Paket anzeigen"
-#: src/ui.cc:1271
+#: src/ui.cc:1418
msgid "^Find"
msgstr "^Suchen"
-#: src/ui.cc:1272
+#: src/ui.cc:1419
msgid "Search for a package"
msgstr "Nach einem Paket suchen"
-#: src/ui.cc:1275
+#: src/ui.cc:1422
msgid "Find ^Again"
msgstr "^Weitersuchen"
-#: src/ui.cc:1276
+#: src/ui.cc:1423
msgid "Repeat the last search"
msgstr "Die letzte Suche wiederholen"
-#: src/ui.cc:1280
+#: src/ui.cc:1427
msgid "^Limit Display"
msgstr "^Filtern des Paketbaums"
-#: src/ui.cc:1281
+#: src/ui.cc:1428
msgid "Apply a filter to the package list"
msgstr "Einen Filter auf die Paketliste anwenden"
-#: src/ui.cc:1284
+#: src/ui.cc:1431
msgid "^Un-Limit Display"
msgstr "^Löschen des Filters"
-#: src/ui.cc:1285
+#: src/ui.cc:1432
msgid "Remove the filter from the package list"
msgstr "Die Paketliste nicht mehr filtern"
-#: src/ui.cc:1289
+#: src/ui.cc:1436
msgid "Find ^Broken"
msgstr "Kaputtes Paket suchen"
-#: src/ui.cc:1290
+#: src/ui.cc:1437
msgid "Find the next package with unsatisfied dependencies"
msgstr "Das nächste Paket mit verletzten Abhängigkeiten finden"
-#: src/ui.cc:1297
+#: src/ui.cc:1444
msgid "^UI options"
msgstr "^Oberfläche"
-#: src/ui.cc:1298
+#: src/ui.cc:1445
msgid "Change the settings which affect the user interface"
msgstr "Einstellungen verändern, die die Benutzeroberfläche betreffen"
-#: src/ui.cc:1301
+#: src/ui.cc:1448
msgid "^Dependency handling"
msgstr "^Abhängigkeisbehandlung"
-#: src/ui.cc:1302
+#: src/ui.cc:1449
msgid "Change the settings which affect how package dependencies are handled"
msgstr ""
"Einstellungen verändern, die die Handhabung von Abhängigkeiten betreffen"
-#: src/ui.cc:1305
+#: src/ui.cc:1452
msgid "^Miscellaneous"
msgstr "^Verschiedenes"
-#: src/ui.cc:1306
+#: src/ui.cc:1453
msgid "Change miscellaneous program settings"
msgstr "Sonstige Programmeinstellungen ändern"
-#: src/ui.cc:1311
+#: src/ui.cc:1458
msgid "^Revert options"
msgstr "^Optionen zurücksetzen"
-#: src/ui.cc:1312
+#: src/ui.cc:1459
msgid "Reset all settings to the system defaults"
msgstr "Alle Einstellungen auf die Vorgabewerte zurücksetzen"
-#: src/ui.cc:1323
+#: src/ui.cc:1470
msgid "^Next"
msgstr "^Nächste"
-#: src/ui.cc:1324
+#: src/ui.cc:1471
msgid "View next display"
msgstr "Nächste Ansicht zeigen"
-#: src/ui.cc:1327
+#: src/ui.cc:1474
msgid "^Prev"
msgstr "^Vorherige"
-#: src/ui.cc:1328
+#: src/ui.cc:1475
msgid "View previous display"
msgstr "Vorherige Ansicht zeigen"
-#: src/ui.cc:1331
+#: src/ui.cc:1478
msgid "^Close"
msgstr "^Schließen"
-#: src/ui.cc:1332
+#: src/ui.cc:1479
msgid "Close this display"
msgstr "Ansicht schließen"
-#: src/ui.cc:1337
+#: src/ui.cc:1484
msgid "New Package ^View"
msgstr "Neue Paket^ansicht"
-#: src/ui.cc:1338
+#: src/ui.cc:1485
msgid "Create a new default package view"
msgstr "Eine neue Paketansicht erzeugen"
-#: src/ui.cc:1341
+#: src/ui.cc:1488
msgid "New Categorical ^Browser"
msgstr "Neuen Kategorie-^Browser"
-#: src/ui.cc:1343
+#: src/ui.cc:1490
msgid "Browse packages by category"
msgstr "Pakete nach Kategorie durchsuchen"
-#: src/ui.cc:1351
+#: src/ui.cc:1498
msgid "^About"
msgstr "Ü^ber"
# ummmm...
-#: src/ui.cc:1352
+#: src/ui.cc:1499
msgid "View information about this program"
msgstr "Information über Aptitude"
-#: src/ui.cc:1355
+#: src/ui.cc:1502
msgid "^Help"
msgstr "K^urzhilfe"
-#: src/ui.cc:1356
+#: src/ui.cc:1503
msgid "View the on-line help"
msgstr "Kurzhilfe zu Aptitude"
-#: src/ui.cc:1358
+#: src/ui.cc:1505
msgid "User's ^Manual"
msgstr "^Anleitung"
-#: src/ui.cc:1359
+#: src/ui.cc:1506
msgid "View the detailed program manual"
msgstr "Die detaillierte Anleitung (README, derzeit nur englisch)"
-#: src/ui.cc:1362
+#: src/ui.cc:1509
msgid "^FAQ"
msgstr "^FAQ"
-#: src/ui.cc:1363
+#: src/ui.cc:1510
msgid "View a list of frequently asked questions"
msgstr "Die Liste häufig gestellter Fragen (Frequently Asked Questions, FAQ)"
-#: src/ui.cc:1366
-msgid "^ChangeLog"
-msgstr "^ChangeLog"
+#: src/ui.cc:1513
+msgid "^NEWS"
+msgstr ""
-#: src/ui.cc:1367
-msgid "View the important changes made in each version of the program"
+#: src/ui.cc:1514
+#, fuzzy
+msgid "View the important changes made in each version of "
msgstr "Protokoll der Änderungen, die an Aptitude vorgenommen wurden"
-#: src/ui.cc:1370
+#: src/ui.cc:1517
msgid "^License"
msgstr "Lizen^z"
-#: src/ui.cc:1371
+#: src/ui.cc:1518
msgid "View the terms under which you may copy the program"
msgstr "Die Bedingungen, unter denen Sie Aptitude kopieren dürfen"
-#: src/ui.cc:1486
+#: src/ui.cc:1636
msgid "Actions"
msgstr "Aktionen"
-#: src/ui.cc:1489
+#: src/ui.cc:1639
msgid "Search"
msgstr "Suchen"
-#: src/ui.cc:1490
+#: src/ui.cc:1640
msgid "Options"
msgstr "Optionen"
-#: src/ui.cc:1491
+#: src/ui.cc:1641
msgid "Views"
msgstr "Ansichten"
-#: src/ui.cc:1492
+#: src/ui.cc:1642
msgid "Help"
msgstr "Hilfe"
-#: src/ui.cc:1537
+#: src/ui.cc:1699
#, c-format
msgid ""
"%s: Menu %s: Help %s: Quit %s: Update %s: Download/Install/Remove Pkgs"
@@ -4152,11 +4421,11 @@
"%s: Menü %s: Hilfe %s: Beenden %s: Update %s: Download/Installieren/"
"Entf. von Paketen"
-#: src/ui.cc:1799 src/vscreen/vscreen.cc:281
+#: src/ui.cc:1968 src/vscreen/vscreen.cc:281
msgid "yes_key"
msgstr "j"
-#: src/ui.cc:1800 src/vscreen/vscreen.cc:282
+#: src/ui.cc:1969 src/vscreen/vscreen.cc:282
msgid "no_key"
msgstr "n"
@@ -4170,6 +4439,16 @@
msgid "Downloading Changelog"
msgstr "Herunterladen des Changelogs"
+#: src/view_changelog.cc:54
+#, fuzzy
+msgid "Download Changelog"
+msgstr "Herunterladen des Changelogs"
+
+#: src/view_changelog.cc:63
+#, c-format
+msgid "%s changes"
+msgstr ""
+
#: src/vscreen/vscreen.cc:119
#, c-format
msgid "Ouch! Got SIGTERM, dying..\n"
@@ -4197,3 +4476,40 @@
#: src/vscreen/vs_util.cc:175 src/vscreen/vs_util.cc:212
msgid "No"
msgstr "Nein"
+
+# Use apt-get's familiar error message,
+# Use apt-get's familiar error message,
+# Use apt-get's familiar error message,
+#~ msgid ""
+#~ "Some packages had unmet dependencies. This may mean that you have\n"
+#~ "requested an impossible situation or if you are using the unstable\n"
+#~ "distribution that some required packages have not yet been created\n"
+#~ "or been moved out of Incoming.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Die Abhängigkeiten einiger Pakete sind nicht erfüllt. Das kann "
+#~ "bedeuten,\n"
+#~ "dass Sie eine unmögliche Auswahl getroffen haben oder (falls Sie die\n"
+#~ "»unstable«-Distribution verwenden), dass einige erforderliche Pakete\n"
+#~ "fehlen oder aktualisiert werden müssen.\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Please insert the following disc into the drive \"%s\":\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Bitte legen Sie folgenden Datenträger in das Laufwerk »%s« ein:\n"
+#~ "%s"
+
+#~ msgid "Invalid option for interactive mode: -s\n"
+#~ msgstr "Unbekannte Option für den Interaktiven Modus: -s\n"
+
+# ummmm...
+#~ msgid "Information about "
+#~ msgstr "Information über "
+
+#~ msgid "Some broken packages could not be fixed!"
+#~ msgstr "Manche kaputten Pakete konnten nicht repariert werden!"
+
+#~ msgid "^ChangeLog"
+#~ msgstr "^ChangeLog"
Modified: branches/aptitude-0.3/aptitude/po/el.po
==============================================================================
--- branches/aptitude-0.3/aptitude/po/el.po (original)
+++ branches/aptitude-0.3/aptitude/po/el.po Sat Apr 30 13:41:32 2005
@@ -17,7 +17,7 @@
msgstr ""
"Project-Id-Version: aptitude_po_el\n"
"Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-01-10 16:26-0800\n"
+"POT-Creation-Date: 2005-04-29 18:11-0400\n"
"PO-Revision-Date: 2004-08-11 14:24+0300\n"
"Last-Translator: George Papamichelakis <george at step.gr>\n"
"Language-Team: <debian-l10n-greek at lists.debian.org>\n"
@@ -171,16 +171,103 @@
"Αυτόματη αφαίÏεση αχÏησιμοποιήτων πακÎτων που ταιÏιάζουν σε αυτό το φίλτÏο"
#: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:184 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
-#: src/vscreen/vs_util.cc:329
+#: src/ui.cc:218 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
+#: src/vscreen/vs_util.cc:328
msgid "Ok"
msgstr "Εντάξει"
#: src/apt_options.cc:242 src/download_list.cc:71 src/mine/cmine.cc:257
-#: src/mine/cmine.cc:330 src/vscreen/vs_util.cc:329
+#: src/mine/cmine.cc:330 src/vscreen/vs_util.cc:328
msgid "Cancel"
msgstr "ΑκÏÏωση"
+#: src/broken_indicator.cc:106 src/solution_dialog.cc:97
+msgid "Internal error: unexpected null solution."
+msgstr ""
+
+#: src/broken_indicator.cc:158
+#, fuzzy
+msgid "Suggest "
+msgstr "Î Ïοτείνει"
+
+#: src/broken_indicator.cc:164
+#, fuzzy, c-format
+msgid "%d installs"
+msgstr "εγκατάσταση"
+
+#: src/broken_indicator.cc:169
+#, fuzzy
+msgid "1 install"
+msgstr "εγκατάσταση"
+
+#: src/broken_indicator.cc:173
+#, c-format
+msgid "%d removals"
+msgstr ""
+
+#: src/broken_indicator.cc:178
+msgid "1 removal"
+msgstr ""
+
+#: src/broken_indicator.cc:182
+#, c-format
+msgid "%d keeps"
+msgstr ""
+
+#: src/broken_indicator.cc:187
+msgid "1 keep"
+msgstr ""
+
+#: src/broken_indicator.cc:191
+#, fuzzy, c-format
+msgid "%d upgrades"
+msgstr "αναβάθμιση"
+
+#: src/broken_indicator.cc:196
+#, fuzzy
+msgid "1 upgrade"
+msgstr "αναβάθμιση"
+
+#: src/broken_indicator.cc:200
+#, fuzzy, c-format
+msgid "%d downgrades"
+msgstr "υποβαθμίζονται"
+
+#: src/broken_indicator.cc:205
+#, fuzzy
+msgid "1 downgrade"
+msgstr "υποβαθμίζονται"
+
+#: src/broken_indicator.cc:214
+#, c-format
+msgid "%s: Examine"
+msgstr ""
+
+#: src/broken_indicator.cc:216
+#, c-format
+msgid "%s: Apply"
+msgstr ""
+
+#: src/broken_indicator.cc:218
+#, fuzzy, c-format
+msgid "%s: Next"
+msgstr "^Επόμενο"
+
+#: src/broken_indicator.cc:220
+#, c-format
+msgid "%s: Previous"
+msgstr ""
+
+#: src/broken_indicator.cc:233
+#, c-format
+msgid "%CSolution search failed. %s: try harder"
+msgstr ""
+
+#: src/broken_indicator.cc:239
+#, c-format
+msgid "%CUnable to resolve dependencies."
+msgstr ""
+
#: src/cmdline/cmdline_action.cc:36
#, c-format
msgid ""
@@ -254,25 +341,25 @@
msgstr ""
"Το πακÎτο %s δεν είναι αναβαθμίσιμο, δεν μποÏεί να απαγοÏευτεί αναβάθμιση\n"
-#: src/cmdline/cmdline_action.cc:213
+#: src/cmdline/cmdline_action.cc:198
#, c-format
msgid "Note: selecting the task \"%s: %s\" for installation\n"
msgstr "Σημείωση: επιλÎχθηκε ο σκοπός \"%s: %s\" για εγκατάσταση\n"
-#: src/cmdline/cmdline_action.cc:240
+#: src/cmdline/cmdline_action.cc:225
#, c-format
msgid "You can only specify a package version with an 'install' command.\n"
msgstr ""
"Δεν μποÏείτε να καθοÏίσετε Îκδοση πακÎτου με την εντολή εγκατάστασης.\n"
-#: src/cmdline/cmdline_action.cc:246
+#: src/cmdline/cmdline_action.cc:231
#, c-format
msgid "You can only specify a package archive with an 'install' command.\n"
msgstr ""
"Δεν μποÏείτε να καθοÏίσετε όνομα αÏχείου πακÎτου με την εντολή "
"εγκατάστασης.\n"
-#: src/cmdline/cmdline_action.cc:280
+#: src/cmdline/cmdline_action.cc:265
#, c-format
msgid ""
"Couldn't find package \"%s\", and more than 40\n"
@@ -281,7 +368,7 @@
"Δεν βÏÎθηκε το πακÎτο \"%s\", και πεÏισσότεÏα από 40\n"
"πακÎτα πεÏιÎχουν το \"%s\" στο όνομά τους.\n"
-#: src/cmdline/cmdline_action.cc:283
+#: src/cmdline/cmdline_action.cc:268
#, c-format
msgid ""
"Couldn't find package \"%s\". However, the following\n"
@@ -290,12 +377,12 @@
"Δεν βÏÎθηκε το πακÎτο \"%s\". ΠάÏαυτα τα ακόλουθα\n"
"πακÎτα πεÏιÎχουν \"%s\" στο όνομά τους:\n"
-#: src/cmdline/cmdline_action.cc:307
+#: src/cmdline/cmdline_action.cc:292
#, c-format
msgid "Couldn't find any package whose name or description matched \"%s\"\n"
msgstr "Δεν βÏÎθηκε πακÎτο με όνομα ή πεÏιγÏαφή που να ταιÏιάζει στο \"%s\"\n"
-#: src/cmdline/cmdline_action.cc:309
+#: src/cmdline/cmdline_action.cc:294
#, c-format
msgid ""
"Couldn't find any package matching \"%s\", and more than 40\n"
@@ -304,7 +391,7 @@
"Δεν βÏÎθηκε πακÎτο να ταιÏιάζει στο \"%s\", και πεÏισσότεÏα από 40\n"
"πακÎτα πεÏιÎχουν το \"%s\" στην πεÏιγÏαφή τους.\n"
-#: src/cmdline/cmdline_action.cc:312
+#: src/cmdline/cmdline_action.cc:297
#, c-format
msgid ""
"Couldn't find any package matching \"%s\". However, the following\n"
@@ -349,13 +436,13 @@
msgid "Freed %sB of disk space\n"
msgstr "Θα ελευθεÏώσει %sB χώÏο στο δίσκο"
-#: src/cmdline/cmdline_do_action.cc:67
+#: src/cmdline/cmdline_do_action.cc:71
#, c-format
msgid "Invalid operation %s"
msgstr "ΑκυÏη λειτουÏγία %s"
-#: src/cmdline/cmdline_do_action.cc:206 src/cmdline/cmdline_simulate.cc:30
-#: src/cmdline/cmdline_upgrade.cc:89
+#: src/cmdline/cmdline_do_action.cc:201 src/cmdline/cmdline_simulate.cc:31
+#: src/cmdline/cmdline_upgrade.cc:91
#, c-format
msgid "Abort.\n"
msgstr "Εγκατάλειψη.\n"
@@ -366,7 +453,7 @@
msgstr ""
"μεταφόÏτωση: θα Ï€ÏÎπει να καθοÏίσετε Îνα τουλάχιστον πακÎτο για κατÎβασμα\n"
-#: src/cmdline/cmdline_download.cc:43 src/download.cc:342
+#: src/cmdline/cmdline_download.cc:43 src/download.cc:344
msgid "Couldn't read source list"
msgstr "ΑδÏνατη η ανάγνωση της λίστας πηγών "
@@ -432,96 +519,96 @@
msgid "What is it? It's an elephant being eaten by a snake, of course.\n"
msgstr "Τι είναι; Είναι Îνα ελεφαντοειδÎÏ‚ που το Ï„Ïώει Îνα φίδι, φυσικά.\n"
-#: src/cmdline/cmdline_prompt.cc:44
+#: src/cmdline/cmdline_prompt.cc:45
msgid "Couldn't read list of sources"
msgstr "ΑδÏνατη η ανάγνωση του καταλόγου των πηγών"
-#: src/cmdline/cmdline_prompt.cc:219 src/cmdline/cmdline_show_broken.cc:73
+#: src/cmdline/cmdline_prompt.cc:220 src/cmdline/cmdline_show_broken.cc:73
#, c-format
msgid "but %s is to be installed."
msgstr "αλλά θα εγκατασταθεί το %s."
-#: src/cmdline/cmdline_prompt.cc:222 src/cmdline/cmdline_show_broken.cc:76
+#: src/cmdline/cmdline_prompt.cc:223 src/cmdline/cmdline_show_broken.cc:76
#, c-format
msgid "but %s is installed and it is kept back."
msgstr "αλλά το %s είναι εγκατεστημÎνο και εξαιÏείται."
-#: src/cmdline/cmdline_prompt.cc:225 src/cmdline/cmdline_show_broken.cc:79
+#: src/cmdline/cmdline_prompt.cc:226 src/cmdline/cmdline_show_broken.cc:79
#, c-format
msgid "but %s is installed."
msgstr "αλλά το %s είναι εγκατεστημÎνο."
-#: src/cmdline/cmdline_prompt.cc:229 src/cmdline/cmdline_show_broken.cc:83
+#: src/cmdline/cmdline_prompt.cc:230 src/cmdline/cmdline_show_broken.cc:83
#, c-format
msgid "but it is not installable"
msgstr "αλλά δεν είναι εγκατάστασιμο"
-#: src/cmdline/cmdline_prompt.cc:233 src/cmdline/cmdline_show_broken.cc:87
+#: src/cmdline/cmdline_prompt.cc:234 src/cmdline/cmdline_show_broken.cc:87
#, c-format
msgid " which is a virtual package."
msgstr " το οποίο είναι Îνα εικονικό πακÎτο."
-#: src/cmdline/cmdline_prompt.cc:236 src/cmdline/cmdline_show_broken.cc:90
+#: src/cmdline/cmdline_prompt.cc:237 src/cmdline/cmdline_show_broken.cc:90
#, c-format
msgid " or"
msgstr " ή"
-#: src/cmdline/cmdline_prompt.cc:248
+#: src/cmdline/cmdline_prompt.cc:249
msgid "The following packages are BROKEN:"
msgstr "Τα ακόλουθα πακÎτα είναι ΕΛΑΤΤΩΜΑΤΙΚΑ:"
-#: src/cmdline/cmdline_prompt.cc:249
+#: src/cmdline/cmdline_prompt.cc:250
msgid "The following packages are unused and will be REMOVED:"
msgstr "Τα ακόλουθα πακÎτα δεν χÏειάζονται και θα ΑΦΑΙΡΕΘΟΥÎ:"
-#: src/cmdline/cmdline_prompt.cc:250
+#: src/cmdline/cmdline_prompt.cc:251
msgid "The following packages have been automatically kept back:"
msgstr "Τα ακόλουθα πακÎτα εξαιÏÎθηκαν αυτόματα:"
-#: src/cmdline/cmdline_prompt.cc:251
+#: src/cmdline/cmdline_prompt.cc:252
msgid "The following NEW packages will be automatically installed:"
msgstr "Τα ακόλουθα ÎΕΑ πακÎτα θα εγκατασταθοÏν αυτόματα:"
-#: src/cmdline/cmdline_prompt.cc:252
+#: src/cmdline/cmdline_prompt.cc:253
msgid "The following packages will be automatically REMOVED:"
msgstr "Τα ακόλουθα πακÎτα θα ΑΦΑΙΡΕΘΟΥΠαυτόματα:"
-#: src/cmdline/cmdline_prompt.cc:253
+#: src/cmdline/cmdline_prompt.cc:254
msgid "The following packages will be DOWNGRADED:"
msgstr "Τα ακόλουθα πακÎτα θα ΥΠΟΒΑΘΜΙΣΤΟΥΠαυτόματα:"
-#: src/cmdline/cmdline_prompt.cc:254
+#: src/cmdline/cmdline_prompt.cc:255
msgid "The following packages have been kept back:"
msgstr "Τα ακόλουθα πακÎτα Îχουν εξαιÏεθεί:"
-#: src/cmdline/cmdline_prompt.cc:255
+#: src/cmdline/cmdline_prompt.cc:256
msgid "The following packages will be REINSTALLED:"
msgstr "Τα ακόλουθα πακÎτα θα ΕΠΑÎΕΓΚΑΤΑΣΤΑΘΟΥÎ:"
-#: src/cmdline/cmdline_prompt.cc:256
+#: src/cmdline/cmdline_prompt.cc:257
msgid "The following NEW packages will be installed:"
msgstr "Τα ακόλουθα ÎΕΑ πακÎτα θα εγκατασταθοÏν:"
-#: src/cmdline/cmdline_prompt.cc:257
+#: src/cmdline/cmdline_prompt.cc:258
msgid "The following packages will be REMOVED:"
msgstr "Τα ακόλουθα πακÎτα θα ΑΦΑΙΡΕΘΟΥÎ:"
-#: src/cmdline/cmdline_prompt.cc:258
+#: src/cmdline/cmdline_prompt.cc:259
msgid "The following packages will be upgraded:"
msgstr "Τα ακόλουθα πακÎτα θα αναβαθμιστοÏν:"
-#: src/cmdline/cmdline_prompt.cc:307
+#: src/cmdline/cmdline_prompt.cc:311
#, c-format
msgid "The following ESSENTIAL packages will be REMOVED!\n"
msgstr "Τα ακόλουθα ΑΠΑΡΑΙΤΗΤΑ πακÎτα θα ΑΦΑΙΡΕΘΟΥÎ!\n"
-#: src/cmdline/cmdline_prompt.cc:316
+#: src/cmdline/cmdline_prompt.cc:320
#, c-format
msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
msgstr ""
"Τα ακόλουθα ΑΠΑΡΑΙΤΗΤΑ πακÎτα θα γίνουν ΕΛΑΤΩΜΑΤΙΚΑ από αυτή την ενÎÏγεια:\n"
-#: src/cmdline/cmdline_prompt.cc:326
+#: src/cmdline/cmdline_prompt.cc:330
#, c-format
msgid ""
"WARNING: Performing this action will probably cause your system to break!\n"
@@ -530,98 +617,101 @@
"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Αυτή η ενÎÏγεια θα Ï€Ïοξενήσει δυσλειτουÏγίες στο σÏστημα!\n"
" ΜΗΠσυνεχίσετε εκτός αν γνωÏίζετε ΑΚΡΙΒΩΣ τι κάνετε!\n"
-#: src/cmdline/cmdline_prompt.cc:328
+#: src/cmdline/cmdline_prompt.cc:332
msgid "I am aware that this is a very bad idea"
msgstr "Îαι γνωÏίζω ότι είναι μια Ï€Î¿Î»Ï ÎºÎ±ÎºÎ® ιδÎα"
-#: src/cmdline/cmdline_prompt.cc:331
+#: src/cmdline/cmdline_prompt.cc:335
#, c-format
msgid "To continue, type the phrase \"%s\":\n"
msgstr "Για να συνεχίσετε, πληκτÏολογήστε την φÏάση \"%s\":\n"
-#: src/cmdline/cmdline_prompt.cc:434
+#: src/cmdline/cmdline_prompt.cc:438
#, c-format
msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
msgstr "Τα ακόλουθα πακÎτα είναι ΠΡΟΤΕΙÎΟΜΕÎΑ αλλά ΔΕΠθα εγκατασταθοÏν:\n"
-#: src/cmdline/cmdline_prompt.cc:440
+#: src/cmdline/cmdline_prompt.cc:444
#, c-format
msgid "The following packages are SUGGESTED but will NOT be installed:\n"
msgstr "Τα ακόλουθα πακÎτα είναι ΠΡΟΤΕΙÎΟΜΕÎΑ αλλά ΔΕΠθα εγκατασταθοÏν:\n"
-#: src/cmdline/cmdline_prompt.cc:445
+#: src/cmdline/cmdline_prompt.cc:449
#, c-format
msgid "No packages will be installed, upgraded, or removed.\n"
msgstr "Δεν θα εγκατασταθοÏν, αναβαθμιστοÏν ή αφαιÏεθοÏν πακÎτα.\n"
-#: src/cmdline/cmdline_prompt.cc:447
+#: src/cmdline/cmdline_prompt.cc:451
#, c-format
msgid "%lu packages upgraded, %lu newly installed, "
msgstr "%lu πακÎτα αναβαθμίζονται, %lu νÎο-εγκατεστημÎνα, "
-#: src/cmdline/cmdline_prompt.cc:451
+#: src/cmdline/cmdline_prompt.cc:455
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu επενεγκατεστημÎνα, "
-#: src/cmdline/cmdline_prompt.cc:453
+#: src/cmdline/cmdline_prompt.cc:457
#, c-format
msgid "%lu downgraded, "
msgstr "%lu υποβαθμισμÎνα, "
-#: src/cmdline/cmdline_prompt.cc:455
+#: src/cmdline/cmdline_prompt.cc:459
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu για αφαίÏεση και %lu δεν αναβαθμίστηκαν.\n"
-#: src/cmdline/cmdline_prompt.cc:462
+#: src/cmdline/cmdline_prompt.cc:466
#, c-format
msgid "Need to get %sB/%sB of archives. "
msgstr "ΧÏειάζεται να κατεβοÏν %sB/%sB αÏχείων. "
-#: src/cmdline/cmdline_prompt.cc:465
+#: src/cmdline/cmdline_prompt.cc:469
#, c-format
msgid "Need to get %sB of archives. "
msgstr "ΧÏειάζεται να κατεβοÏν %sB αÏχείων. "
-#: src/cmdline/cmdline_prompt.cc:472
+#: src/cmdline/cmdline_prompt.cc:476
#, c-format
msgid "After unpacking %sB will be used.\n"
msgstr "Μετά την αποσυμπίεση θα χÏησιμοποιηθοÏν %sB.\n"
-#: src/cmdline/cmdline_prompt.cc:475
+#: src/cmdline/cmdline_prompt.cc:479
#, c-format
msgid "After unpacking %sB will be freed.\n"
msgstr "Μετά την αποσυμπίεση θα ελευθεÏωθοÏν %sB.\n"
-#: src/cmdline/cmdline_prompt.cc:521
+#: src/cmdline/cmdline_prompt.cc:524
#, c-format
msgid "Bad action character '%c'\n"
msgstr "Κακός χαÏακτήÏας ενÎÏγειας '%c'\n"
-#: src/cmdline/cmdline_prompt.cc:596
+#: src/cmdline/cmdline_prompt.cc:595
#, c-format
msgid "No packages to show -- enter the package names on the line after 'i'.\n"
msgstr ""
"Δεν υπάÏχουν πακÎτα για εμφάνιση -- δώστε τα ονόματα των πακÎτων μετά το "
"'i'.\n"
-#: src/cmdline/cmdline_prompt.cc:598 src/cmdline/cmdline_prompt.cc:629
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:597
msgid "Press Return to continue."
msgstr "Πατήστε Return για συνÎχεια"
-#: src/cmdline/cmdline_prompt.cc:625
+#: src/cmdline/cmdline_prompt.cc:623
#, c-format
msgid "No packages found -- enter the package names on the line after 'c'.\n"
msgstr "Δεν βÏÎθηκαν πακÎτα -- γÏάψτε τα ονόματα των πακÎτων μετά το 'c'.\n"
-#: src/cmdline/cmdline_prompt.cc:665
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:627
+#, fuzzy
+msgid "Press Return to continue"
+msgstr "Πατήστε Return για συνÎχεια"
+
+#: src/cmdline/cmdline_prompt.cc:675
msgid "Do you want to continue? [Y/n/?] "
msgstr "ΘÎλετε να συνεχίσετε ; [Y/n/?] "
-#: src/cmdline/cmdline_prompt.cc:690
+#: src/cmdline/cmdline_prompt.cc:700
#, c-format
msgid ""
"\n"
@@ -632,7 +722,7 @@
"Θα εμφανιστοÏν πληÏοφοÏίες εξαÏτήσεων.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:692
+#: src/cmdline/cmdline_prompt.cc:702
#, c-format
msgid ""
"\n"
@@ -643,7 +733,7 @@
"Δεν θα εμφανιστοÏν πληÏοφοÏίες εξαÏτήσεων.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:698
+#: src/cmdline/cmdline_prompt.cc:708
#, c-format
msgid ""
"\n"
@@ -654,7 +744,7 @@
"Θα εμφανιστοÏν πληÏοφοÏίες εκδόσεων.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:700
+#: src/cmdline/cmdline_prompt.cc:710
#, c-format
msgid ""
"\n"
@@ -665,7 +755,7 @@
"Δεν θα εμφανιστοÏν πληÏοφοÏίες εκδόσεων.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:705
+#: src/cmdline/cmdline_prompt.cc:715
#, c-format
msgid ""
"\n"
@@ -676,7 +766,7 @@
"Θα εμφανιστοÏν πληÏοφοÏίες αλλαγής μεγεθών.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:717
#, c-format
msgid ""
"\n"
@@ -687,7 +777,7 @@
"Δεν θα εμφανιστοÏν πληÏοφοÏίες αλλαγής μεγεθών.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:737
#, c-format
msgid ""
"Commands:\n"
@@ -736,33 +826,86 @@
" _ : ΔιαγÏαφή\n"
" = : ΚÏάτημα\n"
-#: src/cmdline/cmdline_prompt.cc:751
+#: src/cmdline/cmdline_prompt.cc:761
#, c-format
msgid "Invalid response. Please enter a valid command or '?' for help.\n"
msgstr ""
"ΑκυÏη απάντηση. ΠαÏακαλώ εισάγετε μια ÎγκυÏη εντολή ή '?' για βοήθεια.\n"
+#: src/cmdline/cmdline_resolver.cc:84
+#, c-format
+msgid "y: %F%nn: %F%nq: %F%n,: %F%n.: %F%n"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:90
+msgid "accept the proposed changes"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:92
+msgid "reject the proposed changes and search for another solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:94
+#, fuzzy
+msgid "give up and quit the program"
+msgstr "Έξοδος από το Ï€ÏόγÏαμμα"
+
+#: src/cmdline/cmdline_resolver.cc:96
+msgid "move to the next solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:98
+msgid "move to the previous solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:131
+#, fuzzy
+msgid "The following actions will resolve these dependencies:"
+msgstr "Τα ακόλουθα πακÎτα Îχουν ανεπίλυτες εξαÏτήσεις:\n"
+
+#: src/cmdline/cmdline_resolver.cc:146
+msgid "Accept this solution? [Y/n/q/?]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:174
+msgid "Abandoning all efforts to resolve these dependencies."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:184
+#, fuzzy
+msgid "The following commands are available:"
+msgstr "Τα ακόλουθα πακÎτα είναι ΕΛΑΤΤΩΜΑΤΙΚΑ:"
+
+#: src/cmdline/cmdline_resolver.cc:188
+#, fuzzy
+msgid "Invalid response; please enter one of the following commands:"
+msgstr ""
+"ΑκυÏη απάντηση. ΠαÏακαλώ εισάγετε μια ÎγκυÏη εντολή ή '?' για βοήθεια.\n"
+
+#: src/cmdline/cmdline_resolver.cc:198
+msgid "No solution found within the allotted time. Try harder? [Y/n]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:226
+#, fuzzy
+msgid "Invalid response; please enter 'y' or 'n'."
+msgstr ""
+"ΑκυÏη απάντηση. ΠαÏακαλώ εισάγετε μια ÎγκυÏη εντολή ή '?' για βοήθεια.\n"
+
+#: src/cmdline/cmdline_resolver.cc:235
+msgid "Unable to resolve dependencies! Giving up..."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:240
+msgid "No more solutions."
+msgstr ""
+
#: src/cmdline/cmdline_search.cc:78
#, c-format
msgid "search: You must provide at least one search term\n"
msgstr "αναζήτηση: Θα Ï€ÏÎπει να οÏίσετε Îνα τουλάχιστον αντικείμενο\n"
-#: src/cmdline/cmdline_show_broken.cc:114
-#, c-format
-msgid ""
-"Some packages had unmet dependencies. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming.\n"
-"\n"
-msgstr ""
-"ΜεÏικά πακÎτα είναι αδÏνατον να εγκατασταθοÏν. Αυτό μποÏεί να σημαίνει ότι\n"
-"δημιουÏγήσατε μια απίθανη κατάσταση ή αν χÏησιμοποιείτε την ασταθή\n"
-"διανομή, ότι μεÏικά από τα πακÎτα δεν Îχουν ακόμα δημιουÏγηθεί ή Îχουν\n"
-"μετακινηθεί από τα εισεÏχόμενα.\n"
-"\n"
-
-#: src/cmdline/cmdline_show_broken.cc:115
+#: src/cmdline/cmdline_show_broken.cc:113
#, c-format
msgid "The following packages have unmet dependencies:\n"
msgstr "Τα ακόλουθα πακÎτα Îχουν ανεπίλυτες εξαÏτήσεις:\n"
@@ -960,12 +1103,12 @@
msgid "Description: "
msgstr "ΠεÏιγÏαφή: "
-#: src/cmdline/cmdline_simulate.cc:36
+#: src/cmdline/cmdline_simulate.cc:37
#, c-format
msgid "Would download/install/remove packages.\n"
msgstr "Θα κατεβοÏν/εγκατασταθοÏν/αφαιÏεθοÏν πακÎτα.\n"
-#: src/cmdline/cmdline_simulate.cc:47
+#: src/cmdline/cmdline_simulate.cc:48
msgid "Internal Error, Ordering didn't finish"
msgstr "ΕσωτεÏικό Σφάλμα, Η ταξινόμηση δεν τελείωσε"
@@ -1007,28 +1150,24 @@
msgid "UNAVAILABLE"
msgstr "ΜΗ ΔΙΑΘΕΣΙΜΑ"
-#: src/download_bar.cc:57 src/download_list.cc:265
+#: src/download_bar.cc:56 src/download_list.cc:263 src/download_screen.cc:57
#, c-format
-msgid ""
-"Please insert the following disc into the drive \"%s\":\n"
-"%s"
-msgstr ""
-"ΠαÏακαλώ τοποθετήστε τον ακόλουθο δίσκο στη μονάδα \"%s\":\n"
-"%s"
+msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
+msgstr "ΠαÏακαλώ εισάγετε το δίσκο με ετικÎτα \"%s\" στη μονάδα CD-ROM \"%s\"."
-#: src/download_bar.cc:76 src/generic/acqprogress.cc:63
+#: src/download_bar.cc:77 src/generic/acqprogress.cc:63
msgid "Hit "
msgstr "Επιτυχία "
-#: src/download_bar.cc:89
+#: src/download_bar.cc:90
msgid "Downloading "
msgstr "ΜεταφόÏτωση του "
-#: src/download_bar.cc:102
+#: src/download_bar.cc:103
msgid "Got "
msgstr "ΜεταφοÏτώθηκε το "
-#: src/download_bar.cc:156
+#: src/download_bar.cc:157
msgid "Downloading..."
msgstr "ΜεταφόÏτωση..."
@@ -1036,7 +1175,7 @@
msgid "Couldn't read list of package sources"
msgstr "Δεν ήταν δυνατή η ανάγνωση των πηγαίων πακÎτων"
-#: src/download.cc:104 src/download.cc:321
+#: src/download.cc:104 src/download.cc:322
msgid "Couldn't lock list directory..are you root?"
msgstr "ΑδÏνατο το κλείδωμα του φακÎλου της λίστας ... είστε root;"
@@ -1048,29 +1187,33 @@
msgid "View the progress of the package list update"
msgstr "Εμφάνιση Ï€Ïοόδου της διαδικασίας ανανÎωσης πακÎτων"
-#: src/download.cc:159
+#: src/download.cc:113
+msgid "List Update"
+msgstr ""
+
+#: src/download.cc:160
msgid "Couldn't clean out list directories"
msgstr "ΑδÏνατο ο καθαÏισμός του φακÎλου της λίστας"
-#: src/download.cc:176 src/ui.cc:1068
+#: src/download.cc:177 src/ui.cc:1152
msgid "Deleting obsolete downloaded files"
msgstr "ΔιαγÏάφονται τα πεÏιττά μεταφοÏτωμÎνα αÏχεία"
-#: src/download.cc:181
+#: src/download.cc:182
#, c-format
msgid "Deleting obsolete downloaded files\n"
msgstr "ΔιαγÏάφονται τα απαÏχαιωμÎνα μεταφοÏτωμÎνα αÏχεία\n"
-#: src/download.cc:223
+#: src/download.cc:224
#, c-format
msgid "Unable to open %s to log actions"
msgstr "ΑδÏνατο το άνοιγμα του %s για την καταγÏαφή ενεÏγειών"
-#: src/download.cc:229
+#: src/download.cc:230
msgid "log report"
msgstr "αναφοÏά σφαλμάτων"
-#: src/download.cc:230
+#: src/download.cc:231
#, c-format
msgid ""
"IMPORTANT: this log only lists intended actions; actions which fail due to\n"
@@ -1082,77 +1225,77 @@
"που αποτυγχάνουν εξαιτίας Ï€Ïοβλημάτων του dpkg δεν θα ολοκληÏωθοÏν.\n"
"\n"
-#: src/download.cc:231
+#: src/download.cc:232
#, c-format
msgid "Will install %li packages, and remove %li packages.\n"
msgstr "Θα εγκαταστήσει %li πακÎτα, και θα αφαιÏÎσει %li πακÎτα.\n"
-#: src/download.cc:233
+#: src/download.cc:234
#, c-format
msgid "%sB of disk space will be used\n"
msgstr "%sB χώÏος από το σκληÏÏŒ δίσκο θα χÏησιμοποιηθοÏν\n"
-#: src/download.cc:236
+#: src/download.cc:237
#, c-format
msgid "%sB bytes of disk space will be freed\n"
msgstr "%sB bytes από το σκληÏÏŒ δίσκο θα απελευθεÏωθοÏν\n"
-#: src/download.cc:244
+#: src/download.cc:245
#, c-format
msgid "[UPGRADE] %s %s -> %s\n"
msgstr "[ΑÎΑΒΑΘΜΙΣΗ] %s %s -> %s\n"
-#: src/download.cc:248
+#: src/download.cc:249
#, c-format
msgid "[DOWNGRADE] %s %s -> %s\n"
msgstr "[ΥΠΟΒΑΘΜΙΣΗ] %s %s -> %s\n"
-#: src/download.cc:258
+#: src/download.cc:259
msgid "REMOVE"
msgstr "ΑΦΑΙΡΕΣΗ"
-#: src/download.cc:264
+#: src/download.cc:265
msgid "INSTALL"
msgstr "ΕΓΚΑΤΑΣΤΑΣΗ"
-#: src/download.cc:267
+#: src/download.cc:268
msgid "REINSTALL"
msgstr "ΕΠΑÎΕΓΚΑΤΑΣΤΑΣΗ"
-#: src/download.cc:270
+#: src/download.cc:271
msgid "HOLD"
msgstr "ΑÎΑΜΟÎΗ"
-#: src/download.cc:273
+#: src/download.cc:274
msgid "BROKEN"
msgstr "ΣΠΑΣΜΕÎΑ"
-#: src/download.cc:276
+#: src/download.cc:277
msgid "REMOVE, NOT USED"
msgstr "ΑΦΑΙΡΕΣΗ, ΜΗ ΧΡΗΣΗΜΟΠΟΙΗΜΕÎΑ"
-#: src/download.cc:279
+#: src/download.cc:280
msgid "REMOVE, DEPENDENCIES"
msgstr "ΑΦΑΙΡΕΣΗ, ΕΞΑΡΤΗΣΕΙΣ"
-#: src/download.cc:282
+#: src/download.cc:283
msgid "INSTALL, DEPENDENCIES"
msgstr "ΕΓΚΑΤΑΣΤΑΣΗ, ΕΞΑΡΤΗΣΕΙΣ"
-#: src/download.cc:285
+#: src/download.cc:286
msgid "HOLD, DEPENDENCIES"
msgstr "ΑÎΑΜΟÎΗ, ΕΞΑΡΤΗΣΕΙΣ"
-#: src/download.cc:287
+#: src/download.cc:288
msgid "????????"
msgstr "????????"
-#: src/download.cc:291
+#: src/download.cc:292
#, c-format
msgid "[%s] %s\n"
msgstr "[%s] %s\n"
-#: src/download.cc:294
+#: src/download.cc:295
#, c-format
msgid ""
"===============================================================================\n"
@@ -1163,36 +1306,41 @@
"\n"
"Η καταγÏαφή ολοκληÏώθηκε.\n"
-#: src/download.cc:329
+#: src/download.cc:330
msgid "Downloading packages"
msgstr "ΜεταφόÏτωση πακÎτων"
-#: src/download.cc:330
+#: src/download.cc:331
msgid "View the progress of the package download"
msgstr "Εμφάνιση Ï€Ïοόδου της διαδικασίας μεταφόÏτωσης πακÎτου"
-#: src/download.cc:352
+#: src/download.cc:332
+#, fuzzy
+msgid "Package Download"
+msgstr "ΠακÎτο: "
+
+#: src/download.cc:354
msgid "Internal error: couldn't generate list of packages to download"
msgstr ""
"ΕσωτεÏικό σφάλμα: δεν ήταν δυνατή η δημιουÏγία της λίστας μεταφόÏτωσης "
"πακÎτων "
-#: src/download.cc:413
+#: src/download.cc:415
msgid "Unable to correct for unavailable packages"
msgstr "Αδυναμία διόÏθωσης των μη διαθÎσιμων πακÎτων"
-#: src/download.cc:465
+#: src/download.cc:467
msgid ""
"Ack! Something bad happened while installing packages. Trying to recover:"
msgstr ""
"ΦτοÏ! Κάτι κακό συνÎβη κατά την εγκατάσταση των πακÎτων. Î Ïοσπάθεια "
"επαναφοÏάς:"
-#: src/download.cc:475 src/pkg_item.cc:413
+#: src/download.cc:477 src/pkg_item.cc:432
msgid "Press return to continue.\n"
msgstr "Πατήστε enter για συνÎχεια.\n"
-#: src/download.cc:506
+#: src/download.cc:508
msgid ""
"Could not regain the system lock! (Perhaps another apt or dpkg is running?)"
msgstr ""
@@ -1253,11 +1401,6 @@
msgid "[ERROR]"
msgstr "[ΣΦΑΛΜΑ]"
-#: src/download_screen.cc:57
-#, c-format
-msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
-msgstr "ΠαÏακαλώ εισάγετε το δίσκο με ετικÎτα \"%s\" στη μονάδα CD-ROM \"%s\"."
-
#: src/download_screen.cc:181
#, c-format
msgid "Downloaded %sB in %ss (%sB/s)."
@@ -1297,117 +1440,117 @@
"Αλλαγή ÎœÎσου: ΠαÏακαλώ εισάγετε το δίσκο με ετικÎτα '%s' στη μονάδα '%s' και "
"πιÎστε enter\n"
-#: src/generic/aptcache.cc:245
+#: src/generic/aptcache.cc:253
msgid "Can't open Aptitude extended state file"
msgstr "ΑδÏνατο το άνοιγμα του αÏχείου λεπτομεÏοÏÏ‚ κατάστασης του Aptitude"
-#: src/generic/aptcache.cc:252 src/generic/aptcache.cc:305
-#: src/generic/aptcache.cc:307
+#: src/generic/aptcache.cc:260 src/generic/aptcache.cc:313
+#: src/generic/aptcache.cc:315
msgid "Reading extended state information"
msgstr "Ανάκτηση των δεδομÎνων λεπτομεÏοÏÏ‚ κατάστασης"
-#: src/generic/aptcache.cc:313 src/generic/aptcache.cc:387
-#: src/generic/aptcache.cc:390
+#: src/generic/aptcache.cc:321 src/generic/aptcache.cc:395
+#: src/generic/aptcache.cc:398
msgid "Initializing package states"
msgstr "ΑÏχικοποίηση κατάστασης πακÎτων"
-#: src/generic/aptcache.cc:501
+#: src/generic/aptcache.cc:509
msgid "Cannot open Aptitude state file"
msgstr "ΑδÏνατο το άνοιγμα του αÏχείου κατάστασης του Aptitude"
-#: src/generic/aptcache.cc:505 src/generic/aptcache.cc:560
-#: src/generic/aptcache.cc:563
+#: src/generic/aptcache.cc:513 src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:571
msgid "Writing extended state information"
msgstr "Αποθήκευση δεδομÎνων λεπτομεÏοÏÏ‚ κατάστασης"
-#: src/generic/aptcache.cc:542
+#: src/generic/aptcache.cc:550
#, c-format
msgid "Internal buffer overflow on package \"%s\" while writing state file"
msgstr ""
"ΕσωτεÏική υπεÏχείλιση στο πακÎτο \"%s\" κατά την εγγÏαφή του αÏχείου "
"κατάστασης"
-#: src/generic/aptcache.cc:551
+#: src/generic/aptcache.cc:559
msgid "Couldn't write state file"
msgstr "ΑδÏνατη η εγγÏαφή στο αÏχείο κατάστασης"
-#: src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:576
msgid "Error writing state file"
msgstr "Σφάλμα κατά την εγγÏαφή στο αÏχείο κατάστασης"
-#: src/generic/aptcache.cc:584
+#: src/generic/aptcache.cc:592
msgid "couldn't replace old state file"
msgstr "αδÏνατη η αντικατάσταση του υπάÏχοντος αÏχείου κατάστασης"
-#: src/generic/aptcache.cc:960
+#: src/generic/aptcache.cc:1000
msgid "Unable to correct dependencies, some packages cannot be installed"
msgstr ""
"ΑδÏνατη η διόÏθωση των εξαÏτήσεων, κάποια πακÎτα δεν μποÏοÏν να εγκατασταθοÏν"
-#: src/generic/aptcache.cc:1325
+#: src/generic/aptcache.cc:1546
msgid "The list of sources could not be read."
msgstr "ΑδÏνατη η ανάγνωση της λίστας πηγών."
-#: src/generic/aptcache.cc:1332
+#: src/generic/aptcache.cc:1553
msgid "The package lists or status file could not be parsed or opened."
msgstr ""
"ΑδÏνατο το άνοιγμα ή η ανάλυση των λιστών πακÎτων ή του αÏχείου κατάστασης."
-#: src/generic/aptcache.cc:1335
+#: src/generic/aptcache.cc:1556
msgid "You may want to update the package lists to correct these missing files"
msgstr ""
"Ίσως να χÏειαστεί να ενημεÏώσετε τις λίστες των πακÎτων για να διοÏθώσετε "
"αυτά τα αγνοοÏμενα αÏχεία."
-#: src/generic/apt.cc:141
+#: src/generic/apt.cc:142
#, c-format
msgid "Unable to open %s for writing"
msgstr "ΑδÏνατο το άνοιγμα του %s για εγγÏαφή"
-#: src/generic/apt.cc:151
+#: src/generic/apt.cc:152
#, c-format
msgid "Unable to replace %s with new configuration file"
msgstr "ΑδÏνατη η αντικατάσταση του %s με νÎο αÏχείο Ïυθμίσεων"
-#: src/generic/apt.cc:226
+#: src/generic/apt.cc:227
msgid "Warning: could not lock the cache file. Opening in read-only mode"
msgstr ""
"Î Ïοειδοποίηση: ΑδÏνατο το κλείδωμα του αÏχείου cache. Θα ανοιχτεί μόνο για "
"ανάγνωση."
-#: src/generic/matchers.cc:780
+#: src/generic/matchers.cc:797
msgid "Unmatched '('"
msgstr "ΑταίÏιαστη '('"
-#: src/generic/matchers.cc:870 src/generic/matchers.cc:949
+#: src/generic/matchers.cc:887 src/generic/matchers.cc:968
#, c-format
msgid "Unknown dependency type: %s"
msgstr "Άγνωστος Ï„Ïπος εξάÏτησης: %s"
-#: src/generic/matchers.cc:931
+#: src/generic/matchers.cc:950
#, c-format
msgid "Unknown action type: %s"
msgstr "Άγνωστος Ï„Ïπος εÏγασίας: %s"
-#: src/generic/matchers.cc:998
+#: src/generic/matchers.cc:1017
#, c-format
msgid "Unknown priority %s"
msgstr "Άγνωστη Ï€ÏοτεÏαιότητα %s"
-#: src/generic/matchers.cc:1020
+#: src/generic/matchers.cc:1039
#, c-format
msgid "Unknown pattern type: %c"
msgstr "Άγνωστος Ï„Ïπος κανονικής παÏάστασης: %c"
-#: src/generic/matchers.cc:1065
+#: src/generic/matchers.cc:1084
msgid "Unexpected empty expression"
msgstr "Μη αναμενόμενη κενή παÏάσταση"
-#: src/generic/matchers.cc:1100
+#: src/generic/matchers.cc:1119
msgid "Badly formed expression"
msgstr "Λάθος διαμοÏφωμÎνη παÏάσταση"
-#: src/generic/matchers.cc:1129
+#: src/generic/matchers.cc:1148
msgid "Unexpected ')'"
msgstr "Μή αναμενόμενη ')'"
@@ -1431,7 +1574,7 @@
msgstr ""
"Δεν μποÏεί να βÏεθεί η τιμή του $HOME, με τη χÏήση του TMPDIR (ανασφαλÎÏ‚)"
-#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:60
+#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:61
#, c-format
msgid "ChangeLog of %s"
msgstr "ΑÏχείο Αλλαγής του %s"
@@ -1638,17 +1781,17 @@
msgid "Invalid sorting policy type '%s'"
msgstr "Μη ÎγκυÏη πολιτική ταξινόμησης '%s'"
-#: src/main.cc:68
+#: src/main.cc:67
#, c-format
msgid "%s %s compiled at %s %s\n"
msgstr "%s %s μεταγλωττίστηκε στις %s %s\n"
-#: src/main.cc:71
+#: src/main.cc:70
#, c-format
msgid "Compiler: g++ %s\n"
msgstr "Î ÏόγÏαμμα μεταγλώττισης : g++ %s\n"
-#: src/main.cc:74
+#: src/main.cc:73
#, c-format
msgid ""
"\n"
@@ -1657,7 +1800,7 @@
"\n"
"Εκδοση NCurses: %s\n"
-#: src/main.cc:76
+#: src/main.cc:75
#, c-format
msgid ""
"\n"
@@ -1666,22 +1809,22 @@
"\n"
"Εκδοση Curses: %s\n"
-#: src/main.cc:78
+#: src/main.cc:77
#, c-format
msgid "libsigc++ version: %s\n"
msgstr "εκδοση libsigc++: %s\n"
-#: src/main.cc:84
+#: src/main.cc:83
#, c-format
msgid "Usage: aptitude [-S fname] [-u|-i]"
msgstr "ΧÏήση: aptitude [-S fname] [-u|-i]"
-#: src/main.cc:86
+#: src/main.cc:85
#, c-format
msgid " aptitude [options] <action> ..."
msgstr " aptitude [επιλογÎÏ‚] <ενÎÏγεια> ..."
-#: src/main.cc:88
+#: src/main.cc:87
#, c-format
msgid ""
" Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -1691,43 +1834,43 @@
"λειτουÏγία):\n"
"\n"
-#: src/main.cc:89
+#: src/main.cc:88
#, c-format
msgid " install - Install/upgrade packages\n"
msgstr " install - Εγκατάσταση/αναβάθμιση πακÎτου\n"
-#: src/main.cc:90
+#: src/main.cc:89
#, c-format
msgid " remove - Remove packages\n"
msgstr " remove - ΑφαίÏεση πακÎτων\n"
-#: src/main.cc:91
+#: src/main.cc:90
#, c-format
msgid " purge - Remove packages and their configuration files\n"
msgstr " purge - ΑφαίÏεση πακÎτων μαζί με τα αÏχεία Ïυθμίσεών τους\n"
-#: src/main.cc:92
+#: src/main.cc:91
#, c-format
msgid " hold - Place packages on hold\n"
msgstr " hold - ΤοποθÎτηση πακÎτων σε αναμονή\n"
-#: src/main.cc:93
+#: src/main.cc:92
#, c-format
msgid " unhold - Cancel a hold command for a package\n"
msgstr " unhold - ΑκÏÏωση της εντολής αναμονή για πακÎτο\n"
-#: src/main.cc:94
+#: src/main.cc:93
#, c-format
msgid " markauto - Mark packages as having been automatically installed\n"
msgstr "markauto - Σήμανση των πακÎτων σαν να Îχουν εγκατασταθεί αυτόματα\n"
-#: src/main.cc:95
+#: src/main.cc:94
#, c-format
msgid " unmarkauto - Mark packages as having been manually installed\n"
msgstr ""
"unmarkauto - Σήμανση των πακÎτων σαν να Îχουν εγκατασταθεί χειÏοκίνητα\n"
-#: src/main.cc:100
+#: src/main.cc:99
#, c-format
msgid ""
" forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -1736,17 +1879,17 @@
" forbid-version - ΑπαγόÏευση της αναβάθμισης ενός πακÎτου σε μια "
"συγκεκÏιμÎνη Îκδοση.\n"
-#: src/main.cc:101
+#: src/main.cc:100
#, c-format
msgid " update - Download lists of new/upgradable packages\n"
msgstr "update - ΜεταφόÏτωση λιστών των νÎων/αναβαθμιζόμενων πακÎτων\n"
-#: src/main.cc:102
+#: src/main.cc:101
#, c-format
msgid " upgrade - Perform a safe upgrade\n"
msgstr " upgrade - ΕκτÎλεση μιας ασφαλοÏÏ‚ αναβάθμισης\n"
-#: src/main.cc:103
+#: src/main.cc:102
#, c-format
msgid ""
" dist-upgrade - Perform an upgrade, possibly installing and removing "
@@ -1755,60 +1898,60 @@
" dist-upgrade - ΕκτÎλεση μιας αναβάθμισης, με πιθανή Ï€Ïοσθήκη και αφαίÏεση "
"πακÎτων\n"
-#: src/main.cc:104
+#: src/main.cc:103
#, c-format
msgid " forget-new - Forget what packages are \"new\"\n"
msgstr "forget-new - ΞÎχασε ποια πακÎτα είναι \"νÎα\"\n"
-#: src/main.cc:105
+#: src/main.cc:104
#, c-format
msgid " search - Search for a package by name and/or expression\n"
msgstr ""
" search - Αναζήτηση ενός πακÎτου με βάση το όνομα ή/και ÎκφÏαση\n"
-#: src/main.cc:106
+#: src/main.cc:105
#, c-format
msgid " show - Display detailed information about a package\n"
msgstr " show - Εμφάνιση λεπτομεÏειών σχετικά με Îνα πακÎτο\n"
-#: src/main.cc:107
+#: src/main.cc:106
#, c-format
msgid " clean - Erase downloaded package files\n"
msgstr " clean - ΔιαγÏαφή μεταφοÏτομÎνων πακÎτων\n"
-#: src/main.cc:108
+#: src/main.cc:107
#, c-format
msgid " autoclean - Erase old downloaded package files\n"
msgstr " autoclean - ΔιαγÏαφή παλαιότεÏα μεταφοÏτομÎνων αÏχεία πακÎτων\n"
-#: src/main.cc:109
+#: src/main.cc:108
#, c-format
msgid " changelog - View a package's changelog\n"
msgstr " ημεÏ. αλλαγών -Εμφάνισε το ημεÏολόγιο αλλαγών ενός πακÎτου\n"
-#: src/main.cc:110
+#: src/main.cc:109
#, c-format
msgid " download - Download the .deb file for a package\n"
msgstr " download - ΜεταφόÏτωση ενός αÏχείου .deb για Îνα πακÎτο\n"
-#: src/main.cc:112
+#: src/main.cc:111
#, c-format
msgid " Options:\n"
msgstr " ΕπιλογÎÏ‚:\n"
-#: src/main.cc:113
+#: src/main.cc:112
#, c-format
msgid " -h This help text\n"
msgstr " -h Αυτό το κείμενο βοήθειας\n"
-#: src/main.cc:114
+#: src/main.cc:113
#, c-format
msgid " -s Simulate actions, but do not actually perform them.\n"
msgstr ""
" -s Εξομοίωση ενεÏγειών, αλλά να μην Ï€ÏαγματοποιηθοÏν στην "
"Ï€Ïαγματικότητα.\n"
-#: src/main.cc:115
+#: src/main.cc:114
#, c-format
msgid ""
" -d Only download packages, do not install or remove anything.\n"
@@ -1816,19 +1959,19 @@
" -d Μόνο μεταφόÏτωση των πακÎτων, να μην γίνει εγκατάσταση ή "
"απεγκατάσταση κάτι.\n"
-#: src/main.cc:116
+#: src/main.cc:115
#, c-format
msgid " -P Always prompt for confirmation or actions\n"
msgstr "-P Îα γίνονται πάντα εÏωτήσεις επιβεβαίωσης ή ενÎÏγειες\n"
-#: src/main.cc:117
+#: src/main.cc:116
#, c-format
msgid ""
" -y Assume that the answer to simple yes/no questions is 'yes'\n"
msgstr ""
"-y ΥπÎθεσε ότι η απάντηση σε απλÎÏ‚ εÏωτήσεις ναι/όχι είναι 'ναι'\n"
-#: src/main.cc:118
+#: src/main.cc:117
#, c-format
msgid ""
" -F format Specify a format for displaying search results; see the "
@@ -1837,7 +1980,7 @@
"-F format ΟÏισμός του Ï„Ïόπου εμφάνισης των αποτελεσμάτων αναζήτησης, "
"δείτε εγχειÏίδιο χÏήσης\n"
-#: src/main.cc:119
+#: src/main.cc:118
#, c-format
msgid ""
" -O order Specify how search results should be sorted; see the manual\n"
@@ -1845,7 +1988,7 @@
"-O order ΟÏισμός του Ï„Ïόπου ταξινόμησης των αποτελεσμάτων αναζήτησης, "
"δείτε το εγχειÏίδιο χÏήσης\n"
-#: src/main.cc:120
+#: src/main.cc:119
#, c-format
msgid ""
" -w width Specify the display width for formatting search results\n"
@@ -1853,32 +1996,32 @@
" -w width ΚαθοÏισμός του πλάτους εμφάνισης των αποτελεσμάτων "
"αναζήτησης\n"
-#: src/main.cc:121
+#: src/main.cc:120
#, c-format
msgid " -f Aggressively try to fix broken packages.\n"
msgstr "-f Επιθετική Ï€Ïοσπάθεια επίλυσης των σπασμÎνων πακÎτων.\n"
-#: src/main.cc:122
+#: src/main.cc:121
#, c-format
msgid " -V Show which versions of packages are to be installed.\n"
msgstr ""
"-V Εμφάνιση των εκδόσεων των πακÎτων που Ï€Ïόκειται να "
"εγκατασταθοÏν.\n"
-#: src/main.cc:123
+#: src/main.cc:122
#, c-format
msgid ""
" -D Show the dependencies of automatically changed packages.\n"
msgstr ""
"-D Εμφάνιση των εξαÏτήσεων των αυτόματα αλλαγμÎνων πακÎτων.\n"
-#: src/main.cc:124
+#: src/main.cc:123
#, c-format
msgid " -Z\t\t Show the change in installed size of each package.\n"
msgstr ""
"-Z\t\t Εμφάνιση της αλλαγής μεγÎθους στο εγκατεστημÎνο κάθε πακÎτου.\n"
-#: src/main.cc:125
+#: src/main.cc:124
#, c-format
msgid ""
" -v Display extra information. (may be supplied multiple times)\n"
@@ -1886,7 +2029,7 @@
"-v Εμφανίζει επιπλÎον πληÏοφοÏίες (μποÏεί να οÏιστεί πολλαπλÎÏ‚ "
"φοÏÎÏ‚)\n"
-#: src/main.cc:126
+#: src/main.cc:125
#, c-format
msgid ""
" -t [release] Set the release from which packages should be installed\n"
@@ -1894,12 +2037,12 @@
" -t [release] ΟÏίστε την Îκδοση από ποια πακÎτα θα Ï€ÏÎπει να "
"εγκατασταθοÏν\n"
-#: src/main.cc:127
+#: src/main.cc:126
#, c-format
msgid " -o key=val Directly set the configuration option named 'key'\n"
msgstr " -o key=val Άμεσος καθοÏισμός μια παÏαμÎÏ„Ïου με όνομα 'key'\n"
-#: src/main.cc:128
+#: src/main.cc:127
#, c-format
msgid ""
" --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -1908,59 +2051,67 @@
" --with(out)-recommends\tΚαθοÏισμός αντιμετώπισης των συνιστώμενων ως\n"
" ισχυÏών εξαÏτήσεων\n"
-#: src/main.cc:129
+#: src/main.cc:128
#, c-format
msgid " -S fname: Read the aptitude extended status info from fname.\n"
msgstr " -S fname: Ανάγνωση των εκτεταμÎνων πληÏοφοÏιών από το αÏχείο fname.\n"
-#: src/main.cc:130
+#: src/main.cc:129
#, c-format
msgid " -u : Download new package lists on startup.\n"
msgstr "u : ΜεταφόÏτωση νÎας λίστας πακÎτων κατά την εκκίνηση.\n"
-#: src/main.cc:131
+#: src/main.cc:130
#, c-format
msgid " -i : Perform an install run on startup.\n"
msgstr "-i : ΕκτÎλεση μιας εγκατάστασης κατά την εκκίνηση.\n"
-#: src/main.cc:133
+#: src/main.cc:132
#, c-format
msgid " This aptitude does not have Super Cow Powers.\n"
msgstr " Αυτό το APT Îχει Δυνάμεις ΥπεÏΑγελάδας.\n"
-#: src/main.cc:254
+#: src/main.cc:253
#, c-format
msgid "-o requires an argument of the form key=value, got %s"
msgstr "-o απαιτεί μια παÏάμετÏο της μοÏφής key=value, Îλαβε %s"
-#: src/main.cc:300 src/main.cc:309
+#: src/main.cc:299 src/main.cc:308
msgid "WEIRDNESS: unknown option code received\n"
msgstr "ΠΑΡΑΞΕÎΟ: ελήφθη άγνωστος κώδικας παÏάμετÏου\n"
-#: src/main.cc:318
+#: src/main.cc:317
msgid "Only one of -u and -i may be specified\n"
msgstr "Μόνο Îνα από το -u και i μποÏοÏν να οÏιστοÏν\n"
-#: src/main.cc:326
+#: src/main.cc:325
msgid ""
"-u and -i may not be specified in command-line mode (eg, with 'install')"
msgstr ""
"το -u και -i δεν μποÏεί να οÏιστοÏν στη λειτουÏγία γÏαμμής εντολών(Ï€.χ. με "
"το 'install')"
-#: src/main.cc:337
+#: src/main.cc:342
msgid "-u and -i may not be specified with a command"
msgstr "το -u και -i δεν μποÏοÏν να οÏιστοÏν στην ίδια εντολή"
-#: src/main.cc:392
+#: src/main.cc:399
#, c-format
msgid "Unknown command \"%s\"\n"
msgstr "Αγνωστη εντολή \"%s\"\n"
-#: src/main.cc:400
+#: src/main.cc:406 src/main.cc:463
+msgid "Internal error: uncaught 'out of solutions' exception.\n"
+msgstr ""
+
+#: src/main.cc:411 src/main.cc:468
+msgid "Internal error: uncaught 'out of time' exception.\n"
+msgstr ""
+
+#: src/main.cc:418
#, c-format
-msgid "Invalid option for interactive mode: -s\n"
-msgstr "ΕσφαλμÎνη επιλογή για τη διαδÏαστική λειτουÏγία: -s\n"
+msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
+msgstr ""
#: src/mine/cmine.cc:93
#, c-format
@@ -1988,7 +2139,7 @@
msgid "Lost"
msgstr "Εχασε"
-#: src/mine/cmine.cc:119 src/ui.cc:1005
+#: src/mine/cmine.cc:119 src/ui.cc:1089
msgid "Minesweeper"
msgstr "ÎαÏκαλιευτής"
@@ -2168,7 +2319,7 @@
msgid "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
msgstr "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
-#: src/pkg_columnizer.cc:84 src/ui.cc:1488
+#: src/pkg_columnizer.cc:84 src/ui.cc:1638
msgid "Package"
msgstr "ΠακÎτο"
@@ -2430,13 +2581,14 @@
"συστήματος."
#: src/pkg_grouppolicy.cc:158
+#, fuzzy
msgid ""
"Programs for faxmodems and other communications devices\n"
" Packages in the 'comm' section are used to control modems and other "
"hardware communications devices. This includes software to control faxmodems "
"(for instance, PPP for dial-up internet connections and programs originally "
-"written for that purpose (zmodem/kermit), as well as software to control "
-"cellular phones, interface with FidoNet, and run a BBS."
+"written for that purpose, such as zmodem/kermit), as well as software to "
+"control cellular phones, interface with FidoNet, and run a BBS."
msgstr ""
"Î ÏογÏάμματα για φαξ μόντεμ και άλλες συσκευÎÏ‚ επικοινωνίας\n"
"Τα πακÎτα στο τομÎα 'comm' χÏησιμοποιοÏνται για τον Îλεγχο μόντεμ και άλλες "
@@ -2898,14 +3050,15 @@
"τομÎα, θα τα βÏείτε πλÎον στην κυÏίως αÏχειοθήκη 'main'."
#: src/pkg_grouppolicy.cc:193
+#, fuzzy
msgid ""
"Programs which are not free software\n"
" Packages in the 'non-free' section are not part of Debian.\n"
" .\n"
" These packages fail to meet one or more of the requirements of the Debian "
-"Free Software Guidelines (see below) You should read the license of programs "
-"in this section to be sure that you are allowed to use them in the way you "
-"intend.\n"
+"Free Software Guidelines (see below). You should read the license of "
+"programs in this section to be sure that you are allowed to use them in the "
+"way you intend.\n"
" .\n"
" For more information about what Debian considers to be Free Software, see "
"http://www.debian.org/social_contract#guidelines"
@@ -2969,11 +3122,12 @@
" Ειναι διαθÎσιμη μια νεότεÏη Îκδοση Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… πακÎτου."
#: src/pkg_grouppolicy.cc:320
+#, fuzzy
msgid ""
"New Packages\n"
" These packages have been added to Debian since the last time you cleared "
-"the list of \"new\" packages. (choose \"Forget new packages\" from the "
-"Actions menu to empty this list)"
+"the list of \"new\" packages (choose \"Forget new packages\" from the "
+"Actions menu to empty this list)."
msgstr ""
"ÎÎα ΠακÎτα\n"
" Αυτά τα πακÎτα Ï€ÏοστÎθηκαν στο Debian από την τελευταία φοÏά που καθαÏίσατε "
@@ -3226,101 +3380,121 @@
msgid "Versions"
msgstr "Εκδόσεις"
-#: src/pkg_item.cc:54
+#: src/pkg_item.cc:55
msgid "Yes, I am aware this is a very bad idea"
msgstr "Îαι ξÎÏω ότι είναι Ï€Î¿Î»Ï ÎºÎ±ÎºÎ® ιδÎα"
#: src/pkg_item.cc:80
-#, c-format
+#, fuzzy, c-format
msgid ""
-"%s is an essential package!\n"
-"\n"
-"Are you sure you want to remove it?\n"
-"Type '%s' if you are."
+"%s is an essential package!%n%nAre you sure you want to remove it?%nType '%"
+"s' if you are."
msgstr ""
"το %s είναι απαÏαίτητο πακÎτο!\n"
"\n"
"Είστε βÎβαιοι για την αφαίÏεσή του;\n"
"ΠληκτÏολογήστε '%s' αν είστε βÎβαιοι."
-#: src/pkg_item.cc:219
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:625
#, c-format
msgid "Information about %s"
msgstr "ΠληÏοφοÏίες σχετικά με το %s"
-#: src/pkg_item.cc:304
-msgid "Available versions of "
+#: src/pkg_item.cc:224 src/pkg_ver_item.cc:627
+#, c-format
+msgid "%s info"
+msgstr ""
+
+#: src/pkg_item.cc:310
+#, fuzzy, c-format
+msgid "Available versions of %s"
msgstr "ΔιαθÎσιμες εκδόσεις του "
-#: src/pkg_item.cc:312 src/pkg_ver_item.cc:648
+#: src/pkg_item.cc:313
+#, fuzzy, c-format
+msgid "%s versions"
+msgstr "Εκδόσεις"
+
+#: src/pkg_item.cc:325 src/pkg_ver_item.cc:655
#, c-format
msgid "Dependencies of %s"
msgstr "ΕξαÏτήσεις του %s"
-#: src/pkg_item.cc:322 src/pkg_ver_item.cc:657
+#: src/pkg_item.cc:327 src/pkg_ver_item.cc:657
+#, c-format
+msgid "%s deps"
+msgstr ""
+
+#: src/pkg_item.cc:338 src/pkg_ver_item.cc:667
#, c-format
msgid "Packages depending on %s"
msgstr "ΠακÎτα που εξαÏτώνται από το %s"
-#: src/pkg_item.cc:373 src/pkg_ver_item.cc:694
+#: src/pkg_item.cc:340 src/pkg_ver_item.cc:669
+#, c-format
+msgid "%s reverse deps"
+msgstr ""
+
+#: src/pkg_item.cc:392 src/pkg_ver_item.cc:707
#, c-format
msgid "Reporting a bug in %s:\n"
msgstr "ΑναφοÏά ενός σφάλματος για το %s:\n"
-#: src/pkg_item.cc:395
+#: src/pkg_item.cc:414
+#, fuzzy
msgid ""
-"You are not root and I cannot find any way\n"
-"to become root. To reconfigure this package,\n"
-"install the menu package, the login package,\n"
-"or run aptitude as root."
+"You are not root and I cannot find any way to become root. To reconfigure "
+"this package, install the menu package, the login package, or run aptitude "
+"as root."
msgstr ""
"Δεν είστε root και δεν μποÏÏŽ να βÏω Ï„Ïόπο\n"
"να γίνετε root. Για να Ïυθμίσετε ξανά αυτό το πακÎτο\n"
"εγκαταστήστε το πακÎτο μενοÏ, το πακÎτο\n"
"Ï€ÏοσπÎλασης, ή εκτελÎστε το aptitude ως root."
-#: src/pkg_item.cc:403
+#: src/pkg_item.cc:422
#, c-format
msgid "Reconfiguring %s\n"
msgstr "ΞαναÏυθμίζεται το %s\n"
-#: src/pkg_item.cc:428
+#: src/pkg_item.cc:447
msgid "Hierarchy editor"
msgstr "ΕπεξεÏγαστής ΙεÏαÏχίας"
+#: src/pkg_item.cc:447
+#, fuzzy
+msgid "Hierarchy Editor"
+msgstr "ΕπεξεÏγαστής ΙεÏαÏχίας"
+
#: src/pkg_tree.cc:325
msgid "Search for: "
msgstr "Αναζήτηση του: "
-#: src/pkg_tree.cc:585
+#: src/pkg_tree.cc:568
msgid "All Packages"
msgstr "Όλα Τα ΠακÎτα"
-#: src/pkg_tree.cc:598 src/pkg_tree.cc:607
+#: src/pkg_tree.cc:581 src/pkg_tree.cc:590
msgid "Building view"
msgstr "ΔημιουÏγία εμφάνισης"
-#: src/pkg_tree.cc:649
+#: src/pkg_tree.cc:632
#, c-format
msgid "No packages matched the pattern \"%s\"."
msgstr "Δεν ταίÏιαξε πακÎτο με το \"%s\"."
-#: src/pkg_tree.cc:671
+#: src/pkg_tree.cc:654
msgid "Enter the new package tree limit: "
msgstr "Εισάγετε Îνα νÎο ÏŒÏιο για το δÎντÏο των πακÎτων:"
-#: src/pkg_tree.cc:705
+#: src/pkg_tree.cc:688
msgid "Enter the new package grouping mechanism for this display: "
msgstr "Εισάγετε το Ï„Ïόπο ομαδοποίησης πακÎτων για αυτή την απεικόνιση:"
-#: src/pkg_tree.cc:713
+#: src/pkg_tree.cc:696
msgid "Enter the new package sorting mechanism for this display: "
msgstr "Εισάγετε το Ï„Ïόπο ταξινόμησης πακÎτων για αυτή την απεικόνιση:"
-#: src/pkg_ver_item.cc:623
-msgid "Information about "
-msgstr "ΠληÏοφοÏίες σχετικά με "
-
#: src/pkg_view.cc:344
msgid "make_package_view: error in arguments -- two main widgets??"
msgstr "make_package_view: σφάλμα στα οÏίσματα -- two main widgets??"
@@ -3335,7 +3509,7 @@
msgid "make_package_view: bad argument!"
msgstr "make_package_view: κακό ÏŒÏισμα!"
-#: src/pkg_view.cc:492
+#: src/pkg_view.cc:495
msgid "make_package_view: no main widget found"
msgstr "make_package_view: no main widget found"
@@ -3555,6 +3729,75 @@
"Τα ακόλουθα πακÎτα εξαÏτώνται από την Îκδοση %B%s%b του %B%s%b, και θα "
"χαλάσουν αν είναι %s."
+#: src/solution_dialog.cc:74
+msgid "The package cache is not available."
+msgstr ""
+
+#: src/solution_dialog.cc:82
+#, fuzzy
+msgid "No packages are broken."
+msgstr ""
+"Κάποια πακÎτα είναι κατεστÏαμμÎνα. Îα γίνει Ï€Ïοσπάθεια επιδιόÏθωσής τους;"
+
+#: src/solution_dialog.cc:103
+msgid "No resolution found."
+msgstr ""
+
+#: src/solution_dialog.cc:107
+#, c-format
+msgid ""
+"Time exhausted while searching for a solution (you can select \"Next Solution"
+"\" or press %s to try harder)."
+msgstr ""
+
+#: src/solution_dialog.cc:146
+#, fuzzy
+msgid "Previous"
+msgstr "ΠαÏÎχει"
+
+#: src/solution_dialog.cc:147
+#, fuzzy
+msgid "Next"
+msgstr "^Επόμενο"
+
+#: src/solution_dialog.cc:148
+msgid "Apply"
+msgstr ""
+
+#: src/solution_dialog.cc:149
+#, fuzzy
+msgid "Close"
+msgstr "^Κλείσιμο"
+
+#: src/solution_fragment.cc:125
+#, fuzzy
+msgid "%BRemove%b the following packages:%n"
+msgstr "Τα ακόλουθα πακÎτα είναι ΕΛΑΤΤΩΜΑΤΙΚΑ:"
+
+#: src/solution_fragment.cc:135
+#, fuzzy
+msgid "%BInstall%b the following packages:%n"
+msgstr "Τα ακόλουθα πακÎτα είναι ΕΛΑΤΤΩΜΑΤΙΚΑ:"
+
+#: src/solution_fragment.cc:148
+msgid "%BKeep%b the following packages at their current version:%n"
+msgstr ""
+
+#: src/solution_fragment.cc:161
+#, fuzzy
+msgid "%BUpgrade%b the following packages:%n"
+msgstr "Τα ακόλουθα πακÎτα είναι ΕΛΑΤΤΩΜΑΤΙΚΑ:"
+
+#: src/solution_fragment.cc:176
+#, fuzzy
+msgid "%BDowngrade%b the following packages:%n"
+msgstr "ΜεταφόÏτωση πακÎτων"
+
+#: src/solution_fragment.cc:190
+#, c-format
+msgid "Score is %d"
+msgstr ""
+
#: src/trust.cc:17 src/trust.cc:19
msgid "WARNING"
msgstr ""
@@ -3566,55 +3809,55 @@
"system."
msgstr ""
-#: src/ui.cc:143
+#: src/ui.cc:164
msgid "Er, there aren't any errors, this shouldn't have happened.."
msgstr "Χμ, δεν υπήÏχαν λάθη, δε θα ÎÏ€Ïεπε να συμβαίνει αυτό.."
-#: src/ui.cc:149
+#: src/ui.cc:170
msgid "E:"
msgstr ""
-#: src/ui.cc:151
+#: src/ui.cc:172
msgid "W:"
msgstr ""
-#: src/ui.cc:172
+#: src/ui.cc:193
msgid "Search for:"
msgstr "Αναζήτηση του:"
-#: src/ui.cc:205
+#: src/ui.cc:261
msgid "You already are root!"
msgstr "Είστε ήδη ο χÏήστης root!"
-#: src/ui.cc:303
+#: src/ui.cc:359
msgid ""
"Subprocess exited with an error -- did you type your password correctly?"
msgstr ""
"Η υποδιεÏγασία τεÏματίστηκε με σφάλμα -- εισάγατε τον κωδικό σας σωστά;"
-#: src/ui.cc:331
+#: src/ui.cc:387
msgid "Loading cache"
msgstr "ΦόÏτωση του cache"
-#: src/ui.cc:353
+#: src/ui.cc:409
msgid "Really quit Aptitude?"
msgstr "Έξοδος από το Aptitude; ΣίγουÏα;"
-#: src/ui.cc:432
+#: src/ui.cc:488
msgid "Really discard your personal settings and reload the defaults?"
msgstr ""
"Είστε σίγουÏοι ότι θÎλετε να διαγÏάψετε τις Ï€ÏοσωπικÎÏ‚ σας Ïυθμίσεις και να "
"φοÏτώσετε τις Ï€ÏοκαθοÏισμÎνες;"
-#: src/ui.cc:532
+#: src/ui.cc:588 src/ui.cc:590 src/ui.cc:618 src/ui.cc:620
msgid "Packages"
msgstr "ΠακÎτα"
-#: src/ui.cc:533 src/ui.cc:560
+#: src/ui.cc:589 src/ui.cc:619
msgid "View available packages and choose actions to perform"
msgstr "Εμφάνιση των διαθÎσιμων πακÎτων και επιλογή εÏγασιών"
-#: src/ui.cc:599
+#: src/ui.cc:666
#, fuzzy
msgid ""
"%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
@@ -3631,15 +3874,15 @@
"επιτÏÎπεται η διανομή του υπό συγκεκÏιμÎνες Ï€ÏοϋποθÎσεις. Δείτε το\n"
"'license' για λεπτομÎÏειες."
-#: src/ui.cc:620
+#: src/ui.cc:687
msgid "help.txt"
msgstr "help.txt"
-#: src/ui.cc:636
+#: src/ui.cc:703
msgid "README"
msgstr "README"
-#: src/ui.cc:718
+#: src/ui.cc:785
msgid ""
"%C%BWARNING%b: untrusted versions of the following packages will be "
"installed!%n%nUntrusted packages could %Bcompromise your system's security%"
@@ -3647,61 +3890,70 @@
"this is what you want to do.%n%n"
msgstr ""
-#: src/ui.cc:732
+#: src/ui.cc:799
#, fuzzy
msgid "Really Continue"
msgstr "ΣυνÎχεια"
-#: src/ui.cc:734
+#: src/ui.cc:801
msgid "Abort Installation"
msgstr ""
-#: src/ui.cc:796
+#: src/ui.cc:862
msgid "Preview of package installation"
msgstr "Î Ïοεπισκόπηση της εγκατάστασης των πακÎτων"
-#: src/ui.cc:797
+#: src/ui.cc:863
msgid "View and/or adjust the actions that will be performed"
msgstr "Εμφάνιση και/ή ÏÏθμιση των ενεÏγειών που θα εκτελεστοÏν"
-#: src/ui.cc:837
-msgid "Some packages were broken and have been fixed"
+#: src/ui.cc:864
+#, fuzzy
+msgid "Preview"
+msgstr "^Î Ïοηγ"
+
+#: src/ui.cc:900
+#, fuzzy
+msgid "Some packages were broken and have been fixed:"
msgstr "Κάποια πακÎτα ήταν κατεστÏαμμÎνα και Îχουν διοÏθωθεί"
-#: src/ui.cc:839
-msgid "Some broken packages could not be fixed!"
-msgstr "Δεν ήταν δυνατή η διόÏθωση κάποιων κατεστÏαμμÎνων πακÎτων!"
+#: src/ui.cc:906
+msgid "No solution to these dependency problems exists!"
+msgstr ""
-#: src/ui.cc:847 src/ui.cc:959
-msgid "Some packages are broken. Try to fix them?"
+#: src/ui.cc:912
+#, c-format
+msgid ""
+"Ran out of time while trying to resolver dependencies (press \"%s\" to try "
+"harder)"
msgstr ""
-"Κάποια πακÎτα είναι κατεστÏαμμÎνα. Îα γίνει Ï€Ïοσπάθεια επιδιόÏθωσής τους;"
-#: src/ui.cc:860
+#: src/ui.cc:958
+#, fuzzy
msgid ""
-"Installing/removing packages requires administrative privileges, which\n"
-"you currently do not have. Would you like to change to the root account?\n"
+"Installing/removing packages requires administrative privileges, which you "
+"currently do not have. Would you like to change to the root account?"
msgstr ""
"Η εγκατάσταση/αφαίÏεση πακÎτων απαιτεί Ï€Ïονόμια διαχειÏιστή, που δεν\n"
"Îχετε αυτή τη στιγμή. Θα θÎλατε να συνδεθείτε ως χÏήστης root;\n"
-#: src/ui.cc:863 src/ui.cc:993
+#: src/ui.cc:961 src/ui.cc:1077
msgid "Become root"
msgstr "ΜετατÏοπή σε root"
-#: src/ui.cc:865 src/ui.cc:995
+#: src/ui.cc:963 src/ui.cc:1079
msgid "Don't become root"
msgstr "Οχι μετατÏοπή σε root"
-#: src/ui.cc:870 src/ui.cc:1000
+#: src/ui.cc:968 src/ui.cc:1084
msgid "A package-list update or install run is already taking place."
msgstr "Ήδη βÏίσκεται σε εξÎλιξη μια διαδικασία αναβάθμισης ή εγκατάστασης."
-#: src/ui.cc:897
+#: src/ui.cc:995
msgid "No packages are scheduled to be installed, removed, or upgraded."
msgstr "Δεν Îχουν επιλεγεί πακÎτα για εγκατάσταση, αφαίÏεση ή αναβάθμιση."
-#: src/ui.cc:903
+#: src/ui.cc:1001
#, fuzzy
msgid ""
"No packages will be installed, removed or upgraded. Some packages could be "
@@ -3714,166 +3966,181 @@
"αναβαθμίσετε.\n"
"ΠληκτÏολογήστε \"U\" για να Ï€Ïοετοιμάσετε μια αναβάθμιση."
-#: src/ui.cc:990
+#: src/ui.cc:1073
+#, fuzzy
msgid ""
-"Updating the package lists requires administrative privileges, which\n"
-"you currently do not have. Would you like to change to the root account?\n"
+"Updating the package lists requires administrative privileges, which you "
+"currently do not have. Would you like to change to the root account?"
msgstr ""
"Η ενημÎÏωση των λιστών πακÎτων απαιτεί Ï€Ïονόμια διαχειÏιστή, που δεν\n"
"Îχετε αυτή τη στιγμή. Θα θÎλατε να συνδεθείτε ως χÏήστης root;\n"
-#: src/ui.cc:1005 src/ui.cc:1198
+#: src/ui.cc:1089 src/ui.cc:1345
msgid "Waste time trying to find mines"
msgstr "Σκοτώστε την ÏŽÏα σας βÏίσκοντας νάÏκες"
-#: src/ui.cc:1012 src/ui.cc:1065
+#: src/ui.cc:1096 src/ui.cc:1149
msgid "Cleaning while a download is in progress is not allowed"
msgstr "Δεν επιτÏÎπεται εκκαθάÏιση κατά τη διάÏκεια της μεταφόÏτωσης"
-#: src/ui.cc:1015
+#: src/ui.cc:1099
msgid "Deleting downloaded files"
msgstr "ΔιαγÏάφονται τα μεταφοÏτωμÎνα αÏχείων"
-#: src/ui.cc:1029
+#: src/ui.cc:1113
msgid "Downloaded package files have been deleted"
msgstr "Τα μεταφοÏτωμÎνα αÏχεία Îχουν διαγÏαφεί"
-#: src/ui.cc:1090
+#: src/ui.cc:1174
#, fuzzy, c-format
msgid ""
"Obsolete downloaded package files have been deleted, freeing %sB of disk "
"space."
msgstr "Τα πεÏιττά μεταφοÏτωμÎνα αÏχεία Îχουν διαγÏαφεί"
-#: src/ui.cc:1174
+#: src/ui.cc:1246
+msgid "All solutions exhausted."
+msgstr ""
+
+#: src/ui.cc:1251 src/ui.cc:1282
+#, fuzzy
+msgid "Ran out of time while trying to find a solution."
+msgstr "Σκοτώστε την ÏŽÏα σας βÏίσκοντας νάÏκες"
+
+#: src/ui.cc:1276
+msgid "Unable to find a solution to apply."
+msgstr ""
+
+#: src/ui.cc:1321
msgid "^Install/remove packages"
msgstr "^Εγκατάσταση/ΑφαίÏεση πακÎτων"
-#: src/ui.cc:1175
+#: src/ui.cc:1322
msgid "Perform all pending installs and removals"
msgstr "ΟλοκλήÏωση όλων των εκκÏεμών εγκαταστάσεων/αφαιÏÎσεων"
-#: src/ui.cc:1177
+#: src/ui.cc:1324
msgid "^Update package list"
msgstr "^ΕνημÎÏωση της λίστας πακÎτων"
-#: src/ui.cc:1178
+#: src/ui.cc:1325
msgid "Check for new versions of packages"
msgstr "Έλεγχος για νÎες εκδόσεις πακÎτων"
-#: src/ui.cc:1181
+#: src/ui.cc:1328
msgid "^Forget new packages"
msgstr "ΞÎχασε τα νÎα πακÎτα"
-#: src/ui.cc:1182
+#: src/ui.cc:1329
msgid "Forget which packages are \"new\""
msgstr "ΞÎχασε τα πακÎτα που είναι \"νÎα\""
-#: src/ui.cc:1185
+#: src/ui.cc:1332
msgid "^Clean package cache"
msgstr "ΕκκαθάÏιση του cache των πακÎτων"
-#: src/ui.cc:1186
+#: src/ui.cc:1333
msgid "Delete package files which were previously downloaded"
msgstr "ΔιαγÏαφή των αÏχείων πακÎτου που Îχουν μεταφοÏτωθεί Ï€ÏοηγουμÎνως"
-#: src/ui.cc:1189
+#: src/ui.cc:1336
msgid "Clean ^obsolete files"
msgstr "ΕκκαθάÏιση ^πεÏιττών αÏχείων"
-#: src/ui.cc:1190
+#: src/ui.cc:1337
msgid "Delete package files which can no longer be downloaded"
msgstr "ΔιαγÏαφή των αÏχείων πακÎτων που δεν μποÏοÏν πλÎον να μεταφοÏτωθοÏν"
-#: src/ui.cc:1193
+#: src/ui.cc:1340
msgid "Mark ^Upgradable"
msgstr "Σημείωση ^ΑναβαθμιζομÎνων"
-#: src/ui.cc:1194
+#: src/ui.cc:1341
msgid "Mark all upgradable packages which are not held for upgrade"
msgstr ""
"Σημείωση όλων των αναβαθμιζομÎνων πακÎτων που δεν κÏατοÏνται πλÎον για "
"αναβάθμιση"
-#: src/ui.cc:1197
+#: src/ui.cc:1344
msgid "^Play Minesweeper"
msgstr "Παίξε ÎαÏκαλιευτή"
-#: src/ui.cc:1200
+#: src/ui.cc:1347
msgid "^Become root"
msgstr "ΣÏνδεση ως root"
-#: src/ui.cc:1201
+#: src/ui.cc:1348
+#, fuzzy
msgid ""
-"Run 'su' to become root; this will restart the program, but your\n"
-"settings will be preserved"
+"Run 'su' to become root; this will restart the program, but your settings "
+"will be preserved"
msgstr ""
"ΕκτελÎστε την εντολή 'su' για να συνδεθείτε ως root. Αυτή θα ξαναεκτελÎσει\n"
"το Ï€ÏόγÏαμμα διατηÏώντας τις δικÎÏ‚ σας Ïυθμίσεις"
-#: src/ui.cc:1204
+#: src/ui.cc:1351
msgid "^Reload package cache"
msgstr "ΕπαναφόÏτωση του cache πακÎτων"
-#: src/ui.cc:1205
+#: src/ui.cc:1352
msgid "Reload the package cache"
msgstr "ΕπαναφόÏτωση του cache των πακÎτων"
-#: src/ui.cc:1211
+#: src/ui.cc:1358
msgid "^Quit"
msgstr "Έξοδος"
-#: src/ui.cc:1212
+#: src/ui.cc:1359
msgid "Exit the program"
msgstr "Έξοδος από το Ï€ÏόγÏαμμα"
-#: src/ui.cc:1218 src/ui.cc:1487
+#: src/ui.cc:1365 src/ui.cc:1637
msgid "Undo"
msgstr "ΑναίÏεση"
-#: src/ui.cc:1219
+#: src/ui.cc:1366
msgid "Undo the last package operation or group of operations"
msgstr "ΕπαναφοÏά της τελευταίας εÏγασίας ή ομάδας εÏγασιών σε πακÎτο."
-#: src/ui.cc:1226
+#: src/ui.cc:1373
msgid "^Install"
msgstr "^Εγκατάσταση"
-#: src/ui.cc:1227
+#: src/ui.cc:1374
msgid "Flag the currently selected package for installation or upgrade"
msgstr "Σήμανση του Ï„ÏÎχοντος πακÎτου για εγκατάσταση ή αναβάθμιση"
-#: src/ui.cc:1230
+#: src/ui.cc:1377
msgid "^Remove"
msgstr "^ΑφαίÏεση"
-#: src/ui.cc:1231
+#: src/ui.cc:1378
msgid "Flag the currently selected package for removal"
msgstr "Σήμανση του Ï„ÏÎχοντος πακÎτου για αφαίÏεση"
-#: src/ui.cc:1234
+#: src/ui.cc:1381
msgid "^Purge"
msgstr "^ΔιαγÏαφή"
-#: src/ui.cc:1235
+#: src/ui.cc:1382
msgid ""
"Flag the currently selected package and its configuration files for removal"
msgstr ""
"Σήμανση του Ï„ÏÎχοντος πακÎτου και των αÏχείων Ïυθμίσεών του για αφαίÏεση"
-#: src/ui.cc:1238
+#: src/ui.cc:1385
msgid "^Keep"
msgstr "^ΚÏάτηση"
-#: src/ui.cc:1239
+#: src/ui.cc:1386
msgid "Cancel any action on the selected package"
msgstr "ΑκÏÏωση κάθε ενÎÏγειας για το επιλεγμÎνο πακÎτο"
-#: src/ui.cc:1242
+#: src/ui.cc:1389
msgid "^Hold"
msgstr "^Αναμονή"
-#: src/ui.cc:1243
+#: src/ui.cc:1390
msgid ""
"Cancel any action on the selected package, and protect it from future "
"upgrades"
@@ -3881,251 +4148,255 @@
"ΑκÏÏωση κάθε ενÎÏγειας για το επιλεγμÎνο πακÎτο, και Ï€Ïοστασία του από "
"μελλοντικÎÏ‚ αναβαθμίσεις"
-#: src/ui.cc:1246
+#: src/ui.cc:1393
msgid "Mark ^Auto"
msgstr "^Αυτόματη Σήμανση"
-#: src/ui.cc:1247
+#: src/ui.cc:1394
+#, fuzzy
msgid ""
-"Mark the selected package as having been automatically installed;\n"
-"it will automatically be removed if no other packages depend on it"
+"Mark the selected package as having been automatically installed; it will "
+"automatically be removed if no other packages depend on it"
msgstr ""
"Σήμανση του επιλεγμÎνου πακÎτου ως αυτόματα εγκατεστημÎνου. \n"
"Îτσι θα αφαιÏεθεί αυτόματα όταν δεν θα εξαÏτώνται άλλα πακÎτα από αυτό."
-#: src/ui.cc:1250
+#: src/ui.cc:1397
msgid "Mark ^Manual"
msgstr "^ΧειÏοκίνητη Σήμανση"
-#: src/ui.cc:1251
+#: src/ui.cc:1398
+#, fuzzy
msgid ""
-"Mark the selected package as having been manually installed;\n"
-"it will not be removed unless you manually remove it"
+"Mark the selected package as having been manually installed; it will not be "
+"removed unless you manually remove it"
msgstr ""
"Σήμανση των επιλεγμÎνων πακÎτων ως χειÏοκίνητα εγκατεστημÎνων. \n"
"δεν θα αφαιÏεθοÏν εκτός και αν τα αφαιÏÎσετε εσείς χειÏοκίνητα."
-#: src/ui.cc:1254
+#: src/ui.cc:1401
msgid "^Forbid Version"
msgstr "^ΑπαγόÏευση Îκδοσης"
-#: src/ui.cc:1255
+#: src/ui.cc:1402
+#, fuzzy
msgid ""
-"Forbid the candidate version of the selected package from being installed;\n"
+"Forbid the candidate version of the selected package from being installed; "
"newer versions of the package will be installed as usual"
msgstr ""
"ΑπαγόÏευσε την υποψήφια Îκδοση του επιλεγμÎνου πακÎτου από το να "
"εγκατασταθεί\n"
"νεώτεÏες εκδόσεις του, θα εγκατασταθοÏν κανονικά"
-#: src/ui.cc:1259
+#: src/ui.cc:1406
msgid "I^nformation"
msgstr "Î ^ληÏοφοÏίες"
-#: src/ui.cc:1260
+#: src/ui.cc:1407
msgid "Display more information about the selected package"
msgstr "Εμφάνισε πεÏισσότεÏες πληÏοφοÏίες για το επιλεγμÎνο πακÎτο"
-#: src/ui.cc:1263
+#: src/ui.cc:1410
msgid "^Changelog"
msgstr "Α^Ïχείο Αλλαγών"
-#: src/ui.cc:1264
+#: src/ui.cc:1411
msgid "Display the Debian changelog of the selected package"
msgstr "Εμφάνισε το ημεÏολόγιο αλλαγών του Debian για το επιλεγμÎνο πακÎτο"
-#: src/ui.cc:1271
+#: src/ui.cc:1418
msgid "^Find"
msgstr "^ΕυÏεση"
-#: src/ui.cc:1272
+#: src/ui.cc:1419
msgid "Search for a package"
msgstr "Αναζήτηση για Îνα πακÎτο"
-#: src/ui.cc:1275
+#: src/ui.cc:1422
msgid "Find ^Again"
msgstr "Î’ÏÎÏ‚ ^Ξανά"
-#: src/ui.cc:1276
+#: src/ui.cc:1423
msgid "Repeat the last search"
msgstr "Επανάληψη της τελευταίας αναζήτησης"
-#: src/ui.cc:1280
+#: src/ui.cc:1427
msgid "^Limit Display"
msgstr "^ΠεÏιόÏισε Εμφάνιση"
-#: src/ui.cc:1281
+#: src/ui.cc:1428
msgid "Apply a filter to the package list"
msgstr "ΕφαÏμογή φίλτÏου στον κατάλογο των πακÎτων"
-#: src/ui.cc:1284
+#: src/ui.cc:1431
msgid "^Un-Limit Display"
msgstr "^Εμφάνιση ΧωÏίς ΠεÏιοÏισμοÏÏ‚"
-#: src/ui.cc:1285
+#: src/ui.cc:1432
msgid "Remove the filter from the package list"
msgstr "ΑφαίÏεση του φίλτÏου από τον κατάλογο των πακÎτων"
-#: src/ui.cc:1289
+#: src/ui.cc:1436
msgid "Find ^Broken"
msgstr "Î’ÏÎÏ‚ Σ^πασμÎνο"
-#: src/ui.cc:1290
+#: src/ui.cc:1437
msgid "Find the next package with unsatisfied dependencies"
msgstr "Î’Ïες το επόμενο πακÎτο με ανεπίλυτες εξαÏτήσεις"
-#: src/ui.cc:1297
+#: src/ui.cc:1444
msgid "^UI options"
msgstr "ΕπιλογÎÏ‚ ^ΠεÏιβάλλοντος"
-#: src/ui.cc:1298
+#: src/ui.cc:1445
msgid "Change the settings which affect the user interface"
msgstr "Αλλαγή των επιλογών που μεταβάλουν το πεÏιβάλλον εÏγασίας"
-#: src/ui.cc:1301
+#: src/ui.cc:1448
msgid "^Dependency handling"
msgstr "ΔιαχείÏιση ΕξαÏτήσεων"
-#: src/ui.cc:1302
+#: src/ui.cc:1449
msgid "Change the settings which affect how package dependencies are handled"
msgstr ""
"Αλλαγή των Ïυθμίσεων που επηÏεάζουν τη διαχείÏιση των εξαÏτήσεων των πακÎτων"
-#: src/ui.cc:1305
+#: src/ui.cc:1452
msgid "^Miscellaneous"
msgstr "^ΔιάφοÏα"
-#: src/ui.cc:1306
+#: src/ui.cc:1453
msgid "Change miscellaneous program settings"
msgstr "Αλλαγή διαφόÏων επιλογών του Ï€ÏογÏάμματος"
-#: src/ui.cc:1311
+#: src/ui.cc:1458
msgid "^Revert options"
msgstr "^ΕπαναφοÏά επιλογών"
-#: src/ui.cc:1312
+#: src/ui.cc:1459
msgid "Reset all settings to the system defaults"
msgstr "ΟÏισμός όλων των επιλογών στις Ï€ÏοκαθοÏισμÎνες τιμÎÏ‚"
-#: src/ui.cc:1323
+#: src/ui.cc:1470
msgid "^Next"
msgstr "^Επόμενο"
-#: src/ui.cc:1324
+#: src/ui.cc:1471
msgid "View next display"
msgstr "Εμφάνιση επόμενης οθόνης"
-#: src/ui.cc:1327
+#: src/ui.cc:1474
msgid "^Prev"
msgstr "^Î Ïοηγ"
-#: src/ui.cc:1328
+#: src/ui.cc:1475
msgid "View previous display"
msgstr "Εμφάνιση Ï€ÏοηγοÏμενης οθόνης"
-#: src/ui.cc:1331
+#: src/ui.cc:1478
msgid "^Close"
msgstr "^Κλείσιμο"
-#: src/ui.cc:1332
+#: src/ui.cc:1479
msgid "Close this display"
msgstr "Κλείσιμο αυτής της οθόνης"
-#: src/ui.cc:1337
+#: src/ui.cc:1484
msgid "New Package ^View"
msgstr "ÎÎα Εμφάνιση ^ΠακÎτου"
-#: src/ui.cc:1338
+#: src/ui.cc:1485
msgid "Create a new default package view"
msgstr "ΔημιουÏγία νÎας οθόνης εμφάνισης πακÎτου"
-#: src/ui.cc:1341
+#: src/ui.cc:1488
msgid "New Categorical ^Browser"
msgstr "Εμφάνιση ÎÎας ΚατηγοÏιοποίησης"
-#: src/ui.cc:1343
+#: src/ui.cc:1490
msgid "Browse packages by category"
msgstr "Εμφάνιση πακÎτων ανά κατηγοÏία"
-#: src/ui.cc:1351
+#: src/ui.cc:1498
msgid "^About"
msgstr "Σχετικά"
-#: src/ui.cc:1352
+#: src/ui.cc:1499
msgid "View information about this program"
msgstr "Εμφάνιση πληÏοφοÏίας σχετικά με το Ï€ÏόγÏαμμα"
-#: src/ui.cc:1355
+#: src/ui.cc:1502
msgid "^Help"
msgstr "^Βοήθεια"
-#: src/ui.cc:1356
+#: src/ui.cc:1503
msgid "View the on-line help"
msgstr "Εμφάνιση της βοήθειας του Ï€ÏογÏάμματος"
-#: src/ui.cc:1358
+#: src/ui.cc:1505
msgid "User's ^Manual"
msgstr "Οδηγίες ^ΧÏήσης"
-#: src/ui.cc:1359
+#: src/ui.cc:1506
msgid "View the detailed program manual"
msgstr "Εμφάνιση των αναλυτικών οδηγιών χÏήσης"
-#: src/ui.cc:1362
+#: src/ui.cc:1509
msgid "^FAQ"
msgstr "^FAQ"
-#: src/ui.cc:1363
+#: src/ui.cc:1510
msgid "View a list of frequently asked questions"
msgstr "Εμφάνιση των πιο συχνών εÏωτήσεων"
-#: src/ui.cc:1366
-msgid "^ChangeLog"
-msgstr "ΑÏχείο Αλλαγών"
+#: src/ui.cc:1513
+msgid "^NEWS"
+msgstr ""
-#: src/ui.cc:1367
-msgid "View the important changes made in each version of the program"
+#: src/ui.cc:1514
+#, fuzzy
+msgid "View the important changes made in each version of "
msgstr "Εμφάνιση των σημαντικών αλλαγών σε κάθε Îκδοση του Ï€ÏογÏάμματος"
-#: src/ui.cc:1370
+#: src/ui.cc:1517
msgid "^License"
msgstr "Άδεια ^χÏήσης"
-#: src/ui.cc:1371
+#: src/ui.cc:1518
msgid "View the terms under which you may copy the program"
msgstr "Εμφάνιση των ÏŒÏων χÏήσης και διανομής του του Ï€ÏογÏάμματος"
-#: src/ui.cc:1486
+#: src/ui.cc:1636
msgid "Actions"
msgstr "ΕνÎÏγειες"
-#: src/ui.cc:1489
+#: src/ui.cc:1639
msgid "Search"
msgstr "Αναζήτηση"
-#: src/ui.cc:1490
+#: src/ui.cc:1640
msgid "Options"
msgstr "ΕπιλογÎÏ‚"
-#: src/ui.cc:1491
+#: src/ui.cc:1641
msgid "Views"
msgstr "Οθόνες"
-#: src/ui.cc:1492
+#: src/ui.cc:1642
msgid "Help"
msgstr "Βοήθεια"
-#: src/ui.cc:1537
+#: src/ui.cc:1699
#, c-format
msgid ""
"%s: Menu %s: Help %s: Quit %s: Update %s: Download/Install/Remove Pkgs"
msgstr "%s: ÎœÎµÎ½Î¿Ï %s: Βοήθεια %s: Έξοδος %s: ΕνημÎÏωση %s: ΕÏγασίες ΠακÎτων"
-#: src/ui.cc:1799 src/vscreen/vscreen.cc:281
+#: src/ui.cc:1968 src/vscreen/vscreen.cc:281
msgid "yes_key"
msgstr "Î"
-#: src/ui.cc:1800 src/vscreen/vscreen.cc:282
+#: src/ui.cc:1969 src/vscreen/vscreen.cc:282
msgid "no_key"
msgstr "Ο"
@@ -4137,6 +4408,16 @@
msgid "Downloading Changelog"
msgstr "ΜεταφόÏτωση ΑÏχείου Αλλαγών"
+#: src/view_changelog.cc:54
+#, fuzzy
+msgid "Download Changelog"
+msgstr "ΜεταφόÏτωση ΑÏχείου Αλλαγών"
+
+#: src/view_changelog.cc:63
+#, c-format
+msgid "%s changes"
+msgstr ""
+
#: src/vscreen/vscreen.cc:119
#, c-format
msgid "Ouch! Got SIGTERM, dying..\n"
@@ -4165,6 +4446,39 @@
msgid "No"
msgstr "Οχι"
+#~ msgid ""
+#~ "Some packages had unmet dependencies. This may mean that you have\n"
+#~ "requested an impossible situation or if you are using the unstable\n"
+#~ "distribution that some required packages have not yet been created\n"
+#~ "or been moved out of Incoming.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "ΜεÏικά πακÎτα είναι αδÏνατον να εγκατασταθοÏν. Αυτό μποÏεί να σημαίνει "
+#~ "ότι\n"
+#~ "δημιουÏγήσατε μια απίθανη κατάσταση ή αν χÏησιμοποιείτε την ασταθή\n"
+#~ "διανομή, ότι μεÏικά από τα πακÎτα δεν Îχουν ακόμα δημιουÏγηθεί ή Îχουν\n"
+#~ "μετακινηθεί από τα εισεÏχόμενα.\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Please insert the following disc into the drive \"%s\":\n"
+#~ "%s"
+#~ msgstr ""
+#~ "ΠαÏακαλώ τοποθετήστε τον ακόλουθο δίσκο στη μονάδα \"%s\":\n"
+#~ "%s"
+
+#~ msgid "Invalid option for interactive mode: -s\n"
+#~ msgstr "ΕσφαλμÎνη επιλογή για τη διαδÏαστική λειτουÏγία: -s\n"
+
+#~ msgid "Information about "
+#~ msgstr "ΠληÏοφοÏίες σχετικά με "
+
+#~ msgid "Some broken packages could not be fixed!"
+#~ msgstr "Δεν ήταν δυνατή η διόÏθωση κάποιων κατεστÏαμμÎνων πακÎτων!"
+
+#~ msgid "^ChangeLog"
+#~ msgstr "ΑÏχείο Αλλαγών"
+
#~ msgid "Go away, I'm trying to think.\n"
#~ msgstr "Deixeu-me tranquil, estic intentant pensar.\n"
Modified: branches/aptitude-0.3/aptitude/po/es.po
==============================================================================
--- branches/aptitude-0.3/aptitude/po/es.po (original)
+++ branches/aptitude-0.3/aptitude/po/es.po Sat Apr 30 13:41:32 2005
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: aptitude 0.2.15.4\n"
"Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-01-10 16:26-0800\n"
+"POT-Creation-Date: 2005-04-29 18:11-0400\n"
"PO-Revision-Date: 2004-07-21 16:23+0200\n"
"Last-Translator: Rubén Porras Campo <nahoo at inicia.es>\n"
"Language-Team: Debian-l10n-Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -156,16 +156,103 @@
"Eliminar paquetes no utilizados que cumplan este filtro de forma automática"
#: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:184 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
-#: src/vscreen/vs_util.cc:329
+#: src/ui.cc:218 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
+#: src/vscreen/vs_util.cc:328
msgid "Ok"
msgstr "Aceptar"
#: src/apt_options.cc:242 src/download_list.cc:71 src/mine/cmine.cc:257
-#: src/mine/cmine.cc:330 src/vscreen/vs_util.cc:329
+#: src/mine/cmine.cc:330 src/vscreen/vs_util.cc:328
msgid "Cancel"
msgstr "Cancelar"
+#: src/broken_indicator.cc:106 src/solution_dialog.cc:97
+msgid "Internal error: unexpected null solution."
+msgstr ""
+
+#: src/broken_indicator.cc:158
+#, fuzzy
+msgid "Suggest "
+msgstr "Sugiere"
+
+#: src/broken_indicator.cc:164
+#, fuzzy, c-format
+msgid "%d installs"
+msgstr "instalar"
+
+#: src/broken_indicator.cc:169
+#, fuzzy
+msgid "1 install"
+msgstr "instalar"
+
+#: src/broken_indicator.cc:173
+#, c-format
+msgid "%d removals"
+msgstr ""
+
+#: src/broken_indicator.cc:178
+msgid "1 removal"
+msgstr ""
+
+#: src/broken_indicator.cc:182
+#, c-format
+msgid "%d keeps"
+msgstr ""
+
+#: src/broken_indicator.cc:187
+msgid "1 keep"
+msgstr ""
+
+#: src/broken_indicator.cc:191
+#, fuzzy, c-format
+msgid "%d upgrades"
+msgstr "actualizar"
+
+#: src/broken_indicator.cc:196
+#, fuzzy
+msgid "1 upgrade"
+msgstr "actualizar"
+
+#: src/broken_indicator.cc:200
+#, fuzzy, c-format
+msgid "%d downgrades"
+msgstr "desactualizado"
+
+#: src/broken_indicator.cc:205
+#, fuzzy
+msgid "1 downgrade"
+msgstr "desactualizado"
+
+#: src/broken_indicator.cc:214
+#, c-format
+msgid "%s: Examine"
+msgstr ""
+
+#: src/broken_indicator.cc:216
+#, c-format
+msgid "%s: Apply"
+msgstr ""
+
+#: src/broken_indicator.cc:218
+#, fuzzy, c-format
+msgid "%s: Next"
+msgstr "^Siguiente"
+
+#: src/broken_indicator.cc:220
+#, c-format
+msgid "%s: Previous"
+msgstr ""
+
+#: src/broken_indicator.cc:233
+#, c-format
+msgid "%CSolution search failed. %s: try harder"
+msgstr ""
+
+#: src/broken_indicator.cc:239
+#, c-format
+msgid "%CUnable to resolve dependencies."
+msgstr ""
+
#: src/cmdline/cmdline_action.cc:36
#, c-format
msgid ""
@@ -239,24 +326,24 @@
msgstr ""
"El paquete %s no es actualizable, no se puede prohibir una actualización\n"
-#: src/cmdline/cmdline_action.cc:213
+#: src/cmdline/cmdline_action.cc:198
#, c-format
msgid "Note: selecting the task \"%s: %s\" for installation\n"
msgstr "Nota: seleccionando la tarea \"%s: %s\" para la instalación\n"
-#: src/cmdline/cmdline_action.cc:240
+#: src/cmdline/cmdline_action.cc:225
#, c-format
msgid "You can only specify a package version with an 'install' command.\n"
msgstr ""
"Sólo puede especificar una versión de un paquete con una orden 'install'.\n"
-#: src/cmdline/cmdline_action.cc:246
+#: src/cmdline/cmdline_action.cc:231
#, c-format
msgid "You can only specify a package archive with an 'install' command.\n"
msgstr ""
"Sólo puede especificar un archivo de un paquete con la orden 'install'.\n"
-#: src/cmdline/cmdline_action.cc:280
+#: src/cmdline/cmdline_action.cc:265
#, c-format
msgid ""
"Couldn't find package \"%s\", and more than 40\n"
@@ -265,7 +352,7 @@
"No se puede encontrar el paquete \"%s\", y su nombre\n"
"\"%s\" se encuentra en más de 40 paquetes.\n"
-#: src/cmdline/cmdline_action.cc:283
+#: src/cmdline/cmdline_action.cc:268
#, c-format
msgid ""
"Couldn't find package \"%s\". However, the following\n"
@@ -274,14 +361,14 @@
"No se puede encontrar el paquete \"%s\". Sin embargo, los siguientes\n"
"paquetes contienen \"%s\" en su nombre:\n"
-#: src/cmdline/cmdline_action.cc:307
+#: src/cmdline/cmdline_action.cc:292
#, c-format
msgid "Couldn't find any package whose name or description matched \"%s\"\n"
msgstr ""
"No se puede encontrar ningún paquete cuyo nombre o descripción coincida con "
"\"%s\"\n"
-#: src/cmdline/cmdline_action.cc:309
+#: src/cmdline/cmdline_action.cc:294
#, c-format
msgid ""
"Couldn't find any package matching \"%s\", and more than 40\n"
@@ -290,7 +377,7 @@
"No se puede encontrar ningún paquete que coincida con \"%s\", y más de 40\n"
"paquetes contienen \"%s\" en su descripción.\n"
-#: src/cmdline/cmdline_action.cc:312
+#: src/cmdline/cmdline_action.cc:297
#, c-format
msgid ""
"Couldn't find any package matching \"%s\". However, the following\n"
@@ -337,13 +424,13 @@
msgid "Freed %sB of disk space\n"
msgstr "Se liberará %sB de espacio de disco"
-#: src/cmdline/cmdline_do_action.cc:67
+#: src/cmdline/cmdline_do_action.cc:71
#, c-format
msgid "Invalid operation %s"
msgstr "Operación %s inválida"
-#: src/cmdline/cmdline_do_action.cc:206 src/cmdline/cmdline_simulate.cc:30
-#: src/cmdline/cmdline_upgrade.cc:89
+#: src/cmdline/cmdline_do_action.cc:201 src/cmdline/cmdline_simulate.cc:31
+#: src/cmdline/cmdline_upgrade.cc:91
#, c-format
msgid "Abort.\n"
msgstr "Cancela.\n"
@@ -353,7 +440,7 @@
msgid "download: you must specify at least one package to download\n"
msgstr "descarga: debe especificar al menos un paquete para descargar\n"
-#: src/cmdline/cmdline_download.cc:43 src/download.cc:342
+#: src/cmdline/cmdline_download.cc:43 src/download.cc:344
msgid "Couldn't read source list"
msgstr "No se pudo leer la lista de fuentes"
@@ -422,95 +509,95 @@
"¿Qué es? Es un elefante que está siendo devorado por una serpiente, por "
"supuesto.\n"
-#: src/cmdline/cmdline_prompt.cc:44
+#: src/cmdline/cmdline_prompt.cc:45
msgid "Couldn't read list of sources"
msgstr "No se pudo leer la lista de fuentes"
-#: src/cmdline/cmdline_prompt.cc:219 src/cmdline/cmdline_show_broken.cc:73
+#: src/cmdline/cmdline_prompt.cc:220 src/cmdline/cmdline_show_broken.cc:73
#, c-format
msgid "but %s is to be installed."
msgstr "pero se va a instalar %s."
-#: src/cmdline/cmdline_prompt.cc:222 src/cmdline/cmdline_show_broken.cc:76
+#: src/cmdline/cmdline_prompt.cc:223 src/cmdline/cmdline_show_broken.cc:76
#, c-format
msgid "but %s is installed and it is kept back."
msgstr "pero %s está instalado y retenido."
-#: src/cmdline/cmdline_prompt.cc:225 src/cmdline/cmdline_show_broken.cc:79
+#: src/cmdline/cmdline_prompt.cc:226 src/cmdline/cmdline_show_broken.cc:79
#, c-format
msgid "but %s is installed."
msgstr "pero está instalado %s."
-#: src/cmdline/cmdline_prompt.cc:229 src/cmdline/cmdline_show_broken.cc:83
+#: src/cmdline/cmdline_prompt.cc:230 src/cmdline/cmdline_show_broken.cc:83
#, c-format
msgid "but it is not installable"
msgstr "pero no es instalable"
-#: src/cmdline/cmdline_prompt.cc:233 src/cmdline/cmdline_show_broken.cc:87
+#: src/cmdline/cmdline_prompt.cc:234 src/cmdline/cmdline_show_broken.cc:87
#, c-format
msgid " which is a virtual package."
msgstr " que es un paquete virtual."
-#: src/cmdline/cmdline_prompt.cc:236 src/cmdline/cmdline_show_broken.cc:90
+#: src/cmdline/cmdline_prompt.cc:237 src/cmdline/cmdline_show_broken.cc:90
#, c-format
msgid " or"
msgstr " o"
-#: src/cmdline/cmdline_prompt.cc:248
+#: src/cmdline/cmdline_prompt.cc:249
msgid "The following packages are BROKEN:"
msgstr "Los siguientes paquetes están ROTOS:"
-#: src/cmdline/cmdline_prompt.cc:249
+#: src/cmdline/cmdline_prompt.cc:250
msgid "The following packages are unused and will be REMOVED:"
msgstr "Los siguientes paquetes no se usan y se ELIMINARÃN:"
-#: src/cmdline/cmdline_prompt.cc:250
+#: src/cmdline/cmdline_prompt.cc:251
msgid "The following packages have been automatically kept back:"
msgstr "Los siguientes paquetes han sido retenidos automáticamente:"
-#: src/cmdline/cmdline_prompt.cc:251
+#: src/cmdline/cmdline_prompt.cc:252
msgid "The following NEW packages will be automatically installed:"
msgstr "Se instalarán automáticamente los siguientes paquetes NUEVOS:"
-#: src/cmdline/cmdline_prompt.cc:252
+#: src/cmdline/cmdline_prompt.cc:253
msgid "The following packages will be automatically REMOVED:"
msgstr "Se ELIMINARÃN automáticamente los siguientes paquetes:"
-#: src/cmdline/cmdline_prompt.cc:253
+#: src/cmdline/cmdline_prompt.cc:254
msgid "The following packages will be DOWNGRADED:"
msgstr "Se DESACTUALIZARÃN los siguientes paquetes:"
-#: src/cmdline/cmdline_prompt.cc:254
+#: src/cmdline/cmdline_prompt.cc:255
msgid "The following packages have been kept back:"
msgstr "Se han retenido los siguientes paquetes:"
-#: src/cmdline/cmdline_prompt.cc:255
+#: src/cmdline/cmdline_prompt.cc:256
msgid "The following packages will be REINSTALLED:"
msgstr "Se REINSTALARÃN los siguientes paquetes:"
-#: src/cmdline/cmdline_prompt.cc:256
+#: src/cmdline/cmdline_prompt.cc:257
msgid "The following NEW packages will be installed:"
msgstr "Se instalarán los siguiente paquetes NUEVOS:"
-#: src/cmdline/cmdline_prompt.cc:257
+#: src/cmdline/cmdline_prompt.cc:258
msgid "The following packages will be REMOVED:"
msgstr "Se ELIMINARÃN los siguientes paquetes:"
-#: src/cmdline/cmdline_prompt.cc:258
+#: src/cmdline/cmdline_prompt.cc:259
msgid "The following packages will be upgraded:"
msgstr "Se actualizarán los siguientes paquetes:"
-#: src/cmdline/cmdline_prompt.cc:307
+#: src/cmdline/cmdline_prompt.cc:311
#, c-format
msgid "The following ESSENTIAL packages will be REMOVED!\n"
msgstr "¡Se ELIMINARÃN los siguientes paquetes ESENCIALES!\n"
-#: src/cmdline/cmdline_prompt.cc:316
+#: src/cmdline/cmdline_prompt.cc:320
#, c-format
msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
msgstr "Esta acción ROMPERà los siguientes paquetes ESENCIALES:\n"
-#: src/cmdline/cmdline_prompt.cc:326
+#: src/cmdline/cmdline_prompt.cc:330
#, c-format
msgid ""
"WARNING: Performing this action will probably cause your system to break!\n"
@@ -519,88 +606,87 @@
"AVISO: ¡Esta acción probablemente romperá su sistema!<\n"
" ¡NO continúe a menos que sepa EXACTAMENTE lo que hace!\n"
-#: src/cmdline/cmdline_prompt.cc:328
+#: src/cmdline/cmdline_prompt.cc:332
msgid "I am aware that this is a very bad idea"
msgstr "SÃ, sé que es una idea muy mala"
-#: src/cmdline/cmdline_prompt.cc:331
+#: src/cmdline/cmdline_prompt.cc:335
#, c-format
msgid "To continue, type the phrase \"%s\":\n"
msgstr "Para continuar, teclee la frase \"%s\":\n"
-#: src/cmdline/cmdline_prompt.cc:434
+#: src/cmdline/cmdline_prompt.cc:438
#, c-format
msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
msgstr "Se RECOMIENDAN los siguientes paquetes, pero NO se instalarán:\n"
-#: src/cmdline/cmdline_prompt.cc:440
+#: src/cmdline/cmdline_prompt.cc:444
#, c-format
msgid "The following packages are SUGGESTED but will NOT be installed:\n"
msgstr "Se SUGIEREN los siguientes paquetes, pero NO se instalarán:\n"
-#: src/cmdline/cmdline_prompt.cc:445
+#: src/cmdline/cmdline_prompt.cc:449
#, c-format
msgid "No packages will be installed, upgraded, or removed.\n"
msgstr "No se instalará, actualizará o eliminará ningún paquete.\n"
-#: src/cmdline/cmdline_prompt.cc:447
+#: src/cmdline/cmdline_prompt.cc:451
#, c-format
msgid "%lu packages upgraded, %lu newly installed, "
msgstr "%lu paquetes actualizados, %lu nuevos instalados, "
-#: src/cmdline/cmdline_prompt.cc:451
+#: src/cmdline/cmdline_prompt.cc:455
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstalados, "
-#: src/cmdline/cmdline_prompt.cc:453
+#: src/cmdline/cmdline_prompt.cc:457
#, c-format
msgid "%lu downgraded, "
msgstr "%lu desactualizados, "
-#: src/cmdline/cmdline_prompt.cc:455
+#: src/cmdline/cmdline_prompt.cc:459
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu para eliminar y %lu sin actualizar.\n"
-#: src/cmdline/cmdline_prompt.cc:462
+#: src/cmdline/cmdline_prompt.cc:466
#, c-format
msgid "Need to get %sB/%sB of archives. "
msgstr "Necesito descargar %sB/%sB de ficheros. "
-#: src/cmdline/cmdline_prompt.cc:465
+#: src/cmdline/cmdline_prompt.cc:469
#, c-format
msgid "Need to get %sB of archives. "
msgstr "Necesito descargar %sB de ficheros. "
-#: src/cmdline/cmdline_prompt.cc:472
+#: src/cmdline/cmdline_prompt.cc:476
#, c-format
msgid "After unpacking %sB will be used.\n"
msgstr "Después de desempaquetar se usarán %sB.\n"
-#: src/cmdline/cmdline_prompt.cc:475
+#: src/cmdline/cmdline_prompt.cc:479
#, c-format
msgid "After unpacking %sB will be freed.\n"
msgstr "Después de desempaquetar se liberarán %sB.\n"
-#: src/cmdline/cmdline_prompt.cc:521
+#: src/cmdline/cmdline_prompt.cc:524
#, c-format
msgid "Bad action character '%c'\n"
msgstr "Carácter de acción '%c' incorrecto\n"
-#: src/cmdline/cmdline_prompt.cc:596
+#: src/cmdline/cmdline_prompt.cc:595
#, c-format
msgid "No packages to show -- enter the package names on the line after 'i'.\n"
msgstr ""
"Ningún paquete a mostrar -- introduzca los nombres de los paquetes en la "
"lÃnea después de 'i'.\n"
-#: src/cmdline/cmdline_prompt.cc:598 src/cmdline/cmdline_prompt.cc:629
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:597
msgid "Press Return to continue."
msgstr "Presione Enter para continuar."
-#: src/cmdline/cmdline_prompt.cc:625
+#: src/cmdline/cmdline_prompt.cc:623
#, c-format
msgid "No packages found -- enter the package names on the line after 'c'.\n"
msgstr ""
@@ -608,12 +694,16 @@
"lÃnea\n"
"después de 'c'.\n"
-#: src/cmdline/cmdline_prompt.cc:665
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:627
+#, fuzzy
+msgid "Press Return to continue"
+msgstr "Presione Enter para continuar."
+
+#: src/cmdline/cmdline_prompt.cc:675
msgid "Do you want to continue? [Y/n/?] "
msgstr "¿Quiere continuar? [Y/n/?] "
-#: src/cmdline/cmdline_prompt.cc:690
+#: src/cmdline/cmdline_prompt.cc:700
#, c-format
msgid ""
"\n"
@@ -624,7 +714,7 @@
"Se mostrará la información de dependencias.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:692
+#: src/cmdline/cmdline_prompt.cc:702
#, c-format
msgid ""
"\n"
@@ -635,7 +725,7 @@
"No se mostrará la información de dependencias.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:698
+#: src/cmdline/cmdline_prompt.cc:708
#, c-format
msgid ""
"\n"
@@ -646,7 +736,7 @@
"Se mostrarán las versiones.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:700
+#: src/cmdline/cmdline_prompt.cc:710
#, c-format
msgid ""
"\n"
@@ -657,7 +747,7 @@
"No se mostrarán la versiones.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:705
+#: src/cmdline/cmdline_prompt.cc:715
#, c-format
msgid ""
"\n"
@@ -668,7 +758,7 @@
"Se mostrarán los tamaños de los cambios.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:717
#, c-format
msgid ""
"\n"
@@ -679,7 +769,7 @@
"No Se mostrarán los tamaños de los cambios.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:737
#, c-format
msgid ""
"Commands:\n"
@@ -730,35 +820,89 @@
" _ : Purga\n"
" = : Retiene\n"
-#: src/cmdline/cmdline_prompt.cc:751
+#: src/cmdline/cmdline_prompt.cc:761
#, c-format
msgid "Invalid response. Please enter a valid command or '?' for help.\n"
msgstr ""
"Respuesta inválida. Por favor, introduzca una orden válida o '?' para leer "
"la ayuda.\n"
+#: src/cmdline/cmdline_resolver.cc:84
+#, c-format
+msgid "y: %F%nn: %F%nq: %F%n,: %F%n.: %F%n"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:90
+msgid "accept the proposed changes"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:92
+msgid "reject the proposed changes and search for another solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:94
+#, fuzzy
+msgid "give up and quit the program"
+msgstr "Salir del programa"
+
+#: src/cmdline/cmdline_resolver.cc:96
+msgid "move to the next solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:98
+msgid "move to the previous solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:131
+#, fuzzy
+msgid "The following actions will resolve these dependencies:"
+msgstr "No se satisfacen las dependencias de los siguientes paquetes:\n"
+
+#: src/cmdline/cmdline_resolver.cc:146
+msgid "Accept this solution? [Y/n/q/?]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:174
+msgid "Abandoning all efforts to resolve these dependencies."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:184
+#, fuzzy
+msgid "The following commands are available:"
+msgstr "Los siguientes paquetes están ROTOS:"
+
+#: src/cmdline/cmdline_resolver.cc:188
+#, fuzzy
+msgid "Invalid response; please enter one of the following commands:"
+msgstr ""
+"Respuesta inválida. Por favor, introduzca una orden válida o '?' para leer "
+"la ayuda.\n"
+
+#: src/cmdline/cmdline_resolver.cc:198
+msgid "No solution found within the allotted time. Try harder? [Y/n]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:226
+#, fuzzy
+msgid "Invalid response; please enter 'y' or 'n'."
+msgstr ""
+"Respuesta inválida. Por favor, introduzca una orden válida o '?' para leer "
+"la ayuda.\n"
+
+#: src/cmdline/cmdline_resolver.cc:235
+msgid "Unable to resolve dependencies! Giving up..."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:240
+msgid "No more solutions."
+msgstr ""
+
#: src/cmdline/cmdline_search.cc:78
#, c-format
msgid "search: You must provide at least one search term\n"
msgstr "búsqueda: Debe proporcionar al menos una término de búsqueda\n"
-#: src/cmdline/cmdline_show_broken.cc:114
-#, c-format
-msgid ""
-"Some packages had unmet dependencies. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming.\n"
-"\n"
-msgstr ""
-"No se cumplen las dependencias de algunos paquetes. Esto puede significar "
-"que ha\n"
-"solicitado una situación imposible o que si usa la distribución inestable "
-"algún\n"
-"paquete requerido aún no ha sido creado o sigue en «Incoming».\n"
-"\n"
-
-#: src/cmdline/cmdline_show_broken.cc:115
+#: src/cmdline/cmdline_show_broken.cc:113
#, c-format
msgid "The following packages have unmet dependencies:\n"
msgstr "No se satisfacen las dependencias de los siguientes paquetes:\n"
@@ -956,12 +1100,12 @@
msgid "Description: "
msgstr "Descripción: "
-#: src/cmdline/cmdline_simulate.cc:36
+#: src/cmdline/cmdline_simulate.cc:37
#, c-format
msgid "Would download/install/remove packages.\n"
msgstr "Descargará/instalará/eliminará paquetes.\n"
-#: src/cmdline/cmdline_simulate.cc:47
+#: src/cmdline/cmdline_simulate.cc:48
msgid "Internal Error, Ordering didn't finish"
msgstr "Error interno, la ordenación no terminó"
@@ -1005,28 +1149,24 @@
msgid "UNAVAILABLE"
msgstr "NO DISPONIBLE"
-#: src/download_bar.cc:57 src/download_list.cc:265
+#: src/download_bar.cc:56 src/download_list.cc:263 src/download_screen.cc:57
#, c-format
-msgid ""
-"Please insert the following disc into the drive \"%s\":\n"
-"%s"
-msgstr ""
-"Por favor, introduzca en la unidad «%s» el siguiente disco:\n"
-"%s"
+msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
+msgstr "Por favor, introduzca el disco etiquetado «%s» en la unidad «%s»"
-#: src/download_bar.cc:76 src/generic/acqprogress.cc:63
+#: src/download_bar.cc:77 src/generic/acqprogress.cc:63
msgid "Hit "
msgstr "Obj "
-#: src/download_bar.cc:89
+#: src/download_bar.cc:90
msgid "Downloading "
msgstr "Descargando "
-#: src/download_bar.cc:102
+#: src/download_bar.cc:103
msgid "Got "
msgstr "Listo "
-#: src/download_bar.cc:156
+#: src/download_bar.cc:157
msgid "Downloading..."
msgstr "Descargando..."
@@ -1034,7 +1174,7 @@
msgid "Couldn't read list of package sources"
msgstr "No se pudo leer la lista de paquetes fuente"
-#: src/download.cc:104 src/download.cc:321
+#: src/download.cc:104 src/download.cc:322
msgid "Couldn't lock list directory..are you root?"
msgstr "No se pudo bloquear el directorio de listas...¿es el administrador?"
@@ -1046,29 +1186,33 @@
msgid "View the progress of the package list update"
msgstr "Ver el progreso de la actualización de la lista de paquetes"
-#: src/download.cc:159
+#: src/download.cc:113
+msgid "List Update"
+msgstr ""
+
+#: src/download.cc:160
msgid "Couldn't clean out list directories"
msgstr "No se pudo borrar los directorios de lista"
-#: src/download.cc:176 src/ui.cc:1068
+#: src/download.cc:177 src/ui.cc:1152
msgid "Deleting obsolete downloaded files"
msgstr "Borrando los ficheros descargados ya obsoletos"
-#: src/download.cc:181
+#: src/download.cc:182
#, c-format
msgid "Deleting obsolete downloaded files\n"
msgstr "Borrando los ficheros descargados ya obsoletos\n"
-#: src/download.cc:223
+#: src/download.cc:224
#, c-format
msgid "Unable to open %s to log actions"
msgstr "Imposible abrir %s para registrar las acciones"
-#: src/download.cc:229
+#: src/download.cc:230
msgid "log report"
msgstr "informe de registro"
-#: src/download.cc:230
+#: src/download.cc:231
#, c-format
msgid ""
"IMPORTANT: this log only lists intended actions; actions which fail due to\n"
@@ -1079,77 +1223,77 @@
"realizar. Puede que no se completen algunas acciones por fallos de dpkg.\n"
"\n"
-#: src/download.cc:231
+#: src/download.cc:232
#, c-format
msgid "Will install %li packages, and remove %li packages.\n"
msgstr "Se instalarán %li paquetes y se eliminarán %li.\n"
-#: src/download.cc:233
+#: src/download.cc:234
#, c-format
msgid "%sB of disk space will be used\n"
msgstr "Se usará %sB de espacio en disco\n"
-#: src/download.cc:236
+#: src/download.cc:237
#, c-format
msgid "%sB bytes of disk space will be freed\n"
msgstr "Se liberarán %sB bytes de espacio en disco\n"
-#: src/download.cc:244
+#: src/download.cc:245
#, c-format
msgid "[UPGRADE] %s %s -> %s\n"
msgstr "[ACTUALIZA] %s %s -> %s\n"
-#: src/download.cc:248
+#: src/download.cc:249
#, c-format
msgid "[DOWNGRADE] %s %s -> %s\n"
msgstr "[DESACTUALIZA] %s %s -> %s\n"
-#: src/download.cc:258
+#: src/download.cc:259
msgid "REMOVE"
msgstr "ELIMINA"
-#: src/download.cc:264
+#: src/download.cc:265
msgid "INSTALL"
msgstr "INSTALA"
-#: src/download.cc:267
+#: src/download.cc:268
msgid "REINSTALL"
msgstr "REINSTALA"
-#: src/download.cc:270
+#: src/download.cc:271
msgid "HOLD"
msgstr "RETIENE"
-#: src/download.cc:273
+#: src/download.cc:274
msgid "BROKEN"
msgstr "ROTO"
-#: src/download.cc:276
+#: src/download.cc:277
msgid "REMOVE, NOT USED"
msgstr "ELIMINA, NO USADO"
-#: src/download.cc:279
+#: src/download.cc:280
msgid "REMOVE, DEPENDENCIES"
msgstr "ELIMINA, DEPENDENCIAS"
-#: src/download.cc:282
+#: src/download.cc:283
msgid "INSTALL, DEPENDENCIES"
msgstr "INSTALA, DEPENDENCIAS"
-#: src/download.cc:285
+#: src/download.cc:286
msgid "HOLD, DEPENDENCIES"
msgstr "RETIENE, DEPENDENCIAS"
-#: src/download.cc:287
+#: src/download.cc:288
msgid "????????"
msgstr "????????"
-#: src/download.cc:291
+#: src/download.cc:292
#, c-format
msgid "[%s] %s\n"
msgstr "[%s] %s\n"
-#: src/download.cc:294
+#: src/download.cc:295
#, c-format
msgid ""
"===============================================================================\n"
@@ -1160,34 +1304,39 @@
"\n"
"Registro completado.\n"
-#: src/download.cc:329
+#: src/download.cc:330
msgid "Downloading packages"
msgstr "Descargando paquetes"
-#: src/download.cc:330
+#: src/download.cc:331
msgid "View the progress of the package download"
msgstr "Ver el progreso de la descarga de los paquetes"
-#: src/download.cc:352
+#: src/download.cc:332
+#, fuzzy
+msgid "Package Download"
+msgstr "Paquete: "
+
+#: src/download.cc:354
msgid "Internal error: couldn't generate list of packages to download"
msgstr "Error interno: no se pudo generar la lista de paquetes a descargar"
-#: src/download.cc:413
+#: src/download.cc:415
msgid "Unable to correct for unavailable packages"
msgstr "Incapaz de corregir los paquetes no disponibles"
-#: src/download.cc:465
+#: src/download.cc:467
msgid ""
"Ack! Something bad happened while installing packages. Trying to recover:"
msgstr ""
"¡Argghh! Algo malo pasó mientras se instalaban los paquetes. Intentado "
"recuperar:"
-#: src/download.cc:475 src/pkg_item.cc:413
+#: src/download.cc:477 src/pkg_item.cc:432
msgid "Press return to continue.\n"
msgstr "Presione ENTER para continuar.\n"
-#: src/download.cc:506
+#: src/download.cc:508
msgid ""
"Could not regain the system lock! (Perhaps another apt or dpkg is running?)"
msgstr ""
@@ -1251,11 +1400,6 @@
msgid "[ERROR]"
msgstr "[ERROR]"
-#: src/download_screen.cc:57
-#, c-format
-msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
-msgstr "Por favor, introduzca el disco etiquetado «%s» en la unidad «%s»"
-
#: src/download_screen.cc:181
#, c-format
msgid "Downloaded %sB in %ss (%sB/s)."
@@ -1296,118 +1440,118 @@
"«%s»\n"
"y presione enter\n"
-#: src/generic/aptcache.cc:245
+#: src/generic/aptcache.cc:253
msgid "Can't open Aptitude extended state file"
msgstr "No se puede abrir el fichero de estado extendido de Aptitude"
-#: src/generic/aptcache.cc:252 src/generic/aptcache.cc:305
-#: src/generic/aptcache.cc:307
+#: src/generic/aptcache.cc:260 src/generic/aptcache.cc:313
+#: src/generic/aptcache.cc:315
msgid "Reading extended state information"
msgstr "Leyendo la información de estado extendido"
-#: src/generic/aptcache.cc:313 src/generic/aptcache.cc:387
-#: src/generic/aptcache.cc:390
+#: src/generic/aptcache.cc:321 src/generic/aptcache.cc:395
+#: src/generic/aptcache.cc:398
msgid "Initializing package states"
msgstr "Inicializando el estado de los paquetes"
-#: src/generic/aptcache.cc:501
+#: src/generic/aptcache.cc:509
msgid "Cannot open Aptitude state file"
msgstr "No se puede abrir el fichero de estado de Aptitude"
-#: src/generic/aptcache.cc:505 src/generic/aptcache.cc:560
-#: src/generic/aptcache.cc:563
+#: src/generic/aptcache.cc:513 src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:571
msgid "Writing extended state information"
msgstr "Escribiendo información de estado extendido"
-#: src/generic/aptcache.cc:542
+#: src/generic/aptcache.cc:550
#, 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/aptcache.cc:551
+#: src/generic/aptcache.cc:559
msgid "Couldn't write state file"
msgstr "No se pudo escribir el fichero de estado"
-#: src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:576
msgid "Error writing state file"
msgstr "Error al escribir el fichero de estado"
-#: src/generic/aptcache.cc:584
+#: src/generic/aptcache.cc:592
msgid "couldn't replace old state file"
msgstr "No se pudo reemplazar el fichero de estado anterior"
-#: src/generic/aptcache.cc:960
+#: src/generic/aptcache.cc:1000
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/aptcache.cc:1325
+#: src/generic/aptcache.cc:1546
msgid "The list of sources could not be read."
msgstr "No se pudo leer la lista de fuentes."
-#: src/generic/aptcache.cc:1332
+#: src/generic/aptcache.cc:1553
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/aptcache.cc:1335
+#: src/generic/aptcache.cc:1556
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 "
"ficheros que faltan"
-#: src/generic/apt.cc:141
+#: src/generic/apt.cc:142
#, c-format
msgid "Unable to open %s for writing"
msgstr "No se pudo abrir %s para escribir en él"
-#: src/generic/apt.cc:151
+#: src/generic/apt.cc:152
#, c-format
msgid "Unable to replace %s with new configuration file"
msgstr "Imposible reemplazar %s con el nuevo fichero de configuración"
-#: src/generic/apt.cc:226
+#: src/generic/apt.cc:227
msgid "Warning: could not lock the cache file. Opening in read-only mode"
msgstr ""
"Aviso: no se pudo bloquear el fichero de caché. Abriendo en modo de sólo "
"lectura."
-#: src/generic/matchers.cc:780
+#: src/generic/matchers.cc:797
msgid "Unmatched '('"
msgstr "'(' no cerrado"
-#: src/generic/matchers.cc:870 src/generic/matchers.cc:949
+#: src/generic/matchers.cc:887 src/generic/matchers.cc:968
#, c-format
msgid "Unknown dependency type: %s"
msgstr "Tipo de dependencia desconocida: %s"
-#: src/generic/matchers.cc:931
+#: src/generic/matchers.cc:950
#, c-format
msgid "Unknown action type: %s"
msgstr "Tipo de acción desconocida: %s"
-#: src/generic/matchers.cc:998
+#: src/generic/matchers.cc:1017
#, c-format
msgid "Unknown priority %s"
msgstr "Prioridad %s desconocida"
-#: src/generic/matchers.cc:1020
+#: src/generic/matchers.cc:1039
#, c-format
msgid "Unknown pattern type: %c"
msgstr "Tipo de patrón desconocido: %c"
-#: src/generic/matchers.cc:1065
+#: src/generic/matchers.cc:1084
msgid "Unexpected empty expression"
msgstr "Expresión vacÃa no esperada"
-#: src/generic/matchers.cc:1100
+#: src/generic/matchers.cc:1119
msgid "Badly formed expression"
msgstr "Expresión malformada"
-#: src/generic/matchers.cc:1129
+#: src/generic/matchers.cc:1148
msgid "Unexpected ')'"
msgstr "')' inesperado"
@@ -1433,7 +1577,7 @@
msgid "Can't get value of $HOME, using TMPDIR (insecure)"
msgstr "No se puede obtener el valor de $HOME, usando TMPDIR (inseguro)"
-#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:60
+#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:61
#, c-format
msgid "ChangeLog of %s"
msgstr "Registro de cambios de %s"
@@ -1646,17 +1790,17 @@
msgid "Invalid sorting policy type '%s'"
msgstr "Tipo de norma de ordenación inválida: '%s'"
-#: src/main.cc:68
+#: src/main.cc:67
#, c-format
msgid "%s %s compiled at %s %s\n"
msgstr "%s %s compilado en %s %s\n"
-#: src/main.cc:71
+#: src/main.cc:70
#, c-format
msgid "Compiler: g++ %s\n"
msgstr "Compilador: g++ %s\n"
-#: src/main.cc:74
+#: src/main.cc:73
#, c-format
msgid ""
"\n"
@@ -1665,7 +1809,7 @@
"\n"
"Versión de ncurses: %s\n"
-#: src/main.cc:76
+#: src/main.cc:75
#, c-format
msgid ""
"\n"
@@ -1674,22 +1818,22 @@
"\n"
"Versión de curses: %s\n"
-#: src/main.cc:78
+#: src/main.cc:77
#, c-format
msgid "libsigc++ version: %s\n"
msgstr "Versión de libsigc++: %s\n"
-#: src/main.cc:84
+#: src/main.cc:83
#, c-format
msgid "Usage: aptitude [-S fname] [-u|-i]"
msgstr "Modo de uso: aptitude [-S nombre_fichero] [-u|-i]"
-#: src/main.cc:86
+#: src/main.cc:85
#, c-format
msgid " aptitude [options] <action> ..."
msgstr " aptitude [opciones] <acción> ..."
-#: src/main.cc:88
+#: src/main.cc:87
#, c-format
msgid ""
" Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -1699,43 +1843,43 @@
"interactivo):\n"
"\n"
-#: src/main.cc:89
+#: src/main.cc:88
#, c-format
msgid " install - Install/upgrade packages\n"
msgstr " install - instala/actualiza paquetes\n"
-#: src/main.cc:90
+#: src/main.cc:89
#, c-format
msgid " remove - Remove packages\n"
msgstr " remove - elimina paquetes\n"
-#: src/main.cc:91
+#: src/main.cc:90
#, c-format
msgid " purge - Remove packages and their configuration files\n"
msgstr ""
" purge - elimina paquetes junto con sus ficheros de configuración\n"
-#: src/main.cc:92
+#: src/main.cc:91
#, c-format
msgid " hold - Place packages on hold\n"
msgstr " hold - bloquea paquetes\n"
-#: src/main.cc:93
+#: src/main.cc:92
#, c-format
msgid " unhold - Cancel a hold command for a package\n"
msgstr " unhold - desbloquea un paquete\n"
-#: src/main.cc:94
+#: src/main.cc:93
#, c-format
msgid " markauto - Mark packages as having been automatically installed\n"
msgstr " markauto - marca paquetes como instalados manualmente\n"
-#: src/main.cc:95
+#: src/main.cc:94
#, c-format
msgid " unmarkauto - Mark packages as having been manually installed\n"
msgstr " unmarkauto - desmarca paquetes como instalados manualmente\n"
-#: src/main.cc:100
+#: src/main.cc:99
#, c-format
msgid ""
" forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -1744,17 +1888,17 @@
" forbid-version - prohÃbe a aptitude actualizar a una versión especÃfica de "
"un paquete.\n"
-#: src/main.cc:101
+#: src/main.cc:100
#, c-format
msgid " update - Download lists of new/upgradable packages\n"
msgstr " update - descarga las listas de paquetes nuevos/actualizables\n"
-#: src/main.cc:102
+#: src/main.cc:101
#, c-format
msgid " upgrade - Perform a safe upgrade\n"
msgstr " upgrade - realiza una actualización segura\n"
-#: src/main.cc:103
+#: src/main.cc:102
#, c-format
msgid ""
" dist-upgrade - Perform an upgrade, possibly installing and removing "
@@ -1763,71 +1907,71 @@
" dist-upgrade - realiza una actualización, posiblemente instalando y "
"eliminando paquetes\n"
-#: src/main.cc:104
+#: src/main.cc:103
#, c-format
msgid " forget-new - Forget what packages are \"new\"\n"
msgstr " forget-new - olvida qué paquetes son \"nuevos\"\n"
-#: src/main.cc:105
+#: src/main.cc:104
#, c-format
msgid " search - Search for a package by name and/or expression\n"
msgstr " search - busca un paquete por nombre y/o expresión\n"
-#: src/main.cc:106
+#: src/main.cc:105
#, c-format
msgid " show - Display detailed information about a package\n"
msgstr " show - muestra información detallada de un paquete\n"
-#: src/main.cc:107
+#: src/main.cc:106
#, c-format
msgid " clean - Erase downloaded package files\n"
msgstr " clean - elimina los ficheros de paquetes descargados\n"
-#: src/main.cc:108
+#: src/main.cc:107
#, c-format
msgid " autoclean - Erase old downloaded package files\n"
msgstr ""
" autoclean - elimina los ficheros de paquetes descargados obsoletos\n"
-#: src/main.cc:109
+#: src/main.cc:108
#, c-format
msgid " changelog - View a package's changelog\n"
msgstr " changelog - muestra el registro de cambios del paquete\n"
-#: src/main.cc:110
+#: src/main.cc:109
#, c-format
msgid " download - Download the .deb file for a package\n"
msgstr " download - descarga los ficheros .deb para un paquete\n"
-#: src/main.cc:112
+#: src/main.cc:111
#, c-format
msgid " Options:\n"
msgstr " Opciones:\n"
-#: src/main.cc:113
+#: src/main.cc:112
#, c-format
msgid " -h This help text\n"
msgstr "-h Este texto de ayuda\n"
-#: src/main.cc:114
+#: src/main.cc:113
#, c-format
msgid " -s Simulate actions, but do not actually perform them.\n"
msgstr ""
"-s Simula las acciones, pero en realidad no las realiza.\n"
-#: src/main.cc:115
+#: src/main.cc:114
#, c-format
msgid ""
" -d Only download packages, do not install or remove anything.\n"
msgstr ""
"-d Sólo descarga paquetes, no instala o desinstala nada.\n"
-#: src/main.cc:116
+#: src/main.cc:115
#, c-format
msgid " -P Always prompt for confirmation or actions\n"
msgstr "-p Siempre pide confirmación de las acciones\n"
-#: src/main.cc:117
+#: src/main.cc:116
#, c-format
msgid ""
" -y Assume that the answer to simple yes/no questions is 'yes'\n"
@@ -1835,7 +1979,7 @@
"-y Supone que la respuesta a preguntas simples del tipo sÃ/no "
"es «sû\n"
-#: src/main.cc:118
+#: src/main.cc:117
#, c-format
msgid ""
" -F format Specify a format for displaying search results; see the "
@@ -1844,7 +1988,7 @@
"-F formato Especifica el formato para mostrar los resultados de las "
"búsquedas, lea el manual\n"
-#: src/main.cc:119
+#: src/main.cc:118
#, c-format
msgid ""
" -O order Specify how search results should be sorted; see the manual\n"
@@ -1852,7 +1996,7 @@
"-O orden Especifica como se deben ordenar los resultados de la "
"búsqueda, lea el manual\n"
-#: src/main.cc:120
+#: src/main.cc:119
#, c-format
msgid ""
" -w width Specify the display width for formatting search results\n"
@@ -1860,17 +2004,17 @@
"-w ancho Especifica el ancho del visor para dar formato a los "
"resultado de la búsqueda\n"
-#: src/main.cc:121
+#: src/main.cc:120
#, c-format
msgid " -f Aggressively try to fix broken packages.\n"
msgstr "-f Trata de arreglar paquetes rotos de forma agresiva.\n"
-#: src/main.cc:122
+#: src/main.cc:121
#, c-format
msgid " -V Show which versions of packages are to be installed.\n"
msgstr "-V Muestra la versión de los paquetes a instalar.\n"
-#: src/main.cc:123
+#: src/main.cc:122
#, c-format
msgid ""
" -D Show the dependencies of automatically changed packages.\n"
@@ -1878,19 +2022,19 @@
"-D Muestra las dependencias de los paquetes cambiados "
"automáticamente.\n"
-#: src/main.cc:124
+#: src/main.cc:123
#, c-format
msgid " -Z\t\t Show the change in installed size of each package.\n"
msgstr "-Z\t\t Muestra el cambio del tamaño instalado de cada paquete.\n"
-#: src/main.cc:125
+#: src/main.cc:124
#, c-format
msgid ""
" -v Display extra information. (may be supplied multiple times)\n"
msgstr ""
"-v Muestra información extra (puede darse más de una vez)\n"
-#: src/main.cc:126
+#: src/main.cc:125
#, c-format
msgid ""
" -t [release] Set the release from which packages should be installed\n"
@@ -1898,14 +2042,14 @@
"-t [distrib] Establece la distribución desde la que se instalan los "
"paquetes\n"
-#: src/main.cc:127
+#: src/main.cc:126
#, c-format
msgid " -o key=val Directly set the configuration option named 'key'\n"
msgstr ""
" -o opconf=val Establecer directamente la opción de configuración "
"llamada 'opconf'\n"
-#: src/main.cc:128
+#: src/main.cc:127
#, c-format
msgid ""
" --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -1914,60 +2058,68 @@
" --with(out)-recommends,\tEspecifica si se tratan o no las "
"recomendaciones como dependencias fuertes\n"
-#: src/main.cc:129
+#: src/main.cc:128
#, c-format
msgid " -S fname: Read the aptitude extended status info from fname.\n"
msgstr ""
"-S fnombre: lee la información de estado extendida de aptitude de fnombre.\n"
-#: src/main.cc:130
+#: src/main.cc:129
#, c-format
msgid " -u : Download new package lists on startup.\n"
msgstr "-u : Descarga una nueva lista de paquetes al arrancar.\n"
-#: src/main.cc:131
+#: src/main.cc:130
#, c-format
msgid " -i : Perform an install run on startup.\n"
msgstr "-i : Realiza una instalación al arrancar.\n"
-#: src/main.cc:133
+#: src/main.cc:132
#, c-format
msgid " This aptitude does not have Super Cow Powers.\n"
msgstr " Este aptitude no tiene poderes de Super Vaca.\n"
-#: src/main.cc:254
+#: src/main.cc:253
#, c-format
msgid "-o requires an argument of the form key=value, got %s"
msgstr "-o requiere un argumento de la forma opción=valor, se dio %s"
-#: src/main.cc:300 src/main.cc:309
+#: src/main.cc:299 src/main.cc:308
msgid "WEIRDNESS: unknown option code received\n"
msgstr "RAREZA: recibido código de opción desconocido\n"
-#: src/main.cc:318
+#: src/main.cc:317
msgid "Only one of -u and -i may be specified\n"
msgstr "No se puede especificar -u y -i a la vez\n"
-#: src/main.cc:326
+#: src/main.cc:325
msgid ""
"-u and -i may not be specified in command-line mode (eg, with 'install')"
msgstr ""
"-u e -i puede que no deban especificarse en la lÃnea de órdenes (p.ej., con "
"'install')"
-#: src/main.cc:337
+#: src/main.cc:342
msgid "-u and -i may not be specified with a command"
msgstr "-u e -i puede que no deban especificarse con una orden"
-#: src/main.cc:392
+#: src/main.cc:399
#, c-format
msgid "Unknown command \"%s\"\n"
msgstr "Orden desconocida \"%s\"\n"
-#: src/main.cc:400
+#: src/main.cc:406 src/main.cc:463
+msgid "Internal error: uncaught 'out of solutions' exception.\n"
+msgstr ""
+
+#: src/main.cc:411 src/main.cc:468
+msgid "Internal error: uncaught 'out of time' exception.\n"
+msgstr ""
+
+#: src/main.cc:418
#, c-format
-msgid "Invalid option for interactive mode: -s\n"
-msgstr "Opción inválida para el modo interactivo: -s\n"
+msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
+msgstr ""
#: src/mine/cmine.cc:93
#, c-format
@@ -1995,7 +2147,7 @@
msgid "Lost"
msgstr "Perdió"
-#: src/mine/cmine.cc:119 src/ui.cc:1005
+#: src/mine/cmine.cc:119 src/ui.cc:1089
msgid "Minesweeper"
msgstr "Buscaminas"
@@ -2175,7 +2327,7 @@
msgid "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
msgstr "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
-#: src/pkg_columnizer.cc:84 src/ui.cc:1488
+#: src/pkg_columnizer.cc:84 src/ui.cc:1638
msgid "Package"
msgstr "Paquete"
@@ -2436,13 +2588,14 @@
"sistema"
#: src/pkg_grouppolicy.cc:158
+#, fuzzy
msgid ""
"Programs for faxmodems and other communications devices\n"
" Packages in the 'comm' section are used to control modems and other "
"hardware communications devices. This includes software to control faxmodems "
"(for instance, PPP for dial-up internet connections and programs originally "
-"written for that purpose (zmodem/kermit), as well as software to control "
-"cellular phones, interface with FidoNet, and run a BBS."
+"written for that purpose, such as zmodem/kermit), as well as software to "
+"control cellular phones, interface with FidoNet, and run a BBS."
msgstr ""
"Programas para faxmodems y otros dispositivos de comunicación\n"
" Los paquetes en la sección 'comm' se usan para controlar modems y otros\n"
@@ -2905,14 +3058,15 @@
"la sección 'main'"
#: src/pkg_grouppolicy.cc:193
+#, fuzzy
msgid ""
"Programs which are not free software\n"
" Packages in the 'non-free' section are not part of Debian.\n"
" .\n"
" These packages fail to meet one or more of the requirements of the Debian "
-"Free Software Guidelines (see below) You should read the license of programs "
-"in this section to be sure that you are allowed to use them in the way you "
-"intend.\n"
+"Free Software Guidelines (see below). You should read the license of "
+"programs in this section to be sure that you are allowed to use them in the "
+"way you intend.\n"
" .\n"
" For more information about what Debian considers to be Free Software, see "
"http://www.debian.org/social_contract#guidelines"
@@ -2976,11 +3130,12 @@
" Está disponible una nueva versión de estos paquetes"
#: src/pkg_grouppolicy.cc:320
+#, fuzzy
msgid ""
"New Packages\n"
" These packages have been added to Debian since the last time you cleared "
-"the list of \"new\" packages. (choose \"Forget new packages\" from the "
-"Actions menu to empty this list)"
+"the list of \"new\" packages (choose \"Forget new packages\" from the "
+"Actions menu to empty this list)."
msgstr ""
"Paquetes nuevos\n"
" Estos paquetes se han añadido a Debian desde la última vez que borró la "
@@ -3237,103 +3392,123 @@
msgid "Versions"
msgstr "Versiones"
-#: src/pkg_item.cc:54
+#: src/pkg_item.cc:55
msgid "Yes, I am aware this is a very bad idea"
msgstr "SÃ, sé que es una idea muy mala"
#: src/pkg_item.cc:80
-#, c-format
+#, fuzzy, c-format
msgid ""
-"%s is an essential package!\n"
-"\n"
-"Are you sure you want to remove it?\n"
-"Type '%s' if you are."
+"%s is an essential package!%n%nAre you sure you want to remove it?%nType '%"
+"s' if you are."
msgstr ""
"¡%s es un paquete esencial!<\n"
"\n"
"¿Seguro que quiere eliminarlo?\n"
"Si lo está escriba '%s'."
-#: src/pkg_item.cc:219
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:625
#, c-format
msgid "Information about %s"
msgstr "Información sobre %s"
-#: src/pkg_item.cc:304
-msgid "Available versions of "
+#: src/pkg_item.cc:224 src/pkg_ver_item.cc:627
+#, c-format
+msgid "%s info"
+msgstr ""
+
+#: src/pkg_item.cc:310
+#, fuzzy, c-format
+msgid "Available versions of %s"
msgstr "Versiones disponibles de "
-#: src/pkg_item.cc:312 src/pkg_ver_item.cc:648
+#: src/pkg_item.cc:313
+#, fuzzy, c-format
+msgid "%s versions"
+msgstr "Versiones"
+
+#: src/pkg_item.cc:325 src/pkg_ver_item.cc:655
#, c-format
msgid "Dependencies of %s"
msgstr "Dependencias de %s"
-#: src/pkg_item.cc:322 src/pkg_ver_item.cc:657
+#: src/pkg_item.cc:327 src/pkg_ver_item.cc:657
+#, c-format
+msgid "%s deps"
+msgstr ""
+
+#: src/pkg_item.cc:338 src/pkg_ver_item.cc:667
#, c-format
msgid "Packages depending on %s"
msgstr "Paquetes que dependen de %s"
-#: src/pkg_item.cc:373 src/pkg_ver_item.cc:694
+#: src/pkg_item.cc:340 src/pkg_ver_item.cc:669
+#, c-format
+msgid "%s reverse deps"
+msgstr ""
+
+#: src/pkg_item.cc:392 src/pkg_ver_item.cc:707
#, c-format
msgid "Reporting a bug in %s:\n"
msgstr "Informando de un fallo en %s:\n"
-#: src/pkg_item.cc:395
+#: src/pkg_item.cc:414
+#, fuzzy
msgid ""
-"You are not root and I cannot find any way\n"
-"to become root. To reconfigure this package,\n"
-"install the menu package, the login package,\n"
-"or run aptitude as root."
+"You are not root and I cannot find any way to become root. To reconfigure "
+"this package, install the menu package, the login package, or run aptitude "
+"as root."
msgstr ""
"Usted no es el administrador y no encuentro ningún\n"
"modo de que convierta en él. Para reconfigurar \n"
"este paquete, instale el paquete 'menu', el paquete\n"
"'login', o ejecute aptitude como administrador."
-#: src/pkg_item.cc:403
+#: src/pkg_item.cc:422
#, c-format
msgid "Reconfiguring %s\n"
msgstr "Reconfigurando %s\n"
-#: src/pkg_item.cc:428
+#: src/pkg_item.cc:447
msgid "Hierarchy editor"
msgstr "Editor de jerarquÃas"
+#: src/pkg_item.cc:447
+#, fuzzy
+msgid "Hierarchy Editor"
+msgstr "Editor de jerarquÃas"
+
#: src/pkg_tree.cc:325
msgid "Search for: "
msgstr "Buscar por:"
-#: src/pkg_tree.cc:585
+#: src/pkg_tree.cc:568
msgid "All Packages"
msgstr "Todos los paquetes"
-#: src/pkg_tree.cc:598 src/pkg_tree.cc:607
+#: src/pkg_tree.cc:581 src/pkg_tree.cc:590
msgid "Building view"
msgstr "Construyendo la vista"
-#: src/pkg_tree.cc:649
+#: src/pkg_tree.cc:632
#, c-format
msgid "No packages matched the pattern \"%s\"."
msgstr "Ningún paquete concuerda con el patrón \"%s\"."
-#: src/pkg_tree.cc:671
+#: src/pkg_tree.cc:654
msgid "Enter the new package tree limit: "
msgstr "Introduzca el nuevo lÃmite de árbol de paquetes:"
-#: src/pkg_tree.cc:705
+#: src/pkg_tree.cc:688
msgid "Enter the new package grouping mechanism for this display: "
msgstr ""
"Introduzca el nuevo mecanismo de agrupación de paquetes para esta vista:"
-#: src/pkg_tree.cc:713
+#: src/pkg_tree.cc:696
msgid "Enter the new package sorting mechanism for this display: "
msgstr ""
"Introduzca el nuevo mecanismo de ordenación de paquetes para esta vista: "
-#: src/pkg_ver_item.cc:623
-msgid "Information about "
-msgstr "Información sobre "
-
#: src/pkg_view.cc:344
msgid "make_package_view: error in arguments -- two main widgets??"
msgstr ""
@@ -3350,7 +3525,7 @@
msgid "make_package_view: bad argument!"
msgstr "make_package_view: ¡argumento incorrecto!"
-#: src/pkg_view.cc:492
+#: src/pkg_view.cc:495
msgid "make_package_view: no main widget found"
msgstr "make_package_view: componente principal no encontrado"
@@ -3569,6 +3744,74 @@
"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:74
+msgid "The package cache is not available."
+msgstr ""
+
+#: src/solution_dialog.cc:82
+#, fuzzy
+msgid "No packages are broken."
+msgstr "Algunos paquetes están rotos. ¿Los intento arreglar?"
+
+#: src/solution_dialog.cc:103
+msgid "No resolution found."
+msgstr ""
+
+#: src/solution_dialog.cc:107
+#, c-format
+msgid ""
+"Time exhausted while searching for a solution (you can select \"Next Solution"
+"\" or press %s to try harder)."
+msgstr ""
+
+#: src/solution_dialog.cc:146
+#, fuzzy
+msgid "Previous"
+msgstr "Proporciona"
+
+#: src/solution_dialog.cc:147
+#, fuzzy
+msgid "Next"
+msgstr "^Siguiente"
+
+#: src/solution_dialog.cc:148
+msgid "Apply"
+msgstr ""
+
+#: src/solution_dialog.cc:149
+#, fuzzy
+msgid "Close"
+msgstr "^Cierra"
+
+#: src/solution_fragment.cc:125
+#, fuzzy
+msgid "%BRemove%b the following packages:%n"
+msgstr "Los siguientes paquetes están ROTOS:"
+
+#: src/solution_fragment.cc:135
+#, fuzzy
+msgid "%BInstall%b the following packages:%n"
+msgstr "Los siguientes paquetes están ROTOS:"
+
+#: src/solution_fragment.cc:148
+msgid "%BKeep%b the following packages at their current version:%n"
+msgstr ""
+
+#: src/solution_fragment.cc:161
+#, fuzzy
+msgid "%BUpgrade%b the following packages:%n"
+msgstr "Los siguientes paquetes están ROTOS:"
+
+#: src/solution_fragment.cc:176
+#, fuzzy
+msgid "%BDowngrade%b the following packages:%n"
+msgstr "Descargando e instalando paquetes"
+
+#: src/solution_fragment.cc:190
+#, c-format
+msgid "Score is %d"
+msgstr ""
+
#: src/trust.cc:17 src/trust.cc:19
msgid "WARNING"
msgstr ""
@@ -3580,54 +3823,54 @@
"system."
msgstr ""
-#: src/ui.cc:143
+#: src/ui.cc:164
msgid "Er, there aren't any errors, this shouldn't have happened.."
msgstr "Vaya, no hay errores, esto no deberÃa haber ocurrido.."
-#: src/ui.cc:149
+#: src/ui.cc:170
msgid "E:"
msgstr ""
-#: src/ui.cc:151
+#: src/ui.cc:172
msgid "W:"
msgstr ""
-#: src/ui.cc:172
+#: src/ui.cc:193
msgid "Search for:"
msgstr "Buscar por:"
-#: src/ui.cc:205
+#: src/ui.cc:261
msgid "You already are root!"
msgstr "¡Ya es el administrador!"
-#: src/ui.cc:303
+#: src/ui.cc:359
msgid ""
"Subprocess exited with an error -- did you type your password correctly?"
msgstr "El subproceso salió con error, ¿escribió su contraseña correctamente?"
-#: src/ui.cc:331
+#: src/ui.cc:387
msgid "Loading cache"
msgstr "Cargando caché"
-#: src/ui.cc:353
+#: src/ui.cc:409
msgid "Really quit Aptitude?"
msgstr "¿Salir de Aptitude?"
-#: src/ui.cc:432
+#: src/ui.cc:488
msgid "Really discard your personal settings and reload the defaults?"
msgstr ""
"¿De verdad quiere descartar sus preferencias personales y cargar los valores "
"por omisión?"
-#: src/ui.cc:532
+#: src/ui.cc:588 src/ui.cc:590 src/ui.cc:618 src/ui.cc:620
msgid "Packages"
msgstr "Paquetes"
-#: src/ui.cc:533 src/ui.cc:560
+#: src/ui.cc:589 src/ui.cc:619
msgid "View available packages and choose actions to perform"
msgstr "Ver los paquetes disponibles y escoger las acciones a realizar"
-#: src/ui.cc:599
+#: src/ui.cc:666
#, fuzzy
msgid ""
"%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
@@ -3644,15 +3887,15 @@
"en el menú de Ayuda. Esto es software libre, puede redistribuirlo \n"
"bajo ciertas condiciones, para más información consulte la 'Licencia'."
-#: src/ui.cc:620
+#: src/ui.cc:687
msgid "help.txt"
msgstr "help.txt"
-#: src/ui.cc:636
+#: src/ui.cc:703
msgid "README"
msgstr "LÉAME"
-#: src/ui.cc:718
+#: src/ui.cc:785
msgid ""
"%C%BWARNING%b: untrusted versions of the following packages will be "
"installed!%n%nUntrusted packages could %Bcompromise your system's security%"
@@ -3660,64 +3903,74 @@
"this is what you want to do.%n%n"
msgstr ""
-#: src/ui.cc:732
+#: src/ui.cc:799
#, fuzzy
msgid "Really Continue"
msgstr "Continua"
-#: src/ui.cc:734
+#: src/ui.cc:801
msgid "Abort Installation"
msgstr ""
-#: src/ui.cc:796
+#: src/ui.cc:862
msgid "Preview of package installation"
msgstr "Pre-visualización de la instalación de los paquetes"
-#: src/ui.cc:797
+#: src/ui.cc:863
msgid "View and/or adjust the actions that will be performed"
msgstr "Ver y/o ajustar las acciones que se realizarán"
-#: src/ui.cc:837
-msgid "Some packages were broken and have been fixed"
+#: src/ui.cc:864
+#, fuzzy
+msgid "Preview"
+msgstr "^Prev"
+
+#: src/ui.cc:900
+#, fuzzy
+msgid "Some packages were broken and have been fixed:"
msgstr "Algunos paquetes estaban rotos y se han arreglado."
-#: src/ui.cc:839
-msgid "Some broken packages could not be fixed!"
-msgstr "¡No se pudieron arreglar algunos paquetes rotos!"
+#: src/ui.cc:906
+msgid "No solution to these dependency problems exists!"
+msgstr ""
-#: src/ui.cc:847 src/ui.cc:959
-msgid "Some packages are broken. Try to fix them?"
-msgstr "Algunos paquetes están rotos. ¿Los intento arreglar?"
+#: src/ui.cc:912
+#, c-format
+msgid ""
+"Ran out of time while trying to resolver dependencies (press \"%s\" to try "
+"harder)"
+msgstr ""
-#: src/ui.cc:860
+#: src/ui.cc:958
+#, fuzzy
msgid ""
-"Installing/removing packages requires administrative privileges, which\n"
-"you currently do not have. Would you like to change to the root account?\n"
+"Installing/removing packages requires administrative privileges, which you "
+"currently do not have. Would you like to change to the root account?"
msgstr ""
"La instalación/eliminación de paquetes requiere privilegios de \n"
"administración, que actualmente no tiene. ¿DesearÃa cambiar a la \n"
"cuenta de administrador?\n"
-#: src/ui.cc:863 src/ui.cc:993
+#: src/ui.cc:961 src/ui.cc:1077
msgid "Become root"
msgstr "Convertirse en administrador"
-#: src/ui.cc:865 src/ui.cc:995
+#: src/ui.cc:963 src/ui.cc:1079
msgid "Don't become root"
msgstr "No convertirse en administrador"
-#: src/ui.cc:870 src/ui.cc:1000
+#: src/ui.cc:968 src/ui.cc:1084
msgid "A package-list update or install run is already taking place."
msgstr ""
"Ya está teniendo lugar una actualización de la lista de paquetes o una "
"instalación."
-#: src/ui.cc:897
+#: src/ui.cc:995
msgid "No packages are scheduled to be installed, removed, or upgraded."
msgstr ""
"No hay ningún paquete planificado para instalar, eliminar o actualizar."
-#: src/ui.cc:903
+#: src/ui.cc:1001
#, fuzzy
msgid ""
"No packages will be installed, removed or upgraded. Some packages could be "
@@ -3729,169 +3982,184 @@
"Algunos paquetes pueden actualizarse, pero ha elegido no actualizarlos.\n"
"Escriba \"U\" para preparar una actualización."
-#: src/ui.cc:990
+#: src/ui.cc:1073
+#, fuzzy
msgid ""
-"Updating the package lists requires administrative privileges, which\n"
-"you currently do not have. Would you like to change to the root account?\n"
+"Updating the package lists requires administrative privileges, which you "
+"currently do not have. Would you like to change to the root account?"
msgstr ""
"La actualización de la lista de paquetes disponibles requiere privilegios "
"de\n"
"administración, que actualmente no tiene. ¿DesearÃa cambiar a la cuenta\n"
"de administrador?\n"
-#: src/ui.cc:1005 src/ui.cc:1198
+#: src/ui.cc:1089 src/ui.cc:1345
msgid "Waste time trying to find mines"
msgstr "Pierda su tiempo intentando buscar las minas"
-#: src/ui.cc:1012 src/ui.cc:1065
+#: src/ui.cc:1096 src/ui.cc:1149
msgid "Cleaning while a download is in progress is not allowed"
msgstr "No está permitido limpiar mientras se esté realizando una descarga"
-#: src/ui.cc:1015
+#: src/ui.cc:1099
msgid "Deleting downloaded files"
msgstr "Eliminando ficheros descargados"
-#: src/ui.cc:1029
+#: src/ui.cc:1113
msgid "Downloaded package files have been deleted"
msgstr "Se han borrado los ficheros de paquetes descargados"
-#: src/ui.cc:1090
+#: src/ui.cc:1174
#, fuzzy, c-format
msgid ""
"Obsolete downloaded package files have been deleted, freeing %sB of disk "
"space."
msgstr "Se han borrado los ficheros de paquetes descargados y obsoletos"
-#: src/ui.cc:1174
+#: src/ui.cc:1246
+msgid "All solutions exhausted."
+msgstr ""
+
+#: src/ui.cc:1251 src/ui.cc:1282
+#, fuzzy
+msgid "Ran out of time while trying to find a solution."
+msgstr "Pierda su tiempo intentando buscar las minas"
+
+#: src/ui.cc:1276
+msgid "Unable to find a solution to apply."
+msgstr ""
+
+#: src/ui.cc:1321
msgid "^Install/remove packages"
msgstr "^Instalar/eliminar paquetes"
-#: src/ui.cc:1175
+#: src/ui.cc:1322
msgid "Perform all pending installs and removals"
msgstr "Realizar todas las instalaciones y eliminaciones pendientes"
-#: src/ui.cc:1177
+#: src/ui.cc:1324
msgid "^Update package list"
msgstr "^Actualizar la lista de paquetes"
-#: src/ui.cc:1178
+#: src/ui.cc:1325
msgid "Check for new versions of packages"
msgstr "Buscar nuevas versiones de los paquetes"
-#: src/ui.cc:1181
+#: src/ui.cc:1328
msgid "^Forget new packages"
msgstr "^Olvidar paquetes nuevos"
-#: src/ui.cc:1182
+#: src/ui.cc:1329
msgid "Forget which packages are \"new\""
msgstr "Olvidar que paquetes son «nuevos»"
-#: src/ui.cc:1185
+#: src/ui.cc:1332
msgid "^Clean package cache"
msgstr "^Limpiar la caché de paquetes"
-#: src/ui.cc:1186
+#: src/ui.cc:1333
msgid "Delete package files which were previously downloaded"
msgstr "Borra los ficheros de paquetes descargados previamente"
-#: src/ui.cc:1189
+#: src/ui.cc:1336
msgid "Clean ^obsolete files"
msgstr "Limpiar ficheros ^obsoletos"
-#: src/ui.cc:1190
+#: src/ui.cc:1337
msgid "Delete package files which can no longer be downloaded"
msgstr "Borra los ficheros de paquetes que ya no pueden ser descargados"
-#: src/ui.cc:1193
+#: src/ui.cc:1340
msgid "Mark ^Upgradable"
msgstr "Marcar ^actualizable"
-#: src/ui.cc:1194
+#: src/ui.cc:1341
msgid "Mark all upgradable packages which are not held for upgrade"
msgstr ""
"Marcar todos los paquetes actualizables que no están retenidos para que sean "
"actualizados"
-#: src/ui.cc:1197
+#: src/ui.cc:1344
msgid "^Play Minesweeper"
msgstr "^Jugar al buscaminas"
-#: src/ui.cc:1200
+#: src/ui.cc:1347
msgid "^Become root"
msgstr "^Convertirse en administrador"
-#: src/ui.cc:1201
+#: src/ui.cc:1348
+#, fuzzy
msgid ""
-"Run 'su' to become root; this will restart the program, but your\n"
-"settings will be preserved"
+"Run 'su' to become root; this will restart the program, but your settings "
+"will be preserved"
msgstr ""
"Ejecuta 'su' para convertirse en administrador. Esto reiniciará el programa\n"
"pero se mantendrán sus preferencias."
-#: src/ui.cc:1204
+#: src/ui.cc:1351
msgid "^Reload package cache"
msgstr "^Recargar la caché de paquetes"
-#: src/ui.cc:1205
+#: src/ui.cc:1352
msgid "Reload the package cache"
msgstr "Recarga la caché de paquetes"
-#: src/ui.cc:1211
+#: src/ui.cc:1358
msgid "^Quit"
msgstr "^Salir"
-#: src/ui.cc:1212
+#: src/ui.cc:1359
msgid "Exit the program"
msgstr "Salir del programa"
-#: src/ui.cc:1218 src/ui.cc:1487
+#: src/ui.cc:1365 src/ui.cc:1637
msgid "Undo"
msgstr "Deshacer"
-#: src/ui.cc:1219
+#: src/ui.cc:1366
msgid "Undo the last package operation or group of operations"
msgstr "Deshacer la última operación o grupo de operaciones sobre los paquetes"
-#: src/ui.cc:1226
+#: src/ui.cc:1373
msgid "^Install"
msgstr "^Instalar"
-#: src/ui.cc:1227
+#: src/ui.cc:1374
msgid "Flag the currently selected package for installation or upgrade"
msgstr "Marcar el paquete seleccionado actualmente para instalar o actualizar"
-#: src/ui.cc:1230
+#: src/ui.cc:1377
msgid "^Remove"
msgstr "^Eliminar"
-#: src/ui.cc:1231
+#: src/ui.cc:1378
msgid "Flag the currently selected package for removal"
msgstr "Marcar el paquete seleccionado actualmente para eliminar"
-#: src/ui.cc:1234
+#: src/ui.cc:1381
msgid "^Purge"
msgstr "^Purgar"
-#: src/ui.cc:1235
+#: src/ui.cc:1382
msgid ""
"Flag the currently selected package and its configuration files for removal"
msgstr ""
"Marcar el paquete seleccionado actualmente y sus ficheros de configuración "
"para eliminar"
-#: src/ui.cc:1238
+#: src/ui.cc:1385
msgid "^Keep"
msgstr "^Mantener"
-#: src/ui.cc:1239
+#: src/ui.cc:1386
msgid "Cancel any action on the selected package"
msgstr "Cancelar cualquier acción en el paquete seleccionado"
-#: src/ui.cc:1242
+#: src/ui.cc:1389
msgid "^Hold"
msgstr "^Retener"
-#: src/ui.cc:1243
+#: src/ui.cc:1390
msgid ""
"Cancel any action on the selected package, and protect it from future "
"upgrades"
@@ -3899,253 +4167,257 @@
"Cancelar cualquier acción en el paquete seleccionado, y protejerlo de "
"futuras actualizaciones"
-#: src/ui.cc:1246
+#: src/ui.cc:1393
msgid "Mark ^Auto"
msgstr "Marcar ^automático"
-#: src/ui.cc:1247
+#: src/ui.cc:1394
+#, fuzzy
msgid ""
-"Mark the selected package as having been automatically installed;\n"
-"it will automatically be removed if no other packages depend on it"
+"Mark the selected package as having been automatically installed; it will "
+"automatically be removed if no other packages depend on it"
msgstr ""
"Marcar el paquete seleccionado como instalado automáticamente.\n"
"Se eliminará automáticamente si ningún otro paquete depende de él"
-#: src/ui.cc:1250
+#: src/ui.cc:1397
msgid "Mark ^Manual"
msgstr "Marcar ^manual"
-#: src/ui.cc:1251
+#: src/ui.cc:1398
+#, fuzzy
msgid ""
-"Mark the selected package as having been manually installed;\n"
-"it will not be removed unless you manually remove it"
+"Mark the selected package as having been manually installed; it will not be "
+"removed unless you manually remove it"
msgstr ""
"Marcar el paquete seleccionado como instalado manualmente.\n"
"No se eliminará a menos que lo haga manualmente"
-#: src/ui.cc:1254
+#: src/ui.cc:1401
msgid "^Forbid Version"
msgstr "^ProhÃbir versiones"
-#: src/ui.cc:1255
+#: src/ui.cc:1402
+#, fuzzy
msgid ""
-"Forbid the candidate version of the selected package from being installed;\n"
+"Forbid the candidate version of the selected package from being installed; "
"newer versions of the package will be installed as usual"
msgstr ""
"Evitar que se instale la versión candidata del paquete seleccionado.\n"
"Las versiones posteriores del paquete se instalaran de la forma usual"
-#: src/ui.cc:1259
+#: src/ui.cc:1406
msgid "I^nformation"
msgstr "^Información"
-#: src/ui.cc:1260
+#: src/ui.cc:1407
msgid "Display more information about the selected package"
msgstr "Mostrar más información acerca del paquete seleccionado"
-#: src/ui.cc:1263
+#: src/ui.cc:1410
msgid "^Changelog"
msgstr "^Registro de cambios"
-#: src/ui.cc:1264
+#: src/ui.cc:1411
msgid "Display the Debian changelog of the selected package"
msgstr "Mostrar el registro de cambios del paquete seleccionado"
-#: src/ui.cc:1271
+#: src/ui.cc:1418
msgid "^Find"
msgstr "^Buscar"
-#: src/ui.cc:1272
+#: src/ui.cc:1419
msgid "Search for a package"
msgstr "Buscar un paquete"
-#: src/ui.cc:1275
+#: src/ui.cc:1422
msgid "Find ^Again"
msgstr "Buscar otra ^Vez"
-#: src/ui.cc:1276
+#: src/ui.cc:1423
msgid "Repeat the last search"
msgstr "Repetir la última búsqueda"
-#: src/ui.cc:1280
+#: src/ui.cc:1427
msgid "^Limit Display"
msgstr "^Limitar vista"
-#: src/ui.cc:1281
+#: src/ui.cc:1428
msgid "Apply a filter to the package list"
msgstr "Aplicar un filtro a la lista de paquetes"
-#: src/ui.cc:1284
+#: src/ui.cc:1431
msgid "^Un-Limit Display"
msgstr "^No limitar vista"
-#: src/ui.cc:1285
+#: src/ui.cc:1432
msgid "Remove the filter from the package list"
msgstr "Eliminar el filtro de la lista de paquetes"
-#: src/ui.cc:1289
+#: src/ui.cc:1436
msgid "Find ^Broken"
msgstr "Buscar ^Roto"
-#: src/ui.cc:1290
+#: src/ui.cc:1437
msgid "Find the next package with unsatisfied dependencies"
msgstr "Encontrar el siguiente paquete con dependencias insatisfechas"
-#: src/ui.cc:1297
+#: src/ui.cc:1444
msgid "^UI options"
msgstr "Opciones de la ^IU"
-#: src/ui.cc:1298
+#: src/ui.cc:1445
msgid "Change the settings which affect the user interface"
msgstr "Cambiar las preferencias que afectan a la interfaz de usuario"
-#: src/ui.cc:1301
+#: src/ui.cc:1448
msgid "^Dependency handling"
msgstr "Manejo de ^dependencias"
-#: src/ui.cc:1302
+#: src/ui.cc:1449
msgid "Change the settings which affect how package dependencies are handled"
msgstr ""
"Cambiar las preferencias que afectan como se gestionan las dependencias de "
"paquetes"
-#: src/ui.cc:1305
+#: src/ui.cc:1452
msgid "^Miscellaneous"
msgstr "^Miscelánea"
-#: src/ui.cc:1306
+#: src/ui.cc:1453
msgid "Change miscellaneous program settings"
msgstr "Cambiar diversas preferencias del programa"
-#: src/ui.cc:1311
+#: src/ui.cc:1458
msgid "^Revert options"
msgstr "^Deshacer opciones"
-#: src/ui.cc:1312
+#: src/ui.cc:1459
msgid "Reset all settings to the system defaults"
msgstr "Fijar todas las preferencias en los valores predeterminados"
-#: src/ui.cc:1323
+#: src/ui.cc:1470
msgid "^Next"
msgstr "^Siguiente"
-#: src/ui.cc:1324
+#: src/ui.cc:1471
msgid "View next display"
msgstr "Ver siguiente pantalla"
-#: src/ui.cc:1327
+#: src/ui.cc:1474
msgid "^Prev"
msgstr "^Prev"
-#: src/ui.cc:1328
+#: src/ui.cc:1475
msgid "View previous display"
msgstr "Ver pantalla anterior"
-#: src/ui.cc:1331
+#: src/ui.cc:1478
msgid "^Close"
msgstr "^Cierra"
-#: src/ui.cc:1332
+#: src/ui.cc:1479
msgid "Close this display"
msgstr "Cerrar esta pantalla"
-#: src/ui.cc:1337
+#: src/ui.cc:1484
msgid "New Package ^View"
msgstr "Nueva ^vista de paquetes"
-#: src/ui.cc:1338
+#: src/ui.cc:1485
msgid "Create a new default package view"
msgstr "Crear una nueva vista de paquetes por defecto"
-#: src/ui.cc:1341
+#: src/ui.cc:1488
msgid "New Categorical ^Browser"
msgstr "Nuevo ^navegador de categorÃas"
-#: src/ui.cc:1343
+#: src/ui.cc:1490
msgid "Browse packages by category"
msgstr "Navegar paquetes por categorÃas"
-#: src/ui.cc:1351
+#: src/ui.cc:1498
msgid "^About"
msgstr "^Acerca de"
-#: src/ui.cc:1352
+#: src/ui.cc:1499
msgid "View information about this program"
msgstr "Ver información sobre este programa"
-#: src/ui.cc:1355
+#: src/ui.cc:1502
msgid "^Help"
msgstr "^Ayuda"
-#: src/ui.cc:1356
+#: src/ui.cc:1503
msgid "View the on-line help"
msgstr "Ver la ayuda en lÃnea"
-#: src/ui.cc:1358
+#: src/ui.cc:1505
msgid "User's ^Manual"
msgstr "^Manual de usuario"
-#: src/ui.cc:1359
+#: src/ui.cc:1506
msgid "View the detailed program manual"
msgstr "Consultar el manual detallado del programa"
-#: src/ui.cc:1362
+#: src/ui.cc:1509
msgid "^FAQ"
msgstr "^PUF"
-#: src/ui.cc:1363
+#: src/ui.cc:1510
msgid "View a list of frequently asked questions"
msgstr "Ver una lista de preguntas frecuentes"
-#: src/ui.cc:1366
-msgid "^ChangeLog"
-msgstr "^Registro de cambios"
+#: src/ui.cc:1513
+msgid "^NEWS"
+msgstr ""
-#: src/ui.cc:1367
-msgid "View the important changes made in each version of the program"
+#: src/ui.cc:1514
+#, fuzzy
+msgid "View the important changes made in each version of "
msgstr ""
"Leer los cambios más importantes realizados en cada versión del programa"
-#: src/ui.cc:1370
+#: src/ui.cc:1517
msgid "^License"
msgstr "^Licencia"
-#: src/ui.cc:1371
+#: src/ui.cc:1518
msgid "View the terms under which you may copy the program"
msgstr "Consultar los términos bajo los que puede copiar este programa"
-#: src/ui.cc:1486
+#: src/ui.cc:1636
msgid "Actions"
msgstr "Acciones"
-#: src/ui.cc:1489
+#: src/ui.cc:1639
msgid "Search"
msgstr "Buscar"
-#: src/ui.cc:1490
+#: src/ui.cc:1640
msgid "Options"
msgstr "Opciones"
-#: src/ui.cc:1491
+#: src/ui.cc:1641
msgid "Views"
msgstr "Vistas"
-#: src/ui.cc:1492
+#: src/ui.cc:1642
msgid "Help"
msgstr "Ayuda"
-#: src/ui.cc:1537
+#: src/ui.cc:1699
#, c-format
msgid ""
"%s: Menu %s: Help %s: Quit %s: Update %s: Download/Install/Remove Pkgs"
msgstr ""
"%s: Menú %s: Ayuda %s: Salir %s: Actualizar %s: Descarga/Instala/Elimina Paqs"
-#: src/ui.cc:1799 src/vscreen/vscreen.cc:281
+#: src/ui.cc:1968 src/vscreen/vscreen.cc:281
msgid "yes_key"
msgstr "sÃ"
-#: src/ui.cc:1800 src/vscreen/vscreen.cc:282
+#: src/ui.cc:1969 src/vscreen/vscreen.cc:282
msgid "no_key"
msgstr "no"
@@ -4157,6 +4429,16 @@
msgid "Downloading Changelog"
msgstr "Descargando registro de cambios"
+#: src/view_changelog.cc:54
+#, fuzzy
+msgid "Download Changelog"
+msgstr "Descargando registro de cambios"
+
+#: src/view_changelog.cc:63
+#, c-format
+msgid "%s changes"
+msgstr ""
+
#: src/vscreen/vscreen.cc:119
#, c-format
msgid "Ouch! Got SIGTERM, dying..\n"
@@ -4185,6 +4467,39 @@
msgid "No"
msgstr "No"
+#~ msgid ""
+#~ "Some packages had unmet dependencies. This may mean that you have\n"
+#~ "requested an impossible situation or if you are using the unstable\n"
+#~ "distribution that some required packages have not yet been created\n"
+#~ "or been moved out of Incoming.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "No se cumplen las dependencias de algunos paquetes. Esto puede significar "
+#~ "que ha\n"
+#~ "solicitado una situación imposible o que si usa la distribución inestable "
+#~ "algún\n"
+#~ "paquete requerido aún no ha sido creado o sigue en «Incoming».\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Please insert the following disc into the drive \"%s\":\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Por favor, introduzca en la unidad «%s» el siguiente disco:\n"
+#~ "%s"
+
+#~ msgid "Invalid option for interactive mode: -s\n"
+#~ msgstr "Opción inválida para el modo interactivo: -s\n"
+
+#~ msgid "Information about "
+#~ msgstr "Información sobre "
+
+#~ msgid "Some broken packages could not be fixed!"
+#~ msgstr "¡No se pudieron arreglar algunos paquetes rotos!"
+
+#~ msgid "^ChangeLog"
+#~ msgstr "^Registro de cambios"
+
#~ msgid "Go away, I'm trying to think.\n"
#~ msgstr "Váyase, estoy intentando pensar.\n"
@@ -4279,9 +4594,6 @@
#~ msgid "\" into the drive \""
#~ msgstr "\" en la unidad \""
-#~ msgid "Downloading and installing packages"
-#~ msgstr "Descargando e instalando paquetes"
-
#~ msgid "Unrecoverable missing packages. Press any key to continue..."
#~ msgstr "Paquetes irrecuperables. Presione una tecla para continuar..."
Modified: branches/aptitude-0.3/aptitude/po/eu.po
==============================================================================
--- branches/aptitude-0.3/aptitude/po/eu.po (original)
+++ branches/aptitude-0.3/aptitude/po/eu.po Sat Apr 30 13:41:32 2005
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: aptitude\n"
"Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-01-10 16:26-0800\n"
+"POT-Creation-Date: 2005-04-29 18:11-0400\n"
"PO-Revision-Date: 2004-10-09 19:03+0200\n"
"Last-Translator: Piarres Beobide Egaña <pi at beobide.net>\n"
"Language-Team: Euskara <librezale at librezale.org>\n"
@@ -157,16 +157,103 @@
msgstr "Ezabatu erabiligabeko paketeak automatikoki iruzkin hau erabiliaz"
#: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:184 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
-#: src/vscreen/vs_util.cc:329
+#: src/ui.cc:218 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
+#: src/vscreen/vs_util.cc:328
msgid "Ok"
msgstr "Ados"
#: src/apt_options.cc:242 src/download_list.cc:71 src/mine/cmine.cc:257
-#: src/mine/cmine.cc:330 src/vscreen/vs_util.cc:329
+#: src/mine/cmine.cc:330 src/vscreen/vs_util.cc:328
msgid "Cancel"
msgstr "Utzi"
+#: src/broken_indicator.cc:106 src/solution_dialog.cc:97
+msgid "Internal error: unexpected null solution."
+msgstr ""
+
+#: src/broken_indicator.cc:158
+#, fuzzy
+msgid "Suggest "
+msgstr "Iradokiak"
+
+#: src/broken_indicator.cc:164
+#, fuzzy, c-format
+msgid "%d installs"
+msgstr "instalaturik"
+
+#: src/broken_indicator.cc:169
+#, fuzzy
+msgid "1 install"
+msgstr "instalaturik"
+
+#: src/broken_indicator.cc:173
+#, c-format
+msgid "%d removals"
+msgstr ""
+
+#: src/broken_indicator.cc:178
+msgid "1 removal"
+msgstr ""
+
+#: src/broken_indicator.cc:182
+#, c-format
+msgid "%d keeps"
+msgstr ""
+
+#: src/broken_indicator.cc:187
+msgid "1 keep"
+msgstr ""
+
+#: src/broken_indicator.cc:191
+#, fuzzy, c-format
+msgid "%d upgrades"
+msgstr "eguneratu"
+
+#: src/broken_indicator.cc:196
+#, fuzzy
+msgid "1 upgrade"
+msgstr "eguneratu"
+
+#: src/broken_indicator.cc:200
+#, fuzzy, c-format
+msgid "%d downgrades"
+msgstr "atzeraturik"
+
+#: src/broken_indicator.cc:205
+#, fuzzy
+msgid "1 downgrade"
+msgstr "atzeraturik"
+
+#: src/broken_indicator.cc:214
+#, c-format
+msgid "%s: Examine"
+msgstr ""
+
+#: src/broken_indicator.cc:216
+#, c-format
+msgid "%s: Apply"
+msgstr ""
+
+#: src/broken_indicator.cc:218
+#, fuzzy, c-format
+msgid "%s: Next"
+msgstr "Hurre^ngoa"
+
+#: src/broken_indicator.cc:220
+#, c-format
+msgid "%s: Previous"
+msgstr ""
+
+#: src/broken_indicator.cc:233
+#, c-format
+msgid "%CSolution search failed. %s: try harder"
+msgstr ""
+
+#: src/broken_indicator.cc:239
+#, c-format
+msgid "%CUnable to resolve dependencies."
+msgstr ""
+
#: src/cmdline/cmdline_action.cc:36
#, c-format
msgid ""
@@ -239,22 +326,22 @@
msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
msgstr "%s paketea ez da eguneragarria, ezin da eguneratu\n"
-#: src/cmdline/cmdline_action.cc:213
+#: src/cmdline/cmdline_action.cc:198
#, c-format
msgid "Note: selecting the task \"%s: %s\" for installation\n"
msgstr "Oharra: \"%s: %s\" ataza instalatzeko aukeratzen\n"
-#: src/cmdline/cmdline_action.cc:240
+#: src/cmdline/cmdline_action.cc:225
#, c-format
msgid "You can only specify a package version with an 'install' command.\n"
msgstr "'install' komandoaz pakete bertsio bakar bat instalatu daiteke.\n"
-#: src/cmdline/cmdline_action.cc:246
+#: src/cmdline/cmdline_action.cc:231
#, c-format
msgid "You can only specify a package archive with an 'install' command.\n"
msgstr "Install komandoaz zuk pakete fitxategi bat bakarriz ezarri dezakezu.\n"
-#: src/cmdline/cmdline_action.cc:280
+#: src/cmdline/cmdline_action.cc:265
#, c-format
msgid ""
"Couldn't find package \"%s\", and more than 40\n"
@@ -263,7 +350,7 @@
"Ezin da \"%s\" paketa aurkitu, eta 40 paketetik\n"
"gora dute \"%s\" beren izenean.\n"
-#: src/cmdline/cmdline_action.cc:283
+#: src/cmdline/cmdline_action.cc:268
#, c-format
msgid ""
"Couldn't find package \"%s\". However, the following\n"
@@ -272,13 +359,13 @@
"Ezin da \"%s\" paketa aurkitu, eta hurrengo paketeak\n"
"\"%s\" beren izenean dute:\n"
-#: src/cmdline/cmdline_action.cc:307
+#: src/cmdline/cmdline_action.cc:292
#, c-format
msgid "Couldn't find any package whose name or description matched \"%s\"\n"
msgstr ""
"Bilatutako \"%s\" pareko izene edo azalpeneko paketerik ez da aurkitu.\n"
-#: src/cmdline/cmdline_action.cc:309
+#: src/cmdline/cmdline_action.cc:294
#, c-format
msgid ""
"Couldn't find any package matching \"%s\", and more than 40\n"
@@ -287,7 +374,7 @@
"Ez da aurkitu \"%s\" duen paketerik eta 40 paketea baino gehiagoren\n"
"azalpenean \"%s\" agertzen da.\n"
-#: src/cmdline/cmdline_action.cc:312
+#: src/cmdline/cmdline_action.cc:297
#, c-format
msgid ""
"Couldn't find any package matching \"%s\". However, the following\n"
@@ -331,13 +418,13 @@
msgid "Freed %sB of disk space\n"
msgstr "%sB disko leku hustuko dira"
-#: src/cmdline/cmdline_do_action.cc:67
+#: src/cmdline/cmdline_do_action.cc:71
#, c-format
msgid "Invalid operation %s"
msgstr "Operazio baliogabea %s"
-#: src/cmdline/cmdline_do_action.cc:206 src/cmdline/cmdline_simulate.cc:30
-#: src/cmdline/cmdline_upgrade.cc:89
+#: src/cmdline/cmdline_do_action.cc:201 src/cmdline/cmdline_simulate.cc:31
+#: src/cmdline/cmdline_upgrade.cc:91
#, c-format
msgid "Abort.\n"
msgstr "Eten.\n"
@@ -347,7 +434,7 @@
msgid "download: you must specify at least one package to download\n"
msgstr "deskargak: zuk pakete bat beintzat ezarri behar duzu deskargatzeko\n"
-#: src/cmdline/cmdline_download.cc:43 src/download.cc:342
+#: src/cmdline/cmdline_download.cc:43 src/download.cc:344
msgid "Couldn't read source list"
msgstr "Ezin da jatorri zerrenda irakurri"
@@ -416,95 +503,95 @@
msgid "What is it? It's an elephant being eaten by a snake, of course.\n"
msgstr "Zer da hau? Hau elefante bat jaten ari den suge bat da, noski.\n"
-#: src/cmdline/cmdline_prompt.cc:44
+#: src/cmdline/cmdline_prompt.cc:45
msgid "Couldn't read list of sources"
msgstr "Ezin da jatorri zerrenda irakurri"
-#: src/cmdline/cmdline_prompt.cc:219 src/cmdline/cmdline_show_broken.cc:73
+#: src/cmdline/cmdline_prompt.cc:220 src/cmdline/cmdline_show_broken.cc:73
#, c-format
msgid "but %s is to be installed."
msgstr "baina %s ez dago instalaturik"
-#: src/cmdline/cmdline_prompt.cc:222 src/cmdline/cmdline_show_broken.cc:76
+#: src/cmdline/cmdline_prompt.cc:223 src/cmdline/cmdline_show_broken.cc:76
#, c-format
msgid "but %s is installed and it is kept back."
msgstr "baina %s instalaturik eta hizozturik dago."
-#: src/cmdline/cmdline_prompt.cc:225 src/cmdline/cmdline_show_broken.cc:79
+#: src/cmdline/cmdline_prompt.cc:226 src/cmdline/cmdline_show_broken.cc:79
#, c-format
msgid "but %s is installed."
msgstr "baina %s instalaturik dago"
-#: src/cmdline/cmdline_prompt.cc:229 src/cmdline/cmdline_show_broken.cc:83
+#: src/cmdline/cmdline_prompt.cc:230 src/cmdline/cmdline_show_broken.cc:83
#, c-format
msgid "but it is not installable"
msgstr "baina ez da instalagarri"
-#: src/cmdline/cmdline_prompt.cc:233 src/cmdline/cmdline_show_broken.cc:87
+#: src/cmdline/cmdline_prompt.cc:234 src/cmdline/cmdline_show_broken.cc:87
#, c-format
msgid " which is a virtual package."
msgstr "pakete birtual bat dena"
-#: src/cmdline/cmdline_prompt.cc:236 src/cmdline/cmdline_show_broken.cc:90
+#: src/cmdline/cmdline_prompt.cc:237 src/cmdline/cmdline_show_broken.cc:90
#, c-format
msgid " or"
msgstr "edo"
-#: src/cmdline/cmdline_prompt.cc:248
+#: src/cmdline/cmdline_prompt.cc:249
msgid "The following packages are BROKEN:"
msgstr "Hurrengo paketeak APURTURIK daude:"
-#: src/cmdline/cmdline_prompt.cc:249
+#: src/cmdline/cmdline_prompt.cc:250
msgid "The following packages are unused and will be REMOVED:"
msgstr "Hurrengo apaketeak ez dira erabiltzen eta EZABATU egingo dira:"
-#: src/cmdline/cmdline_prompt.cc:250
+#: src/cmdline/cmdline_prompt.cc:251
msgid "The following packages have been automatically kept back:"
msgstr "Hurrengo paketeak automatikoki eguneratu gabe utziko dira:"
-#: src/cmdline/cmdline_prompt.cc:251
+#: src/cmdline/cmdline_prompt.cc:252
msgid "The following NEW packages will be automatically installed:"
msgstr "Hurrengo pakete berri hauek automatikoki instalatu egingo dira:"
-#: src/cmdline/cmdline_prompt.cc:252
+#: src/cmdline/cmdline_prompt.cc:253
msgid "The following packages will be automatically REMOVED:"
msgstr "Hurrengo pakete berri hauek automatikoki EZABATU egingo dira:"
-#: src/cmdline/cmdline_prompt.cc:253
+#: src/cmdline/cmdline_prompt.cc:254
msgid "The following packages will be DOWNGRADED:"
msgstr "Hurrengo paketak ATZERATUAK izango dira:"
-#: src/cmdline/cmdline_prompt.cc:254
+#: src/cmdline/cmdline_prompt.cc:255
msgid "The following packages have been kept back:"
msgstr "Honako paketea hauek ez dira eguneratuko:"
-#: src/cmdline/cmdline_prompt.cc:255
+#: src/cmdline/cmdline_prompt.cc:256
msgid "The following packages will be REINSTALLED:"
msgstr "Hurrengo paketak BERRINSTALATUAK izango dira:"
-#: src/cmdline/cmdline_prompt.cc:256
+#: src/cmdline/cmdline_prompt.cc:257
msgid "The following NEW packages will be installed:"
msgstr "Hurrengo paketak berriak INSTALATUAK izango dira:"
-#: src/cmdline/cmdline_prompt.cc:257
+#: src/cmdline/cmdline_prompt.cc:258
msgid "The following packages will be REMOVED:"
msgstr "Hurrengo paketak EZABATUAK izango dira:"
-#: src/cmdline/cmdline_prompt.cc:258
+#: src/cmdline/cmdline_prompt.cc:259
msgid "The following packages will be upgraded:"
msgstr "Hurrengo paketak EGUNERATUAK izango dira:"
-#: src/cmdline/cmdline_prompt.cc:307
+#: src/cmdline/cmdline_prompt.cc:311
#, c-format
msgid "The following ESSENTIAL packages will be REMOVED!\n"
msgstr "Hurrego BEHARREZKO paketeak EZABATU egingo dira!\n"
-#: src/cmdline/cmdline_prompt.cc:316
+#: src/cmdline/cmdline_prompt.cc:320
#, c-format
msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
msgstr "Ekintza honek hurrego BEHARREZKO paketeak APURTU ditzake!\n"
-#: src/cmdline/cmdline_prompt.cc:326
+#: src/cmdline/cmdline_prompt.cc:330
#, c-format
msgid ""
"WARNING: Performing this action will probably cause your system to break!\n"
@@ -513,97 +600,100 @@
"KONTU: Ekintza hau egitak ziurreink zure sistema apurtuko du! \n"
" EZ JARRAITU ez badakizu ZEHATZ MEHATZ zer egiten ari zaren!\n"
-#: src/cmdline/cmdline_prompt.cc:328
+#: src/cmdline/cmdline_prompt.cc:332
msgid "I am aware that this is a very bad idea"
msgstr "Hau oso ideia txarra ela ziur nago"
-#: src/cmdline/cmdline_prompt.cc:331
+#: src/cmdline/cmdline_prompt.cc:335
#, c-format
msgid "To continue, type the phrase \"%s\":\n"
msgstr "Jarraitzeko idatzi \"%s\" esaldia:\n"
-#: src/cmdline/cmdline_prompt.cc:434
+#: src/cmdline/cmdline_prompt.cc:438
#, c-format
msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
msgstr "Hurrengo paketeak GOMENDATURIK daude baina EZ dira instalatuko:\n"
-#: src/cmdline/cmdline_prompt.cc:440
+#: src/cmdline/cmdline_prompt.cc:444
#, c-format
msgid "The following packages are SUGGESTED but will NOT be installed:\n"
msgstr "Hurrengo paketeak GOMENDATURIK daude baina EZ dira instalatuko:\n"
-#: src/cmdline/cmdline_prompt.cc:445
+#: src/cmdline/cmdline_prompt.cc:449
#, c-format
msgid "No packages will be installed, upgraded, or removed.\n"
msgstr "Ez dira paketerik instalatu eguneratu edo ezabatuko.\n"
-#: src/cmdline/cmdline_prompt.cc:447
+#: src/cmdline/cmdline_prompt.cc:451
#, c-format
msgid "%lu packages upgraded, %lu newly installed, "
msgstr "%lu pakete eguneratorik, %lu berri instalaturik"
-#: src/cmdline/cmdline_prompt.cc:451
+#: src/cmdline/cmdline_prompt.cc:455
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu berrinstalaturik, "
-#: src/cmdline/cmdline_prompt.cc:453
+#: src/cmdline/cmdline_prompt.cc:457
#, c-format
msgid "%lu downgraded, "
msgstr "%lu atzeraturik, "
-#: src/cmdline/cmdline_prompt.cc:455
+#: src/cmdline/cmdline_prompt.cc:459
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu ezabatu eta %lu ez dira eguneratu.\n"
-#: src/cmdline/cmdline_prompt.cc:462
+#: src/cmdline/cmdline_prompt.cc:466
#, c-format
msgid "Need to get %sB/%sB of archives. "
msgstr "%sB/%sB Fitxategi eskuratu behar dira. "
-#: src/cmdline/cmdline_prompt.cc:465
+#: src/cmdline/cmdline_prompt.cc:469
#, c-format
msgid "Need to get %sB of archives. "
msgstr "%sB Fitxategi eskuratu behar dira. "
-#: src/cmdline/cmdline_prompt.cc:472
+#: src/cmdline/cmdline_prompt.cc:476
#, c-format
msgid "After unpacking %sB will be used.\n"
msgstr "Desenpaketatu ondoren %sB erabiliko dira\n"
-#: src/cmdline/cmdline_prompt.cc:475
+#: src/cmdline/cmdline_prompt.cc:479
#, c-format
msgid "After unpacking %sB will be freed.\n"
msgstr "Desenpaketatu ondoren %sB uztuko dira\n"
-#: src/cmdline/cmdline_prompt.cc:521
+#: src/cmdline/cmdline_prompt.cc:524
#, c-format
msgid "Bad action character '%c'\n"
msgstr "'%c' karaktere ekintza okerra\n"
-#: src/cmdline/cmdline_prompt.cc:596
+#: src/cmdline/cmdline_prompt.cc:595
#, c-format
msgid "No packages to show -- enter the package names on the line after 'i'.\n"
msgstr "Ez dagop paketerik erkusteko -- sar pakete izenak 'i'-ren ondoren.\n"
-#: src/cmdline/cmdline_prompt.cc:598 src/cmdline/cmdline_prompt.cc:629
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:597
msgid "Press Return to continue."
msgstr "Zanpatu return jarraitzeko."
-#: src/cmdline/cmdline_prompt.cc:625
+#: src/cmdline/cmdline_prompt.cc:623
#, c-format
msgid "No packages found -- enter the package names on the line after 'c'.\n"
msgstr ""
"Ez da paketerik aurkitu -- sar pakete izenak lerroan 'c'-ren ondoren.\n"
-#: src/cmdline/cmdline_prompt.cc:665
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:627
+#, fuzzy
+msgid "Press Return to continue"
+msgstr "Zanpatu return jarraitzeko."
+
+#: src/cmdline/cmdline_prompt.cc:675
msgid "Do you want to continue? [Y/n/?] "
msgstr "Jarraitzea nahi al duzu? [Y/n/?]"
-#: src/cmdline/cmdline_prompt.cc:690
+#: src/cmdline/cmdline_prompt.cc:700
#, c-format
msgid ""
"\n"
@@ -614,7 +704,7 @@
"Dependentzi argibideak erakutsiko dira.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:692
+#: src/cmdline/cmdline_prompt.cc:702
#, c-format
msgid ""
"\n"
@@ -625,7 +715,7 @@
"Dependentzi argibideak ez da erakutsiko.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:698
+#: src/cmdline/cmdline_prompt.cc:708
#, c-format
msgid ""
"\n"
@@ -636,7 +726,7 @@
"Bertsioak erakutsiko dira.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:700
+#: src/cmdline/cmdline_prompt.cc:710
#, c-format
msgid ""
"\n"
@@ -647,7 +737,7 @@
"Bertsioak ez dira erakutsiko.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:705
+#: src/cmdline/cmdline_prompt.cc:715
#, c-format
msgid ""
"\n"
@@ -658,7 +748,7 @@
"Tamaina aldaketeak erakutsiko dira.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:717
#, c-format
msgid ""
"\n"
@@ -669,7 +759,7 @@
"Tamaina aldaketeak ez dira erakutsiko.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:737
#, c-format
msgid ""
"Commands:\n"
@@ -720,34 +810,89 @@
" _ : Garbitu\n"
" = : Hizoztu\n"
-#: src/cmdline/cmdline_prompt.cc:751
+#: src/cmdline/cmdline_prompt.cc:761
#, c-format
msgid "Invalid response. Please enter a valid command or '?' for help.\n"
msgstr ""
"Erantzun baliogabea. Mesedez sar ezazu baliozko komando bat edo '?' "
"laguntzarako.\n"
+#: src/cmdline/cmdline_resolver.cc:84
+#, c-format
+msgid "y: %F%nn: %F%nq: %F%n,: %F%n.: %F%n"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:90
+msgid "accept the proposed changes"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:92
+msgid "reject the proposed changes and search for another solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:94
+#, fuzzy
+msgid "give up and quit the program"
+msgstr "Programatik irten"
+
+#: src/cmdline/cmdline_resolver.cc:96
+msgid "move to the next solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:98
+msgid "move to the previous solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:131
+#, fuzzy
+msgid "The following actions will resolve these dependencies:"
+msgstr "Honako paketeek betegabeko dependentziak dituzte:\n"
+
+#: src/cmdline/cmdline_resolver.cc:146
+msgid "Accept this solution? [Y/n/q/?]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:174
+msgid "Abandoning all efforts to resolve these dependencies."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:184
+#, fuzzy
+msgid "The following commands are available:"
+msgstr "Hurrengo paketeak APURTURIK daude:"
+
+#: src/cmdline/cmdline_resolver.cc:188
+#, fuzzy
+msgid "Invalid response; please enter one of the following commands:"
+msgstr ""
+"Erantzun baliogabea. Mesedez sar ezazu baliozko komando bat edo '?' "
+"laguntzarako.\n"
+
+#: src/cmdline/cmdline_resolver.cc:198
+msgid "No solution found within the allotted time. Try harder? [Y/n]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:226
+#, fuzzy
+msgid "Invalid response; please enter 'y' or 'n'."
+msgstr ""
+"Erantzun baliogabea. Mesedez sar ezazu baliozko komando bat edo '?' "
+"laguntzarako.\n"
+
+#: src/cmdline/cmdline_resolver.cc:235
+msgid "Unable to resolve dependencies! Giving up..."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:240
+msgid "No more solutions."
+msgstr ""
+
#: src/cmdline/cmdline_search.cc:78
#, c-format
msgid "search: You must provide at least one search term\n"
msgstr "bilatu: Zuk beintzat bilaketa patroi bat eman behar duzu\n"
-#: src/cmdline/cmdline_show_broken.cc:114
-#, c-format
-msgid ""
-"Some packages had unmet dependencies. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming.\n"
-"\n"
-msgstr ""
-"Pakete batenbatek betegabeko dependentziak ditu. Hauk zuk ezinezko den\n"
-"egoera bat eskatu duzlako edo zuk distrbuzio ezegonkorra darabilkizu eta\n"
-"dependentzia pakete batenbat ez da sortu orindik edo sarreratik kanpo\n"
-"utzi da.\n"
-"\n"
-
-#: src/cmdline/cmdline_show_broken.cc:115
+#: src/cmdline/cmdline_show_broken.cc:113
#, c-format
msgid "The following packages have unmet dependencies:\n"
msgstr "Honako paketeek betegabeko dependentziak dituzte:\n"
@@ -945,12 +1090,12 @@
msgid "Description: "
msgstr "Azalpena: "
-#: src/cmdline/cmdline_simulate.cc:36
+#: src/cmdline/cmdline_simulate.cc:37
#, c-format
msgid "Would download/install/remove packages.\n"
msgstr "Paketea dekargatu/instalatu/ezabatu-ko ditu.\n"
-#: src/cmdline/cmdline_simulate.cc:47
+#: src/cmdline/cmdline_simulate.cc:48
msgid "Internal Error, Ordering didn't finish"
msgstr "Barne Errorea, Sailkatzea ez da maitu"
@@ -993,28 +1138,24 @@
msgid "UNAVAILABLE"
msgstr "ESKURAEZINA"
-#: src/download_bar.cc:57 src/download_list.cc:265
+#: src/download_bar.cc:56 src/download_list.cc:263 src/download_screen.cc:57
#, c-format
-msgid ""
-"Please insert the following disc into the drive \"%s\":\n"
-"%s"
-msgstr ""
-"Mesedez sar hurrengo diska \"%s\" irakulean : \n"
-"%s"
+msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
+msgstr "Mesedez sartu \"%s\" izeneko diska \"%s\" irakurlean"
-#: src/download_bar.cc:76 src/generic/acqprogress.cc:63
+#: src/download_bar.cc:77 src/generic/acqprogress.cc:63
msgid "Hit "
msgstr "Jo "
-#: src/download_bar.cc:89
+#: src/download_bar.cc:90
msgid "Downloading "
msgstr "Deskargatzen "
-#: src/download_bar.cc:102
+#: src/download_bar.cc:103
msgid "Got "
msgstr "Hartu "
-#: src/download_bar.cc:156
+#: src/download_bar.cc:157
msgid "Downloading..."
msgstr "Dekargatzen..."
@@ -1022,7 +1163,7 @@
msgid "Couldn't read list of package sources"
msgstr "Ezin da jatorri pakete zerrenda irakurri"
-#: src/download.cc:104 src/download.cc:321
+#: src/download.cc:104 src/download.cc:322
msgid "Couldn't lock list directory..are you root?"
msgstr "Ezin da direktorioa blokeatu. Root al zara ?"
@@ -1034,29 +1175,33 @@
msgid "View the progress of the package list update"
msgstr "Pakete zerrenda eguneraketen egoera bistarazi"
-#: src/download.cc:159
+#: src/download.cc:113
+msgid "List Update"
+msgstr ""
+
+#: src/download.cc:160
msgid "Couldn't clean out list directories"
msgstr "Ezin izan dira zerrendako karpetak ezabatu"
-#: src/download.cc:176 src/ui.cc:1068
+#: src/download.cc:177 src/ui.cc:1152
msgid "Deleting obsolete downloaded files"
msgstr "Deskargatutako fitxategi zaharkituak ezabatzen"
-#: src/download.cc:181
+#: src/download.cc:182
#, c-format
msgid "Deleting obsolete downloaded files\n"
msgstr "Deskargatutako fitxategi zaharkituak ezabatzen\n"
-#: src/download.cc:223
+#: src/download.cc:224
#, c-format
msgid "Unable to open %s to log actions"
msgstr "Ezin da %s ireki ekintzak erregistratzeko"
-#: src/download.cc:229
+#: src/download.cc:230
msgid "log report"
msgstr "Erregistro erreportea"
-#: src/download.cc:230
+#: src/download.cc:231
#, c-format
msgid ""
"IMPORTANT: this log only lists intended actions; actions which fail due to\n"
@@ -1067,77 +1212,77 @@
"ditu. Posible da ekintza batzuek dpkg arazorengatik ez osatzea.\n"
"\n"
-#: src/download.cc:231
+#: src/download.cc:232
#, c-format
msgid "Will install %li packages, and remove %li packages.\n"
msgstr "%li pakete instalatu; eta %li pakete ezabatuko dira.\n"
-#: src/download.cc:233
+#: src/download.cc:234
#, c-format
msgid "%sB of disk space will be used\n"
msgstr "%sB diska leku erabiliko da\n"
-#: src/download.cc:236
+#: src/download.cc:237
#, c-format
msgid "%sB bytes of disk space will be freed\n"
msgstr "%sB bite diska leku hustuko dira\n"
-#: src/download.cc:244
+#: src/download.cc:245
#, c-format
msgid "[UPGRADE] %s %s -> %s\n"
msgstr "[EGUNERATU] %s %s -> %s\n"
-#: src/download.cc:248
+#: src/download.cc:249
#, c-format
msgid "[DOWNGRADE] %s %s -> %s\n"
msgstr "[ATZERATU] %s %s -> %s\n"
-#: src/download.cc:258
+#: src/download.cc:259
msgid "REMOVE"
msgstr "EZABATU"
-#: src/download.cc:264
+#: src/download.cc:265
msgid "INSTALL"
msgstr "INSTALATU"
-#: src/download.cc:267
+#: src/download.cc:268
msgid "REINSTALL"
msgstr "BERRINSTALATU"
-#: src/download.cc:270
+#: src/download.cc:271
msgid "HOLD"
msgstr "HIZOZTU"
-#: src/download.cc:273
+#: src/download.cc:274
msgid "BROKEN"
msgstr "APURTURIK"
-#: src/download.cc:276
+#: src/download.cc:277
msgid "REMOVE, NOT USED"
msgstr "EZABATU, ERABILI GABE"
-#: src/download.cc:279
+#: src/download.cc:280
msgid "REMOVE, DEPENDENCIES"
msgstr "EZABATU, DEPENDENTZIAK"
-#: src/download.cc:282
+#: src/download.cc:283
msgid "INSTALL, DEPENDENCIES"
msgstr "INSTALATU, DEPENDENTZIAK"
-#: src/download.cc:285
+#: src/download.cc:286
msgid "HOLD, DEPENDENCIES"
msgstr "HIZOZTU, DEPENDENTZIAK"
-#: src/download.cc:287
+#: src/download.cc:288
msgid "????????"
msgstr "????????"
-#: src/download.cc:291
+#: src/download.cc:292
#, c-format
msgid "[%s] %s\n"
msgstr "[%s] %s\n"
-#: src/download.cc:294
+#: src/download.cc:295
#, c-format
msgid ""
"===============================================================================\n"
@@ -1148,34 +1293,39 @@
"\n"
"Erregistro osoa.\n"
-#: src/download.cc:329
+#: src/download.cc:330
msgid "Downloading packages"
msgstr "Paketeak deskargatzen"
-#: src/download.cc:330
+#: src/download.cc:331
msgid "View the progress of the package download"
msgstr "Pakete deskargaren aurrerapena ikusi"
-#: src/download.cc:352
+#: src/download.cc:332
+#, fuzzy
+msgid "Package Download"
+msgstr "Paketea:"
+
+#: src/download.cc:354
msgid "Internal error: couldn't generate list of packages to download"
msgstr "Barne errorea: Ezin da deskargatzeko pakete zerrenda sortu"
-#: src/download.cc:413
+#: src/download.cc:415
msgid "Unable to correct for unavailable packages"
msgstr "Ez da gai eskuragarri ez dauden paketeak konpontzeko gai"
-#: src/download.cc:465
+#: src/download.cc:467
msgid ""
"Ack! Something bad happened while installing packages. Trying to recover:"
msgstr ""
"Axk Paketeak instalatzeroak okerreko zerbait gertatu da. Berreskuratzen "
"saiatzen:"
-#: src/download.cc:475 src/pkg_item.cc:413
+#: src/download.cc:477 src/pkg_item.cc:432
msgid "Press return to continue.\n"
msgstr "Zanpatu return jarraitzeko.\n"
-#: src/download.cc:506
+#: src/download.cc:508
msgid ""
"Could not regain the system lock! (Perhaps another apt or dpkg is running?)"
msgstr ""
@@ -1237,11 +1387,6 @@
msgid "[ERROR]"
msgstr "[ERROREA]"
-#: src/download_screen.cc:57
-#, c-format
-msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
-msgstr "Mesedez sartu \"%s\" izeneko diska \"%s\" irakurlean"
-
#: src/download_screen.cc:181
#, c-format
msgid "Downloaded %sB in %ss (%sB/s)."
@@ -1281,114 +1426,114 @@
"Medio Aldaketa: Mesedez sar ezazu '%s' izeneko diska '%s' gailuan eta enter "
"sakatu\n"
-#: src/generic/aptcache.cc:245
+#: src/generic/aptcache.cc:253
msgid "Can't open Aptitude extended state file"
msgstr "Ezin da Aptitude hedatutako fitxategia ireki"
-#: src/generic/aptcache.cc:252 src/generic/aptcache.cc:305
-#: src/generic/aptcache.cc:307
+#: src/generic/aptcache.cc:260 src/generic/aptcache.cc:313
+#: src/generic/aptcache.cc:315
msgid "Reading extended state information"
msgstr "Hesatutako egoera argibideak irakurtzen"
-#: src/generic/aptcache.cc:313 src/generic/aptcache.cc:387
-#: src/generic/aptcache.cc:390
+#: src/generic/aptcache.cc:321 src/generic/aptcache.cc:395
+#: src/generic/aptcache.cc:398
msgid "Initializing package states"
msgstr "Pakete egoerak hasieratzen"
-#: src/generic/aptcache.cc:501
+#: src/generic/aptcache.cc:509
msgid "Cannot open Aptitude state file"
msgstr "Ezin da Aptitude egoera fitxategia ireki"
-#: src/generic/aptcache.cc:505 src/generic/aptcache.cc:560
-#: src/generic/aptcache.cc:563
+#: src/generic/aptcache.cc:513 src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:571
msgid "Writing extended state information"
msgstr "egoera argibide hedatuak idazten"
-#: src/generic/aptcache.cc:542
+#: src/generic/aptcache.cc:550
#, c-format
msgid "Internal buffer overflow on package \"%s\" while writing state file"
msgstr ""
"\"%s\" paketea instalatzerakoan barne bufer gainez egoera fitxategia "
"idazterakoan"
-#: src/generic/aptcache.cc:551
+#: src/generic/aptcache.cc:559
msgid "Couldn't write state file"
msgstr "Ezin da egoera fitxategia idatzi"
-#: src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:576
msgid "Error writing state file"
msgstr "Errorea egoera fitxategia idazterakoan"
-#: src/generic/aptcache.cc:584
+#: src/generic/aptcache.cc:592
msgid "couldn't replace old state file"
msgstr "Ezin da egoera fitxategi zaharra aldatu"
-#: src/generic/aptcache.cc:960
+#: src/generic/aptcache.cc:1000
msgid "Unable to correct dependencies, some packages cannot be installed"
msgstr "Ezin dira dependentziak konpondu, zenbait pakete ezin dira instalatu"
-#: src/generic/aptcache.cc:1325
+#: src/generic/aptcache.cc:1546
msgid "The list of sources could not be read."
msgstr "Ezin da jatorri zerrenda irakurri."
-#: src/generic/aptcache.cc:1332
+#: src/generic/aptcache.cc:1553
msgid "The package lists or status file could not be parsed or opened."
msgstr "Pakete zerrenda edo egoera fitxategia ezin dira ireki edo analizatu."
-#: src/generic/aptcache.cc:1335
+#: src/generic/aptcache.cc:1556
msgid "You may want to update the package lists to correct these missing files"
msgstr ""
"Zuk agian falta diren fitxategi hauek konpontzek pakete zerrenda eguneratu "
"nahi duzu"
-#: src/generic/apt.cc:141
+#: src/generic/apt.cc:142
#, c-format
msgid "Unable to open %s for writing"
msgstr "Ezzinb da %s idazteko ireki"
-#: src/generic/apt.cc:151
+#: src/generic/apt.cc:152
#, c-format
msgid "Unable to replace %s with new configuration file"
msgstr "Ezin da %s konfigurazio fitxategi berriagatik aldatu"
-#: src/generic/apt.cc:226
+#: src/generic/apt.cc:227
msgid "Warning: could not lock the cache file. Opening in read-only mode"
msgstr ""
"Oharra; ezin da katxe fitxategia blokeatu. Irakurketa moduan irekitzen"
-#: src/generic/matchers.cc:780
+#: src/generic/matchers.cc:797
msgid "Unmatched '('"
msgstr "Aurkitu ez den '('"
-#: src/generic/matchers.cc:870 src/generic/matchers.cc:949
+#: src/generic/matchers.cc:887 src/generic/matchers.cc:968
#, c-format
msgid "Unknown dependency type: %s"
msgstr "Dependentzi mota ezezaguna: %s"
-#: src/generic/matchers.cc:931
+#: src/generic/matchers.cc:950
#, c-format
msgid "Unknown action type: %s"
msgstr "Akzio mota ezezaguna: %s"
-#: src/generic/matchers.cc:998
+#: src/generic/matchers.cc:1017
#, c-format
msgid "Unknown priority %s"
msgstr "Lehentasun ezezaguna: %s"
-#: src/generic/matchers.cc:1020
+#: src/generic/matchers.cc:1039
#, c-format
msgid "Unknown pattern type: %c"
msgstr "Patroi mota ezezaguna: %c"
-#: src/generic/matchers.cc:1065
+#: src/generic/matchers.cc:1084
msgid "Unexpected empty expression"
msgstr "Espero ez zen espresio hutsa."
-#: src/generic/matchers.cc:1100
+#: src/generic/matchers.cc:1119
msgid "Badly formed expression"
msgstr "Gaizki eraturako espresioa"
-#: src/generic/matchers.cc:1129
+#: src/generic/matchers.cc:1148
msgid "Unexpected ')'"
msgstr "Ez zen itxoiten ')'"
@@ -1413,7 +1558,7 @@
msgid "Can't get value of $HOME, using TMPDIR (insecure)"
msgstr "Ezinda $HOME balioa lortu; TMPDIR erabiltzen (ez ziurra)"
-#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:60
+#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:61
#, c-format
msgid "ChangeLog of %s"
msgstr "%s-n erregistro aldaketak"
@@ -1623,17 +1768,17 @@
msgid "Invalid sorting policy type '%s'"
msgstr "Baliogabea biltze politika mota:'%s'"
-#: src/main.cc:68
+#: src/main.cc:67
#, c-format
msgid "%s %s compiled at %s %s\n"
msgstr "%s %s, %s %s-en konpilaturik\n"
-#: src/main.cc:71
+#: src/main.cc:70
#, c-format
msgid "Compiler: g++ %s\n"
msgstr "Kompilatzailea: g++ %s\n"
-#: src/main.cc:74
+#: src/main.cc:73
#, c-format
msgid ""
"\n"
@@ -1642,7 +1787,7 @@
"\n"
"NCurses bertsioa: %s\n"
-#: src/main.cc:76
+#: src/main.cc:75
#, c-format
msgid ""
"\n"
@@ -1651,22 +1796,22 @@
"\n"
"Curses bertsioa: %s\n"
-#: src/main.cc:78
+#: src/main.cc:77
#, c-format
msgid "libsigc++ version: %s\n"
msgstr "libsigc++ bertsioa: %s\n"
-#: src/main.cc:84
+#: src/main.cc:83
#, c-format
msgid "Usage: aptitude [-S fname] [-u|-i]"
msgstr "Erabilera: aptitude [-S fname] [-u|-i]"
-#: src/main.cc:86
+#: src/main.cc:85
#, c-format
msgid " aptitude [options] <action> ..."
msgstr " aptitude [aukerak] <ekintza> ..."
-#: src/main.cc:88
+#: src/main.cc:87
#, c-format
msgid ""
" Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -1676,43 +1821,43 @@
"da);\n"
"\n"
-#: src/main.cc:89
+#: src/main.cc:88
#, c-format
msgid " install - Install/upgrade packages\n"
msgstr " install - Paketeak instalatu/eguneratu\n"
-#: src/main.cc:90
+#: src/main.cc:89
#, c-format
msgid " remove - Remove packages\n"
msgstr " remove - Paketeak ezabatu\n"
-#: src/main.cc:91
+#: src/main.cc:90
#, c-format
msgid " purge - Remove packages and their configuration files\n"
msgstr " purge - Paketeak eta haien konfigurazio fitxategiak ezabatu\n"
-#: src/main.cc:92
+#: src/main.cc:91
#, c-format
msgid " hold - Place packages on hold\n"
msgstr " hold - Paketeak hizoztu\n"
-#: src/main.cc:93
+#: src/main.cc:92
#, c-format
msgid " unhold - Cancel a hold command for a package\n"
msgstr " unhold - Ezeztatu pakete baten hizoztu komandoa\n"
-#: src/main.cc:94
+#: src/main.cc:93
#, c-format
msgid " markauto - Mark packages as having been automatically installed\n"
msgstr ""
" markauto - Markatu automatikoki instlatuak izan diren fitxategiak\n"
-#: src/main.cc:95
+#: src/main.cc:94
#, c-format
msgid " unmarkauto - Mark packages as having been manually installed\n"
msgstr " unmarkauto - Markatu eskus instalaturik izan diren paketeak\n"
-#: src/main.cc:100
+#: src/main.cc:99
#, c-format
msgid ""
" forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -1721,17 +1866,17 @@
" forbid-version - aptitude pakete baten bertsio jakin batera eguneratzea "
"galerazten du.\n"
-#: src/main.cc:101
+#: src/main.cc:100
#, c-format
msgid " update - Download lists of new/upgradable packages\n"
msgstr " update - Pakete berri/eguneragarrien zerrenda deskargatu\n"
-#: src/main.cc:102
+#: src/main.cc:101
#, c-format
msgid " upgrade - Perform a safe upgrade\n"
msgstr " upgrade - Eguneraketa ziur bat egin\n"
-#: src/main.cc:103
+#: src/main.cc:102
#, c-format
msgid ""
" dist-upgrade - Perform an upgrade, possibly installing and removing "
@@ -1740,58 +1885,58 @@
" dist-upgrade - Eguneraketa bat egin, ziurrenik paketak instalatu eta "
"ezabatuaz\n"
-#: src/main.cc:104
+#: src/main.cc:103
#, c-format
msgid " forget-new - Forget what packages are \"new\"\n"
msgstr " forget-new - Ahaztu zein pakete den \"berria\"\n"
-#: src/main.cc:105
+#: src/main.cc:104
#, c-format
msgid " search - Search for a package by name and/or expression\n"
msgstr " search - Bilatu pakete bat izen edo/eta espresio batez.\n"
-#: src/main.cc:106
+#: src/main.cc:105
#, c-format
msgid " show - Display detailed information about a package\n"
msgstr " show - Bistaratu pakete baten azalpen zehatzak\n"
-#: src/main.cc:107
+#: src/main.cc:106
#, c-format
msgid " clean - Erase downloaded package files\n"
msgstr " clean - Ezabatu deskargaturiko pakete fitxategiak\n"
-#: src/main.cc:108
+#: src/main.cc:107
#, c-format
msgid " autoclean - Erase old downloaded package files\n"
msgstr " autoclean - Ezabatu aurrerago deskargaturiko pakete fitxategiak\n"
-#: src/main.cc:109
+#: src/main.cc:108
#, c-format
msgid " changelog - View a package's changelog\n"
msgstr " changelog - Pakete baten aldaketa erregistro bistaratu\n"
-#: src/main.cc:110
+#: src/main.cc:109
#, c-format
msgid " download - Download the .deb file for a package\n"
msgstr " download - Deskargatu pakete batentzat .deb fitxategia\n"
-#: src/main.cc:112
+#: src/main.cc:111
#, c-format
msgid " Options:\n"
msgstr " (0)aukerak:\n"
-#: src/main.cc:113
+#: src/main.cc:112
#, c-format
msgid " -h This help text\n"
msgstr " -h Laguntza testu hau\n"
-#: src/main.cc:114
+#: src/main.cc:113
#, c-format
msgid " -s Simulate actions, but do not actually perform them.\n"
msgstr ""
" -s Ekintzak egiteko itxura egin baina ez ekintzik egin orain.\n"
-#: src/main.cc:115
+#: src/main.cc:114
#, c-format
msgid ""
" -d Only download packages, do not install or remove anything.\n"
@@ -1799,12 +1944,12 @@
" -d Paketeak deskargatu bakarrik, ez ezer ezabatu edo "
"instalatu.\n"
-#: src/main.cc:116
+#: src/main.cc:115
#, c-format
msgid " -P Always prompt for confirmation or actions\n"
msgstr " -P Beti galdetu berrespen edo ekintzetan\n"
-#: src/main.cc:117
+#: src/main.cc:116
#, c-format
msgid ""
" -y Assume that the answer to simple yes/no questions is 'yes'\n"
@@ -1812,7 +1957,7 @@
" -y Bai edo ez moduko galdera simpleetan erantzuna baiezkoa "
"(yes) dela ezarri\n"
-#: src/main.cc:118
+#: src/main.cc:117
#, c-format
msgid ""
" -F format Specify a format for displaying search results; see the "
@@ -1821,7 +1966,7 @@
" -F format Ezarri emaitzetan erabili nahi duzun formatua, manuala "
"begiratu\n"
-#: src/main.cc:119
+#: src/main.cc:118
#, c-format
msgid ""
" -O order Specify how search results should be sorted; see the manual\n"
@@ -1829,39 +1974,39 @@
" -O ordena Ezarri bilaketa emaitzak nola sailkatzea nahi duzun, "
"manuala begiratu\n"
-#: src/main.cc:120
+#: src/main.cc:119
#, c-format
msgid ""
" -w width Specify the display width for formatting search results\n"
msgstr ""
" -w width Ezarri pantaila zabalera bilaketa emaitza formatuetarako\n"
-#: src/main.cc:121
+#: src/main.cc:120
#, c-format
msgid " -f Aggressively try to fix broken packages.\n"
msgstr ""
"-f Apurturiko paketeak modu indartuan konpontzen saiatzen da.\n"
-#: src/main.cc:122
+#: src/main.cc:121
#, c-format
msgid " -V Show which versions of packages are to be installed.\n"
msgstr ""
" -V Erakutsi paketeen zein bertsio instalatua izango den.\n"
-#: src/main.cc:123
+#: src/main.cc:122
#, c-format
msgid ""
" -D Show the dependencies of automatically changed packages.\n"
msgstr ""
"-D Erakutsi automatikoki aldatutako paketeen dependentziak.\n"
-#: src/main.cc:124
+#: src/main.cc:123
#, c-format
msgid " -Z\t\t Show the change in installed size of each package.\n"
msgstr ""
" -Z\t\t Erakutsi insstalatutako pakete bakoitzaren tamaina aldaketa.\n"
-#: src/main.cc:125
+#: src/main.cc:124
#, c-format
msgid ""
" -v Display extra information. (may be supplied multiple times)\n"
@@ -1869,19 +2014,19 @@
" -v Argibide xehetuak erakutsi.(bein baino gehiagotan erabil "
"daiteke)\n"
-#: src/main.cc:126
+#: src/main.cc:125
#, c-format
msgid ""
" -t [release] Set the release from which packages should be installed\n"
msgstr ""
"-t [banaketa] Paketeak zein banaketatik instalatuko diren ezartzen du.\n"
-#: src/main.cc:127
+#: src/main.cc:126
#, c-format
msgid " -o key=val Directly set the configuration option named 'key'\n"
msgstr " -o key=val Zuzenean 'key' izeneko konfigurazio ukera ezarri\n"
-#: src/main.cc:128
+#: src/main.cc:127
#, c-format
msgid ""
" --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -1890,59 +2035,67 @@
" --with(out)-recommends\tEzarri gomendioak(iradokizunak) dependetzia\n"
" indartsu bezala erabiltzea ala ez\n"
-#: src/main.cc:129
+#: src/main.cc:128
#, c-format
msgid " -S fname: Read the aptitude extended status info from fname.\n"
msgstr "-S fizena: fizena-ren aptitude hedatutako egoera irakurri.\n"
-#: src/main.cc:130
+#: src/main.cc:129
#, c-format
msgid " -u : Download new package lists on startup.\n"
msgstr " -u : Abiaraztean pakete zerrenda berria deskargatu.\n"
-#: src/main.cc:131
+#: src/main.cc:130
#, c-format
msgid " -i : Perform an install run on startup.\n"
msgstr " -i : Abiaraztean instalazio bat egin.\n"
-#: src/main.cc:133
+#: src/main.cc:132
#, c-format
msgid " This aptitude does not have Super Cow Powers.\n"
msgstr " Aptitude honek ez ditu Super Behi potererik.\n"
-#: src/main.cc:254
+#: src/main.cc:253
#, c-format
msgid "-o requires an argument of the form key=value, got %s"
msgstr "-o gako=balioa antzerako argumentu bat behar du, %s erabiltzen"
-#: src/main.cc:300 src/main.cc:309
+#: src/main.cc:299 src/main.cc:308
msgid "WEIRDNESS: unknown option code received\n"
msgstr "arraroa: aukera ezezagun kodea jasorik\n"
-#: src/main.cc:318
+#: src/main.cc:317
msgid "Only one of -u and -i may be specified\n"
msgstr "-u eta -i artean bat bakarrik ezarri dezakezu\n"
-#: src/main.cc:326
+#: src/main.cc:325
msgid ""
"-u and -i may not be specified in command-line mode (eg, with 'install')"
msgstr ""
" baliteke komando moduan -u eta -i ez erabili behar izatea (adib, 'install'-"
"ekin)"
-#: src/main.cc:337
+#: src/main.cc:342
msgid "-u and -i may not be specified with a command"
msgstr "-u eta -i ezin dira komando batekin erabili"
-#: src/main.cc:392
+#: src/main.cc:399
#, c-format
msgid "Unknown command \"%s\"\n"
msgstr "Komando ezezaguna \"%s\"\n"
-#: src/main.cc:400
+#: src/main.cc:406 src/main.cc:463
+msgid "Internal error: uncaught 'out of solutions' exception.\n"
+msgstr ""
+
+#: src/main.cc:411 src/main.cc:468
+msgid "Internal error: uncaught 'out of time' exception.\n"
+msgstr ""
+
+#: src/main.cc:418
#, c-format
-msgid "Invalid option for interactive mode: -s\n"
-msgstr "Eukera baliogabeamodu interkatiboan: -s\n"
+msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
+msgstr ""
#: src/mine/cmine.cc:93
#, c-format
@@ -1970,7 +2123,7 @@
msgid "Lost"
msgstr "Galdu"
-#: src/mine/cmine.cc:119 src/ui.cc:1005
+#: src/mine/cmine.cc:119 src/ui.cc:1089
msgid "Minesweeper"
msgstr "Mina-aurkitzailea"
@@ -2146,7 +2299,7 @@
msgid "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
msgstr "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
-#: src/pkg_columnizer.cc:84 src/ui.cc:1488
+#: src/pkg_columnizer.cc:84 src/ui.cc:1638
msgid "Package"
msgstr "Paketea"
@@ -2405,13 +2558,14 @@
" 'base' ataleko paketeak hasierako debian instalatzailearen parte dira."
#: src/pkg_grouppolicy.cc:158
+#, fuzzy
msgid ""
"Programs for faxmodems and other communications devices\n"
" Packages in the 'comm' section are used to control modems and other "
"hardware communications devices. This includes software to control faxmodems "
"(for instance, PPP for dial-up internet connections and programs originally "
-"written for that purpose (zmodem/kermit), as well as software to control "
-"cellular phones, interface with FidoNet, and run a BBS."
+"written for that purpose, such as zmodem/kermit), as well as software to "
+"control cellular phones, interface with FidoNet, and run a BBS."
msgstr ""
"Faxmodem eta bestealako komunikazio gailuentrzako programak\n"
" 'comm' ataleko paketeak modemak eta bestelako komunikazio hardwarea "
@@ -2859,14 +3013,15 @@
"'main' atalean daude."
#: src/pkg_grouppolicy.cc:193
+#, fuzzy
msgid ""
"Programs which are not free software\n"
" Packages in the 'non-free' section are not part of Debian.\n"
" .\n"
" These packages fail to meet one or more of the requirements of the Debian "
-"Free Software Guidelines (see below) You should read the license of programs "
-"in this section to be sure that you are allowed to use them in the way you "
-"intend.\n"
+"Free Software Guidelines (see below). You should read the license of "
+"programs in this section to be sure that you are allowed to use them in the "
+"way you intend.\n"
" .\n"
" For more information about what Debian considers to be Free Software, see "
"http://www.debian.org/social_contract#guidelines"
@@ -2928,11 +3083,12 @@
" Paketea hauen bertsio berriago bat dago eskuragarri."
#: src/pkg_grouppolicy.cc:320
+#, fuzzy
msgid ""
"New Packages\n"
" These packages have been added to Debian since the last time you cleared "
-"the list of \"new\" packages. (choose \"Forget new packages\" from the "
-"Actions menu to empty this list)"
+"the list of \"new\" packages (choose \"Forget new packages\" from the "
+"Actions menu to empty this list)."
msgstr ""
"Pakete Berriak\n"
"Pakete hauek debianera gehitu dira zuk azkenez pakete berrien zerrenda "
@@ -3186,103 +3342,123 @@
msgid "Versions"
msgstr "Bertsioak"
-#: src/pkg_item.cc:54
+#: src/pkg_item.cc:55
msgid "Yes, I am aware this is a very bad idea"
msgstr "Bai, hau ideia txar bat dela ohartarzirik nago"
#: src/pkg_item.cc:80
-#, c-format
+#, fuzzy, c-format
msgid ""
-"%s is an essential package!\n"
-"\n"
-"Are you sure you want to remove it?\n"
-"Type '%s' if you are."
+"%s is an essential package!%n%nAre you sure you want to remove it?%nType '%"
+"s' if you are."
msgstr ""
"%s beharrezko pakete bat da\n"
"\n"
"Ziur al zaude ezabatu nahi duzula?\n"
"%s idatzi ziur bazaude."
-#: src/pkg_item.cc:219
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:625
#, c-format
msgid "Information about %s"
msgstr "%s-ri buruz argibideak"
-#: src/pkg_item.cc:304
-msgid "Available versions of "
+#: src/pkg_item.cc:224 src/pkg_ver_item.cc:627
+#, c-format
+msgid "%s info"
+msgstr ""
+
+#: src/pkg_item.cc:310
+#, fuzzy, c-format
+msgid "Available versions of %s"
msgstr "Honen bertsio erabilgarriak:"
-#: src/pkg_item.cc:312 src/pkg_ver_item.cc:648
+#: src/pkg_item.cc:313
+#, fuzzy, c-format
+msgid "%s versions"
+msgstr "Bertsioak"
+
+#: src/pkg_item.cc:325 src/pkg_ver_item.cc:655
#, c-format
msgid "Dependencies of %s"
msgstr "%s-ren dependentziak"
-#: src/pkg_item.cc:322 src/pkg_ver_item.cc:657
+#: src/pkg_item.cc:327 src/pkg_ver_item.cc:657
+#, c-format
+msgid "%s deps"
+msgstr ""
+
+#: src/pkg_item.cc:338 src/pkg_ver_item.cc:667
#, c-format
msgid "Packages depending on %s"
msgstr "%s behar duten paketeak"
-#: src/pkg_item.cc:373 src/pkg_ver_item.cc:694
+#: src/pkg_item.cc:340 src/pkg_ver_item.cc:669
+#, c-format
+msgid "%s reverse deps"
+msgstr ""
+
+#: src/pkg_item.cc:392 src/pkg_ver_item.cc:707
#, c-format
msgid "Reporting a bug in %s:\n"
msgstr "%s-n arazo baten berri ematen\n"
-#: src/pkg_item.cc:395
+#: src/pkg_item.cc:414
+#, fuzzy
msgid ""
-"You are not root and I cannot find any way\n"
-"to become root. To reconfigure this package,\n"
-"install the menu package, the login package,\n"
-"or run aptitude as root."
+"You are not root and I cannot find any way to become root. To reconfigure "
+"this package, install the menu package, the login package, or run aptitude "
+"as root."
msgstr ""
"Zu ez zara rrot eta ezin dut zu root biurtzeko\n"
"biderik. Pakete hau berkonfiguratzeko menu\n"
"edo login paketa instalatu edo aptitude root\n"
"bezala abiarazi."
-#: src/pkg_item.cc:403
+#: src/pkg_item.cc:422
#, c-format
msgid "Reconfiguring %s\n"
msgstr "%s berkonfiguratzen\n"
-#: src/pkg_item.cc:428
+#: src/pkg_item.cc:447
msgid "Hierarchy editor"
msgstr "Jerarkia editorea"
+#: src/pkg_item.cc:447
+#, fuzzy
+msgid "Hierarchy Editor"
+msgstr "Jerarkia editorea"
+
#: src/pkg_tree.cc:325
msgid "Search for: "
msgstr "Bilatu hau:"
-#: src/pkg_tree.cc:585
+#: src/pkg_tree.cc:568
msgid "All Packages"
msgstr "Pakete guztiak"
-#: src/pkg_tree.cc:598 src/pkg_tree.cc:607
+#: src/pkg_tree.cc:581 src/pkg_tree.cc:590
msgid "Building view"
msgstr "Ikuspegia eraikitzen"
-#: src/pkg_tree.cc:649
+#: src/pkg_tree.cc:632
#, c-format
msgid "No packages matched the pattern \"%s\"."
msgstr "\"%s\" patroia betetzen duen paketerik ez da aurkitu."
-#: src/pkg_tree.cc:671
+#: src/pkg_tree.cc:654
msgid "Enter the new package tree limit: "
msgstr "Sartu pakete zuhaitz limite berria: "
-#: src/pkg_tree.cc:705
+#: src/pkg_tree.cc:688
msgid "Enter the new package grouping mechanism for this display: "
msgstr ""
"Sar ikuspegi honetan erakutsi behar den pakete taldetze mekanismo berria:"
-#: src/pkg_tree.cc:713
+#: src/pkg_tree.cc:696
msgid "Enter the new package sorting mechanism for this display: "
msgstr ""
"Sar ikuspegi honetan erakutsi behar den pakete biltze mekanismo berria:"
-#: src/pkg_ver_item.cc:623
-msgid "Information about "
-msgstr "Informazioa honi buruz: "
-
#: src/pkg_view.cc:344
msgid "make_package_view: error in arguments -- two main widgets??"
msgstr "make_package_view: errorea argumentuetan -- bi partaide nagusi??"
@@ -3298,7 +3474,7 @@
msgid "make_package_view: bad argument!"
msgstr "make_package_view: argumentu okerra!"
-#: src/pkg_view.cc:492
+#: src/pkg_view.cc:495
msgid "make_package_view: no main widget found"
msgstr "make_package_view: Ez da oinarrizko lanabesa aurkitu"
@@ -3514,6 +3690,74 @@
"Hurrengo paketeak %B%s%b bertsiodun %B%s%b pakerea behar dute, eta buskatu "
"litezke hau %s egingo balitz."
+#: src/solution_dialog.cc:74
+msgid "The package cache is not available."
+msgstr ""
+
+#: src/solution_dialog.cc:82
+#, fuzzy
+msgid "No packages are broken."
+msgstr "Zenbait pakiete apurturik daude. Konpontzen saiatuko?"
+
+#: src/solution_dialog.cc:103
+msgid "No resolution found."
+msgstr ""
+
+#: src/solution_dialog.cc:107
+#, c-format
+msgid ""
+"Time exhausted while searching for a solution (you can select \"Next Solution"
+"\" or press %s to try harder)."
+msgstr ""
+
+#: src/solution_dialog.cc:146
+#, fuzzy
+msgid "Previous"
+msgstr "Dakar"
+
+#: src/solution_dialog.cc:147
+#, fuzzy
+msgid "Next"
+msgstr "Hurre^ngoa"
+
+#: src/solution_dialog.cc:148
+msgid "Apply"
+msgstr ""
+
+#: src/solution_dialog.cc:149
+#, fuzzy
+msgid "Close"
+msgstr "(^C)Itxi"
+
+#: src/solution_fragment.cc:125
+#, fuzzy
+msgid "%BRemove%b the following packages:%n"
+msgstr "Hurrengo paketeak APURTURIK daude:"
+
+#: src/solution_fragment.cc:135
+#, fuzzy
+msgid "%BInstall%b the following packages:%n"
+msgstr "Hurrengo paketeak APURTURIK daude:"
+
+#: src/solution_fragment.cc:148
+msgid "%BKeep%b the following packages at their current version:%n"
+msgstr ""
+
+#: src/solution_fragment.cc:161
+#, fuzzy
+msgid "%BUpgrade%b the following packages:%n"
+msgstr "Hurrengo paketeak APURTURIK daude:"
+
+#: src/solution_fragment.cc:176
+#, fuzzy
+msgid "%BDowngrade%b the following packages:%n"
+msgstr "Paketeak deskargatzen"
+
+#: src/solution_fragment.cc:190
+#, c-format
+msgid "Score is %d"
+msgstr ""
+
#: src/trust.cc:17 src/trust.cc:19
msgid "WARNING"
msgstr ""
@@ -3525,52 +3769,52 @@
"system."
msgstr ""
-#: src/ui.cc:143
+#: src/ui.cc:164
msgid "Er, there aren't any errors, this shouldn't have happened.."
msgstr "Er, hemen ez dago errorerik,hau ezen gertatu beharko.."
-#: src/ui.cc:149
+#: src/ui.cc:170
msgid "E:"
msgstr ""
-#: src/ui.cc:151
+#: src/ui.cc:172
msgid "W:"
msgstr ""
-#: src/ui.cc:172
+#: src/ui.cc:193
msgid "Search for:"
msgstr "Bilatu honentzat:"
-#: src/ui.cc:205
+#: src/ui.cc:261
msgid "You already are root!"
msgstr "Zu dagoeneko root zara!"
-#: src/ui.cc:303
+#: src/ui.cc:359
msgid ""
"Subprocess exited with an error -- did you type your password correctly?"
msgstr "Azpiprozesua errore batez amaitu da - pasahitz egokia erabili al duzu?"
-#: src/ui.cc:331
+#: src/ui.cc:387
msgid "Loading cache"
msgstr "Katxea kargatzen"
-#: src/ui.cc:353
+#: src/ui.cc:409
msgid "Really quit Aptitude?"
msgstr "Benetan Aptitude itxi?"
-#: src/ui.cc:432
+#: src/ui.cc:488
msgid "Really discard your personal settings and reload the defaults?"
msgstr "Benetan zure ezarpen pertsonalñak ezabatu eta lehentsietara itzuli?"
-#: src/ui.cc:532
+#: src/ui.cc:588 src/ui.cc:590 src/ui.cc:618 src/ui.cc:620
msgid "Packages"
msgstr "Paketeak"
-#: src/ui.cc:533 src/ui.cc:560
+#: src/ui.cc:589 src/ui.cc:619
msgid "View available packages and choose actions to perform"
msgstr "Pakete eskuragarriak ikusi eta egibeharreko ekintzak aukeratu"
-#: src/ui.cc:599
+#: src/ui.cc:666
#, fuzzy
msgid ""
"%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
@@ -3586,15 +3830,15 @@
"lizentzia ikusi ditzazkezu. Hau Software librea da eta zenbait egoeratan "
"(lizentzia ikusi xehetasunetarako) banatzeko aukera duzu."
-#: src/ui.cc:620
+#: src/ui.cc:687
msgid "help.txt"
msgstr "help.txt"
-#: src/ui.cc:636
+#: src/ui.cc:703
msgid "README"
msgstr "IRAKURRI"
-#: src/ui.cc:718
+#: src/ui.cc:785
msgid ""
"%C%BWARNING%b: untrusted versions of the following packages will be "
"installed!%n%nUntrusted packages could %Bcompromise your system's security%"
@@ -3602,61 +3846,71 @@
"this is what you want to do.%n%n"
msgstr ""
-#: src/ui.cc:732
+#: src/ui.cc:799
#, fuzzy
msgid "Really Continue"
msgstr "Jarraitu"
-#: src/ui.cc:734
+#: src/ui.cc:801
msgid "Abort Installation"
msgstr ""
-#: src/ui.cc:796
+#: src/ui.cc:862
msgid "Preview of package installation"
msgstr "Pakete instalazioaren aurreikuspena"
-#: src/ui.cc:797
+#: src/ui.cc:863
msgid "View and/or adjust the actions that will be performed"
msgstr "Egingo diren ekintzak bistarazi eta/edo ezarri"
-#: src/ui.cc:837
-msgid "Some packages were broken and have been fixed"
+#: src/ui.cc:864
+#, fuzzy
+msgid "Preview"
+msgstr "(^P)Aurrekoa"
+
+#: src/ui.cc:900
+#, fuzzy
+msgid "Some packages were broken and have been fixed:"
msgstr "Zenbait pakiete apurturik zeuden eta konponduak izan dira"
-#: src/ui.cc:839
-msgid "Some broken packages could not be fixed!"
-msgstr "Buskatutako zenbait pakete ezin dira konpondu!"
+#: src/ui.cc:906
+msgid "No solution to these dependency problems exists!"
+msgstr ""
-#: src/ui.cc:847 src/ui.cc:959
-msgid "Some packages are broken. Try to fix them?"
-msgstr "Zenbait pakiete apurturik daude. Konpontzen saiatuko?"
+#: src/ui.cc:912
+#, c-format
+msgid ""
+"Ran out of time while trying to resolver dependencies (press \"%s\" to try "
+"harder)"
+msgstr ""
-#: src/ui.cc:860
+#: src/ui.cc:958
+#, fuzzy
msgid ""
-"Installing/removing packages requires administrative privileges, which\n"
-"you currently do not have. Would you like to change to the root account?\n"
+"Installing/removing packages requires administrative privileges, which you "
+"currently do not have. Would you like to change to the root account?"
msgstr ""
"Paketak instalu/ezabatzeak zuk une honetan ez dituzun kudeatzaiuile\n"
"baimenak behar ditu. Root kontura aldatu nahi al duzu?\n"
-#: src/ui.cc:863 src/ui.cc:993
+#: src/ui.cc:961 src/ui.cc:1077
msgid "Become root"
msgstr "Root biurtu"
-#: src/ui.cc:865 src/ui.cc:995
+#: src/ui.cc:963 src/ui.cc:1079
msgid "Don't become root"
msgstr "Ez root biurtu"
-#: src/ui.cc:870 src/ui.cc:1000
+#: src/ui.cc:968 src/ui.cc:1084
msgid "A package-list update or install run is already taking place."
msgstr ""
"Pakete zerrenda eguneraketa edo instalaketa bat abiarazirik dago dagoeneko."
-#: src/ui.cc:897
+#: src/ui.cc:995
msgid "No packages are scheduled to be installed, removed, or upgraded."
msgstr "Ez dago paketerik instalatu, ezabatu edo eguneratzeko aukeraturik."
-#: src/ui.cc:903
+#: src/ui.cc:1001
#, fuzzy
msgid ""
"No packages will be installed, removed or upgraded. Some packages could be "
@@ -3668,164 +3922,179 @@
"Zenbait pakete eguneratu daitezke baina zuk ez duzu eguneraketa aukeratu.\n"
"\"U\" erabili danak eguneraketarako prestatzeko."
-#: src/ui.cc:990
+#: src/ui.cc:1073
+#, fuzzy
msgid ""
-"Updating the package lists requires administrative privileges, which\n"
-"you currently do not have. Would you like to change to the root account?\n"
+"Updating the package lists requires administrative privileges, which you "
+"currently do not have. Would you like to change to the root account?"
msgstr ""
"Pakete zerrenda eguneratzeak zuk ez dituzun kudeatzaile baimenak behar "
"ditu.\n"
"Root kontura aldatu nahi al duzu?\n"
-#: src/ui.cc:1005 src/ui.cc:1198
+#: src/ui.cc:1089 src/ui.cc:1345
msgid "Waste time trying to find mines"
msgstr "Minak aurkitzen saiatzen denbora pasa"
-#: src/ui.cc:1012 src/ui.cc:1065
+#: src/ui.cc:1096 src/ui.cc:1149
msgid "Cleaning while a download is in progress is not allowed"
msgstr "Deskarga bat abiarazirik dagoenean ez da garbitzerik onartzen"
-#: src/ui.cc:1015
+#: src/ui.cc:1099
msgid "Deleting downloaded files"
msgstr "Deskargaturiko fitxategiak ezabatzen"
-#: src/ui.cc:1029
+#: src/ui.cc:1113
msgid "Downloaded package files have been deleted"
msgstr "Deskargaturiko pakete fitxategiak ezabatuak izan dira"
-#: src/ui.cc:1090
+#: src/ui.cc:1174
#, fuzzy, c-format
msgid ""
"Obsolete downloaded package files have been deleted, freeing %sB of disk "
"space."
msgstr "Zaharkitutako deskargatutako paketeak ezabatuak izan dira"
-#: src/ui.cc:1174
+#: src/ui.cc:1246
+msgid "All solutions exhausted."
+msgstr ""
+
+#: src/ui.cc:1251 src/ui.cc:1282
+#, fuzzy
+msgid "Ran out of time while trying to find a solution."
+msgstr "Minak aurkitzen saiatzen denbora pasa"
+
+#: src/ui.cc:1276
+msgid "Unable to find a solution to apply."
+msgstr ""
+
+#: src/ui.cc:1321
msgid "^Install/remove packages"
msgstr "^Paketeak Instalatu/Ezabatu"
-#: src/ui.cc:1175
+#: src/ui.cc:1322
msgid "Perform all pending installs and removals"
msgstr "Egin falta diren instalaketa eta ezabaketak"
-#: src/ui.cc:1177
+#: src/ui.cc:1324
msgid "^Update package list"
msgstr "^Eguneratu pakete Zerrenda"
-#: src/ui.cc:1178
+#: src/ui.cc:1325
msgid "Check for new versions of packages"
msgstr "Arakatu paketeen bertsio berrien bila"
-#: src/ui.cc:1181
+#: src/ui.cc:1328
msgid "^Forget new packages"
msgstr "(^F) Ahaztu pakete berriak"
-#: src/ui.cc:1182
+#: src/ui.cc:1329
msgid "Forget which packages are \"new\""
msgstr "Ahaztu zein pakete diren \"berriak\""
-#: src/ui.cc:1185
+#: src/ui.cc:1332
msgid "^Clean package cache"
msgstr "(^C) Garbitu pakete katxea"
-#: src/ui.cc:1186
+#: src/ui.cc:1333
msgid "Delete package files which were previously downloaded"
msgstr "Ezabatu lehen deskargaturiko pakete fitxategiak"
-#: src/ui.cc:1189
+#: src/ui.cc:1336
msgid "Clean ^obsolete files"
msgstr "Garbitu zaharkiturik^o fitxategiak"
-#: src/ui.cc:1190
+#: src/ui.cc:1337
msgid "Delete package files which can no longer be downloaded"
msgstr "Ezabatu dafoenekeo deskargatu ezin diren fitxategiak"
-#: src/ui.cc:1193
+#: src/ui.cc:1340
msgid "Mark ^Upgradable"
msgstr "Eguneragarri Markat^u"
-#: src/ui.cc:1194
+#: src/ui.cc:1341
msgid "Mark all upgradable packages which are not held for upgrade"
msgstr "Markatu hizozturik ez dauden pakete eguneragarri guzitak eguneratzeko"
-#: src/ui.cc:1197
+#: src/ui.cc:1344
msgid "^Play Minesweeper"
msgstr "(^P) Mina aurkitzailera jolastu"
-#: src/ui.cc:1200
+#: src/ui.cc:1347
msgid "^Become root"
msgstr "(^B) Root biurtu"
-#: src/ui.cc:1201
+#: src/ui.cc:1348
+#, fuzzy
msgid ""
-"Run 'su' to become root; this will restart the program, but your\n"
-"settings will be preserved"
+"Run 'su' to become root; this will restart the program, but your settings "
+"will be preserved"
msgstr ""
"Root bihurtzeko 'su' abiarazi. Honek programa berabiarazi du\n"
"baina ezarpenak gordeko dira."
-#: src/ui.cc:1204
+#: src/ui.cc:1351
msgid "^Reload package cache"
msgstr "^(R) PAkete katxea berritu"
-#: src/ui.cc:1205
+#: src/ui.cc:1352
msgid "Reload the package cache"
msgstr "Pakete katxea Berritu."
-#: src/ui.cc:1211
+#: src/ui.cc:1358
msgid "^Quit"
msgstr "^(Q) Irten"
-#: src/ui.cc:1212
+#: src/ui.cc:1359
msgid "Exit the program"
msgstr "Programatik irten"
-#: src/ui.cc:1218 src/ui.cc:1487
+#: src/ui.cc:1365 src/ui.cc:1637
msgid "Undo"
msgstr "Desegin"
-#: src/ui.cc:1219
+#: src/ui.cc:1366
msgid "Undo the last package operation or group of operations"
msgstr "Desegin azke patekete ekintza edo ekintza taldea"
-#: src/ui.cc:1226
+#: src/ui.cc:1373
msgid "^Install"
msgstr "^Instalatu"
-#: src/ui.cc:1227
+#: src/ui.cc:1374
msgid "Flag the currently selected package for installation or upgrade"
msgstr "Aukeratutako paketea instalatu edo eguneratzeko markatu"
-#: src/ui.cc:1230
+#: src/ui.cc:1377
msgid "^Remove"
msgstr "^Ezabatu"
-#: src/ui.cc:1231
+#: src/ui.cc:1378
msgid "Flag the currently selected package for removal"
msgstr "Aukeratutako paketea ezabatzeko markatu"
-#: src/ui.cc:1234
+#: src/ui.cc:1381
msgid "^Purge"
msgstr "^Garbitu"
-#: src/ui.cc:1235
+#: src/ui.cc:1382
msgid ""
"Flag the currently selected package and its configuration files for removal"
msgstr "Aukeratutako paketea eta bere konfigurazioak ezabatzeko markatu"
-#: src/ui.cc:1238
+#: src/ui.cc:1385
msgid "^Keep"
msgstr "^Mantendu"
-#: src/ui.cc:1239
+#: src/ui.cc:1386
msgid "Cancel any action on the selected package"
msgstr "Aukeratutako paketean edozein ekintza ezeztatu"
-#: src/ui.cc:1242
+#: src/ui.cc:1389
msgid "^Hold"
msgstr "^Hizoztu"
-#: src/ui.cc:1243
+#: src/ui.cc:1390
msgid ""
"Cancel any action on the selected package, and protect it from future "
"upgrades"
@@ -3833,250 +4102,254 @@
"Aukeratutako paketean edozein ekintza ezeztatu eta aurreragotako "
"eguneraketez babestu"
-#: src/ui.cc:1246
+#: src/ui.cc:1393
msgid "Mark ^Auto"
msgstr "^Auto markatu"
-#: src/ui.cc:1247
+#: src/ui.cc:1394
+#, fuzzy
msgid ""
-"Mark the selected package as having been automatically installed;\n"
-"it will automatically be removed if no other packages depend on it"
+"Mark the selected package as having been automatically installed; it will "
+"automatically be removed if no other packages depend on it"
msgstr ""
"Markatu aukeratutako paketea automatiko instalatu balitz bezala;\n"
"beste paketerik behar ez duenean automatikoki ezabatua izango da"
-#: src/ui.cc:1250
+#: src/ui.cc:1397
msgid "Mark ^Manual"
msgstr "Markatau ^Manuala"
-#: src/ui.cc:1251
+#: src/ui.cc:1398
+#, fuzzy
msgid ""
-"Mark the selected package as having been manually installed;\n"
-"it will not be removed unless you manually remove it"
+"Mark the selected package as having been manually installed; it will not be "
+"removed unless you manually remove it"
msgstr ""
"Markatu aukeratutako paketea eskuz instalatua izan balitz bezala;\n"
"berau ez da ezabatuko zuk eskuz ezabatu artean"
-#: src/ui.cc:1254
+#: src/ui.cc:1401
msgid "^Forbid Version"
msgstr "^Debekatutako Bertsioa"
-#: src/ui.cc:1255
+#: src/ui.cc:1402
+#, fuzzy
msgid ""
-"Forbid the candidate version of the selected package from being installed;\n"
+"Forbid the candidate version of the selected package from being installed; "
"newer versions of the package will be installed as usual"
msgstr ""
"Debekatu aukeratutako paketearen aukerako bertsioa instalatzea;\n"
"bertsio berragoak era arruntean kudeatuko dira"
-#: src/ui.cc:1259
+#: src/ui.cc:1406
msgid "I^nformation"
msgstr "I^nformazioa"
-#: src/ui.cc:1260
+#: src/ui.cc:1407
msgid "Display more information about the selected package"
msgstr "Aukeratutako paketeren argibide gehiago bistaratu"
-#: src/ui.cc:1263
+#: src/ui.cc:1410
msgid "^Changelog"
msgstr "^Aldaketa Erregistroa"
-#: src/ui.cc:1264
+#: src/ui.cc:1411
msgid "Display the Debian changelog of the selected package"
msgstr "Bistarazi aukeratutako paketearen aldaketa erregistroa"
-#: src/ui.cc:1271
+#: src/ui.cc:1418
msgid "^Find"
msgstr "^Bilatu"
-#: src/ui.cc:1272
+#: src/ui.cc:1419
msgid "Search for a package"
msgstr "Pakete bat bilatu"
-#: src/ui.cc:1275
+#: src/ui.cc:1422
msgid "Find ^Again"
msgstr "Bilatu ^Berriz"
-#: src/ui.cc:1276
+#: src/ui.cc:1423
msgid "Repeat the last search"
msgstr "Azken bilaketa errepikatu"
-#: src/ui.cc:1280
+#: src/ui.cc:1427
msgid "^Limit Display"
msgstr "^Bistaratze Mugatu"
-#: src/ui.cc:1281
+#: src/ui.cc:1428
msgid "Apply a filter to the package list"
msgstr "Pakete zerrendari iragazi bat ezarri"
-#: src/ui.cc:1284
+#: src/ui.cc:1431
msgid "^Un-Limit Display"
msgstr "^Bistaratze Muga kendu"
-#: src/ui.cc:1285
+#: src/ui.cc:1432
msgid "Remove the filter from the package list"
msgstr "Pakete zerrendari iragazia kendu"
-#: src/ui.cc:1289
+#: src/ui.cc:1436
msgid "Find ^Broken"
msgstr "^Bilatu Apurtua"
-#: src/ui.cc:1290
+#: src/ui.cc:1437
msgid "Find the next package with unsatisfied dependencies"
msgstr "Bilatu betegabeko dependentziak dituen hurrengo paketea"
-#: src/ui.cc:1297
+#: src/ui.cc:1444
msgid "^UI options"
msgstr "^UI aukerak"
-#: src/ui.cc:1298
+#: src/ui.cc:1445
msgid "Change the settings which affect the user interface"
msgstr "Erabiltzaile interfazeari dagozkion ezarpenak aldatu."
-#: src/ui.cc:1301
+#: src/ui.cc:1448
msgid "^Dependency handling"
msgstr "^Dependentzi kudeaketa"
-#: src/ui.cc:1302
+#: src/ui.cc:1449
msgid "Change the settings which affect how package dependencies are handled"
msgstr "Pakete dependentziak kudeatzeko eraren ezarpenak aldatu"
-#: src/ui.cc:1305
+#: src/ui.cc:1452
msgid "^Miscellaneous"
msgstr "(^M) Bestelakoak"
-#: src/ui.cc:1306
+#: src/ui.cc:1453
msgid "Change miscellaneous program settings"
msgstr "Programaren beste ezarpen batzuk aldatu"
-#: src/ui.cc:1311
+#: src/ui.cc:1458
msgid "^Revert options"
msgstr "Auke^rak Atzeratu"
-#: src/ui.cc:1312
+#: src/ui.cc:1459
msgid "Reset all settings to the system defaults"
msgstr "Berezarri ezarpen guztiak sistema lehenetsietara"
-#: src/ui.cc:1323
+#: src/ui.cc:1470
msgid "^Next"
msgstr "Hurre^ngoa"
-#: src/ui.cc:1324
+#: src/ui.cc:1471
msgid "View next display"
msgstr "Ikusi hurrengo leihoa"
-#: src/ui.cc:1327
+#: src/ui.cc:1474
msgid "^Prev"
msgstr "(^P)Aurrekoa"
-#: src/ui.cc:1328
+#: src/ui.cc:1475
msgid "View previous display"
msgstr "Ikusi aurreko leihoa"
-#: src/ui.cc:1331
+#: src/ui.cc:1478
msgid "^Close"
msgstr "(^C)Itxi"
-#: src/ui.cc:1332
+#: src/ui.cc:1479
msgid "Close this display"
msgstr "Itxi leiho hau"
-#: src/ui.cc:1337
+#: src/ui.cc:1484
msgid "New Package ^View"
msgstr "(^V) Paketea Berriak Ikusi"
-#: src/ui.cc:1338
+#: src/ui.cc:1485
msgid "Create a new default package view"
msgstr "Pakete bistaratze berri bat sortu"
-#: src/ui.cc:1341
+#: src/ui.cc:1488
msgid "New Categorical ^Browser"
msgstr "Sailkapen ^Berria Ikusi"
-#: src/ui.cc:1343
+#: src/ui.cc:1490
msgid "Browse packages by category"
msgstr "Paketeak sailez bistarazi."
-#: src/ui.cc:1351
+#: src/ui.cc:1498
msgid "^About"
msgstr "(^A)Honi buruz"
-#: src/ui.cc:1352
+#: src/ui.cc:1499
msgid "View information about this program"
msgstr "Programa honi buruzko argibideak ikusi"
-#: src/ui.cc:1355
+#: src/ui.cc:1502
msgid "^Help"
msgstr "(^H)Laguntza"
-#: src/ui.cc:1356
+#: src/ui.cc:1503
msgid "View the on-line help"
msgstr "Ikusi sare bidezko laguntza"
-#: src/ui.cc:1358
+#: src/ui.cc:1505
msgid "User's ^Manual"
msgstr "Erabiltzailearen ^Manuala"
-#: src/ui.cc:1359
+#: src/ui.cc:1506
msgid "View the detailed program manual"
msgstr "Ikusi programaren manual zehaztua"
-#: src/ui.cc:1362
+#: src/ui.cc:1509
msgid "^FAQ"
msgstr "^FAQ"
-#: src/ui.cc:1363
+#: src/ui.cc:1510
msgid "View a list of frequently asked questions"
msgstr "Ikusi sarriago galdetutako galderen zerrenda?"
-#: src/ui.cc:1366
-msgid "^ChangeLog"
-msgstr "(^C) Erregistroa"
+#: src/ui.cc:1513
+msgid "^NEWS"
+msgstr ""
-#: src/ui.cc:1367
-msgid "View the important changes made in each version of the program"
+#: src/ui.cc:1514
+#, fuzzy
+msgid "View the important changes made in each version of "
msgstr "Begiratu programen bertsio bakoitzean eginiko aldaketa garrantzitsuak"
-#: src/ui.cc:1370
+#: src/ui.cc:1517
msgid "^License"
msgstr "^Lizentzia"
-#: src/ui.cc:1371
+#: src/ui.cc:1518
msgid "View the terms under which you may copy the program"
msgstr "Begiratu zein egoeratan zuk programa kopiatu dezakezun"
-#: src/ui.cc:1486
+#: src/ui.cc:1636
msgid "Actions"
msgstr "Ekintzak"
-#: src/ui.cc:1489
+#: src/ui.cc:1639
msgid "Search"
msgstr "Bilatu"
-#: src/ui.cc:1490
+#: src/ui.cc:1640
msgid "Options"
msgstr "Aukerak"
-#: src/ui.cc:1491
+#: src/ui.cc:1641
msgid "Views"
msgstr "Ikuspegiak"
-#: src/ui.cc:1492
+#: src/ui.cc:1642
msgid "Help"
msgstr "Laguntza"
-#: src/ui.cc:1537
+#: src/ui.cc:1699
#, c-format
msgid ""
"%s: Menu %s: Help %s: Quit %s: Update %s: Download/Install/Remove Pkgs"
msgstr ""
"%s=Menua %s=Laguntza %s=Irten %s=Eguneratu %s=Deskargatu/Instalatu/Kendu"
-#: src/ui.cc:1799 src/vscreen/vscreen.cc:281
+#: src/ui.cc:1968 src/vscreen/vscreen.cc:281
msgid "yes_key"
msgstr "Bai_gakoa"
-#: src/ui.cc:1800 src/vscreen/vscreen.cc:282
+#: src/ui.cc:1969 src/vscreen/vscreen.cc:282
msgid "no_key"
msgstr "ez_gakoa"
@@ -4089,6 +4362,16 @@
msgid "Downloading Changelog"
msgstr "Deskargatzen Erregistro aldaketak"
+#: src/view_changelog.cc:54
+#, fuzzy
+msgid "Download Changelog"
+msgstr "Deskargatzen Erregistro aldaketak"
+
+#: src/view_changelog.cc:63
+#, c-format
+msgid "%s changes"
+msgstr ""
+
#: src/vscreen/vscreen.cc:119
#, c-format
msgid "Ouch! Got SIGTERM, dying..\n"
@@ -4117,6 +4400,38 @@
msgid "No"
msgstr "Ez"
+#~ msgid ""
+#~ "Some packages had unmet dependencies. This may mean that you have\n"
+#~ "requested an impossible situation or if you are using the unstable\n"
+#~ "distribution that some required packages have not yet been created\n"
+#~ "or been moved out of Incoming.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Pakete batenbatek betegabeko dependentziak ditu. Hauk zuk ezinezko den\n"
+#~ "egoera bat eskatu duzlako edo zuk distrbuzio ezegonkorra darabilkizu eta\n"
+#~ "dependentzia pakete batenbat ez da sortu orindik edo sarreratik kanpo\n"
+#~ "utzi da.\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Please insert the following disc into the drive \"%s\":\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Mesedez sar hurrengo diska \"%s\" irakulean : \n"
+#~ "%s"
+
+#~ msgid "Invalid option for interactive mode: -s\n"
+#~ msgstr "Eukera baliogabeamodu interkatiboan: -s\n"
+
+#~ msgid "Information about "
+#~ msgstr "Informazioa honi buruz: "
+
+#~ msgid "Some broken packages could not be fixed!"
+#~ msgstr "Buskatutako zenbait pakete ezin dira konpondu!"
+
+#~ msgid "^ChangeLog"
+#~ msgstr "(^C) Erregistroa"
+
#~ msgid "Go away, I'm trying to think.\n"
#~ msgstr "Joan. Pentsatzen saiatzen ari nahiz.\n"
Modified: branches/aptitude-0.3/aptitude/po/fi.po
==============================================================================
--- branches/aptitude-0.3/aptitude/po/fi.po (original)
+++ branches/aptitude-0.3/aptitude/po/fi.po Sat Apr 30 13:41:32 2005
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: aptitude 0.2.15\n"
"Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-01-10 16:26-0800\n"
+"POT-Creation-Date: 2005-04-29 18:11-0400\n"
"PO-Revision-Date: 2004-10-11 09:21+0200\n"
"Last-Translator: Jaakko Kangasharju <ashar at iki.fi>\n"
"Language-Team: Jaakko Kangasharju <ashar at iki.fi>\n"
@@ -151,16 +151,103 @@
msgstr "Poista automaattisesti tähän hakuehtoon täsmäävät paketit"
#: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:184 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
-#: src/vscreen/vs_util.cc:329
+#: src/ui.cc:218 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
+#: src/vscreen/vs_util.cc:328
msgid "Ok"
msgstr "Ok"
#: src/apt_options.cc:242 src/download_list.cc:71 src/mine/cmine.cc:257
-#: src/mine/cmine.cc:330 src/vscreen/vs_util.cc:329
+#: src/mine/cmine.cc:330 src/vscreen/vs_util.cc:328
msgid "Cancel"
msgstr "Peruuta"
+#: src/broken_indicator.cc:106 src/solution_dialog.cc:97
+msgid "Internal error: unexpected null solution."
+msgstr ""
+
+#: src/broken_indicator.cc:158
+#, fuzzy
+msgid "Suggest "
+msgstr "Ehdotukset"
+
+#: src/broken_indicator.cc:164
+#, fuzzy, c-format
+msgid "%d installs"
+msgstr "asenna"
+
+#: src/broken_indicator.cc:169
+#, fuzzy
+msgid "1 install"
+msgstr "asenna"
+
+#: src/broken_indicator.cc:173
+#, c-format
+msgid "%d removals"
+msgstr ""
+
+#: src/broken_indicator.cc:178
+msgid "1 removal"
+msgstr ""
+
+#: src/broken_indicator.cc:182
+#, c-format
+msgid "%d keeps"
+msgstr ""
+
+#: src/broken_indicator.cc:187
+msgid "1 keep"
+msgstr ""
+
+#: src/broken_indicator.cc:191
+#, fuzzy, c-format
+msgid "%d upgrades"
+msgstr "päivitä"
+
+#: src/broken_indicator.cc:196
+#, fuzzy
+msgid "1 upgrade"
+msgstr "päivitä"
+
+#: src/broken_indicator.cc:200
+#, fuzzy, c-format
+msgid "%d downgrades"
+msgstr "vanhennus"
+
+#: src/broken_indicator.cc:205
+#, fuzzy
+msgid "1 downgrade"
+msgstr "vanhennus"
+
+#: src/broken_indicator.cc:214
+#, c-format
+msgid "%s: Examine"
+msgstr ""
+
+#: src/broken_indicator.cc:216
+#, c-format
+msgid "%s: Apply"
+msgstr ""
+
+#: src/broken_indicator.cc:218
+#, fuzzy, c-format
+msgid "%s: Next"
+msgstr "^Seuraava"
+
+#: src/broken_indicator.cc:220
+#, c-format
+msgid "%s: Previous"
+msgstr ""
+
+#: src/broken_indicator.cc:233
+#, c-format
+msgid "%CSolution search failed. %s: try harder"
+msgstr ""
+
+#: src/broken_indicator.cc:239
+#, c-format
+msgid "%CUnable to resolve dependencies."
+msgstr ""
+
#: src/cmdline/cmdline_action.cc:36
#, c-format
msgid ""
@@ -233,22 +320,22 @@
msgstr ""
"Paketti %s ei ole päivitettävissä, joten päivitystä ei ole tarpeen estää\n"
-#: src/cmdline/cmdline_action.cc:213
+#: src/cmdline/cmdline_action.cc:198
#, c-format
msgid "Note: selecting the task \"%s: %s\" for installation\n"
msgstr "Huom: valitsen tehtävän \"%s: %s\" asennettavaksi\n"
-#: src/cmdline/cmdline_action.cc:240
+#: src/cmdline/cmdline_action.cc:225
#, c-format
msgid "You can only specify a package version with an 'install' command.\n"
msgstr "Vain 'install'-komennolle voi määrittää paketin version.\n"
-#: src/cmdline/cmdline_action.cc:246
+#: src/cmdline/cmdline_action.cc:231
#, c-format
msgid "You can only specify a package archive with an 'install' command.\n"
msgstr "Vain 'install'-komennolle voi määrittää paketin arkiston.\n"
-#: src/cmdline/cmdline_action.cc:280
+#: src/cmdline/cmdline_action.cc:265
#, c-format
msgid ""
"Couldn't find package \"%s\", and more than 40\n"
@@ -257,7 +344,7 @@
"En löytänyt pakettia \"%s\" ja yli 40 paketin\n"
"nimessä on merkkijono \"%s\".\n"
-#: src/cmdline/cmdline_action.cc:283
+#: src/cmdline/cmdline_action.cc:268
#, c-format
msgid ""
"Couldn't find package \"%s\". However, the following\n"
@@ -266,13 +353,13 @@
"En löytänyt pakettia \"%s\". Näiden pakettien\n"
"nimet sisältävät merkkijonon \"%s\":\n"
-#: src/cmdline/cmdline_action.cc:307
+#: src/cmdline/cmdline_action.cc:292
#, c-format
msgid "Couldn't find any package whose name or description matched \"%s\"\n"
msgstr ""
"En löytänyt pakettia, jonka nimi tai kuvaus sisältäisi merkkijonon \"%s\".\n"
-#: src/cmdline/cmdline_action.cc:309
+#: src/cmdline/cmdline_action.cc:294
#, c-format
msgid ""
"Couldn't find any package matching \"%s\", and more than 40\n"
@@ -281,7 +368,7 @@
"En löytänyt pakettia, jonka nimi sisältäisi merkkijonon \"%s\"\n"
"ja yli 40 paketin kuvaus sisältää merkkijonon \"%s\".\n"
-#: src/cmdline/cmdline_action.cc:312
+#: src/cmdline/cmdline_action.cc:297
#, c-format
msgid ""
"Couldn't find any package matching \"%s\". However, the following\n"
@@ -326,13 +413,13 @@
msgid "Freed %sB of disk space\n"
msgstr "Vapauttaa %sB levytilaa"
-#: src/cmdline/cmdline_do_action.cc:67
+#: src/cmdline/cmdline_do_action.cc:71
#, c-format
msgid "Invalid operation %s"
msgstr "Virheellinen toiminto %s"
-#: src/cmdline/cmdline_do_action.cc:206 src/cmdline/cmdline_simulate.cc:30
-#: src/cmdline/cmdline_upgrade.cc:89
+#: src/cmdline/cmdline_do_action.cc:201 src/cmdline/cmdline_simulate.cc:31
+#: src/cmdline/cmdline_upgrade.cc:91
#, c-format
msgid "Abort.\n"
msgstr "Keskeytys.\n"
@@ -342,7 +429,7 @@
msgid "download: you must specify at least one package to download\n"
msgstr "nouto: ainakin yksi noudettava paketti on annettava\n"
-#: src/cmdline/cmdline_download.cc:43 src/download.cc:342
+#: src/cmdline/cmdline_download.cc:43 src/download.cc:344
msgid "Couldn't read source list"
msgstr "En pystynyt lukemaan pakettivarastolistaa"
@@ -406,95 +493,95 @@
msgid "What is it? It's an elephant being eaten by a snake, of course.\n"
msgstr "Mikäkö se on? Sehän on boa-käärme, joka sulattaa elefanttia.\n"
-#: src/cmdline/cmdline_prompt.cc:44
+#: src/cmdline/cmdline_prompt.cc:45
msgid "Couldn't read list of sources"
msgstr "En pystynyt lukemaan pakettivarastolistaa"
-#: src/cmdline/cmdline_prompt.cc:219 src/cmdline/cmdline_show_broken.cc:73
+#: src/cmdline/cmdline_prompt.cc:220 src/cmdline/cmdline_show_broken.cc:73
#, c-format
msgid "but %s is to be installed."
msgstr "mutta %s on määrätty asennettavaksi."
-#: src/cmdline/cmdline_prompt.cc:222 src/cmdline/cmdline_show_broken.cc:76
+#: src/cmdline/cmdline_prompt.cc:223 src/cmdline/cmdline_show_broken.cc:76
#, c-format
msgid "but %s is installed and it is kept back."
msgstr "mutta %s on asennettu ja odottaa."
-#: src/cmdline/cmdline_prompt.cc:225 src/cmdline/cmdline_show_broken.cc:79
+#: src/cmdline/cmdline_prompt.cc:226 src/cmdline/cmdline_show_broken.cc:79
#, c-format
msgid "but %s is installed."
msgstr "mutta %s on asennettu."
-#: src/cmdline/cmdline_prompt.cc:229 src/cmdline/cmdline_show_broken.cc:83
+#: src/cmdline/cmdline_prompt.cc:230 src/cmdline/cmdline_show_broken.cc:83
#, c-format
msgid "but it is not installable"
msgstr "mutta se ei ole asennettavissa"
-#: src/cmdline/cmdline_prompt.cc:233 src/cmdline/cmdline_show_broken.cc:87
+#: src/cmdline/cmdline_prompt.cc:234 src/cmdline/cmdline_show_broken.cc:87
#, c-format
msgid " which is a virtual package."
msgstr "joka on näennäispaketti."
-#: src/cmdline/cmdline_prompt.cc:236 src/cmdline/cmdline_show_broken.cc:90
+#: src/cmdline/cmdline_prompt.cc:237 src/cmdline/cmdline_show_broken.cc:90
#, c-format
msgid " or"
msgstr " tai"
-#: src/cmdline/cmdline_prompt.cc:248
+#: src/cmdline/cmdline_prompt.cc:249
msgid "The following packages are BROKEN:"
msgstr "Nämä paketit ovat RIKKI:"
-#: src/cmdline/cmdline_prompt.cc:249
+#: src/cmdline/cmdline_prompt.cc:250
msgid "The following packages are unused and will be REMOVED:"
msgstr "Nämä paketit ovat käyttämättömiä ja POISTETAAN:"
-#: src/cmdline/cmdline_prompt.cc:250
+#: src/cmdline/cmdline_prompt.cc:251
msgid "The following packages have been automatically kept back:"
msgstr "Nämä paketit on automaattisesti jätetty odottamaan:"
-#: src/cmdline/cmdline_prompt.cc:251
+#: src/cmdline/cmdline_prompt.cc:252
msgid "The following NEW packages will be automatically installed:"
msgstr "Nämä UUDET paketit asennetaan automaattisesti:"
-#: src/cmdline/cmdline_prompt.cc:252
+#: src/cmdline/cmdline_prompt.cc:253
msgid "The following packages will be automatically REMOVED:"
msgstr "Nämä paketit POISTETAAN automaattisesti:"
-#: src/cmdline/cmdline_prompt.cc:253
+#: src/cmdline/cmdline_prompt.cc:254
msgid "The following packages will be DOWNGRADED:"
msgstr "Nämä paketit VANHENNETAAN:"
-#: src/cmdline/cmdline_prompt.cc:254
+#: src/cmdline/cmdline_prompt.cc:255
msgid "The following packages have been kept back:"
msgstr "Nämä paketit on jätetty odottamaan:"
-#: src/cmdline/cmdline_prompt.cc:255
+#: src/cmdline/cmdline_prompt.cc:256
msgid "The following packages will be REINSTALLED:"
msgstr "Nämä paketit ASENNETAAN UUDESTAAN:"
-#: src/cmdline/cmdline_prompt.cc:256
+#: src/cmdline/cmdline_prompt.cc:257
msgid "The following NEW packages will be installed:"
msgstr "Nämä UUDET paketit asennetaan:"
-#: src/cmdline/cmdline_prompt.cc:257
+#: src/cmdline/cmdline_prompt.cc:258
msgid "The following packages will be REMOVED:"
msgstr "Nämä paketit POISTETAAN:"
-#: src/cmdline/cmdline_prompt.cc:258
+#: src/cmdline/cmdline_prompt.cc:259
msgid "The following packages will be upgraded:"
msgstr "Nämä paketit päivitetään:"
-#: src/cmdline/cmdline_prompt.cc:307
+#: src/cmdline/cmdline_prompt.cc:311
#, c-format
msgid "The following ESSENTIAL packages will be REMOVED!\n"
msgstr "Nämä VÄLTTÄMÄTTÖMÄT paketit POISTETAAN!\n"
-#: src/cmdline/cmdline_prompt.cc:316
+#: src/cmdline/cmdline_prompt.cc:320
#, c-format
msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
msgstr "Tämä toiminto RIKKOO nämä VÄLTTÄMÄTTÖMÄT paketit:\n"
-#: src/cmdline/cmdline_prompt.cc:326
+#: src/cmdline/cmdline_prompt.cc:330
#, c-format
msgid ""
"WARNING: Performing this action will probably cause your system to break!\n"
@@ -503,96 +590,99 @@
"VAROITUS: Tämä toiminto luultavasti hajoittaa järjestelmäsi!\n"
" ÄLÄ jatka, ellet tiedä VARMASTI, mitä teet!\n"
-#: src/cmdline/cmdline_prompt.cc:328
+#: src/cmdline/cmdline_prompt.cc:332
msgid "I am aware that this is a very bad idea"
msgstr "Kyllä, tiedän hyvin, että tämä on aivan onnettoman surkea ajatus"
-#: src/cmdline/cmdline_prompt.cc:331
+#: src/cmdline/cmdline_prompt.cc:335
#, c-format
msgid "To continue, type the phrase \"%s\":\n"
msgstr "Kirjoita \"%s\" jatkaaksesi:\n"
-#: src/cmdline/cmdline_prompt.cc:434
+#: src/cmdline/cmdline_prompt.cc:438
#, c-format
msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
msgstr "Näitä SUOSITELTUJA paketteja EI asenneta:\n"
-#: src/cmdline/cmdline_prompt.cc:440
+#: src/cmdline/cmdline_prompt.cc:444
#, c-format
msgid "The following packages are SUGGESTED but will NOT be installed:\n"
msgstr "Näitä EHDOTETTUJA paketteja EI asenneta:\n"
-#: src/cmdline/cmdline_prompt.cc:445
+#: src/cmdline/cmdline_prompt.cc:449
#, c-format
msgid "No packages will be installed, upgraded, or removed.\n"
msgstr "Mitään paketteja ei asenneta, päivitetä tai poisteta.\n"
-#: src/cmdline/cmdline_prompt.cc:447
+#: src/cmdline/cmdline_prompt.cc:451
#, c-format
msgid "%lu packages upgraded, %lu newly installed, "
msgstr "%lu päivitettyä pakettia, %lu uutta asennusta, "
-#: src/cmdline/cmdline_prompt.cc:451
+#: src/cmdline/cmdline_prompt.cc:455
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu uudelleen asennettua, "
-#: src/cmdline/cmdline_prompt.cc:453
+#: src/cmdline/cmdline_prompt.cc:457
#, c-format
msgid "%lu downgraded, "
msgstr "%lu vanhennettua, "
-#: src/cmdline/cmdline_prompt.cc:455
+#: src/cmdline/cmdline_prompt.cc:459
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu poistettavaa ja %lu päivittämätöntä.\n"
-#: src/cmdline/cmdline_prompt.cc:462
+#: src/cmdline/cmdline_prompt.cc:466
#, c-format
msgid "Need to get %sB/%sB of archives. "
msgstr "Tarvitsee noutaa %sB/%sB arkistoista. "
-#: src/cmdline/cmdline_prompt.cc:465
+#: src/cmdline/cmdline_prompt.cc:469
#, c-format
msgid "Need to get %sB of archives. "
msgstr "Tarvitsee noutaa %sB arkistoista. "
-#: src/cmdline/cmdline_prompt.cc:472
+#: src/cmdline/cmdline_prompt.cc:476
#, c-format
msgid "After unpacking %sB will be used.\n"
msgstr "Levytilaa kuluu %sB purkamisen jälkeen.\n"
-#: src/cmdline/cmdline_prompt.cc:475
+#: src/cmdline/cmdline_prompt.cc:479
#, c-format
msgid "After unpacking %sB will be freed.\n"
msgstr "Levytilaa vapautuu %sB purkamisen jälkeen.\n"
-#: src/cmdline/cmdline_prompt.cc:521
+#: src/cmdline/cmdline_prompt.cc:524
#, c-format
msgid "Bad action character '%c'\n"
msgstr "Virheellinen komentomerkki '%c'\n"
-#: src/cmdline/cmdline_prompt.cc:596
+#: src/cmdline/cmdline_prompt.cc:595
#, c-format
msgid "No packages to show -- enter the package names on the line after 'i'.\n"
msgstr "Ei näytettäviä paketteja -- anna pakettien nimet 'i':n jälkeen.\n"
-#: src/cmdline/cmdline_prompt.cc:598 src/cmdline/cmdline_prompt.cc:629
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:597
msgid "Press Return to continue."
msgstr "Paina Return jatkaaksesi."
-#: src/cmdline/cmdline_prompt.cc:625
+#: src/cmdline/cmdline_prompt.cc:623
#, c-format
msgid "No packages found -- enter the package names on the line after 'c'.\n"
msgstr "Paketteja ei löytynyt -- anna pakettien nimet 'c':n jälkeen.\n"
-#: src/cmdline/cmdline_prompt.cc:665
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:627
+#, fuzzy
+msgid "Press Return to continue"
+msgstr "Paina Return jatkaaksesi."
+
+#: src/cmdline/cmdline_prompt.cc:675
msgid "Do you want to continue? [Y/n/?] "
msgstr "Haluatko jatkaa? [Kyllä=y/ei=n/?] "
-#: src/cmdline/cmdline_prompt.cc:690
+#: src/cmdline/cmdline_prompt.cc:700
#, c-format
msgid ""
"\n"
@@ -603,7 +693,7 @@
"Riippuvuustiedot näytetään.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:692
+#: src/cmdline/cmdline_prompt.cc:702
#, c-format
msgid ""
"\n"
@@ -614,7 +704,7 @@
"Riippuvuustietoja ei näytetä.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:698
+#: src/cmdline/cmdline_prompt.cc:708
#, c-format
msgid ""
"\n"
@@ -625,7 +715,7 @@
"Versiot näytetään.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:700
+#: src/cmdline/cmdline_prompt.cc:710
#, c-format
msgid ""
"\n"
@@ -636,7 +726,7 @@
"Versioita ei näytetä.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:705
+#: src/cmdline/cmdline_prompt.cc:715
#, c-format
msgid ""
"\n"
@@ -647,7 +737,7 @@
"Kokojen muutokset näytetään.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:717
#, c-format
msgid ""
"\n"
@@ -658,7 +748,7 @@
"Kokojen muutoksia ei näytetä.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:737
#, c-format
msgid ""
"Commands:\n"
@@ -708,34 +798,86 @@
" _ : Siivoa\n"
" = : Jäädytä\n"
-#: src/cmdline/cmdline_prompt.cc:751
+#: src/cmdline/cmdline_prompt.cc:761
#, c-format
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:84
+#, c-format
+msgid "y: %F%nn: %F%nq: %F%n,: %F%n.: %F%n"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:90
+msgid "accept the proposed changes"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:92
+msgid "reject the proposed changes and search for another solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:94
+#, fuzzy
+msgid "give up and quit the program"
+msgstr "Poistu ohjelmasta"
+
+#: src/cmdline/cmdline_resolver.cc:96
+msgid "move to the next solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:98
+msgid "move to the previous solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:131
+#, fuzzy
+msgid "The following actions will resolve these dependencies:"
+msgstr "Näillä paketeilla on tyydyttämättömiä riippuvuuksia:\n"
+
+#: src/cmdline/cmdline_resolver.cc:146
+msgid "Accept this solution? [Y/n/q/?]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:174
+msgid "Abandoning all efforts to resolve these dependencies."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:184
+#, fuzzy
+msgid "The following commands are available:"
+msgstr "Nämä paketit ovat RIKKI:"
+
+#: src/cmdline/cmdline_resolver.cc:188
+#, fuzzy
+msgid "Invalid response; please enter one of the following commands:"
+msgstr ""
+"Virheellinen komento. Anna hyväksytty komento tai '?' saadaksesi apua.\n"
+
+#: src/cmdline/cmdline_resolver.cc:198
+msgid "No solution found within the allotted time. Try harder? [Y/n]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:226
+#, fuzzy
+msgid "Invalid response; please enter 'y' or 'n'."
+msgstr ""
+"Virheellinen komento. Anna hyväksytty komento tai '?' saadaksesi apua.\n"
+
+#: src/cmdline/cmdline_resolver.cc:235
+msgid "Unable to resolve dependencies! Giving up..."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:240
+msgid "No more solutions."
+msgstr ""
+
#: src/cmdline/cmdline_search.cc:78
#, c-format
msgid "search: You must provide at least one search term\n"
msgstr "search: Ainakin yksi hakuehto tarvitaan\n"
-# This needs to be synchronized with apt's translation, if that ever happens
-# JJK
-#: src/cmdline/cmdline_show_broken.cc:114
-#, c-format
-msgid ""
-"Some packages had unmet dependencies. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming.\n"
-"\n"
-msgstr ""
-"Joidenkin pakettien riippuvuuksia ei voinut tyydyttää. Tämä voi johtua\n"
-"antamistasi mahdottomista vaatimuksista tai, jos käytät epävakaata jakelua,\n"
-"siitä, ettei joitakin vaadittuja paketteja ole vielä saatavilla.\n"
-"\n"
-
-#: src/cmdline/cmdline_show_broken.cc:115
+#: src/cmdline/cmdline_show_broken.cc:113
#, c-format
msgid "The following packages have unmet dependencies:\n"
msgstr "Näillä paketeilla on tyydyttämättömiä riippuvuuksia:\n"
@@ -933,12 +1075,12 @@
msgid "Description: "
msgstr "Kuvaus: "
-#: src/cmdline/cmdline_simulate.cc:36
+#: src/cmdline/cmdline_simulate.cc:37
#, c-format
msgid "Would download/install/remove packages.\n"
msgstr "Noutaisi tai asentaisi tai poistaisi paketteja.\n"
-#: src/cmdline/cmdline_simulate.cc:47
+#: src/cmdline/cmdline_simulate.cc:48
msgid "Internal Error, Ordering didn't finish"
msgstr "Sisäinen virhe, järjestäminen ei onnistunut"
@@ -980,26 +1122,24 @@
msgid "UNAVAILABLE"
msgstr "EI SAATAVILLA"
-#: src/download_bar.cc:57 src/download_list.cc:265
+#: src/download_bar.cc:56 src/download_list.cc:263 src/download_screen.cc:57
#, c-format
-msgid ""
-"Please insert the following disc into the drive \"%s\":\n"
-"%s"
-msgstr "Aseta asemaan \"%s\" levyke nimeltä \"%s\""
+msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
+msgstr "Aseta levyke nimeltä \"%s\" asemaan \"%s\""
-#: src/download_bar.cc:76 src/generic/acqprogress.cc:63
+#: src/download_bar.cc:77 src/generic/acqprogress.cc:63
msgid "Hit "
msgstr "Löytyi "
-#: src/download_bar.cc:89
+#: src/download_bar.cc:90
msgid "Downloading "
msgstr "Nouto: "
-#: src/download_bar.cc:102
+#: src/download_bar.cc:103
msgid "Got "
msgstr "Noudettu: "
-#: src/download_bar.cc:156
+#: src/download_bar.cc:157
msgid "Downloading..."
msgstr "Noudan..."
@@ -1007,7 +1147,7 @@
msgid "Couldn't read list of package sources"
msgstr "En pystynyt lukemaan pakettivarastolistaa"
-#: src/download.cc:104 src/download.cc:321
+#: src/download.cc:104 src/download.cc:322
msgid "Couldn't lock list directory..are you root?"
msgstr "En pystynyt lukitsemaan listahakemistoa - oletko varmasti root?"
@@ -1019,29 +1159,33 @@
msgid "View the progress of the package list update"
msgstr "Seuraa pakettilistojen päivityksen edistymistä"
-#: src/download.cc:159
+#: src/download.cc:113
+msgid "List Update"
+msgstr ""
+
+#: src/download.cc:160
msgid "Couldn't clean out list directories"
msgstr "En pystynyt siivoamaan listahakemistoja"
-#: src/download.cc:176 src/ui.cc:1068
+#: src/download.cc:177 src/ui.cc:1152
msgid "Deleting obsolete downloaded files"
msgstr "Poistan vanhentuneita tiedostoja"
-#: src/download.cc:181
+#: src/download.cc:182
#, c-format
msgid "Deleting obsolete downloaded files\n"
msgstr "Poistan vanhentuneita noudettuja tiedostoja\n"
-#: src/download.cc:223
+#: src/download.cc:224
#, c-format
msgid "Unable to open %s to log actions"
msgstr "En pystynyt avaaamaan %s:a lokitiedostoksi"
-#: src/download.cc:229
+#: src/download.cc:230
msgid "log report"
msgstr "loki"
-#: src/download.cc:230
+#: src/download.cc:231
#, c-format
msgid ""
"IMPORTANT: this log only lists intended actions; actions which fail due to\n"
@@ -1052,77 +1196,77 @@
"epäonnistuu dpkg:n ongelmien takia, sitä ei välttämättä suoritettu.\n"
"\n"
-#: src/download.cc:231
+#: src/download.cc:232
#, c-format
msgid "Will install %li packages, and remove %li packages.\n"
msgstr "Asennetaan %li pakettia ja poistetaan %li pakettia.\n"
-#: src/download.cc:233
+#: src/download.cc:234
#, c-format
msgid "%sB of disk space will be used\n"
msgstr "%s tavua levytilaa kuluu\n"
-#: src/download.cc:236
+#: src/download.cc:237
#, c-format
msgid "%sB bytes of disk space will be freed\n"
msgstr "%s tavua levytilaa vapautuu\n"
-#: src/download.cc:244
+#: src/download.cc:245
#, c-format
msgid "[UPGRADE] %s %s -> %s\n"
msgstr "[PÄIVITYS] %s %s -> %s\n"
-#: src/download.cc:248
+#: src/download.cc:249
#, c-format
msgid "[DOWNGRADE] %s %s -> %s\n"
msgstr "[VANHENNUS] %s %s -> %s\n"
-#: src/download.cc:258
+#: src/download.cc:259
msgid "REMOVE"
msgstr "POISTO"
-#: src/download.cc:264
+#: src/download.cc:265
msgid "INSTALL"
msgstr "ASENNUS"
-#: src/download.cc:267
+#: src/download.cc:268
msgid "REINSTALL"
msgstr "UUDELLEENASENNUS"
-#: src/download.cc:270
+#: src/download.cc:271
msgid "HOLD"
msgstr "JÄISSÄ"
-#: src/download.cc:273
+#: src/download.cc:274
msgid "BROKEN"
msgstr "RIKKI"
-#: src/download.cc:276
+#: src/download.cc:277
msgid "REMOVE, NOT USED"
msgstr "POISTO, KÄYTTÄMÄTÖN"
-#: src/download.cc:279
+#: src/download.cc:280
msgid "REMOVE, DEPENDENCIES"
msgstr "POISTO, RIIPPUVUUDET"
-#: src/download.cc:282
+#: src/download.cc:283
msgid "INSTALL, DEPENDENCIES"
msgstr "ASENNUS, RIIPPUVUUDET"
-#: src/download.cc:285
+#: src/download.cc:286
msgid "HOLD, DEPENDENCIES"
msgstr "JÄISSÄ, RIIPPUVUUDET"
-#: src/download.cc:287
+#: src/download.cc:288
msgid "????????"
msgstr "????????"
-#: src/download.cc:291
+#: src/download.cc:292
#, c-format
msgid "[%s] %s\n"
msgstr "[%s] %s\n"
-#: src/download.cc:294
+#: src/download.cc:295
#, c-format
msgid ""
"===============================================================================\n"
@@ -1133,33 +1277,38 @@
"\n"
"Loki kirjoitettu.\n"
-#: src/download.cc:329
+#: src/download.cc:330
msgid "Downloading packages"
msgstr "Noudan paketteja"
-#: src/download.cc:330
+#: src/download.cc:331
msgid "View the progress of the package download"
msgstr "Seuraa pakettien noudon edistymistä"
-#: src/download.cc:352
+#: src/download.cc:332
+#, fuzzy
+msgid "Package Download"
+msgstr "Paketti: "
+
+#: src/download.cc:354
msgid "Internal error: couldn't generate list of packages to download"
msgstr ""
"Sisäinen virhe: en pystynyt muodostamaan listaa noudettavista paketeista"
-#: src/download.cc:413
+#: src/download.cc:415
msgid "Unable to correct for unavailable packages"
msgstr "En pystynyt toipumaan pakettien saavuttamattomuudesta"
-#: src/download.cc:465
+#: src/download.cc:467
msgid ""
"Ack! Something bad happened while installing packages. Trying to recover:"
msgstr "Oih! Jotain ikävää tapahtui asennuksessa. Yritän toipua:"
-#: src/download.cc:475 src/pkg_item.cc:413
+#: src/download.cc:477 src/pkg_item.cc:432
msgid "Press return to continue.\n"
msgstr "Paina return jatkaaksesi.\n"
-#: src/download.cc:506
+#: src/download.cc:508
msgid ""
"Could not regain the system lock! (Perhaps another apt or dpkg is running?)"
msgstr ""
@@ -1220,11 +1369,6 @@
msgid "[ERROR]"
msgstr "[VIRHE]"
-#: src/download_screen.cc:57
-#, c-format
-msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
-msgstr "Aseta levyke nimeltä \"%s\" asemaan \"%s\""
-
#: src/download_screen.cc:181
#, c-format
msgid "Downloaded %sB in %ss (%sB/s)."
@@ -1262,111 +1406,111 @@
"press enter\n"
msgstr "Levynvaihto: Aseta levyke nimeltä '%s' asemaan '%s' ja paina enteriä\n"
-#: src/generic/aptcache.cc:245
+#: src/generic/aptcache.cc:253
msgid "Can't open Aptitude extended state file"
msgstr "En pystynyt avaamaan Aptituden tilatiedostoa"
-#: src/generic/aptcache.cc:252 src/generic/aptcache.cc:305
-#: src/generic/aptcache.cc:307
+#: src/generic/aptcache.cc:260 src/generic/aptcache.cc:313
+#: src/generic/aptcache.cc:315
msgid "Reading extended state information"
msgstr "Luen tilatietoja"
-#: src/generic/aptcache.cc:313 src/generic/aptcache.cc:387
-#: src/generic/aptcache.cc:390
+#: src/generic/aptcache.cc:321 src/generic/aptcache.cc:395
+#: src/generic/aptcache.cc:398
msgid "Initializing package states"
msgstr "Alustan pakettien tiloja"
-#: src/generic/aptcache.cc:501
+#: src/generic/aptcache.cc:509
msgid "Cannot open Aptitude state file"
msgstr "En pystynyt avaamaan Aptituden tilatiedostoa"
-#: src/generic/aptcache.cc:505 src/generic/aptcache.cc:560
-#: src/generic/aptcache.cc:563
+#: src/generic/aptcache.cc:513 src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:571
msgid "Writing extended state information"
msgstr "Kirjoitan tilatietoja"
-#: src/generic/aptcache.cc:542
+#: src/generic/aptcache.cc:550
#, c-format
msgid "Internal buffer overflow on package \"%s\" while writing state file"
msgstr "Puskurin ylivuoto paketin \"%s\" kohdalla tilatietoja kirjoitettaessa"
-#: src/generic/aptcache.cc:551
+#: src/generic/aptcache.cc:559
msgid "Couldn't write state file"
msgstr "En pystynyt kirjoittamaan tilatietoja"
-#: src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:576
msgid "Error writing state file"
msgstr "Virhe tilatietoja kirjoitettaessa"
-#: src/generic/aptcache.cc:584
+#: src/generic/aptcache.cc:592
msgid "couldn't replace old state file"
msgstr "vanhaa tilatiedostoa ei pystynyt korvaamaan"
-#: src/generic/aptcache.cc:960
+#: src/generic/aptcache.cc:1000
msgid "Unable to correct dependencies, some packages cannot be installed"
msgstr "En pysty korjaamaan riippuvuuksia; joitain paketteja ei voi asentaa"
-#: src/generic/aptcache.cc:1325
+#: src/generic/aptcache.cc:1546
msgid "The list of sources could not be read."
msgstr "Pakettivarastojen listaa ei pystynyt lukemaan."
-#: src/generic/aptcache.cc:1332
+#: src/generic/aptcache.cc:1553
msgid "The package lists or status file could not be parsed or opened."
msgstr "Pakettilistan tai tilatiedoston avaaminen tai jäsennys epäonnistui."
-#: src/generic/aptcache.cc:1335
+#: src/generic/aptcache.cc:1556
msgid "You may want to update the package lists to correct these missing files"
msgstr ""
"Haluat ehkä päivittää pakettilistat korjataksesi nämä puuttuvat tiedostot"
-#: src/generic/apt.cc:141
+#: src/generic/apt.cc:142
#, c-format
msgid "Unable to open %s for writing"
msgstr "En pysty kirjoittamaan tiedostoon %s"
-#: src/generic/apt.cc:151
+#: src/generic/apt.cc:152
#, c-format
msgid "Unable to replace %s with new configuration file"
msgstr "En pysty korvaamaan %s:a uudella asetustiedostolla"
-#: src/generic/apt.cc:226
+#: src/generic/apt.cc:227
msgid "Warning: could not lock the cache file. Opening in read-only mode"
msgstr ""
"Varoitus: varaston lukitus epäonnistui, joten siihen ei nyt voi kirjoittaa"
-#: src/generic/matchers.cc:780
+#: src/generic/matchers.cc:797
msgid "Unmatched '('"
msgstr "Pariton '('"
-#: src/generic/matchers.cc:870 src/generic/matchers.cc:949
+#: src/generic/matchers.cc:887 src/generic/matchers.cc:968
#, c-format
msgid "Unknown dependency type: %s"
msgstr "Tuntematon riippuvuuslaji: %s"
-#: src/generic/matchers.cc:931
+#: src/generic/matchers.cc:950
#, c-format
msgid "Unknown action type: %s"
msgstr "Tuntematon toimi: %s"
-#: src/generic/matchers.cc:998
+#: src/generic/matchers.cc:1017
#, c-format
msgid "Unknown priority %s"
msgstr "Tuntematon tärkeys %s"
-#: src/generic/matchers.cc:1020
+#: src/generic/matchers.cc:1039
#, c-format
msgid "Unknown pattern type: %c"
msgstr "Tuntematon hahmotyyppi: %c"
-#: src/generic/matchers.cc:1065
+#: src/generic/matchers.cc:1084
msgid "Unexpected empty expression"
msgstr "Virheellisesti tyhjä lauseke"
-#: src/generic/matchers.cc:1100
+#: src/generic/matchers.cc:1119
msgid "Badly formed expression"
msgstr "Virheellinen lauseke"
-#: src/generic/matchers.cc:1129
+#: src/generic/matchers.cc:1148
msgid "Unexpected ')'"
msgstr "Pariton ')'"
@@ -1390,7 +1534,7 @@
msgid "Can't get value of $HOME, using TMPDIR (insecure)"
msgstr "Arvoa $HOME ei löytynyt, käytän TMPDIR:iä (turvaton)"
-#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:60
+#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:61
#, c-format
msgid "ChangeLog of %s"
msgstr "%s:n muutosloki"
@@ -1591,17 +1735,17 @@
msgid "Invalid sorting policy type '%s'"
msgstr "Lajittelutyylillä virheellinen tyyppi '%s'"
-#: src/main.cc:68
+#: src/main.cc:67
#, c-format
msgid "%s %s compiled at %s %s\n"
msgstr "%s %s käännöspäiväys %s %s\n"
-#: src/main.cc:71
+#: src/main.cc:70
#, c-format
msgid "Compiler: g++ %s\n"
msgstr "Kääntäjä: g++ %s\n"
-#: src/main.cc:74
+#: src/main.cc:73
#, c-format
msgid ""
"\n"
@@ -1610,7 +1754,7 @@
"\n"
"NCurses-versio: %s\n"
-#: src/main.cc:76
+#: src/main.cc:75
#, c-format
msgid ""
"\n"
@@ -1619,22 +1763,22 @@
"\n"
"Curses-versio: %s\n"
-#: src/main.cc:78
+#: src/main.cc:77
#, c-format
msgid "libsigc++ version: %s\n"
msgstr "libsigc++-versio: %s\n"
-#: src/main.cc:84
+#: src/main.cc:83
#, c-format
msgid "Usage: aptitude [-S fname] [-u|-i]"
msgstr "Käyttö: aptitude [-S tnimi] [-u|-i]"
-#: src/main.cc:86
+#: src/main.cc:85
#, c-format
msgid " aptitude [options] <action> ..."
msgstr " aptitude [valitsimet] <toiminto> ..."
-#: src/main.cc:88
+#: src/main.cc:87
#, c-format
msgid ""
" Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -1644,42 +1788,42 @@
"tilaan):\n"
"\n"
-#: src/main.cc:89
+#: src/main.cc:88
#, c-format
msgid " install - Install/upgrade packages\n"
msgstr " install - Asenna tai päivitä paketteja\n"
-#: src/main.cc:90
+#: src/main.cc:89
#, c-format
msgid " remove - Remove packages\n"
msgstr " remove - Poista paketteja\n"
-#: src/main.cc:91
+#: src/main.cc:90
#, c-format
msgid " purge - Remove packages and their configuration files\n"
msgstr " purge - Poista paketteja asetustiedostoineen\n"
-#: src/main.cc:92
+#: src/main.cc:91
#, c-format
msgid " hold - Place packages on hold\n"
msgstr " hold - Jäädytä paketteja\n"
-#: src/main.cc:93
+#: src/main.cc:92
#, c-format
msgid " unhold - Cancel a hold command for a package\n"
msgstr " unhold - Peruuta paketin jäädytys\n"
-#: src/main.cc:94
+#: src/main.cc:93
#, c-format
msgid " markauto - Mark packages as having been automatically installed\n"
msgstr " markauto - Merkitse paketteja automaattisesti asennetuiksi\n"
-#: src/main.cc:95
+#: src/main.cc:94
#, c-format
msgid " unmarkauto - Mark packages as having been manually installed\n"
msgstr " unmarkauto - Merkitse paketteja käsin asennetuiksi\n"
-#: src/main.cc:100
+#: src/main.cc:99
#, c-format
msgid ""
" forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -1688,153 +1832,153 @@
" forbid-version - Estä aptitudea päivittämästä pakettia määritettyyn "
"versioon\n"
-#: src/main.cc:101
+#: src/main.cc:100
#, c-format
msgid " update - Download lists of new/upgradable packages\n"
msgstr " update - Nouda uusien ja päivitettävien pakettien listat\n"
-#: src/main.cc:102
+#: src/main.cc:101
#, c-format
msgid " upgrade - Perform a safe upgrade\n"
msgstr " upgrade - Päivitä turvallisesti\n"
-#: src/main.cc:103
+#: src/main.cc:102
#, c-format
msgid ""
" dist-upgrade - Perform an upgrade, possibly installing and removing "
"packages\n"
msgstr " dist-upgrade - Päivitä sallien pakettien asennukset ja poistot\n"
-#: src/main.cc:104
+#: src/main.cc:103
#, c-format
msgid " forget-new - Forget what packages are \"new\"\n"
msgstr " forget-new - Tyhjennä uusien pakettien lista\n"
-#: src/main.cc:105
+#: src/main.cc:104
#, c-format
msgid " search - Search for a package by name and/or expression\n"
msgstr " search - Etsi paketteja nimellä tai lausekkeella\n"
-#: src/main.cc:106
+#: src/main.cc:105
#, c-format
msgid " show - Display detailed information about a package\n"
msgstr " show - Näytä paketin yksityiskohtaiset tiedot\n"
-#: src/main.cc:107
+#: src/main.cc:106
#, c-format
msgid " clean - Erase downloaded package files\n"
msgstr " clean - Poista noudetut pakettitiedostot\n"
-#: src/main.cc:108
+#: src/main.cc:107
#, c-format
msgid " autoclean - Erase old downloaded package files\n"
msgstr " autoclean - Poista vanhat noudetut pakettitiedostot\n"
-#: src/main.cc:109
+#: src/main.cc:108
#, c-format
msgid " changelog - View a package's changelog\n"
msgstr " muutosloki - Näytä paketin muutosloki\n"
-#: src/main.cc:110
+#: src/main.cc:109
#, c-format
msgid " download - Download the .deb file for a package\n"
msgstr " download - Nouda pakettitiedosto\n"
-#: src/main.cc:112
+#: src/main.cc:111
#, c-format
msgid " Options:\n"
msgstr " Valitsimet:\n"
-#: src/main.cc:113
+#: src/main.cc:112
#, c-format
msgid " -h This help text\n"
msgstr " -h Tämä avustusteksti\n"
-#: src/main.cc:114
+#: src/main.cc:113
#, c-format
msgid " -s Simulate actions, but do not actually perform them.\n"
msgstr ""
" -s Tulosta suoritettavat toiminnot, mutta älä suorita niitä.\n"
-#: src/main.cc:115
+#: src/main.cc:114
#, c-format
msgid ""
" -d Only download packages, do not install or remove anything.\n"
msgstr ""
" -d Älä asenna tai poista paketteja, ainoastaan nouda ne.\n"
-#: src/main.cc:116
+#: src/main.cc:115
#, c-format
msgid " -P Always prompt for confirmation or actions\n"
msgstr " -P Kysy aina varmistusta tai toimintoa\n"
-#: src/main.cc:117
+#: src/main.cc:116
#, c-format
msgid ""
" -y Assume that the answer to simple yes/no questions is 'yes'\n"
msgstr " -y Vastaa yksinkertaisiin kyllä/ei-kysymyksiin kyllä.\n"
-#: src/main.cc:118
+#: src/main.cc:117
#, c-format
msgid ""
" -F format Specify a format for displaying search results; see the "
"manual\n"
msgstr " -F muotoilu Määritä hakutulosten näyttömuoto; katso käyttöopasta\n"
-#: src/main.cc:119
+#: src/main.cc:118
#, c-format
msgid ""
" -O order Specify how search results should be sorted; see the manual\n"
msgstr " -O järjestys Määritä hakutulosten järjestys; katso käyttöopasta\n"
-#: src/main.cc:120
+#: src/main.cc:119
#, c-format
msgid ""
" -w width Specify the display width for formatting search results\n"
msgstr " -w leveys Määritä näytön leveys hakutuloksia varten\n"
-#: src/main.cc:121
+#: src/main.cc:120
#, c-format
msgid " -f Aggressively try to fix broken packages.\n"
msgstr ""
" -f Yritä tosissaan korjata rikkinäisten pakettien "
"riippuvuuksia.\n"
-#: src/main.cc:122
+#: src/main.cc:121
#, c-format
msgid " -V Show which versions of packages are to be installed.\n"
msgstr " -V Näytä asennettavien pakettien versiot.\n"
-#: src/main.cc:123
+#: src/main.cc:122
#, c-format
msgid ""
" -D Show the dependencies of automatically changed packages.\n"
msgstr ""
" -D Näytä automaattisesti muutettujen pakettien riippuvuudet.\n"
-#: src/main.cc:124
+#: src/main.cc:123
#, c-format
msgid " -Z\t\t Show the change in installed size of each package.\n"
msgstr " -Z\t\t Näytä asennetun koon muutos jokaisesta paketista.\n"
-#: src/main.cc:125
+#: src/main.cc:124
#, c-format
msgid ""
" -v Display extra information. (may be supplied multiple times)\n"
msgstr " -v Näytä lisätietoa (voidaan käyttää useita kertoja)\n"
-#: src/main.cc:126
+#: src/main.cc:125
#, c-format
msgid ""
" -t [release] Set the release from which packages should be installed\n"
msgstr " -t [julkaisu] Aseta julkaisu, josta paketit asennetaan\n"
-#: src/main.cc:127
+#: src/main.cc:126
#, c-format
msgid " -o key=val Directly set the configuration option named 'key'\n"
msgstr " -o avain=arvo Anna suoraan asetuksen 'avain' arvo\n"
-#: src/main.cc:128
+#: src/main.cc:127
#, c-format
msgid ""
" --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -1843,57 +1987,65 @@
" --with(out)-recommends\tMääritä, käsitelläänkö suosituksia\n"
" riippuvuuksina\n"
-#: src/main.cc:129
+#: src/main.cc:128
#, c-format
msgid " -S fname: Read the aptitude extended status info from fname.\n"
msgstr " -S tnimi: Lue aptituden laajennetut tilatiedot tiedostosta tnimi.\n"
-#: src/main.cc:130
+#: src/main.cc:129
#, c-format
msgid " -u : Download new package lists on startup.\n"
msgstr " -u : Aloita pakettilistojen päivitys käynnistettäessä.\n"
-#: src/main.cc:131
+#: src/main.cc:130
#, c-format
msgid " -i : Perform an install run on startup.\n"
msgstr " -i : Näytä toimenpideruutu käynnistettäessä.\n"
-#: src/main.cc:133
+#: src/main.cc:132
#, c-format
msgid " This aptitude does not have Super Cow Powers.\n"
msgstr " Tällä aptitudella ei ole Lehmävoimia.\n"
-#: src/main.cc:254
+#: src/main.cc:253
#, c-format
msgid "-o requires an argument of the form key=value, got %s"
msgstr "-o:n argumentin on oltava muotoa avain=arvo; se oli %s"
-#: src/main.cc:300 src/main.cc:309
+#: src/main.cc:299 src/main.cc:308
msgid "WEIRDNESS: unknown option code received\n"
msgstr "OUTOA: tuntematon valitsin\n"
-#: src/main.cc:318
+#: src/main.cc:317
msgid "Only one of -u and -i may be specified\n"
msgstr "Valitsimia -u ja -i ei voi käyttää yhdessä\n"
-#: src/main.cc:326
+#: src/main.cc:325
msgid ""
"-u and -i may not be specified in command-line mode (eg, with 'install')"
msgstr "Valitsimia -u ja -i ei voi käyttää komentorivitoiminnoissa"
-#: src/main.cc:337
+#: src/main.cc:342
msgid "-u and -i may not be specified with a command"
msgstr "Valitsimia -u ja -i ei voi käyttää komennon kanssa"
-#: src/main.cc:392
+#: src/main.cc:399
#, c-format
msgid "Unknown command \"%s\"\n"
msgstr "Tuntematon komento \"%s\"\n"
-#: src/main.cc:400
+#: src/main.cc:406 src/main.cc:463
+msgid "Internal error: uncaught 'out of solutions' exception.\n"
+msgstr ""
+
+#: src/main.cc:411 src/main.cc:468
+msgid "Internal error: uncaught 'out of time' exception.\n"
+msgstr ""
+
+#: src/main.cc:418
#, c-format
-msgid "Invalid option for interactive mode: -s\n"
-msgstr "Sopimaton valitsin vuorovaikutteiseen tilaan: -s\n"
+msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
+msgstr ""
#: src/mine/cmine.cc:93
#, c-format
@@ -1921,7 +2073,7 @@
msgid "Lost"
msgstr "Häviö"
-#: src/mine/cmine.cc:119 src/ui.cc:1005
+#: src/mine/cmine.cc:119 src/ui.cc:1089
msgid "Minesweeper"
msgstr "Miinaharava"
@@ -2096,7 +2248,7 @@
msgid "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
msgstr "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
-#: src/pkg_columnizer.cc:84 src/ui.cc:1488
+#: src/pkg_columnizer.cc:84 src/ui.cc:1638
msgid "Package"
msgstr "Paketti"
@@ -2360,13 +2512,14 @@
" Base-ryhmän paketit ovat osa alkuperäistä asennusta."
#: src/pkg_grouppolicy.cc:158
+#, fuzzy
msgid ""
"Programs for faxmodems and other communications devices\n"
" Packages in the 'comm' section are used to control modems and other "
"hardware communications devices. This includes software to control faxmodems "
"(for instance, PPP for dial-up internet connections and programs originally "
-"written for that purpose (zmodem/kermit), as well as software to control "
-"cellular phones, interface with FidoNet, and run a BBS."
+"written for that purpose, such as zmodem/kermit), as well as software to "
+"control cellular phones, interface with FidoNet, and run a BBS."
msgstr ""
"Faksimodeemien ja muiden tiedonsiirtolaitteiden tarvitsemat ohjelmat\n"
" Comm-ryhmän paketit soveltuvat modeemien ja muiden tiedonsiirtolaitteiden "
@@ -2811,14 +2964,15 @@
"olleet paketit ovat siis nykyään main-ryhmässä."
#: src/pkg_grouppolicy.cc:193
+#, fuzzy
msgid ""
"Programs which are not free software\n"
" Packages in the 'non-free' section are not part of Debian.\n"
" .\n"
" These packages fail to meet one or more of the requirements of the Debian "
-"Free Software Guidelines (see below) You should read the license of programs "
-"in this section to be sure that you are allowed to use them in the way you "
-"intend.\n"
+"Free Software Guidelines (see below). You should read the license of "
+"programs in this section to be sure that you are allowed to use them in the "
+"way you intend.\n"
" .\n"
" For more information about what Debian considers to be Free Software, see "
"http://www.debian.org/social_contract#guidelines"
@@ -2880,11 +3034,12 @@
" Näistä paketeista on saatavilla uudempi versio."
#: src/pkg_grouppolicy.cc:320
+#, fuzzy
msgid ""
"New Packages\n"
" These packages have been added to Debian since the last time you cleared "
-"the list of \"new\" packages. (choose \"Forget new packages\" from the "
-"Actions menu to empty this list)"
+"the list of \"new\" packages (choose \"Forget new packages\" from the "
+"Actions menu to empty this list)."
msgstr ""
"Uudet paketit\n"
" Nämä paketit on lisätty Debianiin sen jälkeen kun viimeksi tyhjensit uusien "
@@ -3134,101 +3289,121 @@
msgid "Versions"
msgstr "Versiot"
-#: src/pkg_item.cc:54
+#: src/pkg_item.cc:55
msgid "Yes, I am aware this is a very bad idea"
msgstr "Kyllä, tiedän hyvin, että tämä on aivan onnettoman surkea ajatus"
#: src/pkg_item.cc:80
-#, c-format
+#, fuzzy, c-format
msgid ""
-"%s is an essential package!\n"
-"\n"
-"Are you sure you want to remove it?\n"
-"Type '%s' if you are."
+"%s is an essential package!%n%nAre you sure you want to remove it?%nType '%"
+"s' if you are."
msgstr ""
"%s on välttämätön paketti!\n"
"\n"
"Oletko aivan varma, että haluat poistaa sen?\n"
"Kirjoita '%s' jos olet."
-#: src/pkg_item.cc:219
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:625
#, c-format
msgid "Information about %s"
msgstr "%s:n tiedot"
-#: src/pkg_item.cc:304
-msgid "Available versions of "
+#: src/pkg_item.cc:224 src/pkg_ver_item.cc:627
+#, c-format
+msgid "%s info"
+msgstr ""
+
+#: src/pkg_item.cc:310
+#, fuzzy, c-format
+msgid "Available versions of %s"
msgstr "Saatavilla olevat versiot paketista "
-#: src/pkg_item.cc:312 src/pkg_ver_item.cc:648
+#: src/pkg_item.cc:313
+#, fuzzy, c-format
+msgid "%s versions"
+msgstr "Versiot"
+
+#: src/pkg_item.cc:325 src/pkg_ver_item.cc:655
#, c-format
msgid "Dependencies of %s"
msgstr "%s:n riippuvuudet"
-#: src/pkg_item.cc:322 src/pkg_ver_item.cc:657
+#: src/pkg_item.cc:327 src/pkg_ver_item.cc:657
+#, c-format
+msgid "%s deps"
+msgstr ""
+
+#: src/pkg_item.cc:338 src/pkg_ver_item.cc:667
#, c-format
msgid "Packages depending on %s"
msgstr "%s:sta riippuvat paketit"
-#: src/pkg_item.cc:373 src/pkg_ver_item.cc:694
+#: src/pkg_item.cc:340 src/pkg_ver_item.cc:669
+#, c-format
+msgid "%s reverse deps"
+msgstr ""
+
+#: src/pkg_item.cc:392 src/pkg_ver_item.cc:707
#, c-format
msgid "Reporting a bug in %s:\n"
msgstr "Ilmoitetaan viasta paketissa %s:\n"
-#: src/pkg_item.cc:395
+#: src/pkg_item.cc:414
+#, fuzzy
msgid ""
-"You are not root and I cannot find any way\n"
-"to become root. To reconfigure this package,\n"
-"install the menu package, the login package,\n"
-"or run aptitude as root."
+"You are not root and I cannot find any way to become root. To reconfigure "
+"this package, install the menu package, the login package, or run aptitude "
+"as root."
msgstr ""
"Et ole root enkä tiedä miten voisit päästä\n"
"rootiksi. Jotta voisit muokata asetuksia,\n"
"asenna menu- tai login-paketti tai aja\n"
"aptitudea root-tunnuksella."
-#: src/pkg_item.cc:403
+#: src/pkg_item.cc:422
#, c-format
msgid "Reconfiguring %s\n"
msgstr "Asetan uudelleen pakettia %s\n"
-#: src/pkg_item.cc:428
+#: src/pkg_item.cc:447
msgid "Hierarchy editor"
msgstr "Hierarkiamuokkain"
+#: src/pkg_item.cc:447
+#, fuzzy
+msgid "Hierarchy Editor"
+msgstr "Hierarkiamuokkain"
+
#: src/pkg_tree.cc:325
msgid "Search for: "
msgstr "Etsi mitä? "
-#: src/pkg_tree.cc:585
+#: src/pkg_tree.cc:568
msgid "All Packages"
msgstr "Kaikki paketit"
-#: src/pkg_tree.cc:598 src/pkg_tree.cc:607
+#: src/pkg_tree.cc:581 src/pkg_tree.cc:590
msgid "Building view"
msgstr "Rakennan näkymää"
-#: src/pkg_tree.cc:649
+#: src/pkg_tree.cc:632
#, c-format
msgid "No packages matched the pattern \"%s\"."
msgstr "Mikään paketti ei täsmännyt hakuehtoon \"%s\"."
-#: src/pkg_tree.cc:671
+#: src/pkg_tree.cc:654
msgid "Enter the new package tree limit: "
msgstr "Syötä pakettipuulle uusi raja: "
-#: src/pkg_tree.cc:705
+#: src/pkg_tree.cc:688
msgid "Enter the new package grouping mechanism for this display: "
msgstr "Syötä uusi ryhmittelytapa tälle näytölle: "
-#: src/pkg_tree.cc:713
+#: src/pkg_tree.cc:696
msgid "Enter the new package sorting mechanism for this display: "
msgstr "Syötä uusi pakettien lajittelutapa tälle näytölle: "
-#: src/pkg_ver_item.cc:623
-msgid "Information about "
-msgstr "Tiedot paketista "
-
#: src/pkg_view.cc:344
msgid "make_package_view: error in arguments -- two main widgets??"
msgstr "make_package_view: virhe argumenteissa -- kaksi päähärpätintä??"
@@ -3244,7 +3419,7 @@
msgid "make_package_view: bad argument!"
msgstr "make_package_view: tuhma argumentti!"
-#: src/pkg_view.cc:492
+#: src/pkg_view.cc:495
msgid "make_package_view: no main widget found"
msgstr "make_package_view: päähärpätintä ei löydy"
@@ -3471,6 +3646,74 @@
"Nämä paketit riippuvat paketin %B%2$s%b versiosta %B%1$s%b ja hajoavat, jos %"
"s tehdään."
+#: src/solution_dialog.cc:74
+msgid "The package cache is not available."
+msgstr ""
+
+#: src/solution_dialog.cc:82
+#, fuzzy
+msgid "No packages are broken."
+msgstr "Jotkut paketit ovat rikki. Yritänkö korjata ne?"
+
+#: src/solution_dialog.cc:103
+msgid "No resolution found."
+msgstr ""
+
+#: src/solution_dialog.cc:107
+#, c-format
+msgid ""
+"Time exhausted while searching for a solution (you can select \"Next Solution"
+"\" or press %s to try harder)."
+msgstr ""
+
+#: src/solution_dialog.cc:146
+#, fuzzy
+msgid "Previous"
+msgstr "Katetut"
+
+#: src/solution_dialog.cc:147
+#, fuzzy
+msgid "Next"
+msgstr "^Seuraava"
+
+#: src/solution_dialog.cc:148
+msgid "Apply"
+msgstr ""
+
+#: src/solution_dialog.cc:149
+#, fuzzy
+msgid "Close"
+msgstr "^Lopeta"
+
+#: src/solution_fragment.cc:125
+#, fuzzy
+msgid "%BRemove%b the following packages:%n"
+msgstr "Nämä paketit ovat RIKKI:"
+
+#: src/solution_fragment.cc:135
+#, fuzzy
+msgid "%BInstall%b the following packages:%n"
+msgstr "Nämä paketit ovat RIKKI:"
+
+#: src/solution_fragment.cc:148
+msgid "%BKeep%b the following packages at their current version:%n"
+msgstr ""
+
+#: src/solution_fragment.cc:161
+#, fuzzy
+msgid "%BUpgrade%b the following packages:%n"
+msgstr "Nämä paketit ovat RIKKI:"
+
+#: src/solution_fragment.cc:176
+#, fuzzy
+msgid "%BDowngrade%b the following packages:%n"
+msgstr "Noudan paketteja"
+
+#: src/solution_fragment.cc:190
+#, c-format
+msgid "Score is %d"
+msgstr ""
+
#: src/trust.cc:17 src/trust.cc:19
msgid "WARNING"
msgstr ""
@@ -3482,52 +3725,52 @@
"system."
msgstr ""
-#: src/ui.cc:143
+#: src/ui.cc:164
msgid "Er, there aren't any errors, this shouldn't have happened.."
msgstr "Öö, mitään virheitä ei ole; näin ei olisi pitänyt käydä..."
-#: src/ui.cc:149
+#: src/ui.cc:170
msgid "E:"
msgstr ""
-#: src/ui.cc:151
+#: src/ui.cc:172
msgid "W:"
msgstr ""
-#: src/ui.cc:172
+#: src/ui.cc:193
msgid "Search for:"
msgstr "Etsi mitä? "
-#: src/ui.cc:205
+#: src/ui.cc:261
msgid "You already are root!"
msgstr "Olet jo root!"
-#: src/ui.cc:303
+#: src/ui.cc:359
msgid ""
"Subprocess exited with an error -- did you type your password correctly?"
msgstr "Lapsiprosessi palautti virhekoodin -- kirjoititko salasanan oikein?"
-#: src/ui.cc:331
+#: src/ui.cc:387
msgid "Loading cache"
msgstr "Lataan varastoa"
-#: src/ui.cc:353
+#: src/ui.cc:409
msgid "Really quit Aptitude?"
msgstr "Haluatko varmasti lopettaa?"
-#: src/ui.cc:432
+#: src/ui.cc:488
msgid "Really discard your personal settings and reload the defaults?"
msgstr "Haluatko varmasti hylätä omat asetuksesi ja korvata ne oletuksilla?"
-#: src/ui.cc:532
+#: src/ui.cc:588 src/ui.cc:590 src/ui.cc:618 src/ui.cc:620
msgid "Packages"
msgstr "Paketit"
-#: src/ui.cc:533 src/ui.cc:560
+#: src/ui.cc:589 src/ui.cc:619
msgid "View available packages and choose actions to perform"
msgstr "Selaa saatavilla olevia paketteja ja suorita toimenpiteitä"
-#: src/ui.cc:599
+#: src/ui.cc:666
#, fuzzy
msgid ""
"%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
@@ -3543,15 +3786,15 @@
"Avustus-valikosta. Tämä on vapaa ohjelma, joten saat vapaasti levittää\n"
"sitä tietyin rajoituksin; 'lisenssi' antaa tarkemmat tiedot (englanniksi)."
-#: src/ui.cc:620
+#: src/ui.cc:687
msgid "help.txt"
msgstr "help-fi.txt"
-#: src/ui.cc:636
+#: src/ui.cc:703
msgid "README"
msgstr "README"
-#: src/ui.cc:718
+#: src/ui.cc:785
msgid ""
"%C%BWARNING%b: untrusted versions of the following packages will be "
"installed!%n%nUntrusted packages could %Bcompromise your system's security%"
@@ -3559,60 +3802,70 @@
"this is what you want to do.%n%n"
msgstr ""
-#: src/ui.cc:732
+#: src/ui.cc:799
#, fuzzy
msgid "Really Continue"
msgstr "Jatka"
-#: src/ui.cc:734
+#: src/ui.cc:801
msgid "Abort Installation"
msgstr ""
-#: src/ui.cc:796
+#: src/ui.cc:862
msgid "Preview of package installation"
msgstr "Pakettien asennuksen esikatselu"
-#: src/ui.cc:797
+#: src/ui.cc:863
msgid "View and/or adjust the actions that will be performed"
msgstr "Näytä toiminnot, jotka suoritetaan, ja muuta niitä"
-#: src/ui.cc:837
-msgid "Some packages were broken and have been fixed"
+#: src/ui.cc:864
+#, fuzzy
+msgid "Preview"
+msgstr "^Edellinen"
+
+#: src/ui.cc:900
+#, fuzzy
+msgid "Some packages were broken and have been fixed:"
msgstr "Jotkut paketit olivat rikki, mutta ovat nyt kunnossa"
-#: src/ui.cc:839
-msgid "Some broken packages could not be fixed!"
-msgstr "Joitain rikkinäisiä paketteja ei pystynyt korjaamaan!"
+#: src/ui.cc:906
+msgid "No solution to these dependency problems exists!"
+msgstr ""
-#: src/ui.cc:847 src/ui.cc:959
-msgid "Some packages are broken. Try to fix them?"
-msgstr "Jotkut paketit ovat rikki. Yritänkö korjata ne?"
+#: src/ui.cc:912
+#, c-format
+msgid ""
+"Ran out of time while trying to resolver dependencies (press \"%s\" to try "
+"harder)"
+msgstr ""
-#: src/ui.cc:860
+#: src/ui.cc:958
+#, fuzzy
msgid ""
-"Installing/removing packages requires administrative privileges, which\n"
-"you currently do not have. Would you like to change to the root account?\n"
+"Installing/removing packages requires administrative privileges, which you "
+"currently do not have. Would you like to change to the root account?"
msgstr ""
"Pakettien asentaminen ja poisto vaativat ylläpitäjän oikeudet, joita\n"
"sinulla ei ole. Haluatko vaihtaa root-tunnukselle?\n"
-#: src/ui.cc:863 src/ui.cc:993
+#: src/ui.cc:961 src/ui.cc:1077
msgid "Become root"
msgstr "Vaihda root-tunnukselle"
-#: src/ui.cc:865 src/ui.cc:995
+#: src/ui.cc:963 src/ui.cc:1079
msgid "Don't become root"
msgstr "Älä vaihda root-tunnukselle"
-#: src/ui.cc:870 src/ui.cc:1000
+#: src/ui.cc:968 src/ui.cc:1084
msgid "A package-list update or install run is already taking place."
msgstr "Asennus tai pakettilistan päivitys on jo käynnissä."
-#: src/ui.cc:897
+#: src/ui.cc:995
msgid "No packages are scheduled to be installed, removed, or upgraded."
msgstr "Mitään paketteja ei asenneta, päivitetä tai poisteta."
-#: src/ui.cc:903
+#: src/ui.cc:1001
#, fuzzy
msgid ""
"No packages will be installed, removed or upgraded. Some packages could be "
@@ -3624,412 +3877,431 @@
"Jotkin paketit olisi mahdollista päivittää.\n"
"Paina \"U\" päivittääksesi nämä."
-#: src/ui.cc:990
+#: src/ui.cc:1073
+#, fuzzy
msgid ""
-"Updating the package lists requires administrative privileges, which\n"
-"you currently do not have. Would you like to change to the root account?\n"
+"Updating the package lists requires administrative privileges, which you "
+"currently do not have. Would you like to change to the root account?"
msgstr ""
"Pakettilistojen päivitys vaatii ylläpitäjän oikeudet, joita sinulla\n"
"ei ole. Haluatko vaihtaa root-tunnukselle?\n"
-#: src/ui.cc:1005 src/ui.cc:1198
+#: src/ui.cc:1089 src/ui.cc:1345
msgid "Waste time trying to find mines"
msgstr "Hukkaa aikaa etsimällä miinoja"
-#: src/ui.cc:1012 src/ui.cc:1065
+#: src/ui.cc:1096 src/ui.cc:1149
msgid "Cleaning while a download is in progress is not allowed"
msgstr "Puhdistusta ei voi tehdä noudon aikana"
-#: src/ui.cc:1015
+#: src/ui.cc:1099
msgid "Deleting downloaded files"
msgstr "Poistan noudettuja tiedostoja"
-#: src/ui.cc:1029
+#: src/ui.cc:1113
msgid "Downloaded package files have been deleted"
msgstr "Noudetut pakettitiedostot on poistettu"
-#: src/ui.cc:1090
+#: src/ui.cc:1174
#, fuzzy, c-format
msgid ""
"Obsolete downloaded package files have been deleted, freeing %sB of disk "
"space."
msgstr "Vanhentuneet pakettitiedostot on poistettu"
-#: src/ui.cc:1174
+#: src/ui.cc:1246
+msgid "All solutions exhausted."
+msgstr ""
+
+#: src/ui.cc:1251 src/ui.cc:1282
+#, fuzzy
+msgid "Ran out of time while trying to find a solution."
+msgstr "Hukkaa aikaa etsimällä miinoja"
+
+#: src/ui.cc:1276
+msgid "Unable to find a solution to apply."
+msgstr ""
+
+#: src/ui.cc:1321
msgid "^Install/remove packages"
msgstr "^Asenna/poista paketteja"
-#: src/ui.cc:1175
+#: src/ui.cc:1322
msgid "Perform all pending installs and removals"
msgstr "Suorita kaikki määritetyt asennukset ja poistot"
-#: src/ui.cc:1177
+#: src/ui.cc:1324
msgid "^Update package list"
msgstr "^Päivitä pakettilista"
-#: src/ui.cc:1178
+#: src/ui.cc:1325
msgid "Check for new versions of packages"
msgstr "Päivitä saatavilla olevien pakettien lista"
-#: src/ui.cc:1181
+#: src/ui.cc:1328
msgid "^Forget new packages"
msgstr "^Unohda uudet paketit"
-#: src/ui.cc:1182
+#: src/ui.cc:1329
msgid "Forget which packages are \"new\""
msgstr "Tyhjennä uusien pakettien lista"
-#: src/ui.cc:1185
+#: src/ui.cc:1332
msgid "^Clean package cache"
msgstr "Puhdista ^koko pakettivarasto"
-#: src/ui.cc:1186
+#: src/ui.cc:1333
msgid "Delete package files which were previously downloaded"
msgstr "Poista aiemmin noudetut pakettitiedostot"
-#: src/ui.cc:1189
+#: src/ui.cc:1336
msgid "Clean ^obsolete files"
msgstr "Puhdista ^vanhentuneet tiedostot"
-#: src/ui.cc:1190
+#: src/ui.cc:1337
msgid "Delete package files which can no longer be downloaded"
msgstr "Poista pakettitiedostot, joita ei enää voi noutaa"
-#: src/ui.cc:1193
+#: src/ui.cc:1340
msgid "Mark ^Upgradable"
msgstr "^Merkitse päivitykset"
-#: src/ui.cc:1194
+#: src/ui.cc:1341
msgid "Mark all upgradable packages which are not held for upgrade"
msgstr ""
"Merkitse päivitettäväksi kaikki päivityskelpoiset ei-jäädytetyt paketit"
-#: src/ui.cc:1197
+#: src/ui.cc:1344
msgid "^Play Minesweeper"
msgstr "Pelaa miina^haravaa"
-#: src/ui.cc:1200
+#: src/ui.cc:1347
msgid "^Become root"
msgstr "Vaihda ^root-tunnukselle"
-#: src/ui.cc:1201
+#: src/ui.cc:1348
+#, fuzzy
msgid ""
-"Run 'su' to become root; this will restart the program, but your\n"
-"settings will be preserved"
+"Run 'su' to become root; this will restart the program, but your settings "
+"will be preserved"
msgstr ""
"Vaihda root-tunnukselle komennolla 'su'. Tämä käynnistää ohjelman\n"
"uudelleen, mutta asetuksesi säilyvät nykyisellään."
-#: src/ui.cc:1204
+#: src/ui.cc:1351
msgid "^Reload package cache"
msgstr "Lataa ^pakettivarasto uudelleen"
-#: src/ui.cc:1205
+#: src/ui.cc:1352
msgid "Reload the package cache"
msgstr "Lataa pakettivarasto uudelleen muistiin."
-#: src/ui.cc:1211
+#: src/ui.cc:1358
msgid "^Quit"
msgstr "^Lopeta"
-#: src/ui.cc:1212
+#: src/ui.cc:1359
msgid "Exit the program"
msgstr "Poistu ohjelmasta"
-#: src/ui.cc:1218 src/ui.cc:1487
+#: src/ui.cc:1365 src/ui.cc:1637
msgid "Undo"
msgstr "Peruuta"
-#: src/ui.cc:1219
+#: src/ui.cc:1366
msgid "Undo the last package operation or group of operations"
msgstr "Peruuta viimeisin suoritettu toimi tai toimiryhmä"
-#: src/ui.cc:1226
+#: src/ui.cc:1373
msgid "^Install"
msgstr "^Asenna"
-#: src/ui.cc:1227
+#: src/ui.cc:1374
msgid "Flag the currently selected package for installation or upgrade"
msgstr "Merkitse valittu paketti asennettavaksi tai päivitettäväksi"
-#: src/ui.cc:1230
+#: src/ui.cc:1377
msgid "^Remove"
msgstr "^Poista"
-#: src/ui.cc:1231
+#: src/ui.cc:1378
msgid "Flag the currently selected package for removal"
msgstr "Merkitse valittu paketti poistettavaksi"
-#: src/ui.cc:1234
+#: src/ui.cc:1381
msgid "^Purge"
msgstr "^Siivoa"
-#: src/ui.cc:1235
+#: src/ui.cc:1382
msgid ""
"Flag the currently selected package and its configuration files for removal"
msgstr "Merkitse valittu paketti asetustiedostoineen poistettavaksi"
-#: src/ui.cc:1238
+#: src/ui.cc:1385
msgid "^Keep"
msgstr "Pala^uta"
-#: src/ui.cc:1239
+#: src/ui.cc:1386
msgid "Cancel any action on the selected package"
msgstr "Peruuta valitulle paketille määritetyt toiminnot"
-#: src/ui.cc:1242
+#: src/ui.cc:1389
msgid "^Hold"
msgstr "^Jäädytä"
-#: src/ui.cc:1243
+#: src/ui.cc:1390
msgid ""
"Cancel any action on the selected package, and protect it from future "
"upgrades"
msgstr "Peruuta valitulle paketille määritetyt toiminnot ja estä sen päivitys"
-#: src/ui.cc:1246
+#: src/ui.cc:1393
msgid "Mark ^Auto"
msgstr "^Merkitse Automaatti"
-#: src/ui.cc:1247
+#: src/ui.cc:1394
+#, fuzzy
msgid ""
-"Mark the selected package as having been automatically installed;\n"
-"it will automatically be removed if no other packages depend on it"
+"Mark the selected package as having been automatically installed; it will "
+"automatically be removed if no other packages depend on it"
msgstr ""
"Merkitse valittu paketti automaattisesti asennetuksi; se poistetaan,\n"
"jos mikään muu paketti ei riipu siitä"
-#: src/ui.cc:1250
+#: src/ui.cc:1397
msgid "Mark ^Manual"
msgstr "Merkitse ^Käsin"
-#: src/ui.cc:1251
+#: src/ui.cc:1398
+#, fuzzy
msgid ""
-"Mark the selected package as having been manually installed;\n"
-"it will not be removed unless you manually remove it"
+"Mark the selected package as having been manually installed; it will not be "
+"removed unless you manually remove it"
msgstr ""
"Merkitse valittu paketti käsin asennetuksi; sitä ei poisteta, ellet\n"
"poista sitä käsin"
-#: src/ui.cc:1254
+#: src/ui.cc:1401
msgid "^Forbid Version"
msgstr "^Estä versio"
-#: src/ui.cc:1255
+#: src/ui.cc:1402
+#, fuzzy
msgid ""
-"Forbid the candidate version of the selected package from being installed;\n"
+"Forbid the candidate version of the selected package from being installed; "
"newer versions of the package will be installed as usual"
msgstr ""
"Estä valitun paketin ehdolla olevan version asennus; paketin uudemmat\n"
"versiot asennetaan normaalisti"
-#: src/ui.cc:1259
+#: src/ui.cc:1406
msgid "I^nformation"
msgstr "^Tiedot"
-#: src/ui.cc:1260
+#: src/ui.cc:1407
msgid "Display more information about the selected package"
msgstr "Näytä lisätietoa valitusta paketista"
-#: src/ui.cc:1263
+#: src/ui.cc:1410
msgid "^Changelog"
msgstr "Muutos^loki"
-#: src/ui.cc:1264
+#: src/ui.cc:1411
msgid "Display the Debian changelog of the selected package"
msgstr "Näytä valitun paketin Debian-muutosloki"
-#: src/ui.cc:1271
+#: src/ui.cc:1418
msgid "^Find"
msgstr "^Etsi"
-#: src/ui.cc:1272
+#: src/ui.cc:1419
msgid "Search for a package"
msgstr "Etsi pakettia"
-#: src/ui.cc:1275
+#: src/ui.cc:1422
msgid "Find ^Again"
msgstr "Etsi ^Uudestaan"
-#: src/ui.cc:1276
+#: src/ui.cc:1423
msgid "Repeat the last search"
msgstr "Toista edellinen haku"
-#: src/ui.cc:1280
+#: src/ui.cc:1427
msgid "^Limit Display"
msgstr "^Rajoita Näkymä"
-#: src/ui.cc:1281
+#: src/ui.cc:1428
msgid "Apply a filter to the package list"
msgstr "Rajoita näkyvien pakettien listaa suodattimella"
-#: src/ui.cc:1284
+#: src/ui.cc:1431
msgid "^Un-Limit Display"
msgstr "^Laajenna Näkymä"
-#: src/ui.cc:1285
+#: src/ui.cc:1432
msgid "Remove the filter from the package list"
msgstr "Poista pakettilistan suodatin"
-#: src/ui.cc:1289
+#: src/ui.cc:1436
msgid "Find ^Broken"
msgstr "^Hae rikkinäiset"
-#: src/ui.cc:1290
+#: src/ui.cc:1437
msgid "Find the next package with unsatisfied dependencies"
msgstr "Etsi seuraava paketti, jonka riippuvuudet eivät ole kunnossa"
-#: src/ui.cc:1297
+#: src/ui.cc:1444
msgid "^UI options"
msgstr "^Käyttöliittymä"
-#: src/ui.cc:1298
+#: src/ui.cc:1445
msgid "Change the settings which affect the user interface"
msgstr "Muuta käyttöliittymään vaikuttavia asetuksia"
-#: src/ui.cc:1301
+#: src/ui.cc:1448
msgid "^Dependency handling"
msgstr "^Riippuvuuksien käsittely"
-#: src/ui.cc:1302
+#: src/ui.cc:1449
msgid "Change the settings which affect how package dependencies are handled"
msgstr "Muuta pakettien riippuvuuksien käsittelyyn vaikuttavia asetuksia"
-#: src/ui.cc:1305
+#: src/ui.cc:1452
msgid "^Miscellaneous"
msgstr "^Sekalaista"
-#: src/ui.cc:1306
+#: src/ui.cc:1453
msgid "Change miscellaneous program settings"
msgstr "Muuta sekalaisia asetuksia"
-#: src/ui.cc:1311
+#: src/ui.cc:1458
msgid "^Revert options"
msgstr "^Palauta oletukset"
-#: src/ui.cc:1312
+#: src/ui.cc:1459
msgid "Reset all settings to the system defaults"
msgstr "Palauta kaikki asetukset ohjelman oletusasetuksiin"
-#: src/ui.cc:1323
+#: src/ui.cc:1470
msgid "^Next"
msgstr "^Seuraava"
-#: src/ui.cc:1324
+#: src/ui.cc:1471
msgid "View next display"
msgstr "Siirry seuraavaan näyttöön"
-#: src/ui.cc:1327
+#: src/ui.cc:1474
msgid "^Prev"
msgstr "^Edellinen"
-#: src/ui.cc:1328
+#: src/ui.cc:1475
msgid "View previous display"
msgstr "Siirry edelliseen näyttöön"
-#: src/ui.cc:1331
+#: src/ui.cc:1478
msgid "^Close"
msgstr "^Lopeta"
-#: src/ui.cc:1332
+#: src/ui.cc:1479
msgid "Close this display"
msgstr "Sulje tämä näyttö"
-#: src/ui.cc:1337
+#: src/ui.cc:1484
msgid "New Package ^View"
msgstr "Uusi paketti^näkymä"
-#: src/ui.cc:1338
+#: src/ui.cc:1485
msgid "Create a new default package view"
msgstr "Luo uusi oletusnäkymä"
-#: src/ui.cc:1341
+#: src/ui.cc:1488
msgid "New Categorical ^Browser"
msgstr "^Uusi luokkaselain"
-#: src/ui.cc:1343
+#: src/ui.cc:1490
msgid "Browse packages by category"
msgstr "Selaa paketteja luokittain"
-#: src/ui.cc:1351
+#: src/ui.cc:1498
msgid "^About"
msgstr "^Tietoja"
-#: src/ui.cc:1352
+#: src/ui.cc:1499
msgid "View information about this program"
msgstr "Tietoja tästä ohjelmasta"
-#: src/ui.cc:1355
+#: src/ui.cc:1502
msgid "^Help"
msgstr "^Pika-apu"
-#: src/ui.cc:1356
+#: src/ui.cc:1503
msgid "View the on-line help"
msgstr "Selaa sisäänrakennettua avustustekstiä"
-#: src/ui.cc:1358
+#: src/ui.cc:1505
msgid "User's ^Manual"
msgstr "^Käyttöohje"
-#: src/ui.cc:1359
+#: src/ui.cc:1506
msgid "View the detailed program manual"
msgstr "Näytä ohjelman varsinainen käyttöohje"
-#: src/ui.cc:1362
+#: src/ui.cc:1509
msgid "^FAQ"
msgstr "^UKK"
-#: src/ui.cc:1363
+#: src/ui.cc:1510
msgid "View a list of frequently asked questions"
msgstr "Näytä usein kysyttyjä kysymyksiä vastauksineen"
-#: src/ui.cc:1366
-msgid "^ChangeLog"
-msgstr "^Muutosloki"
+#: src/ui.cc:1513
+msgid "^NEWS"
+msgstr ""
-#: src/ui.cc:1367
-msgid "View the important changes made in each version of the program"
+#: src/ui.cc:1514
+#, fuzzy
+msgid "View the important changes made in each version of "
msgstr "Näytä ohjelman eri versioissa tehdyt muutokset"
-#: src/ui.cc:1370
+#: src/ui.cc:1517
msgid "^License"
msgstr "^Lisenssi"
-#: src/ui.cc:1371
+#: src/ui.cc:1518
msgid "View the terms under which you may copy the program"
msgstr "Näytä ohjelman kopiointiehdot"
-#: src/ui.cc:1486
+#: src/ui.cc:1636
msgid "Actions"
msgstr "Toiminnot"
-#: src/ui.cc:1489
+#: src/ui.cc:1639
msgid "Search"
msgstr "Haku"
-#: src/ui.cc:1490
+#: src/ui.cc:1640
msgid "Options"
msgstr "Asetukset"
-#: src/ui.cc:1491
+#: src/ui.cc:1641
msgid "Views"
msgstr "Näkymät"
-#: src/ui.cc:1492
+#: src/ui.cc:1642
msgid "Help"
msgstr "Apu"
-#: src/ui.cc:1537
+#: src/ui.cc:1699
#, c-format
msgid ""
"%s: Menu %s: Help %s: Quit %s: Update %s: Download/Install/Remove Pkgs"
msgstr "%s: Valikko %s: Apu %s: Lopeta %s: Päivitä %s: Nouda/Asenna/Poista"
-#: src/ui.cc:1799 src/vscreen/vscreen.cc:281
+#: src/ui.cc:1968 src/vscreen/vscreen.cc:281
msgid "yes_key"
msgstr "kyllä"
-#: src/ui.cc:1800 src/vscreen/vscreen.cc:282
+#: src/ui.cc:1969 src/vscreen/vscreen.cc:282
msgid "no_key"
msgstr "ei"
@@ -4041,6 +4313,16 @@
msgid "Downloading Changelog"
msgstr "Noudan muutoslokia"
+#: src/view_changelog.cc:54
+#, fuzzy
+msgid "Download Changelog"
+msgstr "Noudan muutoslokia"
+
+#: src/view_changelog.cc:63
+#, c-format
+msgid "%s changes"
+msgstr ""
+
#: src/vscreen/vscreen.cc:119
#, c-format
msgid "Ouch! Got SIGTERM, dying..\n"
@@ -4069,6 +4351,38 @@
msgid "No"
msgstr "Ei"
+# This needs to be synchronized with apt's translation, if that ever happens
+# JJK
+#~ msgid ""
+#~ "Some packages had unmet dependencies. This may mean that you have\n"
+#~ "requested an impossible situation or if you are using the unstable\n"
+#~ "distribution that some required packages have not yet been created\n"
+#~ "or been moved out of Incoming.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Joidenkin pakettien riippuvuuksia ei voinut tyydyttää. Tämä voi johtua\n"
+#~ "antamistasi mahdottomista vaatimuksista tai, jos käytät epävakaata "
+#~ "jakelua,\n"
+#~ "siitä, ettei joitakin vaadittuja paketteja ole vielä saatavilla.\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Please insert the following disc into the drive \"%s\":\n"
+#~ "%s"
+#~ msgstr "Aseta asemaan \"%s\" levyke nimeltä \"%s\""
+
+#~ msgid "Invalid option for interactive mode: -s\n"
+#~ msgstr "Sopimaton valitsin vuorovaikutteiseen tilaan: -s\n"
+
+#~ msgid "Information about "
+#~ msgstr "Tiedot paketista "
+
+#~ msgid "Some broken packages could not be fixed!"
+#~ msgstr "Joitain rikkinäisiä paketteja ei pystynyt korjaamaan!"
+
+#~ msgid "^ChangeLog"
+#~ msgstr "^Muutosloki"
+
#~ msgid "Go away, I'm trying to think.\n"
#~ msgstr "Mene pois, yritän ajatella.\n"
Modified: branches/aptitude-0.3/aptitude/po/fr.po
==============================================================================
--- branches/aptitude-0.3/aptitude/po/fr.po (original)
+++ branches/aptitude-0.3/aptitude/po/fr.po Sat Apr 30 13:41:32 2005
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: aptitude 0.2.14.1\n"
"Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-01-10 16:26-0800\n"
+"POT-Creation-Date: 2005-04-29 18:11-0400\n"
"PO-Revision-Date: 2004-10-05 06:55+0200\n"
"Last-Translator: Christian Perrier <bubulle at debian.org>\n"
"Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -152,16 +152,103 @@
msgstr "Supprimer les paquets inutilisés correspondant à ce filtre"
#: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:184 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
-#: src/vscreen/vs_util.cc:329
+#: src/ui.cc:218 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
+#: src/vscreen/vs_util.cc:328
msgid "Ok"
msgstr "Continuer"
#: src/apt_options.cc:242 src/download_list.cc:71 src/mine/cmine.cc:257
-#: src/mine/cmine.cc:330 src/vscreen/vs_util.cc:329
+#: src/mine/cmine.cc:330 src/vscreen/vs_util.cc:328
msgid "Cancel"
msgstr "Abandon"
+#: src/broken_indicator.cc:106 src/solution_dialog.cc:97
+msgid "Internal error: unexpected null solution."
+msgstr ""
+
+#: src/broken_indicator.cc:158
+#, fuzzy
+msgid "Suggest "
+msgstr "Suggère"
+
+#: src/broken_indicator.cc:164
+#, fuzzy, c-format
+msgid "%d installs"
+msgstr "installer"
+
+#: src/broken_indicator.cc:169
+#, fuzzy
+msgid "1 install"
+msgstr "installer"
+
+#: src/broken_indicator.cc:173
+#, c-format
+msgid "%d removals"
+msgstr ""
+
+#: src/broken_indicator.cc:178
+msgid "1 removal"
+msgstr ""
+
+#: src/broken_indicator.cc:182
+#, c-format
+msgid "%d keeps"
+msgstr ""
+
+#: src/broken_indicator.cc:187
+msgid "1 keep"
+msgstr ""
+
+#: src/broken_indicator.cc:191
+#, fuzzy, c-format
+msgid "%d upgrades"
+msgstr "mettre à jour"
+
+#: src/broken_indicator.cc:196
+#, fuzzy
+msgid "1 upgrade"
+msgstr "mettre à jour"
+
+#: src/broken_indicator.cc:200
+#, fuzzy, c-format
+msgid "%d downgrades"
+msgstr "réinstallés vers une version antérieure"
+
+#: src/broken_indicator.cc:205
+#, fuzzy
+msgid "1 downgrade"
+msgstr "réinstallés vers une version antérieure"
+
+#: src/broken_indicator.cc:214
+#, c-format
+msgid "%s: Examine"
+msgstr ""
+
+#: src/broken_indicator.cc:216
+#, c-format
+msgid "%s: Apply"
+msgstr ""
+
+#: src/broken_indicator.cc:218
+#, fuzzy, c-format
+msgid "%s: Next"
+msgstr "^Suivant"
+
+#: src/broken_indicator.cc:220
+#, c-format
+msgid "%s: Previous"
+msgstr ""
+
+#: src/broken_indicator.cc:233
+#, c-format
+msgid "%CSolution search failed. %s: try harder"
+msgstr ""
+
+#: src/broken_indicator.cc:239
+#, c-format
+msgid "%CUnable to resolve dependencies."
+msgstr ""
+
#: src/cmdline/cmdline_action.cc:36
#, c-format
msgid ""
@@ -237,26 +324,26 @@
"Le paquet %s n'est pas susceptible d'être mis à jour, l'interdiction de mise "
"Ã jour n'est pas possible\n"
-#: src/cmdline/cmdline_action.cc:213
+#: src/cmdline/cmdline_action.cc:198
#, c-format
msgid "Note: selecting the task \"%s: %s\" for installation\n"
msgstr "Note : sélection de la tâche « %s : %s » pour installation\n"
-#: src/cmdline/cmdline_action.cc:240
+#: src/cmdline/cmdline_action.cc:225
#, c-format
msgid "You can only specify a package version with an 'install' command.\n"
msgstr ""
"Vous ne pouvez spécifier qu'une version de paquet avec une commande "
"« install »\n"
-#: src/cmdline/cmdline_action.cc:246
+#: src/cmdline/cmdline_action.cc:231
#, c-format
msgid "You can only specify a package archive with an 'install' command.\n"
msgstr ""
"Vous ne pouvez spécifier qu'une archive de paquet avec une commande "
"« install »\n"
-#: src/cmdline/cmdline_action.cc:280
+#: src/cmdline/cmdline_action.cc:265
#, c-format
msgid ""
"Couldn't find package \"%s\", and more than 40\n"
@@ -265,7 +352,7 @@
"Impossible de trouver le paquet « %s » et plus de 40\n"
"paquets comportent « %s » dans leur nom.\n"
-#: src/cmdline/cmdline_action.cc:283
+#: src/cmdline/cmdline_action.cc:268
#, c-format
msgid ""
"Couldn't find package \"%s\". However, the following\n"
@@ -274,14 +361,14 @@
"Impossible de trouver le paquet « %s ». Cependant, les\n"
"paquets suivants comportent « %s » dans leur nom :\n"
-#: src/cmdline/cmdline_action.cc:307
+#: src/cmdline/cmdline_action.cc:292
#, c-format
msgid "Couldn't find any package whose name or description matched \"%s\"\n"
msgstr ""
"Impossible de trouver un paquet dont le nom ou la description correspond à "
"« %s »\n"
-#: src/cmdline/cmdline_action.cc:309
+#: src/cmdline/cmdline_action.cc:294
#, c-format
msgid ""
"Couldn't find any package matching \"%s\", and more than 40\n"
@@ -290,7 +377,7 @@
"Impossible de trouver un paquet correspondant à « %s »\n"
"et plus de 40 paquets comportent « %s » dans leur description.\n"
-#: src/cmdline/cmdline_action.cc:312
+#: src/cmdline/cmdline_action.cc:297
#, c-format
msgid ""
"Couldn't find any package matching \"%s\". However, the following\n"
@@ -337,13 +424,13 @@
msgid "Freed %sB of disk space\n"
msgstr "Libérera %so d'espace disque"
-#: src/cmdline/cmdline_do_action.cc:67
+#: src/cmdline/cmdline_do_action.cc:71
#, c-format
msgid "Invalid operation %s"
msgstr "Opération invalide %s"
-#: src/cmdline/cmdline_do_action.cc:206 src/cmdline/cmdline_simulate.cc:30
-#: src/cmdline/cmdline_upgrade.cc:89
+#: src/cmdline/cmdline_do_action.cc:201 src/cmdline/cmdline_simulate.cc:31
+#: src/cmdline/cmdline_upgrade.cc:91
#, c-format
msgid "Abort.\n"
msgstr "Abandon\n"
@@ -354,7 +441,7 @@
msgstr ""
"téléchargement : vous devez spécifier au moins un paquet à télécharger\n"
-#: src/cmdline/cmdline_download.cc:43 src/download.cc:342
+#: src/cmdline/cmdline_download.cc:43 src/download.cc:344
msgid "Couldn't read source list"
msgstr "Impossible de lire la liste des sources"
@@ -423,95 +510,95 @@
"Qu'est-ce que c'est ? C'est un éléphant qui se fait manger par un\n"
"serpent, bien sûr.\n"
-#: src/cmdline/cmdline_prompt.cc:44
+#: src/cmdline/cmdline_prompt.cc:45
msgid "Couldn't read list of sources"
msgstr "Impossible de lire la liste des sources"
-#: src/cmdline/cmdline_prompt.cc:219 src/cmdline/cmdline_show_broken.cc:73
+#: src/cmdline/cmdline_prompt.cc:220 src/cmdline/cmdline_show_broken.cc:73
#, c-format
msgid "but %s is to be installed."
msgstr "mais %s doit être installé"
-#: src/cmdline/cmdline_prompt.cc:222 src/cmdline/cmdline_show_broken.cc:76
+#: src/cmdline/cmdline_prompt.cc:223 src/cmdline/cmdline_show_broken.cc:76
#, c-format
msgid "but %s is installed and it is kept back."
msgstr "mais %s est installé et a été conservé"
-#: src/cmdline/cmdline_prompt.cc:225 src/cmdline/cmdline_show_broken.cc:79
+#: src/cmdline/cmdline_prompt.cc:226 src/cmdline/cmdline_show_broken.cc:79
#, c-format
msgid "but %s is installed."
msgstr "mais %s est installé"
-#: src/cmdline/cmdline_prompt.cc:229 src/cmdline/cmdline_show_broken.cc:83
+#: src/cmdline/cmdline_prompt.cc:230 src/cmdline/cmdline_show_broken.cc:83
#, c-format
msgid "but it is not installable"
msgstr "mais il n'est pas installable"
-#: src/cmdline/cmdline_prompt.cc:233 src/cmdline/cmdline_show_broken.cc:87
+#: src/cmdline/cmdline_prompt.cc:234 src/cmdline/cmdline_show_broken.cc:87
#, c-format
msgid " which is a virtual package."
msgstr "qui est un paquet virtuel"
-#: src/cmdline/cmdline_prompt.cc:236 src/cmdline/cmdline_show_broken.cc:90
+#: src/cmdline/cmdline_prompt.cc:237 src/cmdline/cmdline_show_broken.cc:90
#, c-format
msgid " or"
msgstr "ou"
-#: src/cmdline/cmdline_prompt.cc:248
+#: src/cmdline/cmdline_prompt.cc:249
msgid "The following packages are BROKEN:"
msgstr "Les paquets suivants sont CASSÉS : "
-#: src/cmdline/cmdline_prompt.cc:249
+#: src/cmdline/cmdline_prompt.cc:250
msgid "The following packages are unused and will be REMOVED:"
msgstr "Les paquets suivants ne sont pas utilisés et vont être ENLEVÉS : "
-#: src/cmdline/cmdline_prompt.cc:250
+#: src/cmdline/cmdline_prompt.cc:251
msgid "The following packages have been automatically kept back:"
msgstr "Les paquets suivants ont été conservés automatiquement : "
-#: src/cmdline/cmdline_prompt.cc:251
+#: src/cmdline/cmdline_prompt.cc:252
msgid "The following NEW packages will be automatically installed:"
msgstr "Les NOUVEAUX paquets suivants vont être automatiquement installés : "
-#: src/cmdline/cmdline_prompt.cc:252
+#: src/cmdline/cmdline_prompt.cc:253
msgid "The following packages will be automatically REMOVED:"
msgstr "Les paquets suivants seront automatiquement ENLEVÉS : "
-#: src/cmdline/cmdline_prompt.cc:253
+#: src/cmdline/cmdline_prompt.cc:254
msgid "The following packages will be DOWNGRADED:"
msgstr "Les paquets suivants vont être RÉINSTALLÉS à une VERSION ANTÉRIEURE : "
-#: src/cmdline/cmdline_prompt.cc:254
+#: src/cmdline/cmdline_prompt.cc:255
msgid "The following packages have been kept back:"
msgstr "Les paquets suivants ont été conservés : "
-#: src/cmdline/cmdline_prompt.cc:255
+#: src/cmdline/cmdline_prompt.cc:256
msgid "The following packages will be REINSTALLED:"
msgstr "Les paquets suivants seront RÉINSTALLÉS : "
-#: src/cmdline/cmdline_prompt.cc:256
+#: src/cmdline/cmdline_prompt.cc:257
msgid "The following NEW packages will be installed:"
msgstr "Les NOUVEAUX paquets suivants vont être installés : "
-#: src/cmdline/cmdline_prompt.cc:257
+#: src/cmdline/cmdline_prompt.cc:258
msgid "The following packages will be REMOVED:"
msgstr "Les paquets suivants seront ENLEVÉS : "
-#: src/cmdline/cmdline_prompt.cc:258
+#: src/cmdline/cmdline_prompt.cc:259
msgid "The following packages will be upgraded:"
msgstr "Les paquets suivants seront mis à jour : "
-#: src/cmdline/cmdline_prompt.cc:307
+#: src/cmdline/cmdline_prompt.cc:311
#, c-format
msgid "The following ESSENTIAL packages will be REMOVED!\n"
msgstr "Les paquets ESSENTIELS suivants vont être ENLEVÉS !\n"
-#: src/cmdline/cmdline_prompt.cc:316
+#: src/cmdline/cmdline_prompt.cc:320
#, c-format
msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
msgstr "Les paquets ESSENTIELS suivants vont être CASSÉS par cette action :\n"
-#: src/cmdline/cmdline_prompt.cc:326
+#: src/cmdline/cmdline_prompt.cc:330
#, c-format
msgid ""
"WARNING: Performing this action will probably cause your system to break!\n"
@@ -521,99 +608,102 @@
" Ne PAS continuer à moins que vous ne sachiez EXACTEMENT ce que vous "
"faites !\n"
-#: src/cmdline/cmdline_prompt.cc:328
+#: src/cmdline/cmdline_prompt.cc:332
msgid "I am aware that this is a very bad idea"
msgstr "Je suis conscient que c'est une très mauvaise idée"
-#: src/cmdline/cmdline_prompt.cc:331
+#: src/cmdline/cmdline_prompt.cc:335
#, c-format
msgid "To continue, type the phrase \"%s\":\n"
msgstr "Pour continuer, entrer la phrase « %s » :\n"
-#: src/cmdline/cmdline_prompt.cc:434
+#: src/cmdline/cmdline_prompt.cc:438
#, c-format
msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
msgstr ""
"Les paquets suivants sont RECOMMANDÉS mais ne seront pas installés : \n"
-#: src/cmdline/cmdline_prompt.cc:440
+#: src/cmdline/cmdline_prompt.cc:444
#, c-format
msgid "The following packages are SUGGESTED but will NOT be installed:\n"
msgstr "Les paquets suivants sont SUGGÉRÉS mais ne seront pas installés : \n"
-#: src/cmdline/cmdline_prompt.cc:445
+#: src/cmdline/cmdline_prompt.cc:449
#, c-format
msgid "No packages will be installed, upgraded, or removed.\n"
msgstr "Aucun paquet ne va être installé, mis à jour ou enlevé.\n"
-#: src/cmdline/cmdline_prompt.cc:447
+#: src/cmdline/cmdline_prompt.cc:451
#, c-format
msgid "%lu packages upgraded, %lu newly installed, "
msgstr "%lu paquets mis à jour, %lu nouvellement installés, "
-#: src/cmdline/cmdline_prompt.cc:451
+#: src/cmdline/cmdline_prompt.cc:455
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu réinstallés, "
-#: src/cmdline/cmdline_prompt.cc:453
+#: src/cmdline/cmdline_prompt.cc:457
#, c-format
msgid "%lu downgraded, "
msgstr "%lu remis à une version antérieure, "
-#: src/cmdline/cmdline_prompt.cc:455
+#: src/cmdline/cmdline_prompt.cc:459
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu à enlever et %lu non mis à jour.\n"
-#: src/cmdline/cmdline_prompt.cc:462
+#: src/cmdline/cmdline_prompt.cc:466
#, c-format
msgid "Need to get %sB/%sB of archives. "
msgstr "Il est nécessaire de télécharger %so/%so d'archives. "
-#: src/cmdline/cmdline_prompt.cc:465
+#: src/cmdline/cmdline_prompt.cc:469
#, c-format
msgid "Need to get %sB of archives. "
msgstr "Il est nécessaire de télécharger %so d'archives. "
-#: src/cmdline/cmdline_prompt.cc:472
+#: src/cmdline/cmdline_prompt.cc:476
#, c-format
msgid "After unpacking %sB will be used.\n"
msgstr "Après dépaquetage, %so seront utilisés.\n"
-#: src/cmdline/cmdline_prompt.cc:475
+#: src/cmdline/cmdline_prompt.cc:479
#, c-format
msgid "After unpacking %sB will be freed.\n"
msgstr "Après dépaquetage, %so seront libérés.\n"
-#: src/cmdline/cmdline_prompt.cc:521
+#: src/cmdline/cmdline_prompt.cc:524
#, c-format
msgid "Bad action character '%c'\n"
msgstr "Le caractère %c ne correspond à aucune action connue\n"
-#: src/cmdline/cmdline_prompt.cc:596
+#: src/cmdline/cmdline_prompt.cc:595
#, c-format
msgid "No packages to show -- enter the package names on the line after 'i'.\n"
msgstr ""
"Aucun paquet à afficher - indiquez les noms de paquets à la suite de « i ».\n"
-#: src/cmdline/cmdline_prompt.cc:598 src/cmdline/cmdline_prompt.cc:629
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:597
msgid "Press Return to continue."
msgstr "Appuyez sur Entrée pour continuer."
-#: src/cmdline/cmdline_prompt.cc:625
+#: src/cmdline/cmdline_prompt.cc:623
#, c-format
msgid "No packages found -- enter the package names on the line after 'c'.\n"
msgstr ""
"Aucun paquet trouvé - indiquez les noms de paquets à la suite de « c ».\n"
-#: src/cmdline/cmdline_prompt.cc:665
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:627
+#, fuzzy
+msgid "Press Return to continue"
+msgstr "Appuyez sur Entrée pour continuer."
+
+#: src/cmdline/cmdline_prompt.cc:675
msgid "Do you want to continue? [Y/n/?] "
msgstr "Voulez-vous continuer ? [Y/n/?] "
-#: src/cmdline/cmdline_prompt.cc:690
+#: src/cmdline/cmdline_prompt.cc:700
#, c-format
msgid ""
"\n"
@@ -624,7 +714,7 @@
"Les informations de dépendances seront affichées.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:692
+#: src/cmdline/cmdline_prompt.cc:702
#, c-format
msgid ""
"\n"
@@ -635,7 +725,7 @@
"Les informations de dépendances ne seront pas affichées.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:698
+#: src/cmdline/cmdline_prompt.cc:708
#, c-format
msgid ""
"\n"
@@ -646,7 +736,7 @@
"Les versions seront affichées.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:700
+#: src/cmdline/cmdline_prompt.cc:710
#, c-format
msgid ""
"\n"
@@ -657,7 +747,7 @@
"Les versions ne seront pas affichées.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:705
+#: src/cmdline/cmdline_prompt.cc:715
#, c-format
msgid ""
"\n"
@@ -668,7 +758,7 @@
"Les changements de taille seront affichés.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:717
#, c-format
msgid ""
"\n"
@@ -679,7 +769,7 @@
"Les changements de taille ne seront pas affichés.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:737
#, c-format
msgid ""
"Commands:\n"
@@ -732,35 +822,89 @@
" _Â : Purger\n"
" =Â : Retenir\n"
-#: src/cmdline/cmdline_prompt.cc:751
+#: src/cmdline/cmdline_prompt.cc:761
#, c-format
msgid "Invalid response. Please enter a valid command or '?' for help.\n"
msgstr ""
"Réponse incorrecte. Veuillez entrer une commande correcte ou « ? » pour "
"obtenir de l'aide.\n"
+#: src/cmdline/cmdline_resolver.cc:84
+#, c-format
+msgid "y: %F%nn: %F%nq: %F%n,: %F%n.: %F%n"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:90
+msgid "accept the proposed changes"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:92
+msgid "reject the proposed changes and search for another solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:94
+#, fuzzy
+msgid "give up and quit the program"
+msgstr "Quitter le programme"
+
+#: src/cmdline/cmdline_resolver.cc:96
+msgid "move to the next solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:98
+msgid "move to the previous solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:131
+#, fuzzy
+msgid "The following actions will resolve these dependencies:"
+msgstr "Les paquets suivants ont des dépendances non satisfaites :\n"
+
+#: src/cmdline/cmdline_resolver.cc:146
+msgid "Accept this solution? [Y/n/q/?]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:174
+msgid "Abandoning all efforts to resolve these dependencies."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:184
+#, fuzzy
+msgid "The following commands are available:"
+msgstr "Les paquets suivants sont CASSÉS : "
+
+#: src/cmdline/cmdline_resolver.cc:188
+#, fuzzy
+msgid "Invalid response; please enter one of the following commands:"
+msgstr ""
+"Réponse incorrecte. Veuillez entrer une commande correcte ou « ? » pour "
+"obtenir de l'aide.\n"
+
+#: src/cmdline/cmdline_resolver.cc:198
+msgid "No solution found within the allotted time. Try harder? [Y/n]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:226
+#, fuzzy
+msgid "Invalid response; please enter 'y' or 'n'."
+msgstr ""
+"Réponse incorrecte. Veuillez entrer une commande correcte ou « ? » pour "
+"obtenir de l'aide.\n"
+
+#: src/cmdline/cmdline_resolver.cc:235
+msgid "Unable to resolve dependencies! Giving up..."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:240
+msgid "No more solutions."
+msgstr ""
+
#: src/cmdline/cmdline_search.cc:78
#, c-format
msgid "search: You must provide at least one search term\n"
msgstr "recherche : vous devez donner au moins un terme de recherche\n"
-#: src/cmdline/cmdline_show_broken.cc:114
-#, c-format
-msgid ""
-"Some packages had unmet dependencies. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming.\n"
-"\n"
-msgstr ""
-"Certains paquets ont des dépendances non résolues. Ceci peut signifier\n"
-"que vous avez demandé une situation impossible ou que vous utilisez la\n"
-"distribution instable qui a besoin de paquets qui n'ont pas encore été "
-"créés\n"
-"ou qui ne sont pas encore sortis « d'incoming ».\n"
-"\n"
-
-#: src/cmdline/cmdline_show_broken.cc:115
+#: src/cmdline/cmdline_show_broken.cc:113
#, c-format
msgid "The following packages have unmet dependencies:\n"
msgstr "Les paquets suivants ont des dépendances non satisfaites :\n"
@@ -958,12 +1102,12 @@
msgid "Description: "
msgstr "Description : "
-#: src/cmdline/cmdline_simulate.cc:36
+#: src/cmdline/cmdline_simulate.cc:37
#, c-format
msgid "Would download/install/remove packages.\n"
msgstr "Charger/installer/enlever des paquets.\n"
-#: src/cmdline/cmdline_simulate.cc:47
+#: src/cmdline/cmdline_simulate.cc:48
msgid "Internal Error, Ordering didn't finish"
msgstr "Erreur interne. Le classement ne s'est pas terminé"
@@ -1008,28 +1152,25 @@
msgid "UNAVAILABLE"
msgstr "NON DISPONIBLE"
-#: src/download_bar.cc:57 src/download_list.cc:265
+#: src/download_bar.cc:56 src/download_list.cc:263 src/download_screen.cc:57
#, c-format
-msgid ""
-"Please insert the following disc into the drive \"%s\":\n"
-"%s"
+msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
msgstr ""
-"Veuillez insérer le disque suivant dans le lecteur « %s » :\n"
-"%s"
+"Veuillez insérer le disque dont le nom est « %s » dans le lecteur « %s »"
-#: src/download_bar.cc:76 src/generic/acqprogress.cc:63
+#: src/download_bar.cc:77 src/generic/acqprogress.cc:63
msgid "Hit "
msgstr "Atteint "
-#: src/download_bar.cc:89
+#: src/download_bar.cc:90
msgid "Downloading "
msgstr "Téléchargement "
-#: src/download_bar.cc:102
+#: src/download_bar.cc:103
msgid "Got "
msgstr "Reçu "
-#: src/download_bar.cc:156
+#: src/download_bar.cc:157
msgid "Downloading..."
msgstr "Téléchargement..."
@@ -1037,7 +1178,7 @@
msgid "Couldn't read list of package sources"
msgstr "Impossible de lire les sources de listes de paquets"
-#: src/download.cc:104 src/download.cc:321
+#: src/download.cc:104 src/download.cc:322
msgid "Couldn't lock list directory..are you root?"
msgstr "Impossible de bloquer le répertoire des listes... Êtes-vous root ? "
@@ -1049,29 +1190,33 @@
msgid "View the progress of the package list update"
msgstr "Visualiser l'avancement de la mise à jour de la liste des paquets"
-#: src/download.cc:159
+#: src/download.cc:113
+msgid "List Update"
+msgstr ""
+
+#: src/download.cc:160
msgid "Couldn't clean out list directories"
msgstr "Impossible de nettoyer l'index des listes"
-#: src/download.cc:176 src/ui.cc:1068
+#: src/download.cc:177 src/ui.cc:1152
msgid "Deleting obsolete downloaded files"
msgstr "Effacement des fichiers téléchargés périmés"
-#: src/download.cc:181
+#: src/download.cc:182
#, c-format
msgid "Deleting obsolete downloaded files\n"
msgstr "Effacement des fichiers téléchargés périmés\n"
-#: src/download.cc:223
+#: src/download.cc:224
#, c-format
msgid "Unable to open %s to log actions"
msgstr "Impossible d'ouvrir %s pour enregistrer les actions"
-#: src/download.cc:229
+#: src/download.cc:230
msgid "log report"
msgstr "journal"
-#: src/download.cc:230
+#: src/download.cc:231
#, c-format
msgid ""
"IMPORTANT: this log only lists intended actions; actions which fail due to\n"
@@ -1083,77 +1228,77 @@
"échouent à cause d'erreurs de dpkg peuvent donc ne pas être réalisées.\n"
"\n"
-#: src/download.cc:231
+#: src/download.cc:232
#, c-format
msgid "Will install %li packages, and remove %li packages.\n"
msgstr "%li paquets vont être installés, et %li retirés.\n"
-#: src/download.cc:233
+#: src/download.cc:234
#, c-format
msgid "%sB of disk space will be used\n"
msgstr "%s octets d'espace disque vont être utilisés\n"
-#: src/download.cc:236
+#: src/download.cc:237
#, c-format
msgid "%sB bytes of disk space will be freed\n"
msgstr "%s octets d'espace disque vont être libérés\n"
-#: src/download.cc:244
+#: src/download.cc:245
#, c-format
msgid "[UPGRADE] %s %s -> %s\n"
msgstr "[MIS A JOUR] %s %s -> %s\n"
-#: src/download.cc:248
+#: src/download.cc:249
#, c-format
msgid "[DOWNGRADE] %s %s -> %s\n"
msgstr "[VERSION PRÉCÉDENTE] %s %s -> %s\n"
-#: src/download.cc:258
+#: src/download.cc:259
msgid "REMOVE"
msgstr "RETIRE"
-#: src/download.cc:264
+#: src/download.cc:265
msgid "INSTALL"
msgstr "INSTALLE"
-#: src/download.cc:267
+#: src/download.cc:268
msgid "REINSTALL"
msgstr "RÉINSTALLE"
-#: src/download.cc:270
+#: src/download.cc:271
msgid "HOLD"
msgstr "GARDE"
-#: src/download.cc:273
+#: src/download.cc:274
msgid "BROKEN"
msgstr "CASSÉ"
-#: src/download.cc:276
+#: src/download.cc:277
msgid "REMOVE, NOT USED"
msgstr "SUPPRIME, NON UTILISÉ"
-#: src/download.cc:279
+#: src/download.cc:280
msgid "REMOVE, DEPENDENCIES"
msgstr "RETIRE, DÉPENDANCES"
-#: src/download.cc:282
+#: src/download.cc:283
msgid "INSTALL, DEPENDENCIES"
msgstr "INSTALLE, DÉPENDANCES"
-#: src/download.cc:285
+#: src/download.cc:286
msgid "HOLD, DEPENDENCIES"
msgstr "GARDE, DÉPENDANCES"
-#: src/download.cc:287
+#: src/download.cc:288
msgid "????????"
msgstr "????????"
-#: src/download.cc:291
+#: src/download.cc:292
#, c-format
msgid "[%s] %s\n"
msgstr "[%s] %s\n"
-#: src/download.cc:294
+#: src/download.cc:295
#, c-format
msgid ""
"===============================================================================\n"
@@ -1164,35 +1309,40 @@
"\n"
"Enregistrement terminé.\n"
-#: src/download.cc:329
+#: src/download.cc:330
msgid "Downloading packages"
msgstr "Téléchargement des paquets"
-#: src/download.cc:330
+#: src/download.cc:331
msgid "View the progress of the package download"
msgstr "Visualiser l'avancement du téléchargement des paquets"
-#: src/download.cc:352
+#: src/download.cc:332
+#, fuzzy
+msgid "Package Download"
+msgstr "Paquet : "
+
+#: src/download.cc:354
msgid "Internal error: couldn't generate list of packages to download"
msgstr ""
"Erreur interne : impossible de générer la liste des paquets à télécharger"
-#: src/download.cc:413
+#: src/download.cc:415
msgid "Unable to correct for unavailable packages"
msgstr "Impossible d'effectuer la correction pour des paquets manquants"
-#: src/download.cc:465
+#: src/download.cc:467
msgid ""
"Ack! Something bad happened while installing packages. Trying to recover:"
msgstr ""
"Ouille ! Quelque chose ne s'est pas bien passé lors de l'installation des "
"paquets. Tentative de réparation : "
-#: src/download.cc:475 src/pkg_item.cc:413
+#: src/download.cc:477 src/pkg_item.cc:432
msgid "Press return to continue.\n"
msgstr "Appuyez sur Entrée pour continuer.\n"
-#: src/download.cc:506
+#: src/download.cc:508
msgid ""
"Could not regain the system lock! (Perhaps another apt or dpkg is running?)"
msgstr ""
@@ -1254,12 +1404,6 @@
msgid "[ERROR]"
msgstr "[ERREUR]"
-#: src/download_screen.cc:57
-#, c-format
-msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
-msgstr ""
-"Veuillez insérer le disque dont le nom est « %s » dans le lecteur « %s »"
-
#: src/download_screen.cc:181
#, c-format
msgid "Downloaded %sB in %ss (%sB/s)."
@@ -1299,119 +1443,119 @@
"Changement de support : Veuillez insérer le disque dont le nom est « %s » "
"dans le lecteur « %s » et presser Entrée\n"
-#: src/generic/aptcache.cc:245
+#: src/generic/aptcache.cc:253
msgid "Can't open Aptitude extended state file"
msgstr "Impossible d'ouvrir le fichier d'état étendu d'Aptitude"
-#: src/generic/aptcache.cc:252 src/generic/aptcache.cc:305
-#: src/generic/aptcache.cc:307
+#: src/generic/aptcache.cc:260 src/generic/aptcache.cc:313
+#: src/generic/aptcache.cc:315
msgid "Reading extended state information"
msgstr "Lecture de l'information d'état étendu"
-#: src/generic/aptcache.cc:313 src/generic/aptcache.cc:387
-#: src/generic/aptcache.cc:390
+#: src/generic/aptcache.cc:321 src/generic/aptcache.cc:395
+#: src/generic/aptcache.cc:398
msgid "Initializing package states"
msgstr "Initialisation de l'état des paquets"
-#: src/generic/aptcache.cc:501
+#: src/generic/aptcache.cc:509
msgid "Cannot open Aptitude state file"
msgstr "Impossible d'ouvrir le fichier d'état d'Aptitude"
-#: src/generic/aptcache.cc:505 src/generic/aptcache.cc:560
-#: src/generic/aptcache.cc:563
+#: src/generic/aptcache.cc:513 src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:571
msgid "Writing extended state information"
msgstr "Écriture de l'information d'état étendu"
-#: src/generic/aptcache.cc:542
+#: src/generic/aptcache.cc:550
#, c-format
msgid "Internal buffer overflow on package \"%s\" while writing state file"
msgstr ""
"Dépassement de tampon interne sur le paquet « %s » lors de l'écriture du "
"fichier d'état"
-#: src/generic/aptcache.cc:551
+#: src/generic/aptcache.cc:559
msgid "Couldn't write state file"
msgstr "Impossible d'écrire le fichier d'état"
-#: src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:576
msgid "Error writing state file"
msgstr "Erreur lors de l'écriture du fichier d'état"
-#: src/generic/aptcache.cc:584
+#: src/generic/aptcache.cc:592
msgid "couldn't replace old state file"
msgstr "Impossible de remplacer l'ancien fichier d'état"
-#: src/generic/aptcache.cc:960
+#: src/generic/aptcache.cc:1000
msgid "Unable to correct dependencies, some packages cannot be installed"
msgstr ""
"Impossible de corriger les dépendances, certains paquets ne peuvent pas être "
"installés"
-#: src/generic/aptcache.cc:1325
+#: src/generic/aptcache.cc:1546
msgid "The list of sources could not be read."
msgstr "La liste des sources ne peut pas être lue."
-#: src/generic/aptcache.cc:1332
+#: src/generic/aptcache.cc:1553
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 incompréhensibles."
-#: src/generic/aptcache.cc:1335
+#: src/generic/aptcache.cc:1556
msgid "You may want to update the package lists to correct these missing files"
msgstr ""
"Vous devriez mettre la liste des paquets à jour pour corriger ces\n"
"fichiers manquants."
-#: src/generic/apt.cc:141
+#: src/generic/apt.cc:142
#, c-format
msgid "Unable to open %s for writing"
msgstr "Impossible d'ouvrir %s en écriture"
-#: src/generic/apt.cc:151
+#: src/generic/apt.cc:152
#, c-format
msgid "Unable to replace %s with new configuration file"
msgstr "Impossible de remplacer %s avec le nouveau fichier de configuration"
-#: src/generic/apt.cc:226
+#: src/generic/apt.cc:227
msgid "Warning: could not lock the cache file. Opening in read-only mode"
msgstr ""
"Attention : le fichier cache ne peut être verrouillé.\n"
" Ouverture du fichier en lecture seule."
-#: src/generic/matchers.cc:780
+#: src/generic/matchers.cc:797
msgid "Unmatched '('"
msgstr "« ( » non équilibrée"
-#: src/generic/matchers.cc:870 src/generic/matchers.cc:949
+#: src/generic/matchers.cc:887 src/generic/matchers.cc:968
#, c-format
msgid "Unknown dependency type: %s"
msgstr "Type de dépendance inconnu : %s"
-#: src/generic/matchers.cc:931
+#: src/generic/matchers.cc:950
#, c-format
msgid "Unknown action type: %s"
msgstr "Type d'action inconnu : %s"
-#: src/generic/matchers.cc:998
+#: src/generic/matchers.cc:1017
#, c-format
msgid "Unknown priority %s"
msgstr "Priorité %s inconnue"
-#: src/generic/matchers.cc:1020
+#: src/generic/matchers.cc:1039
#, c-format
msgid "Unknown pattern type: %c"
msgstr "Type de modèle inconnu : %c"
-#: src/generic/matchers.cc:1065
+#: src/generic/matchers.cc:1084
msgid "Unexpected empty expression"
msgstr "Expression vide"
-#: src/generic/matchers.cc:1100
+#: src/generic/matchers.cc:1119
msgid "Badly formed expression"
msgstr "Expression mal formulée"
-#: src/generic/matchers.cc:1129
+#: src/generic/matchers.cc:1148
msgid "Unexpected ')'"
msgstr "« ) » mal placée"
@@ -1437,7 +1581,7 @@
msgstr ""
"Impossible de trouver la valeur de $HOME, utilisation de TMPDIR (peu sûr)"
-#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:60
+#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:61
#, c-format
msgid "ChangeLog of %s"
msgstr "Liste des modifications de %s"
@@ -1659,17 +1803,17 @@
msgid "Invalid sorting policy type '%s'"
msgstr "Type de règle de tri « %s » incorrect"
-#: src/main.cc:68
+#: src/main.cc:67
#, c-format
msgid "%s %s compiled at %s %s\n"
msgstr "%s %s compilé le %s %s\n"
-#: src/main.cc:71
+#: src/main.cc:70
#, c-format
msgid "Compiler: g++ %s\n"
msgstr "Compilateur : g++ %s\n"
-#: src/main.cc:74
+#: src/main.cc:73
#, c-format
msgid ""
"\n"
@@ -1678,7 +1822,7 @@
"\n"
"Version de NCurses : %s\n"
-#: src/main.cc:76
+#: src/main.cc:75
#, c-format
msgid ""
"\n"
@@ -1687,22 +1831,22 @@
"\n"
"Version de Curses : %s\n"
-#: src/main.cc:78
+#: src/main.cc:77
#, c-format
msgid "libsigc++ version: %s\n"
msgstr "Version de libsigc++Â : %s\n"
-#: src/main.cc:84
+#: src/main.cc:83
#, c-format
msgid "Usage: aptitude [-S fname] [-u|-i]"
msgstr "Utilisation : aptitude [-S NomFichier] [-u|-i]"
-#: src/main.cc:86
+#: src/main.cc:85
#, c-format
msgid " aptitude [options] <action> ..."
msgstr " | aptitude [options] <action> ..."
-#: src/main.cc:88
+#: src/main.cc:87
#, c-format
msgid ""
" Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -1711,46 +1855,46 @@
" Actions (si aucune n'est spécifiée, aptitude entrera en mode interactif) :\n"
"\n"
-#: src/main.cc:89
+#: src/main.cc:88
#, c-format
msgid " install - Install/upgrade packages\n"
msgstr " install - Installe ou met à jour des paquets\n"
-#: src/main.cc:90
+#: src/main.cc:89
#, c-format
msgid " remove - Remove packages\n"
msgstr " remove - Supprime les paquets\n"
-#: src/main.cc:91
+#: src/main.cc:90
#, c-format
msgid " purge - Remove packages and their configuration files\n"
msgstr ""
" purge - Supprime les paquets et leurs fichiers de configuration\n"
-#: src/main.cc:92
+#: src/main.cc:91
#, c-format
msgid " hold - Place packages on hold\n"
msgstr " hold - Garde ce paquet\n"
-#: src/main.cc:93
+#: src/main.cc:92
#, c-format
msgid " unhold - Cancel a hold command for a package\n"
msgstr " unhold - Annule une commande pour garder un paquet\n"
-#: src/main.cc:94
+#: src/main.cc:93
#, c-format
msgid " markauto - Mark packages as having been automatically installed\n"
msgstr ""
" markauto - Marque les paquets comme ayant été automatiquement "
"installés\n"
-#: src/main.cc:95
+#: src/main.cc:94
#, c-format
msgid " unmarkauto - Mark packages as having been manually installed\n"
msgstr ""
" unmarkauto - Marque les paquets comme ayant été manuellement installés\n"
-#: src/main.cc:100
+#: src/main.cc:99
#, c-format
msgid ""
" forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -1759,18 +1903,18 @@
" forbid-version - Interdit à aptitude la mise à jour vers une version "
"spécifique de paquet.\n"
-#: src/main.cc:101
+#: src/main.cc:100
#, c-format
msgid " update - Download lists of new/upgradable packages\n"
msgstr ""
" update - Télécharger les listes de paquets nouveaux/à mettre à jour\n"
-#: src/main.cc:102
+#: src/main.cc:101
#, c-format
msgid " upgrade - Perform a safe upgrade\n"
msgstr " upgrade - Effectue une mise à jour en toute sécurité\n"
-#: src/main.cc:103
+#: src/main.cc:102
#, c-format
msgid ""
" dist-upgrade - Perform an upgrade, possibly installing and removing "
@@ -1779,60 +1923,60 @@
" dist-upgrade - Effectue une mise à jour, faisant éventuellement des\n"
" installations et suppressions de paquets\n"
-#: src/main.cc:104
+#: src/main.cc:103
#, c-format
msgid " forget-new - Forget what packages are \"new\"\n"
msgstr " forget-new - Oublie quels paquets sont « nouveaux  »\n"
-#: src/main.cc:105
+#: src/main.cc:104
#, c-format
msgid " search - Search for a package by name and/or expression\n"
msgstr ""
" search - Recherche des paquets en spécifiant leur nom ou une "
"expression\n"
-#: src/main.cc:106
+#: src/main.cc:105
#, c-format
msgid " show - Display detailed information about a package\n"
msgstr ""
" show - Affiche les informations détaillées concernant un paquet\n"
-#: src/main.cc:107
+#: src/main.cc:106
#, c-format
msgid " clean - Erase downloaded package files\n"
msgstr " clean - Efface les fichiers des paquets téléchargés\n"
-#: src/main.cc:108
+#: src/main.cc:107
#, c-format
msgid " autoclean - Erase old downloaded package files\n"
msgstr " autoclean - Efface les anciens fichiers des paquets téléchargés\n"
-#: src/main.cc:109
+#: src/main.cc:108
#, c-format
msgid " changelog - View a package's changelog\n"
msgstr " changelog - Voir le journal des modifications d'un paquet\n"
-#: src/main.cc:110
+#: src/main.cc:109
#, c-format
msgid " download - Download the .deb file for a package\n"
msgstr " download - Télécharge le fichier .deb d'un paquet\n"
-#: src/main.cc:112
+#: src/main.cc:111
#, c-format
msgid " Options:\n"
msgstr " Options :\n"
-#: src/main.cc:113
+#: src/main.cc:112
#, c-format
msgid " -h This help text\n"
msgstr " -h Affiche ce texte d'aide\n"
-#: src/main.cc:114
+#: src/main.cc:113
#, c-format
msgid " -s Simulate actions, but do not actually perform them.\n"
msgstr " -s Simule les actions, sans les effectuer réellement\n"
-#: src/main.cc:115
+#: src/main.cc:114
#, c-format
msgid ""
" -d Only download packages, do not install or remove anything.\n"
@@ -1840,19 +1984,19 @@
" -d Effectue uniquement le téléchargement d'un paquet, sans\n"
" installer ou enlever quoi que ce soit.\n"
-#: src/main.cc:116
+#: src/main.cc:115
#, c-format
msgid " -P Always prompt for confirmation or actions\n"
msgstr " -P Demande toujours confirmation pour les actions\n"
-#: src/main.cc:117
+#: src/main.cc:116
#, c-format
msgid ""
" -y Assume that the answer to simple yes/no questions is 'yes'\n"
msgstr ""
" -y Suppose que la réponse à des questions oui/non est « oui »\n"
-#: src/main.cc:118
+#: src/main.cc:117
#, c-format
msgid ""
" -F format Specify a format for displaying search results; see the "
@@ -1861,7 +2005,7 @@
" -F format Spécifie un format pour l'affichage des résultats d'une\n"
" recherche ; voir le manuel\n"
-#: src/main.cc:119
+#: src/main.cc:118
#, c-format
msgid ""
" -O order Specify how search results should be sorted; see the manual\n"
@@ -1869,7 +2013,7 @@
" -O ordre Spécifie comment les résultats d'une recherche doivent être\n"
" ordonnés ; voir le manuel\n"
-#: src/main.cc:120
+#: src/main.cc:119
#, c-format
msgid ""
" -w width Specify the display width for formatting search results\n"
@@ -1877,19 +2021,19 @@
" -w largeur Spécifie la largeur de l'affichage pour le formatage des\n"
" résultats d'une recherche\n"
-#: src/main.cc:121
+#: src/main.cc:120
#, c-format
msgid " -f Aggressively try to fix broken packages.\n"
msgstr ""
" -f Tente de corriger de manière agressive les paquets cassés.\n"
-#: src/main.cc:122
+#: src/main.cc:121
#, c-format
msgid " -V Show which versions of packages are to be installed.\n"
msgstr ""
" -V Affiche quelles versions des paquets vont être installées.\n"
-#: src/main.cc:123
+#: src/main.cc:122
#, c-format
msgid ""
" -D Show the dependencies of automatically changed packages.\n"
@@ -1897,14 +2041,14 @@
" -D Affiche les dépendances des paquets qui sont modifiés\n"
" automatiquement.\n"
-#: src/main.cc:124
+#: src/main.cc:123
#, c-format
msgid " -Z\t\t Show the change in installed size of each package.\n"
msgstr ""
" -Z Affiche les changements de la taille de chacun des paquets\n"
" après installation.\n"
-#: src/main.cc:125
+#: src/main.cc:124
#, c-format
msgid ""
" -v Display extra information. (may be supplied multiple times)\n"
@@ -1912,7 +2056,7 @@
" -v Affiche des informations supplémentaires (peut être\n"
" indiqué plusieurs fois).\n"
-#: src/main.cc:126
+#: src/main.cc:125
#, c-format
msgid ""
" -t [release] Set the release from which packages should be installed\n"
@@ -1920,14 +2064,14 @@
" -t [dist] Indique la distribution pour laquelle le paquet doit être\n"
" installé\n"
-#: src/main.cc:127
+#: src/main.cc:126
#, c-format
msgid " -o key=val Directly set the configuration option named 'key'\n"
msgstr ""
" -o clé=valeur Établit directement l'option de configuration appelée\n"
" « clé »\n"
-#: src/main.cc:128
+#: src/main.cc:127
#, c-format
msgid ""
" --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -1936,63 +2080,71 @@
" --with(out)-recommends\tPrécise s'il faut ou non considérer « recommends »\n"
" comme des dépendances fortes\n"
-#: src/main.cc:129
+#: src/main.cc:128
#, c-format
msgid " -S fname: Read the aptitude extended status info from fname.\n"
msgstr ""
" -S nomfic : Lit les informations d'état étendu d'Aptitude à partir du\n"
" fichier nomfic.\n"
-#: src/main.cc:130
+#: src/main.cc:129
#, c-format
msgid " -u : Download new package lists on startup.\n"
msgstr ""
" -u  : Télécharge les nouvelles listes de paquet au démarrage.\n"
-#: src/main.cc:131
+#: src/main.cc:130
#, c-format
msgid " -i : Perform an install run on startup.\n"
msgstr ""
" -i  : Effectue une opération d'installation lors du démarrage.\n"
-#: src/main.cc:133
+#: src/main.cc:132
#, c-format
msgid " This aptitude does not have Super Cow Powers.\n"
msgstr " Cet aptitude n'a pas de « Super Cow Powers ».\n"
-#: src/main.cc:254
+#: src/main.cc:253
#, c-format
msgid "-o requires an argument of the form key=value, got %s"
msgstr "-o a besoin d'un argument de la forme clé=valeur (%s incorrect)"
-#: src/main.cc:300 src/main.cc:309
+#: src/main.cc:299 src/main.cc:308
msgid "WEIRDNESS: unknown option code received\n"
msgstr "BIZARRERIE : un code d'option inconnu a été reçu\n"
-#: src/main.cc:318
+#: src/main.cc:317
msgid "Only one of -u and -i may be specified\n"
msgstr "Une seule des options -u ou -i doit être spécifiée\n"
-#: src/main.cc:326
+#: src/main.cc:325
msgid ""
"-u and -i may not be specified in command-line mode (eg, with 'install')"
msgstr ""
"-u et -i ne devraient pas être spécifiés dans le mode ligne de commande (par "
"exemple avec « install »)"
-#: src/main.cc:337
+#: src/main.cc:342
msgid "-u and -i may not be specified with a command"
msgstr "-u et -i ne peuvent pas être spécifiés avec une commande"
-#: src/main.cc:392
+#: src/main.cc:399
#, c-format
msgid "Unknown command \"%s\"\n"
msgstr "Commande inconnue « %s »\n"
-#: src/main.cc:400
+#: src/main.cc:406 src/main.cc:463
+msgid "Internal error: uncaught 'out of solutions' exception.\n"
+msgstr ""
+
+#: src/main.cc:411 src/main.cc:468
+msgid "Internal error: uncaught 'out of time' exception.\n"
+msgstr ""
+
+#: src/main.cc:418
#, c-format
-msgid "Invalid option for interactive mode: -s\n"
-msgstr "Option incorrecte en mode interactif : -s\n"
+msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
+msgstr ""
#: src/mine/cmine.cc:93
#, c-format
@@ -2020,7 +2172,7 @@
msgid "Lost"
msgstr "perdu"
-#: src/mine/cmine.cc:119 src/ui.cc:1005
+#: src/mine/cmine.cc:119 src/ui.cc:1089
msgid "Minesweeper"
msgstr "Démineur"
@@ -2204,7 +2356,7 @@
msgid "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
msgstr "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
-#: src/pkg_columnizer.cc:84 src/ui.cc:1488
+#: src/pkg_columnizer.cc:84 src/ui.cc:1638
msgid "Package"
msgstr "Paquet"
@@ -2468,13 +2620,14 @@
"du système."
#: src/pkg_grouppolicy.cc:158
+#, fuzzy
msgid ""
"Programs for faxmodems and other communications devices\n"
" Packages in the 'comm' section are used to control modems and other "
"hardware communications devices. This includes software to control faxmodems "
"(for instance, PPP for dial-up internet connections and programs originally "
-"written for that purpose (zmodem/kermit), as well as software to control "
-"cellular phones, interface with FidoNet, and run a BBS."
+"written for that purpose, such as zmodem/kermit), as well as software to "
+"control cellular phones, interface with FidoNet, and run a BBS."
msgstr ""
"Programmes pour modem-fax et autres appareils de communication\n"
" Les paquets dans la section « comm » sont utilisés pour piloter des modems "
@@ -2951,14 +3104,15 @@
"« main »."
#: src/pkg_grouppolicy.cc:193
+#, fuzzy
msgid ""
"Programs which are not free software\n"
" Packages in the 'non-free' section are not part of Debian.\n"
" .\n"
" These packages fail to meet one or more of the requirements of the Debian "
-"Free Software Guidelines (see below) You should read the license of programs "
-"in this section to be sure that you are allowed to use them in the way you "
-"intend.\n"
+"Free Software Guidelines (see below). You should read the license of "
+"programs in this section to be sure that you are allowed to use them in the "
+"way you intend.\n"
" .\n"
" For more information about what Debian considers to be Free Software, see "
"http://www.debian.org/social_contract#guidelines"
@@ -3022,11 +3176,12 @@
" Une version plus récente de ces paquets existe."
#: src/pkg_grouppolicy.cc:320
+#, fuzzy
msgid ""
"New Packages\n"
" These packages have been added to Debian since the last time you cleared "
-"the list of \"new\" packages. (choose \"Forget new packages\" from the "
-"Actions menu to empty this list)"
+"the list of \"new\" packages (choose \"Forget new packages\" from the "
+"Actions menu to empty this list)."
msgstr ""
"Nouveaux paquets\n"
" Ces paquets ont été ajoutés à Debian depuis la dernière fois que vous avez "
@@ -3284,102 +3439,122 @@
msgid "Versions"
msgstr "Versions"
-#: src/pkg_item.cc:54
+#: src/pkg_item.cc:55
msgid "Yes, I am aware this is a very bad idea"
msgstr "Oui, je suis conscient que c'est une très mauvaise idée"
#: src/pkg_item.cc:80
-#, c-format
+#, fuzzy, c-format
msgid ""
-"%s is an essential package!\n"
-"\n"
-"Are you sure you want to remove it?\n"
-"Type '%s' if you are."
+"%s is an essential package!%n%nAre you sure you want to remove it?%nType '%"
+"s' if you are."
msgstr ""
"%s est un paquet essentiel !\n"
"\n"
"Êtes-vous sûr de vouloir le supprimer ?\n"
"Dans ce cas, entrez « %s »."
-#: src/pkg_item.cc:219
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:625
#, c-format
msgid "Information about %s"
msgstr "Informations à propos de %s"
-#: src/pkg_item.cc:304
-msgid "Available versions of "
+#: src/pkg_item.cc:224 src/pkg_ver_item.cc:627
+#, c-format
+msgid "%s info"
+msgstr ""
+
+#: src/pkg_item.cc:310
+#, fuzzy, c-format
+msgid "Available versions of %s"
msgstr "Versions disponibles de "
-#: src/pkg_item.cc:312 src/pkg_ver_item.cc:648
+#: src/pkg_item.cc:313
+#, fuzzy, c-format
+msgid "%s versions"
+msgstr "Versions"
+
+#: src/pkg_item.cc:325 src/pkg_ver_item.cc:655
#, c-format
msgid "Dependencies of %s"
msgstr "Dépendances de %s"
-#: src/pkg_item.cc:322 src/pkg_ver_item.cc:657
+#: src/pkg_item.cc:327 src/pkg_ver_item.cc:657
+#, c-format
+msgid "%s deps"
+msgstr ""
+
+#: src/pkg_item.cc:338 src/pkg_ver_item.cc:667
#, c-format
msgid "Packages depending on %s"
msgstr "Paquets dépendants de %s"
-#: src/pkg_item.cc:373 src/pkg_ver_item.cc:694
+#: src/pkg_item.cc:340 src/pkg_ver_item.cc:669
+#, c-format
+msgid "%s reverse deps"
+msgstr ""
+
+#: src/pkg_item.cc:392 src/pkg_ver_item.cc:707
#, c-format
msgid "Reporting a bug in %s:\n"
msgstr "Rapporter un bogue dans %s :\n"
-#: src/pkg_item.cc:395
+#: src/pkg_item.cc:414
+#, fuzzy
msgid ""
-"You are not root and I cannot find any way\n"
-"to become root. To reconfigure this package,\n"
-"install the menu package, the login package,\n"
-"or run aptitude as root."
+"You are not root and I cannot find any way to become root. To reconfigure "
+"this package, install the menu package, the login package, or run aptitude "
+"as root."
msgstr ""
"Vous n'êtes pas l'administrateur et je ne trouve aucune manière\n"
"de le devenir. Pour reconfigurer ce paquet,\n"
"installer le paquet menu et le paquet login,\n"
"ou lancer aptitude en tant qu'administrateur."
-#: src/pkg_item.cc:403
+#: src/pkg_item.cc:422
#, c-format
msgid "Reconfiguring %s\n"
msgstr "Reconfiguration %s\n"
-#: src/pkg_item.cc:428
+#: src/pkg_item.cc:447
msgid "Hierarchy editor"
msgstr "Éditeur de hiérarchie"
+#: src/pkg_item.cc:447
+#, fuzzy
+msgid "Hierarchy Editor"
+msgstr "Éditeur de hiérarchie"
+
#: src/pkg_tree.cc:325
msgid "Search for: "
msgstr "Recherche de :"
-#: src/pkg_tree.cc:585
+#: src/pkg_tree.cc:568
msgid "All Packages"
msgstr "Tous les paquets"
-#: src/pkg_tree.cc:598 src/pkg_tree.cc:607
+#: src/pkg_tree.cc:581 src/pkg_tree.cc:590
msgid "Building view"
msgstr "Construction de la vue"
-#: src/pkg_tree.cc:649
+#: src/pkg_tree.cc:632
#, c-format
msgid "No packages matched the pattern \"%s\"."
msgstr "Aucun paquet ne correspond à l'expression « %s »."
-#: src/pkg_tree.cc:671
+#: src/pkg_tree.cc:654
msgid "Enter the new package tree limit: "
msgstr "Entrer la profondeur de l'arborescence des nouveaux paquets : "
-#: src/pkg_tree.cc:705
+#: src/pkg_tree.cc:688
msgid "Enter the new package grouping mechanism for this display: "
msgstr ""
"Entrez le nouveau mécanisme de regroupement des paquets pour cet affichage : "
-#: src/pkg_tree.cc:713
+#: src/pkg_tree.cc:696
msgid "Enter the new package sorting mechanism for this display: "
msgstr "Entrez le nouveau mécanisme de tri des paquets pour cet affichage : "
-#: src/pkg_ver_item.cc:623
-msgid "Information about "
-msgstr "Informations à propos de "
-
#: src/pkg_view.cc:344
msgid "make_package_view: error in arguments -- two main widgets??"
msgstr ""
@@ -3396,7 +3571,7 @@
msgid "make_package_view: bad argument!"
msgstr "make_package_view : argument incorrect ! "
-#: src/pkg_view.cc:492
+#: src/pkg_view.cc:495
msgid "make_package_view: no main widget found"
msgstr "make_package_view : le widget principal n'a pas été trouvé"
@@ -3617,6 +3792,74 @@
"Les paquets suivants dépendent de la version %B%s%b de %B%s%b et seront "
"cassés s'il est %s."
+#: src/solution_dialog.cc:74
+msgid "The package cache is not available."
+msgstr ""
+
+#: src/solution_dialog.cc:82
+#, fuzzy
+msgid "No packages are broken."
+msgstr "Certains paquets sont cassés. Faut-il essayer de les réparer ?"
+
+#: src/solution_dialog.cc:103
+msgid "No resolution found."
+msgstr ""
+
+#: src/solution_dialog.cc:107
+#, c-format
+msgid ""
+"Time exhausted while searching for a solution (you can select \"Next Solution"
+"\" or press %s to try harder)."
+msgstr ""
+
+#: src/solution_dialog.cc:146
+#, fuzzy
+msgid "Previous"
+msgstr "Fournit"
+
+#: src/solution_dialog.cc:147
+#, fuzzy
+msgid "Next"
+msgstr "^Suivant"
+
+#: src/solution_dialog.cc:148
+msgid "Apply"
+msgstr ""
+
+#: src/solution_dialog.cc:149
+#, fuzzy
+msgid "Close"
+msgstr "^Fermer"
+
+#: src/solution_fragment.cc:125
+#, fuzzy
+msgid "%BRemove%b the following packages:%n"
+msgstr "Les paquets suivants sont CASSÉS : "
+
+#: src/solution_fragment.cc:135
+#, fuzzy
+msgid "%BInstall%b the following packages:%n"
+msgstr "Les paquets suivants sont CASSÉS : "
+
+#: src/solution_fragment.cc:148
+msgid "%BKeep%b the following packages at their current version:%n"
+msgstr ""
+
+#: src/solution_fragment.cc:161
+#, fuzzy
+msgid "%BUpgrade%b the following packages:%n"
+msgstr "Les paquets suivants sont CASSÉS : "
+
+#: src/solution_fragment.cc:176
+#, fuzzy
+msgid "%BDowngrade%b the following packages:%n"
+msgstr "Téléchargement des paquets"
+
+#: src/solution_fragment.cc:190
+#, c-format
+msgid "Score is %d"
+msgstr ""
+
#: src/trust.cc:17 src/trust.cc:19
msgid "WARNING"
msgstr ""
@@ -3628,56 +3871,56 @@
"system."
msgstr ""
-#: src/ui.cc:143
+#: src/ui.cc:164
msgid "Er, there aren't any errors, this shouldn't have happened.."
msgstr "Bon, il n'y a pas eu d'erreur donc ceci n'aurait pas dû se produire..."
-#: src/ui.cc:149
+#: src/ui.cc:170
msgid "E:"
msgstr ""
-#: src/ui.cc:151
+#: src/ui.cc:172
msgid "W:"
msgstr ""
-#: src/ui.cc:172
+#: src/ui.cc:193
msgid "Search for:"
msgstr "Recherche de : "
-#: src/ui.cc:205
+#: src/ui.cc:261
msgid "You already are root!"
msgstr "Vous êtes déjà root !"
-#: src/ui.cc:303
+#: src/ui.cc:359
msgid ""
"Subprocess exited with an error -- did you type your password correctly?"
msgstr ""
"Le sous-processus s'est terminé avec une erreur -- avez-vous entré votre mot "
"de passe correctement ?"
-#: src/ui.cc:331
+#: src/ui.cc:387
msgid "Loading cache"
msgstr " Chargement du cache "
-#: src/ui.cc:353
+#: src/ui.cc:409
msgid "Really quit Aptitude?"
msgstr " Voulez-vous vraiment quitter Aptitude ? "
-#: src/ui.cc:432
+#: src/ui.cc:488
msgid "Really discard your personal settings and reload the defaults?"
msgstr ""
"Voulez-vous vraiment perdre vos préférences personnelles et\n"
"recharger les valeurs par défaut ?"
-#: src/ui.cc:532
+#: src/ui.cc:588 src/ui.cc:590 src/ui.cc:618 src/ui.cc:620
msgid "Packages"
msgstr "Paquets"
-#: src/ui.cc:533 src/ui.cc:560
+#: src/ui.cc:589 src/ui.cc:619
msgid "View available packages and choose actions to perform"
msgstr "Afficher les paquets disponibles et choisir les actions à effectuer"
-#: src/ui.cc:599
+#: src/ui.cc:666
#, fuzzy
msgid ""
"%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
@@ -3694,15 +3937,15 @@
"êtes encouragé à le redistribuer sous certaines conditions ; consulter la\n"
"« licence » pour plus de détails."
-#: src/ui.cc:620
+#: src/ui.cc:687
msgid "help.txt"
msgstr "help-fr.txt"
-#: src/ui.cc:636
+#: src/ui.cc:703
msgid "README"
msgstr "README"
-#: src/ui.cc:718
+#: src/ui.cc:785
msgid ""
"%C%BWARNING%b: untrusted versions of the following packages will be "
"installed!%n%nUntrusted packages could %Bcompromise your system's security%"
@@ -3710,63 +3953,73 @@
"this is what you want to do.%n%n"
msgstr ""
-#: src/ui.cc:732
+#: src/ui.cc:799
#, fuzzy
msgid "Really Continue"
msgstr "Continuer"
-#: src/ui.cc:734
+#: src/ui.cc:801
msgid "Abort Installation"
msgstr ""
-#: src/ui.cc:796
+#: src/ui.cc:862
msgid "Preview of package installation"
msgstr "Pré-visualisation de l'installation des paquets"
-#: src/ui.cc:797
+#: src/ui.cc:863
msgid "View and/or adjust the actions that will be performed"
msgstr "Voir ou modifier les actions qui seront effectuées"
-#: src/ui.cc:837
-msgid "Some packages were broken and have been fixed"
+#: src/ui.cc:864
+#, fuzzy
+msgid "Preview"
+msgstr "^Précédent"
+
+#: src/ui.cc:900
+#, fuzzy
+msgid "Some packages were broken and have been fixed:"
msgstr "Certains paquets étaient cassés et ont été réparés"
-#: src/ui.cc:839
-msgid "Some broken packages could not be fixed!"
-msgstr "Certains paquets cassés n'ont pas pu être réparés !"
+#: src/ui.cc:906
+msgid "No solution to these dependency problems exists!"
+msgstr ""
-#: src/ui.cc:847 src/ui.cc:959
-msgid "Some packages are broken. Try to fix them?"
-msgstr "Certains paquets sont cassés. Faut-il essayer de les réparer ?"
+#: src/ui.cc:912
+#, c-format
+msgid ""
+"Ran out of time while trying to resolver dependencies (press \"%s\" to try "
+"harder)"
+msgstr ""
-#: src/ui.cc:860
+#: src/ui.cc:958
+#, fuzzy
msgid ""
-"Installing/removing packages requires administrative privileges, which\n"
-"you currently do not have. Would you like to change to the root account?\n"
+"Installing/removing packages requires administrative privileges, which you "
+"currently do not have. Would you like to change to the root account?"
msgstr ""
"L'installation et la suppression de paquets demandent des droits\n"
"d'administration que vous n'avez pas pour le moment. Voulez-vous\n"
"utiliser le compte administrateur ?\n"
-#: src/ui.cc:863 src/ui.cc:993
+#: src/ui.cc:961 src/ui.cc:1077
msgid "Become root"
msgstr "Devenir administrateur"
-#: src/ui.cc:865 src/ui.cc:995
+#: src/ui.cc:963 src/ui.cc:1079
msgid "Don't become root"
msgstr "Ne pas devenir administrateur"
-#: src/ui.cc:870 src/ui.cc:1000
+#: src/ui.cc:968 src/ui.cc:1084
msgid "A package-list update or install run is already taking place."
msgstr ""
"Une mise à jour de la liste des paquets ou une installation est déjà en "
"cours."
-#: src/ui.cc:897
+#: src/ui.cc:995
msgid "No packages are scheduled to be installed, removed, or upgraded."
msgstr "Il n'est prévu d'installer, mettre à jour ou enlever aucun paquet."
-#: src/ui.cc:903
+#: src/ui.cc:1001
#, fuzzy
msgid ""
"No packages will be installed, removed or upgraded. Some packages could be "
@@ -3778,173 +4031,190 @@
"Certains paquets pourraient être mis à jour mais vous avez choisi de ne pas\n"
"le faire. Entrez « U » pour préparer une mise à jour."
-#: src/ui.cc:990
+#: src/ui.cc:1073
+#, fuzzy
msgid ""
-"Updating the package lists requires administrative privileges, which\n"
-"you currently do not have. Would you like to change to the root account?\n"
+"Updating the package lists requires administrative privileges, which you "
+"currently do not have. Would you like to change to the root account?"
msgstr ""
"La mise à jour des listes de paquets exige des privilèges d'administration\n"
"que vous n'avez pas pour le moment. Voulez-vous utiliser le compte\n"
"administrateur ?\n"
-#: src/ui.cc:1005 src/ui.cc:1198
+#: src/ui.cc:1089 src/ui.cc:1345
msgid "Waste time trying to find mines"
msgstr ""
"Passer le temps en essayant de trouver les mines\n"
"(il y a certainement mieux à faire)"
-#: src/ui.cc:1012 src/ui.cc:1065
+#: src/ui.cc:1096 src/ui.cc:1149
msgid "Cleaning while a download is in progress is not allowed"
msgstr ""
"Il n'est pas autorisé d'effectuer un nettoyage alors qu'un téléchargement "
"est en cours"
-#: src/ui.cc:1015
+#: src/ui.cc:1099
msgid "Deleting downloaded files"
msgstr "Effacement des fichiers téléchargés"
-#: src/ui.cc:1029
+#: src/ui.cc:1113
msgid "Downloaded package files have been deleted"
msgstr " Les fichiers téléchargés ont été effacés "
-#: src/ui.cc:1090
+#: src/ui.cc:1174
#, fuzzy, c-format
msgid ""
"Obsolete downloaded package files have been deleted, freeing %sB of disk "
"space."
msgstr " Les fichiers téléchargés de paquets périmés ont été effacés "
-#: src/ui.cc:1174
+#: src/ui.cc:1246
+msgid "All solutions exhausted."
+msgstr ""
+
+#: src/ui.cc:1251 src/ui.cc:1282
+#, fuzzy
+msgid "Ran out of time while trying to find a solution."
+msgstr ""
+"Passer le temps en essayant de trouver les mines\n"
+"(il y a certainement mieux à faire)"
+
+#: src/ui.cc:1276
+msgid "Unable to find a solution to apply."
+msgstr ""
+
+#: src/ui.cc:1321
msgid "^Install/remove packages"
msgstr "^Installer/enlever des paquets"
-#: src/ui.cc:1175
+#: src/ui.cc:1322
msgid "Perform all pending installs and removals"
msgstr ""
"Effectuer toutes les actions d'installation ou de suppression demandées"
-#: src/ui.cc:1177
+#: src/ui.cc:1324
msgid "^Update package list"
msgstr "^Mettre à jour les listes de paquets"
-#: src/ui.cc:1178
+#: src/ui.cc:1325
msgid "Check for new versions of packages"
msgstr "Vérifier s'il existe de nouvelles versions des paquets"
-#: src/ui.cc:1181
+#: src/ui.cc:1328
msgid "^Forget new packages"
msgstr "^Oublier les nouveaux paquets"
-#: src/ui.cc:1182
+#: src/ui.cc:1329
msgid "Forget which packages are \"new\""
msgstr "Oublier quels paquets sont « nouveaux »"
-#: src/ui.cc:1185
+#: src/ui.cc:1332
msgid "^Clean package cache"
msgstr "^Nettoyer le cache des paquets"
-#: src/ui.cc:1186
+#: src/ui.cc:1333
msgid "Delete package files which were previously downloaded"
msgstr "Effacer les fichiers de paquets précédemment téléchargés"
-#: src/ui.cc:1189
+#: src/ui.cc:1336
msgid "Clean ^obsolete files"
msgstr "Nettoyer les fichiers ^périmés"
-#: src/ui.cc:1190
+#: src/ui.cc:1337
msgid "Delete package files which can no longer be downloaded"
msgstr "Effacer les fichiers des paquets qui ne peuvent plus être téléchargés"
-#: src/ui.cc:1193
+#: src/ui.cc:1340
msgid "Mark ^Upgradable"
msgstr "Marquer comme étant susceptible de mise à ^jour"
-#: src/ui.cc:1194
+#: src/ui.cc:1341
msgid "Mark all upgradable packages which are not held for upgrade"
msgstr ""
"Marquer tous les paquets susceptibles d'être mis à jour et qui ne sont pas "
"gelés pour mise à jour"
-#: src/ui.cc:1197
+#: src/ui.cc:1344
msgid "^Play Minesweeper"
msgstr "Jouer au ^démineur"
-#: src/ui.cc:1200
+#: src/ui.cc:1347
msgid "^Become root"
msgstr "Devenir ^administrateur"
-#: src/ui.cc:1201
+#: src/ui.cc:1348
+#, fuzzy
msgid ""
-"Run 'su' to become root; this will restart the program, but your\n"
-"settings will be preserved"
+"Run 'su' to become root; this will restart the program, but your settings "
+"will be preserved"
msgstr ""
"Utilisez la commande « su » pour devenir administrateur.\n"
"Cela relancera le programme mais vos préférences seront conservées"
-#: src/ui.cc:1204
+#: src/ui.cc:1351
msgid "^Reload package cache"
msgstr "^Recharger le cache des paquets"
-#: src/ui.cc:1205
+#: src/ui.cc:1352
msgid "Reload the package cache"
msgstr "Recharger le cache des paquets"
-#: src/ui.cc:1211
+#: src/ui.cc:1358
msgid "^Quit"
msgstr "^Quitter"
-#: src/ui.cc:1212
+#: src/ui.cc:1359
msgid "Exit the program"
msgstr "Quitter le programme"
-#: src/ui.cc:1218 src/ui.cc:1487
+#: src/ui.cc:1365 src/ui.cc:1637
msgid "Undo"
msgstr "Défaire"
-#: src/ui.cc:1219
+#: src/ui.cc:1366
msgid "Undo the last package operation or group of operations"
msgstr "Défaire la dernière opération ou groupe d'opérations sur les paquets"
-#: src/ui.cc:1226
+#: src/ui.cc:1373
msgid "^Install"
msgstr "^Installer"
-#: src/ui.cc:1227
+#: src/ui.cc:1374
msgid "Flag the currently selected package for installation or upgrade"
msgstr "Marquer le paquet sélectionné pour installation ou mise à jour"
-#: src/ui.cc:1230
+#: src/ui.cc:1377
msgid "^Remove"
msgstr "^Supprimer"
-#: src/ui.cc:1231
+#: src/ui.cc:1378
msgid "Flag the currently selected package for removal"
msgstr "Marquer le paquet sélectionné pour suppression"
-#: src/ui.cc:1234
+#: src/ui.cc:1381
msgid "^Purge"
msgstr "^Purger"
-#: src/ui.cc:1235
+#: src/ui.cc:1382
msgid ""
"Flag the currently selected package and its configuration files for removal"
msgstr ""
"Marquer le paquet sélectionné et ses fichiers de configuration pour "
"suppression"
-#: src/ui.cc:1238
+#: src/ui.cc:1385
msgid "^Keep"
msgstr "^Garder"
-#: src/ui.cc:1239
+#: src/ui.cc:1386
msgid "Cancel any action on the selected package"
msgstr "Annuler toute action sur le paquet sélectionné"
-#: src/ui.cc:1242
+#: src/ui.cc:1389
msgid "^Hold"
msgstr "G^eler"
-#: src/ui.cc:1243
+#: src/ui.cc:1390
msgid ""
"Cancel any action on the selected package, and protect it from future "
"upgrades"
@@ -3952,240 +4222,244 @@
"Annuler toute action sur le paquet sélectionné et refuser toute mise à jour "
"ultérieure"
-#: src/ui.cc:1246
+#: src/ui.cc:1393
msgid "Mark ^Auto"
msgstr "Marquer ^automatique"
-#: src/ui.cc:1247
+#: src/ui.cc:1394
+#, fuzzy
msgid ""
-"Mark the selected package as having been automatically installed;\n"
-"it will automatically be removed if no other packages depend on it"
+"Mark the selected package as having been automatically installed; it will "
+"automatically be removed if no other packages depend on it"
msgstr ""
"Marquer le paquet choisi comme ayant été automatiquement installé ;\n"
"il sera supprimé automatiquement si aucun autre paquet n'en dépend"
-#: src/ui.cc:1250
+#: src/ui.cc:1397
msgid "Mark ^Manual"
msgstr "Marquer ^manuel"
-#: src/ui.cc:1251
+#: src/ui.cc:1398
+#, fuzzy
msgid ""
-"Mark the selected package as having been manually installed;\n"
-"it will not be removed unless you manually remove it"
+"Mark the selected package as having been manually installed; it will not be "
+"removed unless you manually remove it"
msgstr ""
"Marquer le paquet choisi comme ayant été manuellement installé ;\n"
"il ne sera pas supprimé tant que vous ne le ferez pas vous-même"
-#: src/ui.cc:1254
+#: src/ui.cc:1401
msgid "^Forbid Version"
msgstr "^Interdire version"
-#: src/ui.cc:1255
+#: src/ui.cc:1402
+#, fuzzy
msgid ""
-"Forbid the candidate version of the selected package from being installed;\n"
+"Forbid the candidate version of the selected package from being installed; "
"newer versions of the package will be installed as usual"
msgstr ""
"Interdire d'installer la version proposée pour le paquet sélectionné;\n"
"les versions ultérieures du paquet seront normalement installées"
-#: src/ui.cc:1259
+#: src/ui.cc:1406
msgid "I^nformation"
msgstr "I^nformation"
-#: src/ui.cc:1260
+#: src/ui.cc:1407
msgid "Display more information about the selected package"
msgstr "Afficher plus d'informations sur le paquet sélectionné"
-#: src/ui.cc:1263
+#: src/ui.cc:1410
msgid "^Changelog"
msgstr "Liste des ^modifications"
-#: src/ui.cc:1264
+#: src/ui.cc:1411
msgid "Display the Debian changelog of the selected package"
msgstr ""
"Afficher la liste des modifications (« changelog ») du paquet sélectionné"
-#: src/ui.cc:1271
+#: src/ui.cc:1418
msgid "^Find"
msgstr "^Rechercher"
-#: src/ui.cc:1272
+#: src/ui.cc:1419
msgid "Search for a package"
msgstr "Rechercher un paquet"
-#: src/ui.cc:1275
+#: src/ui.cc:1422
msgid "Find ^Again"
msgstr "Rechercher ^encore"
-#: src/ui.cc:1276
+#: src/ui.cc:1423
msgid "Repeat the last search"
msgstr "Recommencer la recherche précédente"
-#: src/ui.cc:1280
+#: src/ui.cc:1427
msgid "^Limit Display"
msgstr "Affichage ^restreint"
-#: src/ui.cc:1281
+#: src/ui.cc:1428
msgid "Apply a filter to the package list"
msgstr "Filtrer la liste des paquets"
-#: src/ui.cc:1284
+#: src/ui.cc:1431
msgid "^Un-Limit Display"
msgstr "Affichage ^complet"
-#: src/ui.cc:1285
+#: src/ui.cc:1432
msgid "Remove the filter from the package list"
msgstr "Supprimer le filtre de la liste des paquets"
-#: src/ui.cc:1289
+#: src/ui.cc:1436
msgid "Find ^Broken"
msgstr "Rechercher ^cassés"
-#: src/ui.cc:1290
+#: src/ui.cc:1437
msgid "Find the next package with unsatisfied dependencies"
msgstr "Rechercher le prochain paquet avec des dépendances non satisfaites"
-#: src/ui.cc:1297
+#: src/ui.cc:1444
msgid "^UI options"
msgstr "Options de l'Interface ^Utilisateur"
-#: src/ui.cc:1298
+#: src/ui.cc:1445
msgid "Change the settings which affect the user interface"
msgstr "Modifier les paramètres qui affectent l'interface utilisateur"
-#: src/ui.cc:1301
+#: src/ui.cc:1448
msgid "^Dependency handling"
msgstr "^Gestion des Dépendances"
-#: src/ui.cc:1302
+#: src/ui.cc:1449
msgid "Change the settings which affect how package dependencies are handled"
msgstr "Changer les paramètres qui régissent la gestion des dépendances"
-#: src/ui.cc:1305
+#: src/ui.cc:1452
msgid "^Miscellaneous"
msgstr "^Divers"
-#: src/ui.cc:1306
+#: src/ui.cc:1453
msgid "Change miscellaneous program settings"
msgstr "^Modifier divers paramètres du programme"
-#: src/ui.cc:1311
+#: src/ui.cc:1458
msgid "^Revert options"
msgstr "^Revenir aux valeurs précédentes des options"
-#: src/ui.cc:1312
+#: src/ui.cc:1459
msgid "Reset all settings to the system defaults"
msgstr "Remettre tous les paramètres à leurs valeurs par défaut"
-#: src/ui.cc:1323
+#: src/ui.cc:1470
msgid "^Next"
msgstr "^Suivant"
-#: src/ui.cc:1324
+#: src/ui.cc:1471
msgid "View next display"
msgstr "Affichage de l'écran suivant"
-#: src/ui.cc:1327
+#: src/ui.cc:1474
msgid "^Prev"
msgstr "^Précédent"
-#: src/ui.cc:1328
+#: src/ui.cc:1475
msgid "View previous display"
msgstr "Affichage de l'écran précédant"
-#: src/ui.cc:1331
+#: src/ui.cc:1478
msgid "^Close"
msgstr "^Fermer"
-#: src/ui.cc:1332
+#: src/ui.cc:1479
msgid "Close this display"
msgstr "Fermer cet écran"
-#: src/ui.cc:1337
+#: src/ui.cc:1484
msgid "New Package ^View"
msgstr "Nouvelle ^Vue des Paquets"
-#: src/ui.cc:1338
+#: src/ui.cc:1485
msgid "Create a new default package view"
msgstr "Créer une nouvelle vue par défaut des paquets"
-#: src/ui.cc:1341
+#: src/ui.cc:1488
msgid "New Categorical ^Browser"
msgstr "Nouvelle vue par ^Catégories"
-#: src/ui.cc:1343
+#: src/ui.cc:1490
msgid "Browse packages by category"
msgstr "Parcourir les paquets par catégorie"
-#: src/ui.cc:1351
+#: src/ui.cc:1498
msgid "^About"
msgstr "A ^propos"
-#: src/ui.cc:1352
+#: src/ui.cc:1499
msgid "View information about this program"
msgstr "Afficher l'information à propos de ce programme"
-#: src/ui.cc:1355
+#: src/ui.cc:1502
msgid "^Help"
msgstr "^Aide"
-#: src/ui.cc:1356
+#: src/ui.cc:1503
msgid "View the on-line help"
msgstr "Afficher l'aide en ligne d'Aptitude"
-#: src/ui.cc:1358
+#: src/ui.cc:1505
msgid "User's ^Manual"
msgstr "^Manuel Utilisateur"
-#: src/ui.cc:1359
+#: src/ui.cc:1506
msgid "View the detailed program manual"
msgstr "Afficher le manuel d'utilisation détaillé"
-#: src/ui.cc:1362
+#: src/ui.cc:1509
msgid "^FAQ"
msgstr "^FAQ"
-#: src/ui.cc:1363
+#: src/ui.cc:1510
msgid "View a list of frequently asked questions"
msgstr "Afficher la liste des questions souvent posées"
-#: src/ui.cc:1366
-msgid "^ChangeLog"
-msgstr "Liste des ^modifications"
+#: src/ui.cc:1513
+msgid "^NEWS"
+msgstr ""
-#: src/ui.cc:1367
-msgid "View the important changes made in each version of the program"
+#: src/ui.cc:1514
+#, fuzzy
+msgid "View the important changes made in each version of "
msgstr "Afficher les changements importants de chaque version du programme"
-#: src/ui.cc:1370
+#: src/ui.cc:1517
msgid "^License"
msgstr "^Licence"
-#: src/ui.cc:1371
+#: src/ui.cc:1518
msgid "View the terms under which you may copy the program"
msgstr "Afficher les termes selon lesquels vous pouvez copier ce programme"
-#: src/ui.cc:1486
+#: src/ui.cc:1636
msgid "Actions"
msgstr "Actions"
-#: src/ui.cc:1489
+#: src/ui.cc:1639
msgid "Search"
msgstr "Rechercher"
-#: src/ui.cc:1490
+#: src/ui.cc:1640
msgid "Options"
msgstr "Options"
-#: src/ui.cc:1491
+#: src/ui.cc:1641
msgid "Views"
msgstr "Vues"
-#: src/ui.cc:1492
+#: src/ui.cc:1642
msgid "Help"
msgstr "Aide"
-#: src/ui.cc:1537
+#: src/ui.cc:1699
#, c-format
msgid ""
"%s: Menu %s: Help %s: Quit %s: Update %s: Download/Install/Remove Pkgs"
@@ -4193,11 +4467,11 @@
"%s : Menu %s : Aide %s : Quitter %s : M-à -J %s : Téléch./Inst./Suppr. "
"Pqts"
-#: src/ui.cc:1799 src/vscreen/vscreen.cc:281
+#: src/ui.cc:1968 src/vscreen/vscreen.cc:281
msgid "yes_key"
msgstr "o"
-#: src/ui.cc:1800 src/vscreen/vscreen.cc:282
+#: src/ui.cc:1969 src/vscreen/vscreen.cc:282
msgid "no_key"
msgstr "n"
@@ -4211,6 +4485,16 @@
msgid "Downloading Changelog"
msgstr "Téléchargement du fichier « Changelog »"
+#: src/view_changelog.cc:54
+#, fuzzy
+msgid "Download Changelog"
+msgstr "Téléchargement du fichier « Changelog »"
+
+#: src/view_changelog.cc:63
+#, c-format
+msgid "%s changes"
+msgstr ""
+
#: src/vscreen/vscreen.cc:119
#, c-format
msgid "Ouch! Got SIGTERM, dying..\n"
@@ -4239,6 +4523,39 @@
msgid "No"
msgstr "Non"
+#~ msgid ""
+#~ "Some packages had unmet dependencies. This may mean that you have\n"
+#~ "requested an impossible situation or if you are using the unstable\n"
+#~ "distribution that some required packages have not yet been created\n"
+#~ "or been moved out of Incoming.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Certains paquets ont des dépendances non résolues. Ceci peut signifier\n"
+#~ "que vous avez demandé une situation impossible ou que vous utilisez la\n"
+#~ "distribution instable qui a besoin de paquets qui n'ont pas encore été "
+#~ "créés\n"
+#~ "ou qui ne sont pas encore sortis « d'incoming ».\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Please insert the following disc into the drive \"%s\":\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Veuillez insérer le disque suivant dans le lecteur « %s » :\n"
+#~ "%s"
+
+#~ msgid "Invalid option for interactive mode: -s\n"
+#~ msgstr "Option incorrecte en mode interactif : -s\n"
+
+#~ msgid "Information about "
+#~ msgstr "Informations à propos de "
+
+#~ msgid "Some broken packages could not be fixed!"
+#~ msgstr "Certains paquets cassés n'ont pas pu être réparés !"
+
+#~ msgid "^ChangeLog"
+#~ msgstr "Liste des ^modifications"
+
#~ msgid "Go away, I'm trying to think.\n"
#~ msgstr "Allez-vous en, j'essaie de réfléchir.\n"
Modified: branches/aptitude-0.3/aptitude/po/gl.po
==============================================================================
--- branches/aptitude-0.3/aptitude/po/gl.po (original)
+++ branches/aptitude-0.3/aptitude/po/gl.po Sat Apr 30 13:41:32 2005
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: aptitude 0.0.7.19\n"
"Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-01-10 16:26-0800\n"
+"POT-Creation-Date: 2005-04-29 18:11-0400\n"
"PO-Revision-Date: 2001-03-10 02:33+01:00\n"
"Last-Translator: Jacobo Tarrio <jtarrio at gpul.org>\n"
"Language-Team: Galician <trasno at ceu.fi.udc.es>\n"
@@ -147,17 +147,103 @@
msgstr ""
#: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:184 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
-#: src/vscreen/vs_util.cc:329
+#: src/ui.cc:218 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
+#: src/vscreen/vs_util.cc:328
msgid "Ok"
msgstr ""
#: src/apt_options.cc:242 src/download_list.cc:71 src/mine/cmine.cc:257
-#: src/mine/cmine.cc:330 src/vscreen/vs_util.cc:329
+#: src/mine/cmine.cc:330 src/vscreen/vs_util.cc:328
#, fuzzy
msgid "Cancel"
msgstr "VerCand"
+#: src/broken_indicator.cc:106 src/solution_dialog.cc:97
+msgid "Internal error: unexpected null solution."
+msgstr ""
+
+#: src/broken_indicator.cc:158
+msgid "Suggest "
+msgstr ""
+
+#: src/broken_indicator.cc:164
+#, fuzzy, c-format
+msgid "%d installs"
+msgstr "instalar"
+
+#: src/broken_indicator.cc:169
+#, fuzzy
+msgid "1 install"
+msgstr "instalar"
+
+#: src/broken_indicator.cc:173
+#, c-format
+msgid "%d removals"
+msgstr ""
+
+#: src/broken_indicator.cc:178
+msgid "1 removal"
+msgstr ""
+
+#: src/broken_indicator.cc:182
+#, c-format
+msgid "%d keeps"
+msgstr ""
+
+#: src/broken_indicator.cc:187
+msgid "1 keep"
+msgstr ""
+
+#: src/broken_indicator.cc:191
+#, fuzzy, c-format
+msgid "%d upgrades"
+msgstr "actualizar"
+
+#: src/broken_indicator.cc:196
+#, fuzzy
+msgid "1 upgrade"
+msgstr "actualizar"
+
+#: src/broken_indicator.cc:200
+#, fuzzy, c-format
+msgid "%d downgrades"
+msgstr "[Descargado]"
+
+#: src/broken_indicator.cc:205
+#, fuzzy
+msgid "1 downgrade"
+msgstr "[Descargado]"
+
+#: src/broken_indicator.cc:214
+#, c-format
+msgid "%s: Examine"
+msgstr ""
+
+#: src/broken_indicator.cc:216
+#, c-format
+msgid "%s: Apply"
+msgstr ""
+
+#: src/broken_indicator.cc:218
+#, c-format
+msgid "%s: Next"
+msgstr ""
+
+#: src/broken_indicator.cc:220
+#, c-format
+msgid "%s: Previous"
+msgstr ""
+
+#: src/broken_indicator.cc:233
+#, c-format
+msgid "%CSolution search failed. %s: try harder"
+msgstr ""
+
+#: src/broken_indicator.cc:239
+#, c-format
+msgid "%CUnable to resolve dependencies."
+msgstr ""
+
#: src/cmdline/cmdline_action.cc:36
#, c-format
msgid ""
@@ -221,48 +307,48 @@
msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
msgstr "Paquetes para eliminar"
-#: src/cmdline/cmdline_action.cc:213
+#: src/cmdline/cmdline_action.cc:198
#, c-format
msgid "Note: selecting the task \"%s: %s\" for installation\n"
msgstr ""
-#: src/cmdline/cmdline_action.cc:240
+#: src/cmdline/cmdline_action.cc:225
#, c-format
msgid "You can only specify a package version with an 'install' command.\n"
msgstr ""
-#: src/cmdline/cmdline_action.cc:246
+#: src/cmdline/cmdline_action.cc:231
#, c-format
msgid "You can only specify a package archive with an 'install' command.\n"
msgstr ""
-#: src/cmdline/cmdline_action.cc:280
+#: src/cmdline/cmdline_action.cc:265
#, c-format
msgid ""
"Couldn't find package \"%s\", and more than 40\n"
"packages contain \"%s\" in their name.\n"
msgstr ""
-#: src/cmdline/cmdline_action.cc:283
+#: src/cmdline/cmdline_action.cc:268
#, c-format
msgid ""
"Couldn't find package \"%s\". However, the following\n"
"packages contain \"%s\" in their name:\n"
msgstr ""
-#: src/cmdline/cmdline_action.cc:307
+#: src/cmdline/cmdline_action.cc:292
#, c-format
msgid "Couldn't find any package whose name or description matched \"%s\"\n"
msgstr ""
-#: src/cmdline/cmdline_action.cc:309
+#: src/cmdline/cmdline_action.cc:294
#, c-format
msgid ""
"Couldn't find any package matching \"%s\", and more than 40\n"
"packages contain \"%s\" in their description.\n"
msgstr ""
-#: src/cmdline/cmdline_action.cc:312
+#: src/cmdline/cmdline_action.cc:297
#, c-format
msgid ""
"Couldn't find any package matching \"%s\". However, the following\n"
@@ -303,13 +389,13 @@
msgid "Freed %sB of disk space\n"
msgstr "Hanse liberar %sB de espacio"
-#: src/cmdline/cmdline_do_action.cc:67
+#: src/cmdline/cmdline_do_action.cc:71
#, fuzzy, c-format
msgid "Invalid operation %s"
msgstr "Información de %s"
-#: src/cmdline/cmdline_do_action.cc:206 src/cmdline/cmdline_simulate.cc:30
-#: src/cmdline/cmdline_upgrade.cc:89
+#: src/cmdline/cmdline_do_action.cc:201 src/cmdline/cmdline_simulate.cc:31
+#: src/cmdline/cmdline_upgrade.cc:91
#, c-format
msgid "Abort.\n"
msgstr ""
@@ -319,7 +405,7 @@
msgid "download: you must specify at least one package to download\n"
msgstr "Erro interno: non se puido xera-la lista de paquetes para baixar"
-#: src/cmdline/cmdline_download.cc:43 src/download.cc:342
+#: src/cmdline/cmdline_download.cc:43 src/download.cc:344
msgid "Couldn't read source list"
msgstr "Non se puido le-la lista de fontes"
@@ -381,194 +467,198 @@
msgid "What is it? It's an elephant being eaten by a snake, of course.\n"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:44
+#: src/cmdline/cmdline_prompt.cc:45
#, fuzzy
msgid "Couldn't read list of sources"
msgstr "Non se puido le-la lista de fontes de paquetes"
-#: src/cmdline/cmdline_prompt.cc:219 src/cmdline/cmdline_show_broken.cc:73
+#: src/cmdline/cmdline_prompt.cc:220 src/cmdline/cmdline_show_broken.cc:73
#, fuzzy, c-format
msgid "but %s is to be installed."
msgstr "Paquetes para instalar"
-#: src/cmdline/cmdline_prompt.cc:222 src/cmdline/cmdline_show_broken.cc:76
+#: src/cmdline/cmdline_prompt.cc:223 src/cmdline/cmdline_show_broken.cc:76
#, c-format
msgid "but %s is installed and it is kept back."
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:225 src/cmdline/cmdline_show_broken.cc:79
+#: src/cmdline/cmdline_prompt.cc:226 src/cmdline/cmdline_show_broken.cc:79
#, fuzzy, c-format
msgid "but %s is installed."
msgstr "instalado"
-#: src/cmdline/cmdline_prompt.cc:229 src/cmdline/cmdline_show_broken.cc:83
+#: src/cmdline/cmdline_prompt.cc:230 src/cmdline/cmdline_show_broken.cc:83
#, c-format
msgid "but it is not installable"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:233 src/cmdline/cmdline_show_broken.cc:87
+#: src/cmdline/cmdline_prompt.cc:234 src/cmdline/cmdline_show_broken.cc:87
#, c-format
msgid " which is a virtual package."
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:236 src/cmdline/cmdline_show_broken.cc:90
+#: src/cmdline/cmdline_prompt.cc:237 src/cmdline/cmdline_show_broken.cc:90
#, c-format
msgid " or"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:248
+#: src/cmdline/cmdline_prompt.cc:249
msgid "The following packages are BROKEN:"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:249
+#: src/cmdline/cmdline_prompt.cc:250
msgid "The following packages are unused and will be REMOVED:"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:250
+#: src/cmdline/cmdline_prompt.cc:251
msgid "The following packages have been automatically kept back:"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:251
+#: src/cmdline/cmdline_prompt.cc:252
msgid "The following NEW packages will be automatically installed:"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:252
+#: src/cmdline/cmdline_prompt.cc:253
msgid "The following packages will be automatically REMOVED:"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:253
+#: src/cmdline/cmdline_prompt.cc:254
msgid "The following packages will be DOWNGRADED:"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:254
+#: src/cmdline/cmdline_prompt.cc:255
msgid "The following packages have been kept back:"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:255
+#: src/cmdline/cmdline_prompt.cc:256
msgid "The following packages will be REINSTALLED:"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:256
+#: src/cmdline/cmdline_prompt.cc:257
#, fuzzy
msgid "The following NEW packages will be installed:"
msgstr "Paquetes para instalar"
-#: src/cmdline/cmdline_prompt.cc:257
+#: src/cmdline/cmdline_prompt.cc:258
msgid "The following packages will be REMOVED:"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:258
+#: src/cmdline/cmdline_prompt.cc:259
#, fuzzy
msgid "The following packages will be upgraded:"
msgstr "Paquetes para actualizar"
-#: src/cmdline/cmdline_prompt.cc:307
+#: src/cmdline/cmdline_prompt.cc:311
#, c-format
msgid "The following ESSENTIAL packages will be REMOVED!\n"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:316
+#: src/cmdline/cmdline_prompt.cc:320
#, c-format
msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:326
+#: src/cmdline/cmdline_prompt.cc:330
#, c-format
msgid ""
"WARNING: Performing this action will probably cause your system to break!\n"
" Do NOT continue unless you know EXACTLY what you are doing!\n"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:328
+#: src/cmdline/cmdline_prompt.cc:332
msgid "I am aware that this is a very bad idea"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:331
+#: src/cmdline/cmdline_prompt.cc:335
#, c-format
msgid "To continue, type the phrase \"%s\":\n"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:434
+#: src/cmdline/cmdline_prompt.cc:438
#, fuzzy, c-format
msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
msgstr "Paquetes para instalar"
-#: src/cmdline/cmdline_prompt.cc:440
+#: src/cmdline/cmdline_prompt.cc:444
#, fuzzy, c-format
msgid "The following packages are SUGGESTED but will NOT be installed:\n"
msgstr "Paquetes para instalar"
-#: src/cmdline/cmdline_prompt.cc:445
+#: src/cmdline/cmdline_prompt.cc:449
#, c-format
msgid "No packages will be installed, upgraded, or removed.\n"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:447
+#: src/cmdline/cmdline_prompt.cc:451
#, c-format
msgid "%lu packages upgraded, %lu newly installed, "
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:451
+#: src/cmdline/cmdline_prompt.cc:455
#, fuzzy, c-format
msgid "%lu reinstalled, "
msgstr "reinstalar"
-#: src/cmdline/cmdline_prompt.cc:453
+#: src/cmdline/cmdline_prompt.cc:457
#, c-format
msgid "%lu downgraded, "
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:455
+#: src/cmdline/cmdline_prompt.cc:459
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:462
+#: src/cmdline/cmdline_prompt.cc:466
#, c-format
msgid "Need to get %sB/%sB of archives. "
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:465
+#: src/cmdline/cmdline_prompt.cc:469
#, c-format
msgid "Need to get %sB of archives. "
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:472
+#: src/cmdline/cmdline_prompt.cc:476
#, c-format
msgid "After unpacking %sB will be used.\n"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:475
+#: src/cmdline/cmdline_prompt.cc:479
#, c-format
msgid "After unpacking %sB will be freed.\n"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:521
+#: src/cmdline/cmdline_prompt.cc:524
#, c-format
msgid "Bad action character '%c'\n"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:596
+#: src/cmdline/cmdline_prompt.cc:595
#, c-format
msgid "No packages to show -- enter the package names on the line after 'i'.\n"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:598 src/cmdline/cmdline_prompt.cc:629
-#, fuzzy, c-format
+#: src/cmdline/cmdline_prompt.cc:597
+#, fuzzy
msgid "Press Return to continue."
msgstr "Prema Intro para continuar.\n"
-#: src/cmdline/cmdline_prompt.cc:625
+#: src/cmdline/cmdline_prompt.cc:623
#, c-format
msgid "No packages found -- enter the package names on the line after 'c'.\n"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:665
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:627
+#, fuzzy
+msgid "Press Return to continue"
+msgstr "Prema Intro para continuar.\n"
+
+#: src/cmdline/cmdline_prompt.cc:675
msgid "Do you want to continue? [Y/n/?] "
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:690
+#: src/cmdline/cmdline_prompt.cc:700
#, c-format
msgid ""
"\n"
@@ -576,7 +666,7 @@
"\n"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:692
+#: src/cmdline/cmdline_prompt.cc:702
#, c-format
msgid ""
"\n"
@@ -584,7 +674,7 @@
"\n"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:698
+#: src/cmdline/cmdline_prompt.cc:708
#, c-format
msgid ""
"\n"
@@ -592,7 +682,7 @@
"\n"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:700
+#: src/cmdline/cmdline_prompt.cc:710
#, c-format
msgid ""
"\n"
@@ -600,7 +690,7 @@
"\n"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:705
+#: src/cmdline/cmdline_prompt.cc:715
#, c-format
msgid ""
"\n"
@@ -608,7 +698,7 @@
"\n"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:717
#, c-format
msgid ""
"\n"
@@ -616,7 +706,7 @@
"\n"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:737
#, c-format
msgid ""
"Commands:\n"
@@ -643,27 +733,81 @@
" = : Hold\n"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:751
+#: src/cmdline/cmdline_prompt.cc:761
#, c-format
msgid "Invalid response. Please enter a valid command or '?' for help.\n"
msgstr ""
-#: src/cmdline/cmdline_search.cc:78
+#: src/cmdline/cmdline_resolver.cc:84
#, c-format
-msgid "search: You must provide at least one search term\n"
+msgid "y: %F%nn: %F%nq: %F%n,: %F%n.: %F%n"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:90
+msgid "accept the proposed changes"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:92
+msgid "reject the proposed changes and search for another solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:94
+#, fuzzy
+msgid "give up and quit the program"
+msgstr "Información de %s"
+
+#: src/cmdline/cmdline_resolver.cc:96
+msgid "move to the next solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:98
+msgid "move to the previous solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:131
+#, fuzzy
+msgid "The following actions will resolve these dependencies:"
+msgstr "Paquetes para actualizar"
+
+#: src/cmdline/cmdline_resolver.cc:146
+msgid "Accept this solution? [Y/n/q/?]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:174
+msgid "Abandoning all efforts to resolve these dependencies."
msgstr ""
-#: src/cmdline/cmdline_show_broken.cc:114
+#: src/cmdline/cmdline_resolver.cc:184
+#, fuzzy
+msgid "The following commands are available:"
+msgstr "Paquetes para instalar"
+
+#: src/cmdline/cmdline_resolver.cc:188
+msgid "Invalid response; please enter one of the following commands:"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:198
+msgid "No solution found within the allotted time. Try harder? [Y/n]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:226
+msgid "Invalid response; please enter 'y' or 'n'."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:235
+msgid "Unable to resolve dependencies! Giving up..."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:240
+msgid "No more solutions."
+msgstr ""
+
+#: src/cmdline/cmdline_search.cc:78
#, c-format
-msgid ""
-"Some packages had unmet dependencies. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming.\n"
-"\n"
+msgid "search: You must provide at least one search term\n"
msgstr ""
-#: src/cmdline/cmdline_show_broken.cc:115
+#: src/cmdline/cmdline_show_broken.cc:113
#, c-format
msgid "The following packages have unmet dependencies:\n"
msgstr ""
@@ -873,12 +1017,12 @@
msgid "Description: "
msgstr "Descrición"
-#: src/cmdline/cmdline_simulate.cc:36
+#: src/cmdline/cmdline_simulate.cc:37
#, fuzzy, c-format
msgid "Would download/install/remove packages.\n"
msgstr "Paquetes Instalados"
-#: src/cmdline/cmdline_simulate.cc:47
+#: src/cmdline/cmdline_simulate.cc:48
msgid "Internal Error, Ordering didn't finish"
msgstr ""
@@ -920,26 +1064,24 @@
msgid "UNAVAILABLE"
msgstr ""
-#: src/download_bar.cc:57 src/download_list.cc:265
+#: src/download_bar.cc:56 src/download_list.cc:263 src/download_screen.cc:57
#, fuzzy, c-format
-msgid ""
-"Please insert the following disc into the drive \"%s\":\n"
-"%s"
+msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
msgstr "Introduza o disco etiquetado \""
-#: src/download_bar.cc:76 src/generic/acqprogress.cc:63
+#: src/download_bar.cc:77 src/generic/acqprogress.cc:63
msgid "Hit "
msgstr "Prema "
-#: src/download_bar.cc:89
+#: src/download_bar.cc:90
msgid "Downloading "
msgstr "Descargando "
-#: src/download_bar.cc:102
+#: src/download_bar.cc:103
msgid "Got "
msgstr "Recibido "
-#: src/download_bar.cc:156
+#: src/download_bar.cc:157
msgid "Downloading..."
msgstr "Descargando..."
@@ -947,7 +1089,7 @@
msgid "Couldn't read list of package sources"
msgstr "Non se puido le-la lista de fontes de paquetes"
-#: src/download.cc:104 src/download.cc:321
+#: src/download.cc:104 src/download.cc:322
msgid "Couldn't lock list directory..are you root?"
msgstr "Non se puido bloquea-lo directorio de listas. ¿É vostede o root?"
@@ -959,29 +1101,33 @@
msgid "View the progress of the package list update"
msgstr ""
-#: src/download.cc:159
+#: src/download.cc:113
+msgid "List Update"
+msgstr ""
+
+#: src/download.cc:160
msgid "Couldn't clean out list directories"
msgstr "Non se puideron limpa-los directorios de listas"
-#: src/download.cc:176 src/ui.cc:1068
+#: src/download.cc:177 src/ui.cc:1152
msgid "Deleting obsolete downloaded files"
msgstr ""
-#: src/download.cc:181
+#: src/download.cc:182
#, c-format
msgid "Deleting obsolete downloaded files\n"
msgstr ""
-#: src/download.cc:223
+#: src/download.cc:224
#, c-format
msgid "Unable to open %s to log actions"
msgstr "Non se puido abrir %s para rexistra-las accións"
-#: src/download.cc:229
+#: src/download.cc:230
msgid "log report"
msgstr ""
-#: src/download.cc:230
+#: src/download.cc:231
#, c-format
msgid ""
"IMPORTANT: this log only lists intended actions; actions which fail due to\n"
@@ -993,77 +1139,77 @@
"as accións que fallen por problemas con dpkg poden non terse completado.\n"
"\n"
-#: src/download.cc:231
+#: src/download.cc:232
#, c-format
msgid "Will install %li packages, and remove %li packages.\n"
msgstr "Hanse instalar %li paquetes, e borrar %li paquetes.\n"
-#: src/download.cc:233
+#: src/download.cc:234
#, fuzzy, c-format
msgid "%sB of disk space will be used\n"
msgstr "Hanse ocupar %li bytes de espacio de disco\n"
-#: src/download.cc:236
+#: src/download.cc:237
#, fuzzy, c-format
msgid "%sB bytes of disk space will be freed\n"
msgstr "Hanse liberar %li bytes de espacio de disco\n"
-#: src/download.cc:244
+#: src/download.cc:245
#, c-format
msgid "[UPGRADE] %s %s -> %s\n"
msgstr "[ACTUALIZAR] %s %s -> %s\n"
-#: src/download.cc:248
+#: src/download.cc:249
#, fuzzy, c-format
msgid "[DOWNGRADE] %s %s -> %s\n"
msgstr "[ACTUALIZAR] %s %s -> %s\n"
-#: src/download.cc:258
+#: src/download.cc:259
msgid "REMOVE"
msgstr "BORRAR"
-#: src/download.cc:264
+#: src/download.cc:265
msgid "INSTALL"
msgstr "INSTALAR"
-#: src/download.cc:267
+#: src/download.cc:268
msgid "REINSTALL"
msgstr "REINSTALAR"
-#: src/download.cc:270
+#: src/download.cc:271
msgid "HOLD"
msgstr "RETER"
-#: src/download.cc:273
+#: src/download.cc:274
msgid "BROKEN"
msgstr ""
-#: src/download.cc:276
+#: src/download.cc:277
msgid "REMOVE, NOT USED"
msgstr ""
-#: src/download.cc:279
+#: src/download.cc:280
msgid "REMOVE, DEPENDENCIES"
msgstr "BORRAR, DEPENDENCIAS"
-#: src/download.cc:282
+#: src/download.cc:283
msgid "INSTALL, DEPENDENCIES"
msgstr "INSTALAR, DEPENDENCIAS"
-#: src/download.cc:285
+#: src/download.cc:286
msgid "HOLD, DEPENDENCIES"
msgstr "RETER, DEPENDENCIAS"
-#: src/download.cc:287
+#: src/download.cc:288
msgid "????????"
msgstr "????????"
-#: src/download.cc:291
+#: src/download.cc:292
#, c-format
msgid "[%s] %s\n"
msgstr "[%s] %s\n"
-#: src/download.cc:294
+#: src/download.cc:295
#, c-format
msgid ""
"===============================================================================\n"
@@ -1074,34 +1220,39 @@
"\n"
"Rexistro completado.\n"
-#: src/download.cc:329
+#: src/download.cc:330
#, fuzzy
msgid "Downloading packages"
msgstr "Descargando "
-#: src/download.cc:330
+#: src/download.cc:331
msgid "View the progress of the package download"
msgstr ""
-#: src/download.cc:352
+#: src/download.cc:332
+#, fuzzy
+msgid "Package Download"
+msgstr "Paquete"
+
+#: src/download.cc:354
msgid "Internal error: couldn't generate list of packages to download"
msgstr "Erro interno: non se puido xera-la lista de paquetes para baixar"
-#: src/download.cc:413
+#: src/download.cc:415
msgid "Unable to correct for unavailable packages"
msgstr ""
-#: src/download.cc:465
+#: src/download.cc:467
msgid ""
"Ack! Something bad happened while installing packages. Trying to recover:"
msgstr ""
"¡Ag! Ocorreu algo malo cando se instalaban os paquetes. Tentando recuperar:"
-#: src/download.cc:475 src/pkg_item.cc:413
+#: src/download.cc:477 src/pkg_item.cc:432
msgid "Press return to continue.\n"
msgstr "Prema Intro para continuar.\n"
-#: src/download.cc:506
+#: src/download.cc:508
msgid ""
"Could not regain the system lock! (Perhaps another apt or dpkg is running?)"
msgstr ""
@@ -1162,11 +1313,6 @@
msgid "[ERROR]"
msgstr "ERRO"
-#: src/download_screen.cc:57
-#, fuzzy, c-format
-msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
-msgstr "Introduza o disco etiquetado \""
-
#: src/download_screen.cc:181
#, fuzzy, c-format
msgid "Downloaded %sB in %ss (%sB/s)."
@@ -1205,117 +1351,117 @@
"press enter\n"
msgstr "Introduza o disco etiquetado \""
-#: src/generic/aptcache.cc:245
+#: src/generic/aptcache.cc:253
msgid "Can't open Aptitude extended state file"
msgstr "Non se puido abri-lo ficheiro de estado extendido de Aptitude"
-#: src/generic/aptcache.cc:252 src/generic/aptcache.cc:305
-#: src/generic/aptcache.cc:307
+#: src/generic/aptcache.cc:260 src/generic/aptcache.cc:313
+#: src/generic/aptcache.cc:315
msgid "Reading extended state information"
msgstr "Lendo a información de estado extendido"
-#: src/generic/aptcache.cc:313 src/generic/aptcache.cc:387
-#: src/generic/aptcache.cc:390
+#: src/generic/aptcache.cc:321 src/generic/aptcache.cc:395
+#: src/generic/aptcache.cc:398
#, fuzzy
msgid "Initializing package states"
msgstr "Actualizando as listas de paquetes"
-#: src/generic/aptcache.cc:501
+#: src/generic/aptcache.cc:509
msgid "Cannot open Aptitude state file"
msgstr "Non se puido abri-lo ficheiro de estado de Aptitude"
-#: src/generic/aptcache.cc:505 src/generic/aptcache.cc:560
-#: src/generic/aptcache.cc:563
+#: src/generic/aptcache.cc:513 src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:571
msgid "Writing extended state information"
msgstr "Escribindo a información de estado extendido"
-#: src/generic/aptcache.cc:542
+#: src/generic/aptcache.cc:550
#, c-format
msgid "Internal buffer overflow on package \"%s\" while writing state file"
msgstr ""
"Desbordamento do buffer interno no paquete \"%s\" ao escribi-lo ficheiro de "
"estado"
-#: src/generic/aptcache.cc:551
+#: src/generic/aptcache.cc:559
msgid "Couldn't write state file"
msgstr "Non se puido escribi-lo ficheiro de estado"
-#: src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:576
msgid "Error writing state file"
msgstr "Erro ao escribi-lo ficheiro de estado"
-#: src/generic/aptcache.cc:584
+#: src/generic/aptcache.cc:592
msgid "couldn't replace old state file"
msgstr "non se puido substituÃ-lo ficheiro de estado antigo"
-#: src/generic/aptcache.cc:960
+#: src/generic/aptcache.cc:1000
msgid "Unable to correct dependencies, some packages cannot be installed"
msgstr ""
"Non se puideron corrixi-las dependencias, non se pode instalar algúns "
"paquetes"
-#: src/generic/aptcache.cc:1325
+#: src/generic/aptcache.cc:1546
msgid "The list of sources could not be read."
msgstr "Non se puido le-la lista de fontes."
-#: src/generic/aptcache.cc:1332
+#: src/generic/aptcache.cc:1553
msgid "The package lists or status file could not be parsed or opened."
msgstr ""
"Non se puido abrir ou analiza-la lista de paquetes ou o ficheiro de estado."
-#: src/generic/aptcache.cc:1335
+#: src/generic/aptcache.cc:1556
msgid "You may want to update the package lists to correct these missing files"
msgstr ""
"Pode precisar actualiza-la lista de paquetes para corrixir eses ficheiros "
"que faltan"
-#: src/generic/apt.cc:141
+#: src/generic/apt.cc:142
#, fuzzy, c-format
msgid "Unable to open %s for writing"
msgstr "Non se puido abrir %s para rexistra-las accións"
-#: src/generic/apt.cc:151
+#: src/generic/apt.cc:152
#, fuzzy, c-format
msgid "Unable to replace %s with new configuration file"
msgstr "Non se puido abrir %s para rexistra-las accións"
-#: src/generic/apt.cc:226
+#: src/generic/apt.cc:227
msgid "Warning: could not lock the cache file. Opening in read-only mode"
msgstr ""
-#: src/generic/matchers.cc:780
+#: src/generic/matchers.cc:797
msgid "Unmatched '('"
msgstr ""
-#: src/generic/matchers.cc:870 src/generic/matchers.cc:949
+#: src/generic/matchers.cc:887 src/generic/matchers.cc:968
#, c-format
msgid "Unknown dependency type: %s"
msgstr ""
-#: src/generic/matchers.cc:931
+#: src/generic/matchers.cc:950
#, c-format
msgid "Unknown action type: %s"
msgstr ""
-#: src/generic/matchers.cc:998
+#: src/generic/matchers.cc:1017
#, fuzzy, c-format
msgid "Unknown priority %s"
msgstr "Prioridade: "
-#: src/generic/matchers.cc:1020
+#: src/generic/matchers.cc:1039
#, c-format
msgid "Unknown pattern type: %c"
msgstr ""
-#: src/generic/matchers.cc:1065
+#: src/generic/matchers.cc:1084
msgid "Unexpected empty expression"
msgstr ""
-#: src/generic/matchers.cc:1100
+#: src/generic/matchers.cc:1119
msgid "Badly formed expression"
msgstr ""
-#: src/generic/matchers.cc:1129
+#: src/generic/matchers.cc:1148
msgid "Unexpected ')'"
msgstr ""
@@ -1336,7 +1482,7 @@
msgid "Can't get value of $HOME, using TMPDIR (insecure)"
msgstr ""
-#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:60
+#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:61
#, fuzzy, c-format
msgid "ChangeLog of %s"
msgstr "Rexistro de modificacións de "
@@ -1537,292 +1683,300 @@
msgid "Invalid sorting policy type '%s'"
msgstr ""
-#: src/main.cc:68
+#: src/main.cc:67
#, c-format
msgid "%s %s compiled at %s %s\n"
msgstr ""
-#: src/main.cc:71
+#: src/main.cc:70
#, c-format
msgid "Compiler: g++ %s\n"
msgstr ""
-#: src/main.cc:74
+#: src/main.cc:73
#, c-format
msgid ""
"\n"
"NCurses version: %s\n"
msgstr ""
-#: src/main.cc:76
+#: src/main.cc:75
#, c-format
msgid ""
"\n"
"Curses version: %s\n"
msgstr ""
-#: src/main.cc:78
+#: src/main.cc:77
#, c-format
msgid "libsigc++ version: %s\n"
msgstr ""
-#: src/main.cc:84
+#: src/main.cc:83
#, c-format
msgid "Usage: aptitude [-S fname] [-u|-i]"
msgstr ""
-#: src/main.cc:86
+#: src/main.cc:85
#, c-format
msgid " aptitude [options] <action> ..."
msgstr ""
-#: src/main.cc:88
+#: src/main.cc:87
#, c-format
msgid ""
" Actions (if none is specified, aptitude will enter interactive mode):\n"
"\n"
msgstr ""
-#: src/main.cc:89
+#: src/main.cc:88
#, c-format
msgid " install - Install/upgrade packages\n"
msgstr ""
-#: src/main.cc:90
+#: src/main.cc:89
#, c-format
msgid " remove - Remove packages\n"
msgstr ""
-#: src/main.cc:91
+#: src/main.cc:90
#, c-format
msgid " purge - Remove packages and their configuration files\n"
msgstr ""
-#: src/main.cc:92
+#: src/main.cc:91
#, c-format
msgid " hold - Place packages on hold\n"
msgstr ""
-#: src/main.cc:93
+#: src/main.cc:92
#, c-format
msgid " unhold - Cancel a hold command for a package\n"
msgstr ""
-#: src/main.cc:94
+#: src/main.cc:93
#, c-format
msgid " markauto - Mark packages as having been automatically installed\n"
msgstr ""
-#: src/main.cc:95
+#: src/main.cc:94
#, c-format
msgid " unmarkauto - Mark packages as having been manually installed\n"
msgstr ""
-#: src/main.cc:100
+#: src/main.cc:99
#, c-format
msgid ""
" forbid-version - Forbid aptitude from upgrading to a specific package "
"version.\n"
msgstr ""
-#: src/main.cc:101
+#: src/main.cc:100
#, c-format
msgid " update - Download lists of new/upgradable packages\n"
msgstr ""
-#: src/main.cc:102
+#: src/main.cc:101
#, c-format
msgid " upgrade - Perform a safe upgrade\n"
msgstr ""
-#: src/main.cc:103
+#: src/main.cc:102
#, c-format
msgid ""
" dist-upgrade - Perform an upgrade, possibly installing and removing "
"packages\n"
msgstr ""
-#: src/main.cc:104
+#: src/main.cc:103
#, c-format
msgid " forget-new - Forget what packages are \"new\"\n"
msgstr ""
-#: src/main.cc:105
+#: src/main.cc:104
#, c-format
msgid " search - Search for a package by name and/or expression\n"
msgstr ""
-#: src/main.cc:106
+#: src/main.cc:105
#, c-format
msgid " show - Display detailed information about a package\n"
msgstr ""
-#: src/main.cc:107
+#: src/main.cc:106
#, c-format
msgid " clean - Erase downloaded package files\n"
msgstr ""
-#: src/main.cc:108
+#: src/main.cc:107
#, c-format
msgid " autoclean - Erase old downloaded package files\n"
msgstr ""
-#: src/main.cc:109
+#: src/main.cc:108
#, c-format
msgid " changelog - View a package's changelog\n"
msgstr ""
-#: src/main.cc:110
+#: src/main.cc:109
#, c-format
msgid " download - Download the .deb file for a package\n"
msgstr ""
-#: src/main.cc:112
+#: src/main.cc:111
#, c-format
msgid " Options:\n"
msgstr ""
-#: src/main.cc:113
+#: src/main.cc:112
#, c-format
msgid " -h This help text\n"
msgstr ""
-#: src/main.cc:114
+#: src/main.cc:113
#, c-format
msgid " -s Simulate actions, but do not actually perform them.\n"
msgstr ""
-#: src/main.cc:115
+#: src/main.cc:114
#, c-format
msgid ""
" -d Only download packages, do not install or remove anything.\n"
msgstr ""
-#: src/main.cc:116
+#: src/main.cc:115
#, c-format
msgid " -P Always prompt for confirmation or actions\n"
msgstr ""
-#: src/main.cc:117
+#: src/main.cc:116
#, c-format
msgid ""
" -y Assume that the answer to simple yes/no questions is 'yes'\n"
msgstr ""
-#: src/main.cc:118
+#: src/main.cc:117
#, c-format
msgid ""
" -F format Specify a format for displaying search results; see the "
"manual\n"
msgstr ""
-#: src/main.cc:119
+#: src/main.cc:118
#, c-format
msgid ""
" -O order Specify how search results should be sorted; see the manual\n"
msgstr ""
-#: src/main.cc:120
+#: src/main.cc:119
#, c-format
msgid ""
" -w width Specify the display width for formatting search results\n"
msgstr ""
-#: src/main.cc:121
+#: src/main.cc:120
#, c-format
msgid " -f Aggressively try to fix broken packages.\n"
msgstr ""
-#: src/main.cc:122
+#: src/main.cc:121
#, c-format
msgid " -V Show which versions of packages are to be installed.\n"
msgstr ""
-#: src/main.cc:123
+#: src/main.cc:122
#, c-format
msgid ""
" -D Show the dependencies of automatically changed packages.\n"
msgstr ""
-#: src/main.cc:124
+#: src/main.cc:123
#, c-format
msgid " -Z\t\t Show the change in installed size of each package.\n"
msgstr ""
-#: src/main.cc:125
+#: src/main.cc:124
#, c-format
msgid ""
" -v Display extra information. (may be supplied multiple times)\n"
msgstr ""
-#: src/main.cc:126
+#: src/main.cc:125
#, c-format
msgid ""
" -t [release] Set the release from which packages should be installed\n"
msgstr ""
-#: src/main.cc:127
+#: src/main.cc:126
#, c-format
msgid " -o key=val Directly set the configuration option named 'key'\n"
msgstr ""
-#: src/main.cc:128
+#: src/main.cc:127
#, c-format
msgid ""
" --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
" strong dependencies\n"
msgstr ""
-#: src/main.cc:129
+#: src/main.cc:128
#, c-format
msgid " -S fname: Read the aptitude extended status info from fname.\n"
msgstr ""
-#: src/main.cc:130
+#: src/main.cc:129
#, c-format
msgid " -u : Download new package lists on startup.\n"
msgstr ""
-#: src/main.cc:131
+#: src/main.cc:130
#, c-format
msgid " -i : Perform an install run on startup.\n"
msgstr ""
-#: src/main.cc:133
+#: src/main.cc:132
#, c-format
msgid " This aptitude does not have Super Cow Powers.\n"
msgstr ""
-#: src/main.cc:254
+#: src/main.cc:253
#, c-format
msgid "-o requires an argument of the form key=value, got %s"
msgstr ""
-#: src/main.cc:300 src/main.cc:309
+#: src/main.cc:299 src/main.cc:308
msgid "WEIRDNESS: unknown option code received\n"
msgstr ""
-#: src/main.cc:318
+#: src/main.cc:317
msgid "Only one of -u and -i may be specified\n"
msgstr ""
-#: src/main.cc:326
+#: src/main.cc:325
msgid ""
"-u and -i may not be specified in command-line mode (eg, with 'install')"
msgstr ""
-#: src/main.cc:337
+#: src/main.cc:342
msgid "-u and -i may not be specified with a command"
msgstr ""
-#: src/main.cc:392
+#: src/main.cc:399
#, c-format
msgid "Unknown command \"%s\"\n"
msgstr ""
-#: src/main.cc:400
+#: src/main.cc:406 src/main.cc:463
+msgid "Internal error: uncaught 'out of solutions' exception.\n"
+msgstr ""
+
+#: src/main.cc:411 src/main.cc:468
+msgid "Internal error: uncaught 'out of time' exception.\n"
+msgstr ""
+
+#: src/main.cc:418
#, c-format
-msgid "Invalid option for interactive mode: -s\n"
+msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
msgstr ""
#: src/mine/cmine.cc:93
@@ -1852,7 +2006,7 @@
msgid "Lost"
msgstr ""
-#: src/mine/cmine.cc:119 src/ui.cc:1005
+#: src/mine/cmine.cc:119 src/ui.cc:1089
msgid "Minesweeper"
msgstr ""
@@ -2029,7 +2183,7 @@
msgid "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
msgstr ""
-#: src/pkg_columnizer.cc:84 src/ui.cc:1488
+#: src/pkg_columnizer.cc:84 src/ui.cc:1638
msgid "Package"
msgstr "Paquete"
@@ -2282,8 +2436,8 @@
" Packages in the 'comm' section are used to control modems and other "
"hardware communications devices. This includes software to control faxmodems "
"(for instance, PPP for dial-up internet connections and programs originally "
-"written for that purpose (zmodem/kermit), as well as software to control "
-"cellular phones, interface with FidoNet, and run a BBS."
+"written for that purpose, such as zmodem/kermit), as well as software to "
+"control cellular phones, interface with FidoNet, and run a BBS."
msgstr ""
#: src/pkg_grouppolicy.cc:159
@@ -2576,9 +2730,9 @@
" Packages in the 'non-free' section are not part of Debian.\n"
" .\n"
" These packages fail to meet one or more of the requirements of the Debian "
-"Free Software Guidelines (see below) You should read the license of programs "
-"in this section to be sure that you are allowed to use them in the way you "
-"intend.\n"
+"Free Software Guidelines (see below). You should read the license of "
+"programs in this section to be sure that you are allowed to use them in the "
+"way you intend.\n"
" .\n"
" For more information about what Debian considers to be Free Software, see "
"http://www.debian.org/social_contract#guidelines"
@@ -2627,8 +2781,8 @@
msgid ""
"New Packages\n"
" These packages have been added to Debian since the last time you cleared "
-"the list of \"new\" packages. (choose \"Forget new packages\" from the "
-"Actions menu to empty this list)"
+"the list of \"new\" packages (choose \"Forget new packages\" from the "
+"Actions menu to empty this list)."
msgstr ""
#: src/pkg_grouppolicy.cc:321
@@ -2824,97 +2978,114 @@
msgid "Versions"
msgstr "Versións"
-#: src/pkg_item.cc:54
+#: src/pkg_item.cc:55
msgid "Yes, I am aware this is a very bad idea"
msgstr ""
#: src/pkg_item.cc:80
#, c-format
msgid ""
-"%s is an essential package!\n"
-"\n"
-"Are you sure you want to remove it?\n"
-"Type '%s' if you are."
+"%s is an essential package!%n%nAre you sure you want to remove it?%nType '%"
+"s' if you are."
msgstr ""
-#: src/pkg_item.cc:219
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:625
#, fuzzy, c-format
msgid "Information about %s"
msgstr "Información de %s"
-#: src/pkg_item.cc:304
-msgid "Available versions of "
+#: src/pkg_item.cc:224 src/pkg_ver_item.cc:627
+#, c-format
+msgid "%s info"
+msgstr ""
+
+#: src/pkg_item.cc:310
+#, fuzzy, c-format
+msgid "Available versions of %s"
msgstr "Versións dispoñibles de "
-#: src/pkg_item.cc:312 src/pkg_ver_item.cc:648
+#: src/pkg_item.cc:313
+#, fuzzy, c-format
+msgid "%s versions"
+msgstr "Versións"
+
+#: src/pkg_item.cc:325 src/pkg_ver_item.cc:655
#, fuzzy, c-format
msgid "Dependencies of %s"
msgstr "Dependencias de %s"
-#: src/pkg_item.cc:322 src/pkg_ver_item.cc:657
+#: src/pkg_item.cc:327 src/pkg_ver_item.cc:657
+#, c-format
+msgid "%s deps"
+msgstr ""
+
+#: src/pkg_item.cc:338 src/pkg_ver_item.cc:667
#, fuzzy, c-format
msgid "Packages depending on %s"
msgstr "Paquetes que dependen de %s"
-#: src/pkg_item.cc:373 src/pkg_ver_item.cc:694
+#: src/pkg_item.cc:340 src/pkg_ver_item.cc:669
+#, c-format
+msgid "%s reverse deps"
+msgstr ""
+
+#: src/pkg_item.cc:392 src/pkg_ver_item.cc:707
#, c-format
msgid "Reporting a bug in %s:\n"
msgstr ""
-#: src/pkg_item.cc:395
+#: src/pkg_item.cc:414
msgid ""
-"You are not root and I cannot find any way\n"
-"to become root. To reconfigure this package,\n"
-"install the menu package, the login package,\n"
-"or run aptitude as root."
+"You are not root and I cannot find any way to become root. To reconfigure "
+"this package, install the menu package, the login package, or run aptitude "
+"as root."
msgstr ""
-#: src/pkg_item.cc:403
+#: src/pkg_item.cc:422
#, c-format
msgid "Reconfiguring %s\n"
msgstr ""
-#: src/pkg_item.cc:428
+#: src/pkg_item.cc:447
msgid "Hierarchy editor"
msgstr ""
+#: src/pkg_item.cc:447
+msgid "Hierarchy Editor"
+msgstr ""
+
#: src/pkg_tree.cc:325
msgid "Search for: "
msgstr ""
-#: src/pkg_tree.cc:585
+#: src/pkg_tree.cc:568
msgid "All Packages"
msgstr "Tódolos Paquetes"
-#: src/pkg_tree.cc:598 src/pkg_tree.cc:607
+#: src/pkg_tree.cc:581 src/pkg_tree.cc:590
msgid "Building view"
msgstr ""
-#: src/pkg_tree.cc:649
+#: src/pkg_tree.cc:632
#, c-format
msgid "No packages matched the pattern \"%s\"."
msgstr ""
-#: src/pkg_tree.cc:671
+#: src/pkg_tree.cc:654
#, fuzzy
msgid "Enter the new package tree limit: "
msgstr "Introduza o novo formato de visualización de paquetes: "
-#: src/pkg_tree.cc:705
+#: src/pkg_tree.cc:688
#, fuzzy
msgid "Enter the new package grouping mechanism for this display: "
msgstr "Introduza o novo formato de visualización de paquetes: "
-#: src/pkg_tree.cc:713
+#: src/pkg_tree.cc:696
#, fuzzy
msgid "Enter the new package sorting mechanism for this display: "
msgstr "Introduza o novo formato de visualización de paquetes: "
-#: src/pkg_ver_item.cc:623
-#, fuzzy
-msgid "Information about "
-msgstr "Información de %s"
-
#: src/pkg_view.cc:344
msgid "make_package_view: error in arguments -- two main widgets??"
msgstr ""
@@ -2928,7 +3099,7 @@
msgid "make_package_view: bad argument!"
msgstr ""
-#: src/pkg_view.cc:492
+#: src/pkg_view.cc:495
msgid "make_package_view: no main widget found"
msgstr ""
@@ -3128,6 +3299,68 @@
"broken if it is %s."
msgstr ""
+#: src/solution_dialog.cc:74
+msgid "The package cache is not available."
+msgstr ""
+
+#: src/solution_dialog.cc:82
+#, fuzzy
+msgid "No packages are broken."
+msgstr "Algúns paquetes están corrompidos. ¿Arranxalos? "
+
+#: src/solution_dialog.cc:103
+msgid "No resolution found."
+msgstr ""
+
+#: src/solution_dialog.cc:107
+#, c-format
+msgid ""
+"Time exhausted while searching for a solution (you can select \"Next Solution"
+"\" or press %s to try harder)."
+msgstr ""
+
+#: src/solution_dialog.cc:146
+msgid "Previous"
+msgstr ""
+
+#: src/solution_dialog.cc:147
+msgid "Next"
+msgstr ""
+
+#: src/solution_dialog.cc:148
+msgid "Apply"
+msgstr ""
+
+#: src/solution_dialog.cc:149
+msgid "Close"
+msgstr ""
+
+#: src/solution_fragment.cc:125
+msgid "%BRemove%b the following packages:%n"
+msgstr ""
+
+#: src/solution_fragment.cc:135
+msgid "%BInstall%b the following packages:%n"
+msgstr ""
+
+#: src/solution_fragment.cc:148
+msgid "%BKeep%b the following packages at their current version:%n"
+msgstr ""
+
+#: src/solution_fragment.cc:161
+msgid "%BUpgrade%b the following packages:%n"
+msgstr ""
+
+#: src/solution_fragment.cc:176
+#, fuzzy
+msgid "%BDowngrade%b the following packages:%n"
+msgstr "Descargando "
+
+#: src/solution_fragment.cc:190
+#, c-format
+msgid "Score is %d"
+msgstr ""
+
#: src/trust.cc:17 src/trust.cc:19
msgid "WARNING"
msgstr ""
@@ -3139,54 +3372,54 @@
"system."
msgstr ""
-#: src/ui.cc:143
+#: src/ui.cc:164
msgid "Er, there aren't any errors, this shouldn't have happened.."
msgstr ""
-#: src/ui.cc:149
+#: src/ui.cc:170
msgid "E:"
msgstr ""
-#: src/ui.cc:151
+#: src/ui.cc:172
msgid "W:"
msgstr ""
-#: src/ui.cc:172
+#: src/ui.cc:193
msgid "Search for:"
msgstr ""
-#: src/ui.cc:205
+#: src/ui.cc:261
msgid "You already are root!"
msgstr ""
-#: src/ui.cc:303
+#: src/ui.cc:359
msgid ""
"Subprocess exited with an error -- did you type your password correctly?"
msgstr ""
-#: src/ui.cc:331
+#: src/ui.cc:387
msgid "Loading cache"
msgstr ""
-#: src/ui.cc:353
+#: src/ui.cc:409
#, fuzzy
msgid "Really quit Aptitude?"
msgstr "¿Realmente quere saÃr?"
-#: src/ui.cc:432
+#: src/ui.cc:488
msgid "Really discard your personal settings and reload the defaults?"
msgstr ""
-#: src/ui.cc:532
+#: src/ui.cc:588 src/ui.cc:590 src/ui.cc:618 src/ui.cc:620
#, fuzzy
msgid "Packages"
msgstr "Paquete"
-#: src/ui.cc:533 src/ui.cc:560
+#: src/ui.cc:589 src/ui.cc:619
msgid "View available packages and choose actions to perform"
msgstr ""
-#: src/ui.cc:599
+#: src/ui.cc:666
msgid ""
"%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
"BABSOLUTELY NO WARRANTY%b; for details see 'license' in the Help menu. This "
@@ -3194,17 +3427,17 @@
"conditions; see 'license' for details."
msgstr ""
-#: src/ui.cc:620
+#: src/ui.cc:687
#, fuzzy
msgid "help.txt"
msgstr "/help-gl.txt"
-#: src/ui.cc:636
+#: src/ui.cc:703
#, fuzzy
msgid "README"
msgstr "BORRAR"
-#: src/ui.cc:718
+#: src/ui.cc:785
msgid ""
"%C%BWARNING%b: untrusted versions of the following packages will be "
"installed!%n%nUntrusted packages could %Bcompromise your system's security%"
@@ -3212,479 +3445,496 @@
"this is what you want to do.%n%n"
msgstr ""
-#: src/ui.cc:732
+#: src/ui.cc:799
#, fuzzy
msgid "Really Continue"
msgstr "¿Realmente quere saÃr?"
-#: src/ui.cc:734
+#: src/ui.cc:801
msgid "Abort Installation"
msgstr ""
-#: src/ui.cc:796
+#: src/ui.cc:862
msgid "Preview of package installation"
msgstr ""
-#: src/ui.cc:797
+#: src/ui.cc:863
msgid "View and/or adjust the actions that will be performed"
msgstr ""
-#: src/ui.cc:837
+#: src/ui.cc:864
+msgid "Preview"
+msgstr ""
+
+#: src/ui.cc:900
#, fuzzy
-msgid "Some packages were broken and have been fixed"
+msgid "Some packages were broken and have been fixed:"
msgstr "Algúns paquetes están corrompidos. ¿Arranxalos? "
-#: src/ui.cc:839
-msgid "Some broken packages could not be fixed!"
+#: src/ui.cc:906
+msgid "No solution to these dependency problems exists!"
msgstr ""
-#: src/ui.cc:847 src/ui.cc:959
-#, fuzzy
-msgid "Some packages are broken. Try to fix them?"
-msgstr "Algúns paquetes están corrompidos. ¿Arranxalos? "
+#: src/ui.cc:912
+#, c-format
+msgid ""
+"Ran out of time while trying to resolver dependencies (press \"%s\" to try "
+"harder)"
+msgstr ""
-#: src/ui.cc:860
+#: src/ui.cc:958
msgid ""
-"Installing/removing packages requires administrative privileges, which\n"
-"you currently do not have. Would you like to change to the root account?\n"
+"Installing/removing packages requires administrative privileges, which you "
+"currently do not have. Would you like to change to the root account?"
msgstr ""
-#: src/ui.cc:863 src/ui.cc:993
+#: src/ui.cc:961 src/ui.cc:1077
msgid "Become root"
msgstr ""
-#: src/ui.cc:865 src/ui.cc:995
+#: src/ui.cc:963 src/ui.cc:1079
msgid "Don't become root"
msgstr ""
-#: src/ui.cc:870 src/ui.cc:1000
+#: src/ui.cc:968 src/ui.cc:1084
msgid "A package-list update or install run is already taking place."
msgstr ""
-#: src/ui.cc:897
+#: src/ui.cc:995
msgid "No packages are scheduled to be installed, removed, or upgraded."
msgstr ""
-#: src/ui.cc:903
+#: src/ui.cc:1001
msgid ""
"No packages will be installed, removed or upgraded. Some packages could be "
"upgraded, but you have not chosen to upgrade them. Type \"U\" to prepare an "
"upgrade."
msgstr ""
-#: src/ui.cc:990
+#: src/ui.cc:1073
msgid ""
-"Updating the package lists requires administrative privileges, which\n"
-"you currently do not have. Would you like to change to the root account?\n"
+"Updating the package lists requires administrative privileges, which you "
+"currently do not have. Would you like to change to the root account?"
msgstr ""
-#: src/ui.cc:1005 src/ui.cc:1198
+#: src/ui.cc:1089 src/ui.cc:1345
msgid "Waste time trying to find mines"
msgstr ""
-#: src/ui.cc:1012 src/ui.cc:1065
+#: src/ui.cc:1096 src/ui.cc:1149
msgid "Cleaning while a download is in progress is not allowed"
msgstr ""
-#: src/ui.cc:1015
+#: src/ui.cc:1099
msgid "Deleting downloaded files"
msgstr ""
-#: src/ui.cc:1029
+#: src/ui.cc:1113
msgid "Downloaded package files have been deleted"
msgstr ""
-#: src/ui.cc:1090
+#: src/ui.cc:1174
#, c-format
msgid ""
"Obsolete downloaded package files have been deleted, freeing %sB of disk "
"space."
msgstr ""
-#: src/ui.cc:1174
+#: src/ui.cc:1246
+msgid "All solutions exhausted."
+msgstr ""
+
+#: src/ui.cc:1251 src/ui.cc:1282
+msgid "Ran out of time while trying to find a solution."
+msgstr ""
+
+#: src/ui.cc:1276
+msgid "Unable to find a solution to apply."
+msgstr ""
+
+#: src/ui.cc:1321
#, fuzzy
msgid "^Install/remove packages"
msgstr "Paquetes Instalados"
-#: src/ui.cc:1175
+#: src/ui.cc:1322
msgid "Perform all pending installs and removals"
msgstr ""
-#: src/ui.cc:1177
+#: src/ui.cc:1324
#, fuzzy
msgid "^Update package list"
msgstr "Actualizando as listas de paquetes"
-#: src/ui.cc:1178
+#: src/ui.cc:1325
msgid "Check for new versions of packages"
msgstr ""
-#: src/ui.cc:1181
+#: src/ui.cc:1328
#, fuzzy
msgid "^Forget new packages"
msgstr "Paquetes Novos"
-#: src/ui.cc:1182
+#: src/ui.cc:1329
msgid "Forget which packages are \"new\""
msgstr ""
-#: src/ui.cc:1185
+#: src/ui.cc:1332
msgid "^Clean package cache"
msgstr ""
-#: src/ui.cc:1186
+#: src/ui.cc:1333
msgid "Delete package files which were previously downloaded"
msgstr ""
-#: src/ui.cc:1189
+#: src/ui.cc:1336
msgid "Clean ^obsolete files"
msgstr ""
-#: src/ui.cc:1190
+#: src/ui.cc:1337
msgid "Delete package files which can no longer be downloaded"
msgstr ""
-#: src/ui.cc:1193
+#: src/ui.cc:1340
msgid "Mark ^Upgradable"
msgstr ""
-#: src/ui.cc:1194
+#: src/ui.cc:1341
msgid "Mark all upgradable packages which are not held for upgrade"
msgstr ""
-#: src/ui.cc:1197
+#: src/ui.cc:1344
msgid "^Play Minesweeper"
msgstr ""
-#: src/ui.cc:1200
+#: src/ui.cc:1347
msgid "^Become root"
msgstr ""
-#: src/ui.cc:1201
+#: src/ui.cc:1348
msgid ""
-"Run 'su' to become root; this will restart the program, but your\n"
-"settings will be preserved"
+"Run 'su' to become root; this will restart the program, but your settings "
+"will be preserved"
msgstr ""
-#: src/ui.cc:1204
+#: src/ui.cc:1351
msgid "^Reload package cache"
msgstr ""
-#: src/ui.cc:1205
+#: src/ui.cc:1352
msgid "Reload the package cache"
msgstr ""
-#: src/ui.cc:1211
+#: src/ui.cc:1358
msgid "^Quit"
msgstr ""
-#: src/ui.cc:1212
+#: src/ui.cc:1359
msgid "Exit the program"
msgstr ""
-#: src/ui.cc:1218 src/ui.cc:1487
+#: src/ui.cc:1365 src/ui.cc:1637
msgid "Undo"
msgstr ""
-#: src/ui.cc:1219
+#: src/ui.cc:1366
msgid "Undo the last package operation or group of operations"
msgstr ""
-#: src/ui.cc:1226
+#: src/ui.cc:1373
#, fuzzy
msgid "^Install"
msgstr "instalar"
-#: src/ui.cc:1227
+#: src/ui.cc:1374
msgid "Flag the currently selected package for installation or upgrade"
msgstr ""
-#: src/ui.cc:1230
+#: src/ui.cc:1377
msgid "^Remove"
msgstr ""
-#: src/ui.cc:1231
+#: src/ui.cc:1378
msgid "Flag the currently selected package for removal"
msgstr ""
-#: src/ui.cc:1234
+#: src/ui.cc:1381
#, fuzzy
msgid "^Purge"
msgstr "purgar"
-#: src/ui.cc:1235
+#: src/ui.cc:1382
msgid ""
"Flag the currently selected package and its configuration files for removal"
msgstr ""
-#: src/ui.cc:1238
+#: src/ui.cc:1385
msgid "^Keep"
msgstr ""
-#: src/ui.cc:1239
+#: src/ui.cc:1386
msgid "Cancel any action on the selected package"
msgstr ""
-#: src/ui.cc:1242
+#: src/ui.cc:1389
#, fuzzy
msgid "^Hold"
msgstr "reter"
-#: src/ui.cc:1243
+#: src/ui.cc:1390
msgid ""
"Cancel any action on the selected package, and protect it from future "
"upgrades"
msgstr ""
-#: src/ui.cc:1246
+#: src/ui.cc:1393
msgid "Mark ^Auto"
msgstr ""
-#: src/ui.cc:1247
+#: src/ui.cc:1394
msgid ""
-"Mark the selected package as having been automatically installed;\n"
-"it will automatically be removed if no other packages depend on it"
+"Mark the selected package as having been automatically installed; it will "
+"automatically be removed if no other packages depend on it"
msgstr ""
-#: src/ui.cc:1250
+#: src/ui.cc:1397
msgid "Mark ^Manual"
msgstr ""
-#: src/ui.cc:1251
+#: src/ui.cc:1398
msgid ""
-"Mark the selected package as having been manually installed;\n"
-"it will not be removed unless you manually remove it"
+"Mark the selected package as having been manually installed; it will not be "
+"removed unless you manually remove it"
msgstr ""
-#: src/ui.cc:1254
+#: src/ui.cc:1401
#, fuzzy
msgid "^Forbid Version"
msgstr "Versións"
-#: src/ui.cc:1255
+#: src/ui.cc:1402
msgid ""
-"Forbid the candidate version of the selected package from being installed;\n"
+"Forbid the candidate version of the selected package from being installed; "
"newer versions of the package will be installed as usual"
msgstr ""
-#: src/ui.cc:1259
+#: src/ui.cc:1406
#, fuzzy
msgid "I^nformation"
msgstr "Información de %s"
-#: src/ui.cc:1260
+#: src/ui.cc:1407
#, fuzzy
msgid "Display more information about the selected package"
msgstr "Información de %s"
-#: src/ui.cc:1263
+#: src/ui.cc:1410
#, fuzzy
msgid "^Changelog"
msgstr "Rexistro de modificacións de "
-#: src/ui.cc:1264
+#: src/ui.cc:1411
msgid "Display the Debian changelog of the selected package"
msgstr ""
-#: src/ui.cc:1271
+#: src/ui.cc:1418
msgid "^Find"
msgstr ""
-#: src/ui.cc:1272
+#: src/ui.cc:1419
msgid "Search for a package"
msgstr ""
-#: src/ui.cc:1275
+#: src/ui.cc:1422
msgid "Find ^Again"
msgstr ""
-#: src/ui.cc:1276
+#: src/ui.cc:1423
msgid "Repeat the last search"
msgstr ""
-#: src/ui.cc:1280
+#: src/ui.cc:1427
msgid "^Limit Display"
msgstr ""
-#: src/ui.cc:1281
+#: src/ui.cc:1428
#, fuzzy
msgid "Apply a filter to the package list"
msgstr "Actualizando as listas de paquetes"
-#: src/ui.cc:1284
+#: src/ui.cc:1431
msgid "^Un-Limit Display"
msgstr ""
-#: src/ui.cc:1285
+#: src/ui.cc:1432
msgid "Remove the filter from the package list"
msgstr ""
-#: src/ui.cc:1289
+#: src/ui.cc:1436
#, fuzzy
msgid "Find ^Broken"
msgstr "corrupto"
-#: src/ui.cc:1290
+#: src/ui.cc:1437
msgid "Find the next package with unsatisfied dependencies"
msgstr ""
-#: src/ui.cc:1297
+#: src/ui.cc:1444
msgid "^UI options"
msgstr ""
-#: src/ui.cc:1298
+#: src/ui.cc:1445
msgid "Change the settings which affect the user interface"
msgstr ""
-#: src/ui.cc:1301
+#: src/ui.cc:1448
msgid "^Dependency handling"
msgstr ""
-#: src/ui.cc:1302
+#: src/ui.cc:1449
msgid "Change the settings which affect how package dependencies are handled"
msgstr ""
-#: src/ui.cc:1305
+#: src/ui.cc:1452
msgid "^Miscellaneous"
msgstr ""
-#: src/ui.cc:1306
+#: src/ui.cc:1453
msgid "Change miscellaneous program settings"
msgstr ""
-#: src/ui.cc:1311
+#: src/ui.cc:1458
msgid "^Revert options"
msgstr ""
-#: src/ui.cc:1312
+#: src/ui.cc:1459
msgid "Reset all settings to the system defaults"
msgstr ""
-#: src/ui.cc:1323
+#: src/ui.cc:1470
msgid "^Next"
msgstr ""
-#: src/ui.cc:1324
+#: src/ui.cc:1471
msgid "View next display"
msgstr ""
-#: src/ui.cc:1327
+#: src/ui.cc:1474
msgid "^Prev"
msgstr ""
-#: src/ui.cc:1328
+#: src/ui.cc:1475
msgid "View previous display"
msgstr ""
-#: src/ui.cc:1331
+#: src/ui.cc:1478
msgid "^Close"
msgstr ""
-#: src/ui.cc:1332
+#: src/ui.cc:1479
msgid "Close this display"
msgstr ""
-#: src/ui.cc:1337
+#: src/ui.cc:1484
#, fuzzy
msgid "New Package ^View"
msgstr "Paquetes Novos"
-#: src/ui.cc:1338
+#: src/ui.cc:1485
msgid "Create a new default package view"
msgstr ""
-#: src/ui.cc:1341
+#: src/ui.cc:1488
msgid "New Categorical ^Browser"
msgstr ""
-#: src/ui.cc:1343
+#: src/ui.cc:1490
msgid "Browse packages by category"
msgstr ""
-#: src/ui.cc:1351
+#: src/ui.cc:1498
msgid "^About"
msgstr ""
-#: src/ui.cc:1352
+#: src/ui.cc:1499
#, fuzzy
msgid "View information about this program"
msgstr "Información de %s"
-#: src/ui.cc:1355
+#: src/ui.cc:1502
msgid "^Help"
msgstr ""
-#: src/ui.cc:1356
+#: src/ui.cc:1503
#, fuzzy
msgid "View the on-line help"
msgstr "Axuda en liña de Aptitude"
-#: src/ui.cc:1358
+#: src/ui.cc:1505
msgid "User's ^Manual"
msgstr ""
-#: src/ui.cc:1359
+#: src/ui.cc:1506
msgid "View the detailed program manual"
msgstr ""
-#: src/ui.cc:1362
+#: src/ui.cc:1509
msgid "^FAQ"
msgstr ""
-#: src/ui.cc:1363
+#: src/ui.cc:1510
msgid "View a list of frequently asked questions"
msgstr ""
-#: src/ui.cc:1366
-#, fuzzy
-msgid "^ChangeLog"
-msgstr "Rexistro de modificacións de "
+#: src/ui.cc:1513
+msgid "^NEWS"
+msgstr ""
-#: src/ui.cc:1367
-msgid "View the important changes made in each version of the program"
+#: src/ui.cc:1514
+msgid "View the important changes made in each version of "
msgstr ""
-#: src/ui.cc:1370
+#: src/ui.cc:1517
msgid "^License"
msgstr ""
-#: src/ui.cc:1371
+#: src/ui.cc:1518
msgid "View the terms under which you may copy the program"
msgstr ""
-#: src/ui.cc:1486
+#: src/ui.cc:1636
#, fuzzy
msgid "Actions"
msgstr "Acción"
-#: src/ui.cc:1489
+#: src/ui.cc:1639
msgid "Search"
msgstr ""
-#: src/ui.cc:1490
+#: src/ui.cc:1640
#, fuzzy
msgid "Options"
msgstr "Acción"
-#: src/ui.cc:1491
+#: src/ui.cc:1641
msgid "Views"
msgstr ""
-#: src/ui.cc:1492
+#: src/ui.cc:1642
msgid "Help"
msgstr ""
-#: src/ui.cc:1537
+#: src/ui.cc:1699
#, c-format
msgid ""
"%s: Menu %s: Help %s: Quit %s: Update %s: Download/Install/Remove Pkgs"
msgstr ""
-#: src/ui.cc:1799 src/vscreen/vscreen.cc:281
+#: src/ui.cc:1968 src/vscreen/vscreen.cc:281
msgid "yes_key"
msgstr ""
-#: src/ui.cc:1800 src/vscreen/vscreen.cc:282
+#: src/ui.cc:1969 src/vscreen/vscreen.cc:282
#, fuzzy
msgid "no_key"
msgstr "nada"
@@ -3698,6 +3948,16 @@
msgid "Downloading Changelog"
msgstr "Descargando "
+#: src/view_changelog.cc:54
+#, fuzzy
+msgid "Download Changelog"
+msgstr "Descargando "
+
+#: src/view_changelog.cc:63
+#, c-format
+msgid "%s changes"
+msgstr ""
+
#: src/vscreen/vscreen.cc:119
#, c-format
msgid "Ouch! Got SIGTERM, dying..\n"
@@ -3726,6 +3986,20 @@
msgid "No"
msgstr ""
+#, fuzzy
+#~ msgid ""
+#~ "Please insert the following disc into the drive \"%s\":\n"
+#~ "%s"
+#~ msgstr "Introduza o disco etiquetado \""
+
+#, fuzzy
+#~ msgid "Information about "
+#~ msgstr "Información de %s"
+
+#, fuzzy
+#~ msgid "^ChangeLog"
+#~ msgstr "Rexistro de modificacións de "
+
#~ msgid "Go away, I'm trying to think.\n"
#~ msgstr "Deixeu-me tranquil, estic intentant pensar.\n"
Modified: branches/aptitude-0.3/aptitude/po/it.po
==============================================================================
--- branches/aptitude-0.3/aptitude/po/it.po (original)
+++ branches/aptitude-0.3/aptitude/po/it.po Sat Apr 30 13:41:32 2005
@@ -42,7 +42,7 @@
msgstr ""
"Project-Id-Version: aptitude 0.2.15.7\n"
"Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-01-10 16:26-0800\n"
+"POT-Creation-Date: 2005-04-29 18:11-0400\n"
"PO-Revision-Date: 2004-09-17 22:37+0200\n"
"Last-Translator: Danilo Piazzalunga <danilopiazza at libero.it>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -186,16 +186,103 @@
msgstr "Filtro per i pacchetti inutilizzati"
#: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:184 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
-#: src/vscreen/vs_util.cc:329
+#: src/ui.cc:218 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
+#: src/vscreen/vs_util.cc:328
msgid "Ok"
msgstr "Ok"
#: src/apt_options.cc:242 src/download_list.cc:71 src/mine/cmine.cc:257
-#: src/mine/cmine.cc:330 src/vscreen/vs_util.cc:329
+#: src/mine/cmine.cc:330 src/vscreen/vs_util.cc:328
msgid "Cancel"
msgstr "Annulla"
+#: src/broken_indicator.cc:106 src/solution_dialog.cc:97
+msgid "Internal error: unexpected null solution."
+msgstr ""
+
+#: src/broken_indicator.cc:158
+#, fuzzy
+msgid "Suggest "
+msgstr "Consiglia"
+
+#: src/broken_indicator.cc:164
+#, fuzzy, c-format
+msgid "%d installs"
+msgstr "installa"
+
+#: src/broken_indicator.cc:169
+#, fuzzy
+msgid "1 install"
+msgstr "installa"
+
+#: src/broken_indicator.cc:173
+#, c-format
+msgid "%d removals"
+msgstr ""
+
+#: src/broken_indicator.cc:178
+msgid "1 removal"
+msgstr ""
+
+#: src/broken_indicator.cc:182
+#, c-format
+msgid "%d keeps"
+msgstr ""
+
+#: src/broken_indicator.cc:187
+msgid "1 keep"
+msgstr ""
+
+#: src/broken_indicator.cc:191
+#, fuzzy, c-format
+msgid "%d upgrades"
+msgstr "aggiorna"
+
+#: src/broken_indicator.cc:196
+#, fuzzy
+msgid "1 upgrade"
+msgstr "aggiorna"
+
+#: src/broken_indicator.cc:200
+#, fuzzy, c-format
+msgid "%d downgrades"
+msgstr "retrocesso (downgraded)"
+
+#: src/broken_indicator.cc:205
+#, fuzzy
+msgid "1 downgrade"
+msgstr "retrocesso (downgraded)"
+
+#: src/broken_indicator.cc:214
+#, c-format
+msgid "%s: Examine"
+msgstr ""
+
+#: src/broken_indicator.cc:216
+#, c-format
+msgid "%s: Apply"
+msgstr ""
+
+#: src/broken_indicator.cc:218
+#, fuzzy, c-format
+msgid "%s: Next"
+msgstr "^Successivo"
+
+#: src/broken_indicator.cc:220
+#, c-format
+msgid "%s: Previous"
+msgstr ""
+
+#: src/broken_indicator.cc:233
+#, c-format
+msgid "%CSolution search failed. %s: try harder"
+msgstr ""
+
+#: src/broken_indicator.cc:239
+#, c-format
+msgid "%CUnable to resolve dependencies."
+msgstr ""
+
#: src/cmdline/cmdline_action.cc:36
#, c-format
msgid ""
@@ -269,22 +356,22 @@
msgstr ""
"Il pacchetto %s non è aggiornabile: impossibile proibirne l'aggiornamento\n"
-#: src/cmdline/cmdline_action.cc:213
+#: src/cmdline/cmdline_action.cc:198
#, c-format
msgid "Note: selecting the task \"%s: %s\" for installation\n"
msgstr "Nota: si sta selezionando il task «%s: %s» per l'installazione\n"
-#: src/cmdline/cmdline_action.cc:240
+#: src/cmdline/cmdline_action.cc:225
#, c-format
msgid "You can only specify a package version with an 'install' command.\n"
msgstr "È possibile specificare solo la versione con il comando «install».\n"
-#: src/cmdline/cmdline_action.cc:246
+#: src/cmdline/cmdline_action.cc:231
#, c-format
msgid "You can only specify a package archive with an 'install' command.\n"
msgstr "È possibile specificare solo l'archivio con il comando «install».\n"
-#: src/cmdline/cmdline_action.cc:280
+#: src/cmdline/cmdline_action.cc:265
#, c-format
msgid ""
"Couldn't find package \"%s\", and more than 40\n"
@@ -293,7 +380,7 @@
"Impossibile trovare il pacchetto «%s» e più di 40\n"
"pacchetti hanno un nome che contiene «%s».\n"
-#: src/cmdline/cmdline_action.cc:283
+#: src/cmdline/cmdline_action.cc:268
#, c-format
msgid ""
"Couldn't find package \"%s\". However, the following\n"
@@ -302,14 +389,14 @@
"Impossibile trovare il pacchetto «%s». Ad ogni modo, i seguenti\n"
"pacchetti hanno un nome che contiene «%s»:\n"
-#: src/cmdline/cmdline_action.cc:307
+#: src/cmdline/cmdline_action.cc:292
#, c-format
msgid "Couldn't find any package whose name or description matched \"%s\"\n"
msgstr ""
"Impossibile trovare un pacchetto il cui nome o descrizione corrispondano a «%"
"s»\n"
-#: src/cmdline/cmdline_action.cc:309
+#: src/cmdline/cmdline_action.cc:294
#, c-format
msgid ""
"Couldn't find any package matching \"%s\", and more than 40\n"
@@ -318,7 +405,7 @@
"Impossibile trovare un pacchetto che corrisponda a «%s» e più di 40\n"
"pacchetti hanno un nome o una descrizione che contiene «%s».\n"
-#: src/cmdline/cmdline_action.cc:312
+#: src/cmdline/cmdline_action.cc:297
#, c-format
msgid ""
"Couldn't find any package matching \"%s\". However, the following\n"
@@ -363,13 +450,13 @@
msgid "Freed %sB of disk space\n"
msgstr "Libererà %sB su disco"
-#: src/cmdline/cmdline_do_action.cc:67
+#: src/cmdline/cmdline_do_action.cc:71
#, c-format
msgid "Invalid operation %s"
msgstr "Operazione «%s» non ammessa"
-#: src/cmdline/cmdline_do_action.cc:206 src/cmdline/cmdline_simulate.cc:30
-#: src/cmdline/cmdline_upgrade.cc:89
+#: src/cmdline/cmdline_do_action.cc:201 src/cmdline/cmdline_simulate.cc:31
+#: src/cmdline/cmdline_upgrade.cc:91
#, c-format
msgid "Abort.\n"
msgstr "Uscita.\n"
@@ -379,7 +466,7 @@
msgid "download: you must specify at least one package to download\n"
msgstr "download: si deve specificare almeno un pacchetto da scaricare\n"
-#: src/cmdline/cmdline_download.cc:43 src/download.cc:342
+#: src/cmdline/cmdline_download.cc:43 src/download.cc:344
msgid "Couldn't read source list"
msgstr "Impossibile leggere l'elenco delle sorgenti"
@@ -444,96 +531,96 @@
msgid "What is it? It's an elephant being eaten by a snake, of course.\n"
msgstr "Che cos'è? È un elefante che viene mangiato da un boa, naturalmente.\n"
-#: src/cmdline/cmdline_prompt.cc:44
+#: src/cmdline/cmdline_prompt.cc:45
msgid "Couldn't read list of sources"
msgstr "Impossibile leggere l'elenco delle sorgenti"
-#: src/cmdline/cmdline_prompt.cc:219 src/cmdline/cmdline_show_broken.cc:73
+#: src/cmdline/cmdline_prompt.cc:220 src/cmdline/cmdline_show_broken.cc:73
#, c-format
msgid "but %s is to be installed."
msgstr "ma %s sta per essere installato."
-#: src/cmdline/cmdline_prompt.cc:222 src/cmdline/cmdline_show_broken.cc:76
+#: src/cmdline/cmdline_prompt.cc:223 src/cmdline/cmdline_show_broken.cc:76
#, c-format
msgid "but %s is installed and it is kept back."
msgstr "ma %s è installato e viene mantenuto alla versione precedente."
-#: src/cmdline/cmdline_prompt.cc:225 src/cmdline/cmdline_show_broken.cc:79
+#: src/cmdline/cmdline_prompt.cc:226 src/cmdline/cmdline_show_broken.cc:79
#, c-format
msgid "but %s is installed."
msgstr "ma %s è installato."
-#: src/cmdline/cmdline_prompt.cc:229 src/cmdline/cmdline_show_broken.cc:83
+#: src/cmdline/cmdline_prompt.cc:230 src/cmdline/cmdline_show_broken.cc:83
#, c-format
msgid "but it is not installable"
msgstr "ma non è installabile"
-#: src/cmdline/cmdline_prompt.cc:233 src/cmdline/cmdline_show_broken.cc:87
+#: src/cmdline/cmdline_prompt.cc:234 src/cmdline/cmdline_show_broken.cc:87
#, c-format
msgid " which is a virtual package."
msgstr " che è un pacchetto virtuale."
-#: src/cmdline/cmdline_prompt.cc:236 src/cmdline/cmdline_show_broken.cc:90
+#: src/cmdline/cmdline_prompt.cc:237 src/cmdline/cmdline_show_broken.cc:90
#, c-format
msgid " or"
msgstr " o "
-#: src/cmdline/cmdline_prompt.cc:248
+#: src/cmdline/cmdline_prompt.cc:249
msgid "The following packages are BROKEN:"
msgstr "I seguenti pacchetti sono DIFETTOSI:"
-#: src/cmdline/cmdline_prompt.cc:249
+#: src/cmdline/cmdline_prompt.cc:250
msgid "The following packages are unused and will be REMOVED:"
msgstr "I seguenti pacchetti sono inutilizzati e saranno RIMOSSI:"
-#: src/cmdline/cmdline_prompt.cc:250
+#: src/cmdline/cmdline_prompt.cc:251
msgid "The following packages have been automatically kept back:"
msgstr "I seguenti pacchetti sono stati mantenuti alla versione precedente:"
-#: src/cmdline/cmdline_prompt.cc:251
+#: src/cmdline/cmdline_prompt.cc:252
msgid "The following NEW packages will be automatically installed:"
msgstr "I seguenti pacchetti NUOVI (NEW) saranno automaticamente installati:"
-#: src/cmdline/cmdline_prompt.cc:252
+#: src/cmdline/cmdline_prompt.cc:253
msgid "The following packages will be automatically REMOVED:"
msgstr "I seguenti pacchetti saranno automaticamente RIMOSSI:"
-#: src/cmdline/cmdline_prompt.cc:253
+#: src/cmdline/cmdline_prompt.cc:254
msgid "The following packages will be DOWNGRADED:"
msgstr "I seguenti pacchetti saranno RETROCESSI (DOWNGRADED):"
-#: src/cmdline/cmdline_prompt.cc:254
+#: src/cmdline/cmdline_prompt.cc:255
msgid "The following packages have been kept back:"
msgstr "I seguenti pacchetti sono stati bloccati:"
-#: src/cmdline/cmdline_prompt.cc:255
+#: src/cmdline/cmdline_prompt.cc:256
msgid "The following packages will be REINSTALLED:"
msgstr "I seguenti pacchetti saranno REINSTALLATI:"
-#: src/cmdline/cmdline_prompt.cc:256
+#: src/cmdline/cmdline_prompt.cc:257
msgid "The following NEW packages will be installed:"
msgstr "I seguenti pacchetti NUOVI (NEW) saranno installati:"
-#: src/cmdline/cmdline_prompt.cc:257
+#: src/cmdline/cmdline_prompt.cc:258
msgid "The following packages will be REMOVED:"
msgstr "I seguenti pacchetti saranno RIMOSSI:"
-#: src/cmdline/cmdline_prompt.cc:258
+#: src/cmdline/cmdline_prompt.cc:259
msgid "The following packages will be upgraded:"
msgstr "I seguenti pacchetti saranno aggiornati:"
-#: src/cmdline/cmdline_prompt.cc:307
+#: src/cmdline/cmdline_prompt.cc:311
#, c-format
msgid "The following ESSENTIAL packages will be REMOVED!\n"
msgstr "I seguenti pacchetti ESSENZIALI saranno RIMOSSI.\n"
-#: src/cmdline/cmdline_prompt.cc:316
+#: src/cmdline/cmdline_prompt.cc:320
#, c-format
msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
msgstr ""
"I seguenti pacchetti ESSENZIALI saranno DIFETTOSI dopo questa azione:\n"
-#: src/cmdline/cmdline_prompt.cc:326
+#: src/cmdline/cmdline_prompt.cc:330
#, c-format
msgid ""
"WARNING: Performing this action will probably cause your system to break!\n"
@@ -544,98 +631,101 @@
" NON proseguire a meno che non si sappia ESATTAMENTE ciò che si\n"
" sta per fare.\n"
-#: src/cmdline/cmdline_prompt.cc:328
+#: src/cmdline/cmdline_prompt.cc:332
msgid "I am aware that this is a very bad idea"
msgstr "So che si tratta di una pessima idea"
-#: src/cmdline/cmdline_prompt.cc:331
+#: src/cmdline/cmdline_prompt.cc:335
#, c-format
msgid "To continue, type the phrase \"%s\":\n"
msgstr "Per continuare, inserire la frase «%s»:\n"
-#: src/cmdline/cmdline_prompt.cc:434
+#: src/cmdline/cmdline_prompt.cc:438
#, c-format
msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
msgstr "I seguenti pacchetti sono RACCOMANDATI ma NON verranno installati:\n"
-#: src/cmdline/cmdline_prompt.cc:440
+#: src/cmdline/cmdline_prompt.cc:444
#, c-format
msgid "The following packages are SUGGESTED but will NOT be installed:\n"
msgstr "I seguenti pacchetti sono CONSIGLIATI ma NON verranno installati:\n"
-#: src/cmdline/cmdline_prompt.cc:445
+#: src/cmdline/cmdline_prompt.cc:449
#, c-format
msgid "No packages will be installed, upgraded, or removed.\n"
msgstr "Nessun pacchetto verrà installato, aggiornato o rimosso.\n"
-#: src/cmdline/cmdline_prompt.cc:447
+#: src/cmdline/cmdline_prompt.cc:451
#, c-format
msgid "%lu packages upgraded, %lu newly installed, "
msgstr "%lu pacchetti aggiornati, %lu installati, "
-#: src/cmdline/cmdline_prompt.cc:451
+#: src/cmdline/cmdline_prompt.cc:455
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstallati, "
-#: src/cmdline/cmdline_prompt.cc:453
+#: src/cmdline/cmdline_prompt.cc:457
#, c-format
msgid "%lu downgraded, "
msgstr "%lu retrocessi (downgraded), "
-#: src/cmdline/cmdline_prompt.cc:455
+#: src/cmdline/cmdline_prompt.cc:459
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu da rimuovere e %lu non aggiornati.\n"
-#: src/cmdline/cmdline_prompt.cc:462
+#: src/cmdline/cmdline_prompt.cc:466
#, c-format
msgid "Need to get %sB/%sB of archives. "
msgstr "È necessario prelevare %sB/%sB di archivi. "
-#: src/cmdline/cmdline_prompt.cc:465
+#: src/cmdline/cmdline_prompt.cc:469
#, c-format
msgid "Need to get %sB of archives. "
msgstr "È necessario prelevare %sB di archivi. "
-#: src/cmdline/cmdline_prompt.cc:472
+#: src/cmdline/cmdline_prompt.cc:476
#, c-format
msgid "After unpacking %sB will be used.\n"
msgstr "Dopo l'estrazione, verranno occupati %sB.\n"
-#: src/cmdline/cmdline_prompt.cc:475
+#: src/cmdline/cmdline_prompt.cc:479
#, c-format
msgid "After unpacking %sB will be freed.\n"
msgstr "Dopo l'estrazione, verranno liberati %sB.\n"
-#: src/cmdline/cmdline_prompt.cc:521
+#: src/cmdline/cmdline_prompt.cc:524
#, c-format
msgid "Bad action character '%c'\n"
msgstr "Il carattere «%c» non descrive un'azione ammessa\n"
-#: src/cmdline/cmdline_prompt.cc:596
+#: src/cmdline/cmdline_prompt.cc:595
#, c-format
msgid "No packages to show -- enter the package names on the line after 'i'.\n"
msgstr ""
"Nessun pacchetto da mostrare; specificare i nomi dei pacchetti dopo «i».\n"
-#: src/cmdline/cmdline_prompt.cc:598 src/cmdline/cmdline_prompt.cc:629
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:597
msgid "Press Return to continue."
msgstr "Premere Invio per continuare."
-#: src/cmdline/cmdline_prompt.cc:625
+#: src/cmdline/cmdline_prompt.cc:623
#, c-format
msgid "No packages found -- enter the package names on the line after 'c'.\n"
msgstr ""
"Nessun pacchetto da mostrare; specificare i nomi dei pacchetti dopo «c».\n"
-#: src/cmdline/cmdline_prompt.cc:665
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:627
+#, fuzzy
+msgid "Press Return to continue"
+msgstr "Premere Invio per continuare."
+
+#: src/cmdline/cmdline_prompt.cc:675
msgid "Do you want to continue? [Y/n/?] "
msgstr "Continuare? [Y/n/?] "
-#: src/cmdline/cmdline_prompt.cc:690
+#: src/cmdline/cmdline_prompt.cc:700
#, c-format
msgid ""
"\n"
@@ -646,7 +736,7 @@
"Le informazioni sulle dipendenze vengono mostrate.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:692
+#: src/cmdline/cmdline_prompt.cc:702
#, c-format
msgid ""
"\n"
@@ -657,7 +747,7 @@
"Le informazioni sulle dipendenze non vengono mostrate.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:698
+#: src/cmdline/cmdline_prompt.cc:708
#, c-format
msgid ""
"\n"
@@ -668,7 +758,7 @@
"Le versioni vengono mostrate.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:700
+#: src/cmdline/cmdline_prompt.cc:710
#, c-format
msgid ""
"\n"
@@ -679,7 +769,7 @@
"Le versioni non vengono mostrate.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:705
+#: src/cmdline/cmdline_prompt.cc:715
#, c-format
msgid ""
"\n"
@@ -690,7 +780,7 @@
"Le variazioni dello spazio occupato vengono mostrate.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:717
#, c-format
msgid ""
"\n"
@@ -701,7 +791,7 @@
"Le variazioni dello spazio occupato non vengono mostrate.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:737
#, c-format
msgid ""
"Commands:\n"
@@ -752,31 +842,83 @@
" _ : Elimina\n"
" = : Blocca\n"
-#: src/cmdline/cmdline_prompt.cc:751
+#: src/cmdline/cmdline_prompt.cc:761
#, c-format
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:84
+#, c-format
+msgid "y: %F%nn: %F%nq: %F%n,: %F%n.: %F%n"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:90
+msgid "accept the proposed changes"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:92
+msgid "reject the proposed changes and search for another solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:94
+#, fuzzy
+msgid "give up and quit the program"
+msgstr "Esce dal programma"
+
+#: src/cmdline/cmdline_resolver.cc:96
+msgid "move to the next solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:98
+msgid "move to the previous solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:131
+#, fuzzy
+msgid "The following actions will resolve these dependencies:"
+msgstr "I seguenti pacchetti hanno dipendenze non soddisfatte:\n"
+
+#: src/cmdline/cmdline_resolver.cc:146
+msgid "Accept this solution? [Y/n/q/?]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:174
+msgid "Abandoning all efforts to resolve these dependencies."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:184
+#, fuzzy
+msgid "The following commands are available:"
+msgstr "I seguenti pacchetti sono DIFETTOSI:"
+
+#: src/cmdline/cmdline_resolver.cc:188
+#, 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:198
+msgid "No solution found within the allotted time. Try harder? [Y/n]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:226
+#, 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:235
+msgid "Unable to resolve dependencies! Giving up..."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:240
+msgid "No more solutions."
+msgstr ""
+
#: src/cmdline/cmdline_search.cc:78
#, c-format
msgid "search: You must provide at least one search term\n"
msgstr "search: si deve specificare almeno un'espressione di ricerca\n"
-#: src/cmdline/cmdline_show_broken.cc:114
-#, c-format
-msgid ""
-"Some packages had unmet dependencies. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming.\n"
-"\n"
-msgstr ""
-"Alcuni pacchetti hanno dipendenze non soddisfatte. Questo può voler\n"
-"dire che è stata richiesta una situazione impossibile oppure, se\n"
-"si sta usando la distribuzione «unstable», che alcuni pacchetti\n"
-"richiesti non sono ancora stati creati o spostati da «incoming».\n"
-
-#: src/cmdline/cmdline_show_broken.cc:115
+#: src/cmdline/cmdline_show_broken.cc:113
#, c-format
msgid "The following packages have unmet dependencies:\n"
msgstr "I seguenti pacchetti hanno dipendenze non soddisfatte:\n"
@@ -974,12 +1116,12 @@
msgid "Description: "
msgstr "Descrizione: "
-#: src/cmdline/cmdline_simulate.cc:36
+#: src/cmdline/cmdline_simulate.cc:37
#, c-format
msgid "Would download/install/remove packages.\n"
msgstr "Sarebbero stati scaricati/installati/rimossi pacchetti.\n"
-#: src/cmdline/cmdline_simulate.cc:47
+#: src/cmdline/cmdline_simulate.cc:48
msgid "Internal Error, Ordering didn't finish"
msgstr "Errore interno: l'ordinamento non è terminato"
@@ -1024,28 +1166,24 @@
msgid "UNAVAILABLE"
msgstr "NON DISPONIBILE"
-#: src/download_bar.cc:57 src/download_list.cc:265
+#: src/download_bar.cc:56 src/download_list.cc:263 src/download_screen.cc:57
#, c-format
-msgid ""
-"Please insert the following disc into the drive \"%s\":\n"
-"%s"
-msgstr ""
-"Inserire il seguente disco nell'unità «%s»:\n"
-"%s"
+msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
+msgstr "Inserire il disco chiamato «%s» nell'unità «%s»"
-#: src/download_bar.cc:76 src/generic/acqprogress.cc:63
+#: src/download_bar.cc:77 src/generic/acqprogress.cc:63
msgid "Hit "
msgstr "Hit "
-#: src/download_bar.cc:89
+#: src/download_bar.cc:90
msgid "Downloading "
msgstr "Scaricamento "
-#: src/download_bar.cc:102
+#: src/download_bar.cc:103
msgid "Got "
msgstr "Got "
-#: src/download_bar.cc:156
+#: src/download_bar.cc:157
msgid "Downloading..."
msgstr "Scaricamento..."
@@ -1053,7 +1191,7 @@
msgid "Couldn't read list of package sources"
msgstr "Impossibile leggere l'elenco delle sorgenti dei pacchetti"
-#: src/download.cc:104 src/download.cc:321
+#: src/download.cc:104 src/download.cc:322
msgid "Couldn't lock list directory..are you root?"
msgstr ""
"Impossibile creare un lock sulla directory dell'elenco. Si possiedono i "
@@ -1067,29 +1205,33 @@
msgid "View the progress of the package list update"
msgstr "Mostra l'avanzamento dell'aggiornamento dell'elenco dei pacchetti"
-#: src/download.cc:159
+#: src/download.cc:113
+msgid "List Update"
+msgstr ""
+
+#: src/download.cc:160
msgid "Couldn't clean out list directories"
msgstr "Impossibile ripulire le directory dell'elenco"
-#: src/download.cc:176 src/ui.cc:1068
+#: src/download.cc:177 src/ui.cc:1152
msgid "Deleting obsolete downloaded files"
msgstr "Cancellazione dei vecchi file scaricati"
-#: src/download.cc:181
+#: src/download.cc:182
#, c-format
msgid "Deleting obsolete downloaded files\n"
msgstr "Cancellazione dei vecchi file scaricati\n"
-#: src/download.cc:223
+#: src/download.cc:224
#, c-format
msgid "Unable to open %s to log actions"
msgstr "Impossibile aprire %s come file di log per le azioni"
-#: src/download.cc:229
+#: src/download.cc:230
msgid "log report"
msgstr "resoconto di log"
-#: src/download.cc:230
+#: src/download.cc:231
#, c-format
msgid ""
"IMPORTANT: this log only lists intended actions; actions which fail due to\n"
@@ -1100,77 +1242,77 @@
"riuscite in seguito a problemi con dpkg potrebbero non venire completate.\n"
"\n"
-#: src/download.cc:231
+#: src/download.cc:232
#, c-format
msgid "Will install %li packages, and remove %li packages.\n"
msgstr "Saranno installati %li pacchetti e rimossi %li pacchetti.\n"
-#: src/download.cc:233
+#: src/download.cc:234
#, c-format
msgid "%sB of disk space will be used\n"
msgstr "Verranno occupati %sB di spazio su disco\n"
-#: src/download.cc:236
+#: src/download.cc:237
#, c-format
msgid "%sB bytes of disk space will be freed\n"
msgstr "Verranno liberati %sB di spazio su disco\n"
-#: src/download.cc:244
+#: src/download.cc:245
#, c-format
msgid "[UPGRADE] %s %s -> %s\n"
msgstr "[AGGIORNA] %s %s -> %s\n"
-#: src/download.cc:248
+#: src/download.cc:249
#, c-format
msgid "[DOWNGRADE] %s %s -> %s\n"
msgstr "[RETROCEDI (DOWNGRADE)] %s %s -> %s\n"
-#: src/download.cc:258
+#: src/download.cc:259
msgid "REMOVE"
msgstr "RIMUOVI"
-#: src/download.cc:264
+#: src/download.cc:265
msgid "INSTALL"
msgstr "INSTALLA"
-#: src/download.cc:267
+#: src/download.cc:268
msgid "REINSTALL"
msgstr "REINSTALLA"
-#: src/download.cc:270
+#: src/download.cc:271
msgid "HOLD"
msgstr "BLOCCATO"
-#: src/download.cc:273
+#: src/download.cc:274
msgid "BROKEN"
msgstr "DIFETTOSO"
-#: src/download.cc:276
+#: src/download.cc:277
msgid "REMOVE, NOT USED"
msgstr "RIMUOVI, NON USATO"
-#: src/download.cc:279
+#: src/download.cc:280
msgid "REMOVE, DEPENDENCIES"
msgstr "RIMUOVI, DIPENDENZA"
-#: src/download.cc:282
+#: src/download.cc:283
msgid "INSTALL, DEPENDENCIES"
msgstr "INSTALLA, DIPENDENZA"
-#: src/download.cc:285
+#: src/download.cc:286
msgid "HOLD, DEPENDENCIES"
msgstr "BLOCCATO, DIPENDENZA"
-#: src/download.cc:287
+#: src/download.cc:288
msgid "????????"
msgstr "????????"
-#: src/download.cc:291
+#: src/download.cc:292
#, c-format
msgid "[%s] %s\n"
msgstr "[%s] %s\n"
-#: src/download.cc:294
+#: src/download.cc:295
#, c-format
msgid ""
"===============================================================================\n"
@@ -1181,34 +1323,39 @@
"\n"
"Log completato.\n"
-#: src/download.cc:329
+#: src/download.cc:330
msgid "Downloading packages"
msgstr "Scaricamento dei pacchetti"
-#: src/download.cc:330
+#: src/download.cc:331
msgid "View the progress of the package download"
msgstr "Mostra l'avanzamento dello scaricamento dei pacchetti"
-#: src/download.cc:352
+#: src/download.cc:332
+#, fuzzy
+msgid "Package Download"
+msgstr "Pacchetto: "
+
+#: src/download.cc:354
msgid "Internal error: couldn't generate list of packages to download"
msgstr ""
"Errore interno: impossibile generare l'elenco dei pacchetti da scaricare"
-#: src/download.cc:413
+#: src/download.cc:415
msgid "Unable to correct for unavailable packages"
msgstr "Impossibile correggere a causa di pacchetti non disponibili"
-#: src/download.cc:465
+#: src/download.cc:467
msgid ""
"Ack! Something bad happened while installing packages. Trying to recover:"
msgstr ""
"Ahi! C'è stato un errore durante l'installazione. Tentativo di ripristino:"
-#: src/download.cc:475 src/pkg_item.cc:413
+#: src/download.cc:477 src/pkg_item.cc:432
msgid "Press return to continue.\n"
msgstr "Premere Invio per continuare.\n"
-#: src/download.cc:506
+#: src/download.cc:508
msgid ""
"Could not regain the system lock! (Perhaps another apt or dpkg is running?)"
msgstr ""
@@ -1273,11 +1420,6 @@
msgid "[ERROR]"
msgstr "[ERRORE]"
-#: src/download_screen.cc:57
-#, c-format
-msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
-msgstr "Inserire il disco chiamato «%s» nell'unità «%s»"
-
#: src/download_screen.cc:181
#, c-format
msgid "Downloaded %sB in %ss (%sB/s)."
@@ -1317,114 +1459,114 @@
"Cambio disco: inserire il disco chiamato «%s» nell'unità «%s» e premere "
"Invio\n"
-#: src/generic/aptcache.cc:245
+#: src/generic/aptcache.cc:253
msgid "Can't open Aptitude extended state file"
msgstr "Impossibile aprire il file di stato esteso di Aptitude"
-#: src/generic/aptcache.cc:252 src/generic/aptcache.cc:305
-#: src/generic/aptcache.cc:307
+#: src/generic/aptcache.cc:260 src/generic/aptcache.cc:313
+#: src/generic/aptcache.cc:315
msgid "Reading extended state information"
msgstr "Lettura delle informazioni sullo stato esteso"
-#: src/generic/aptcache.cc:313 src/generic/aptcache.cc:387
-#: src/generic/aptcache.cc:390
+#: src/generic/aptcache.cc:321 src/generic/aptcache.cc:395
+#: src/generic/aptcache.cc:398
msgid "Initializing package states"
msgstr "Inizializzazione dello stato dei pacchetti"
-#: src/generic/aptcache.cc:501
+#: src/generic/aptcache.cc:509
msgid "Cannot open Aptitude state file"
msgstr "Impossibile aprire il file di stato di Aptitude"
-#: src/generic/aptcache.cc:505 src/generic/aptcache.cc:560
-#: src/generic/aptcache.cc:563
+#: src/generic/aptcache.cc:513 src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:571
msgid "Writing extended state information"
msgstr "Scrittura delle informazioni sullo stato esteso"
-#: src/generic/aptcache.cc:542
+#: src/generic/aptcache.cc:550
#, 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/aptcache.cc:551
+#: src/generic/aptcache.cc:559
msgid "Couldn't write state file"
msgstr "Impossibile scrivere il file di stato"
-#: src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:576
msgid "Error writing state file"
msgstr "Errore nella scrittura del file di stato"
-#: src/generic/aptcache.cc:584
+#: src/generic/aptcache.cc:592
msgid "couldn't replace old state file"
msgstr "Impossibile sostituire il vecchio file di stato"
-#: src/generic/aptcache.cc:960
+#: src/generic/aptcache.cc:1000
msgid "Unable to correct dependencies, some packages cannot be installed"
msgstr ""
"Impossibile correggere le dipendenze; alcuni pacchetti non saranno installati"
-#: src/generic/aptcache.cc:1325
+#: src/generic/aptcache.cc:1546
msgid "The list of sources could not be read."
msgstr "Impossibile leggere l'elenco delle sorgenti."
-#: src/generic/aptcache.cc:1332
+#: src/generic/aptcache.cc:1553
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/aptcache.cc:1335
+#: src/generic/aptcache.cc:1556
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."
-#: src/generic/apt.cc:141
+#: src/generic/apt.cc:142
#, c-format
msgid "Unable to open %s for writing"
msgstr "Impossibile aprire %s in scrittura"
-#: src/generic/apt.cc:151
+#: src/generic/apt.cc:152
#, c-format
msgid "Unable to replace %s with new configuration file"
msgstr "Impossibile sostituire %s con il nuovo file di configurazione"
-#: src/generic/apt.cc:226
+#: src/generic/apt.cc:227
msgid "Warning: could not lock the cache file. Opening in read-only mode"
msgstr ""
"Impossibile creare un lock sul file di cache: apertura in sola lettura."
-#: src/generic/matchers.cc:780
+#: src/generic/matchers.cc:797
msgid "Unmatched '('"
msgstr "«(» non accoppiata"
-#: src/generic/matchers.cc:870 src/generic/matchers.cc:949
+#: src/generic/matchers.cc:887 src/generic/matchers.cc:968
#, c-format
msgid "Unknown dependency type: %s"
msgstr "Dipendenza «%s» sconosciuta"
-#: src/generic/matchers.cc:931
+#: src/generic/matchers.cc:950
#, c-format
msgid "Unknown action type: %s"
msgstr "Azione «%s» sconosciuta"
-#: src/generic/matchers.cc:998
+#: src/generic/matchers.cc:1017
#, c-format
msgid "Unknown priority %s"
msgstr "Priorità «%s» sconosciuta"
-#: src/generic/matchers.cc:1020
+#: src/generic/matchers.cc:1039
#, c-format
msgid "Unknown pattern type: %c"
msgstr "Modello «%c» sconosciuto"
-#: src/generic/matchers.cc:1065
+#: src/generic/matchers.cc:1084
msgid "Unexpected empty expression"
msgstr "Espressione vuota non prevista"
-#: src/generic/matchers.cc:1100
+#: src/generic/matchers.cc:1119
msgid "Badly formed expression"
msgstr "Espressione non corretta"
-#: src/generic/matchers.cc:1129
+#: src/generic/matchers.cc:1148
msgid "Unexpected ')'"
msgstr "«)» non prevista"
@@ -1450,7 +1592,7 @@
msgid "Can't get value of $HOME, using TMPDIR (insecure)"
msgstr "Impossibile leggere il valore di $HOME, sarà usata TMPDIR (non sicura)"
-#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:60
+#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:61
#, c-format
msgid "ChangeLog of %s"
msgstr "ChangeLog di %s"
@@ -1668,17 +1810,17 @@
msgid "Invalid sorting policy type '%s'"
msgstr "Tipo di criterio di ordinamento «%s» non ammesso"
-#: src/main.cc:68
+#: src/main.cc:67
#, c-format
msgid "%s %s compiled at %s %s\n"
msgstr "%s %s compilato il %s %s\n"
-#: src/main.cc:71
+#: src/main.cc:70
#, c-format
msgid "Compiler: g++ %s\n"
msgstr "Compilatore: g++ %s\n"
-#: src/main.cc:74
+#: src/main.cc:73
#, c-format
msgid ""
"\n"
@@ -1687,7 +1829,7 @@
"\n"
"Versione di NCurses: %s\n"
-#: src/main.cc:76
+#: src/main.cc:75
#, c-format
msgid ""
"\n"
@@ -1696,22 +1838,22 @@
"\n"
"Versione di Curses: %s\n"
-#: src/main.cc:78
+#: src/main.cc:77
#, c-format
msgid "libsigc++ version: %s\n"
msgstr "Versione di libsigc++: %s\n"
-#: src/main.cc:84
+#: src/main.cc:83
#, c-format
msgid "Usage: aptitude [-S fname] [-u|-i]"
msgstr "Uso: aptitude [-S nomefile] [-u|-i]"
-#: src/main.cc:86
+#: src/main.cc:85
#, c-format
msgid " aptitude [options] <action> ..."
msgstr " aptitude [opzioni] <azione> ..."
-#: src/main.cc:88
+#: src/main.cc:87
#, c-format
msgid ""
" Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -1720,42 +1862,42 @@
" Azioni (se omesse, Aptitude entrerà nella modalità interattiva):\n"
"\n"
-#: src/main.cc:89
+#: src/main.cc:88
#, c-format
msgid " install - Install/upgrade packages\n"
msgstr " install - Installa/aggiorna pacchetti\n"
-#: src/main.cc:90
+#: src/main.cc:89
#, c-format
msgid " remove - Remove packages\n"
msgstr " remove - Rimuove pacchetti\n"
-#: src/main.cc:91
+#: src/main.cc:90
#, c-format
msgid " purge - Remove packages and their configuration files\n"
msgstr " purge - Elimina i pacchetti e i loro file di configurazione\n"
-#: src/main.cc:92
+#: src/main.cc:91
#, c-format
msgid " hold - Place packages on hold\n"
msgstr " hold - Imposta i pacchetti come bloccati\n"
-#: src/main.cc:93
+#: src/main.cc:92
#, c-format
msgid " unhold - Cancel a hold command for a package\n"
msgstr " unhold - Rimuove il blocco ad un pacchetto bloccato\n"
-#: src/main.cc:94
+#: src/main.cc:93
#, c-format
msgid " markauto - Mark packages as having been automatically installed\n"
msgstr " markauto - Segna i pacchetti come installati automaticamente\n"
-#: src/main.cc:95
+#: src/main.cc:94
#, c-format
msgid " unmarkauto - Mark packages as having been manually installed\n"
msgstr " unmarkauto - Segna i pacchetti come installati manualmente\n"
-#: src/main.cc:100
+#: src/main.cc:99
#, c-format
msgid ""
" forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -1764,17 +1906,17 @@
" forbid-version - Impedisce di aggiornare un pacchetto ad una determinata "
"versione.\n"
-#: src/main.cc:101
+#: src/main.cc:100
#, c-format
msgid " update - Download lists of new/upgradable packages\n"
msgstr " update - Scarica l'elenco dei pacchetti nuovi/da aggiornare\n"
-#: src/main.cc:102
+#: src/main.cc:101
#, c-format
msgid " upgrade - Perform a safe upgrade\n"
msgstr " upgrade - Esegue un aggiornamento sicuro\n"
-#: src/main.cc:103
+#: src/main.cc:102
#, c-format
msgid ""
" dist-upgrade - Perform an upgrade, possibly installing and removing "
@@ -1783,57 +1925,57 @@
" dist-upgrade - Esegue un aggiornamento, eventualmente installando e\n"
" rimuovendo pacchetti\n"
-#: src/main.cc:104
+#: src/main.cc:103
#, c-format
msgid " forget-new - Forget what packages are \"new\"\n"
msgstr " forget-new - Dimentica quali pacchetti sono «nuovi»\n"
-#: src/main.cc:105
+#: src/main.cc:104
#, c-format
msgid " search - Search for a package by name and/or expression\n"
msgstr " search - Cerca un pacchetto per nome o espressione\n"
-#: src/main.cc:106
+#: src/main.cc:105
#, c-format
msgid " show - Display detailed information about a package\n"
msgstr " show - Mostra informazioni dettagliate su un pacchetto\n"
-#: src/main.cc:107
+#: src/main.cc:106
#, c-format
msgid " clean - Erase downloaded package files\n"
msgstr " clean - Cancella i file dei pacchetti scaricati\n"
-#: src/main.cc:108
+#: src/main.cc:107
#, c-format
msgid " autoclean - Erase old downloaded package files\n"
msgstr " autoclean - Cancella i file dei vecchi pacchetti scaricati\n"
-#: src/main.cc:109
+#: src/main.cc:108
#, c-format
msgid " changelog - View a package's changelog\n"
msgstr " changelog - Mostra il changelog di un pacchetto\n"
-#: src/main.cc:110
+#: src/main.cc:109
#, c-format
msgid " download - Download the .deb file for a package\n"
msgstr " download - Scarica il file .deb di un pacchetto\n"
-#: src/main.cc:112
+#: src/main.cc:111
#, c-format
msgid " Options:\n"
msgstr " Opzioni:\n"
-#: src/main.cc:113
+#: src/main.cc:112
#, c-format
msgid " -h This help text\n"
msgstr " -h Questo help\n"
-#: src/main.cc:114
+#: src/main.cc:113
#, c-format
msgid " -s Simulate actions, but do not actually perform them.\n"
msgstr " -s Simula le azioni, senza eseguirle realmente\n"
-#: src/main.cc:115
+#: src/main.cc:114
#, c-format
msgid ""
" -d Only download packages, do not install or remove anything.\n"
@@ -1841,19 +1983,19 @@
" -d Scarica i pacchetti e basta, senza installare o rimuovere "
"nulla\n"
-#: src/main.cc:116
+#: src/main.cc:115
#, c-format
msgid " -P Always prompt for confirmation or actions\n"
msgstr " -P Chiede sempre conferma prima di un'azione\n"
-#: src/main.cc:117
+#: src/main.cc:116
#, c-format
msgid ""
" -y Assume that the answer to simple yes/no questions is 'yes'\n"
msgstr ""
" -y Suppone che la risposta a semplici domande sì/no sia «sì»\n"
-#: src/main.cc:118
+#: src/main.cc:117
#, c-format
msgid ""
" -F format Specify a format for displaying search results; see the "
@@ -1863,7 +2005,7 @@
"ricerca;\n"
" vedere anche il manuale\n"
-#: src/main.cc:119
+#: src/main.cc:118
#, c-format
msgid ""
" -O order Specify how search results should be sorted; see the manual\n"
@@ -1871,7 +2013,7 @@
" -O ordine Specifica come ordinare i risultati di una ricerca; vedere\n"
" anche il manuale\n"
-#: src/main.cc:120
+#: src/main.cc:119
#, c-format
msgid ""
" -w width Specify the display width for formatting search results\n"
@@ -1879,51 +2021,51 @@
" -w larghezza Specifica la larghezza per mostrare i risultati di una "
"ricerca\n"
-#: src/main.cc:121
+#: src/main.cc:120
#, c-format
msgid " -f Aggressively try to fix broken packages.\n"
msgstr ""
" -f Prova in tutti i modi a correggere i pacchetti difettosi\n"
-#: src/main.cc:122
+#: src/main.cc:121
#, c-format
msgid " -V Show which versions of packages are to be installed.\n"
msgstr ""
" -V Mostra quali versioni dei pacchetti si sta per installare\n"
-#: src/main.cc:123
+#: src/main.cc:122
#, c-format
msgid ""
" -D Show the dependencies of automatically changed packages.\n"
msgstr ""
" -D Mostra le dipendenze dei pacchetti cambiati automaticamente\n"
-#: src/main.cc:124
+#: src/main.cc:123
#, c-format
msgid " -Z\t\t Show the change in installed size of each package.\n"
msgstr ""
" -Z Mostra i cambiamenti nella dimensione occupata da ogni "
"pacchetto\n"
-#: src/main.cc:125
+#: src/main.cc:124
#, c-format
msgid ""
" -v Display extra information. (may be supplied multiple times)\n"
msgstr ""
" -v Mostra informazioni extra (può essere fornita più volte)\n"
-#: src/main.cc:126
+#: src/main.cc:125
#, c-format
msgid ""
" -t [release] Set the release from which packages should be installed\n"
msgstr " -t [release] Imposta la release da cui installare i pacchetti\n"
-#: src/main.cc:127
+#: src/main.cc:126
#, c-format
msgid " -o key=val Directly set the configuration option named 'key'\n"
msgstr " -o chiave=val Imposta l'opzione di configurazione di nome «chiave»\n"
-#: src/main.cc:128
+#: src/main.cc:127
#, c-format
msgid ""
" --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -1932,58 +2074,66 @@
" --with(out)-recommends\tSpecifica se trattare Raccomanda come\n"
" una dipendenza forte\n"
-#: src/main.cc:129
+#: src/main.cc:128
#, c-format
msgid " -S fname: Read the aptitude extended status info from fname.\n"
msgstr " -S nomefile: Legge lo stato esteso di Aptitude da nomefile\n"
-#: src/main.cc:130
+#: src/main.cc:129
#, c-format
msgid " -u : Download new package lists on startup.\n"
msgstr " -u : Scarica il nuovo elenco dei pacchetti all'avvio\n"
-#: src/main.cc:131
+#: src/main.cc:130
#, c-format
msgid " -i : Perform an install run on startup.\n"
msgstr " -i : Esegue un'installazione all'avvio\n"
-#: src/main.cc:133
+#: src/main.cc:132
#, c-format
msgid " This aptitude does not have Super Cow Powers.\n"
msgstr " Questo Aptitude non ha i Poteri della Super Mucca.\n"
-#: src/main.cc:254
+#: src/main.cc:253
#, c-format
msgid "-o requires an argument of the form key=value, got %s"
msgstr "-o richiede un argomento nel formato chiave=valore, invece di «%s»"
-#: src/main.cc:300 src/main.cc:309
+#: src/main.cc:299 src/main.cc:308
msgid "WEIRDNESS: unknown option code received\n"
msgstr "STRANEZZA: ricevuto un codice di opzione sconosciuto\n"
-#: src/main.cc:318
+#: src/main.cc:317
msgid "Only one of -u and -i may be specified\n"
msgstr "-u e -i non possono essere specificate contemporaneamente\n"
-#: src/main.cc:326
+#: src/main.cc:325
msgid ""
"-u and -i may not be specified in command-line mode (eg, with 'install')"
msgstr ""
"-u e -i non sono ammesse in modalità riga di comando (es. con «install»)"
-#: src/main.cc:337
+#: src/main.cc:342
msgid "-u and -i may not be specified with a command"
msgstr "-u e -i non possono essere specificate insieme a un comando"
-#: src/main.cc:392
+#: src/main.cc:399
#, c-format
msgid "Unknown command \"%s\"\n"
msgstr "Comando sconosciuto: «%s»\n"
-#: src/main.cc:400
+#: src/main.cc:406 src/main.cc:463
+msgid "Internal error: uncaught 'out of solutions' exception.\n"
+msgstr ""
+
+#: src/main.cc:411 src/main.cc:468
+msgid "Internal error: uncaught 'out of time' exception.\n"
+msgstr ""
+
+#: src/main.cc:418
#, c-format
-msgid "Invalid option for interactive mode: -s\n"
-msgstr "Opzione non ammessa nella modalità interattiva: -s\n"
+msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
+msgstr ""
#: src/mine/cmine.cc:93
#, c-format
@@ -2011,7 +2161,7 @@
msgid "Lost"
msgstr "Perso"
-#: src/mine/cmine.cc:119 src/ui.cc:1005
+#: src/mine/cmine.cc:119 src/ui.cc:1089
msgid "Minesweeper"
msgstr "Campo minato"
@@ -2190,7 +2340,7 @@
msgid "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
msgstr "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
-#: src/pkg_columnizer.cc:84 src/ui.cc:1488
+#: src/pkg_columnizer.cc:84 src/ui.cc:1638
msgid "Package"
msgstr "Pacchetto"
@@ -2457,13 +2607,14 @@
"del sistema."
#: src/pkg_grouppolicy.cc:158
+#, fuzzy
msgid ""
"Programs for faxmodems and other communications devices\n"
" Packages in the 'comm' section are used to control modems and other "
"hardware communications devices. This includes software to control faxmodems "
"(for instance, PPP for dial-up internet connections and programs originally "
-"written for that purpose (zmodem/kermit), as well as software to control "
-"cellular phones, interface with FidoNet, and run a BBS."
+"written for that purpose, such as zmodem/kermit), as well as software to "
+"control cellular phones, interface with FidoNet, and run a BBS."
msgstr ""
"Programmi per faxmodem e altri dispositivi di comunicazione\n"
" I pacchetti nella sezione «comm» servono a controllare modem e altri "
@@ -2924,14 +3075,15 @@
"trovavano in questa sezione ora sono in «main»."
#: src/pkg_grouppolicy.cc:193
+#, fuzzy
msgid ""
"Programs which are not free software\n"
" Packages in the 'non-free' section are not part of Debian.\n"
" .\n"
" These packages fail to meet one or more of the requirements of the Debian "
-"Free Software Guidelines (see below) You should read the license of programs "
-"in this section to be sure that you are allowed to use them in the way you "
-"intend.\n"
+"Free Software Guidelines (see below). You should read the license of "
+"programs in this section to be sure that you are allowed to use them in the "
+"way you intend.\n"
" .\n"
" For more information about what Debian considers to be Free Software, see "
"http://www.debian.org/social_contract#guidelines"
@@ -2995,11 +3147,12 @@
" È disponibile una nuova versione di questi pacchetti."
#: src/pkg_grouppolicy.cc:320
+#, fuzzy
msgid ""
"New Packages\n"
" These packages have been added to Debian since the last time you cleared "
-"the list of \"new\" packages. (choose \"Forget new packages\" from the "
-"Actions menu to empty this list)"
+"the list of \"new\" packages (choose \"Forget new packages\" from the "
+"Actions menu to empty this list)."
msgstr ""
"Pacchetti nuovi\n"
" Questi pacchetti sono stati aggiunti a Debian dopo l'ultima cancellazione "
@@ -3253,101 +3406,121 @@
msgid "Versions"
msgstr "Versioni"
-#: src/pkg_item.cc:54
+#: src/pkg_item.cc:55
msgid "Yes, I am aware this is a very bad idea"
msgstr "So che si tratta di una pessima idea"
#: src/pkg_item.cc:80
-#, c-format
+#, fuzzy, c-format
msgid ""
-"%s is an essential package!\n"
-"\n"
-"Are you sure you want to remove it?\n"
-"Type '%s' if you are."
+"%s is an essential package!%n%nAre you sure you want to remove it?%nType '%"
+"s' if you are."
msgstr ""
"%s è un pacchetto essenziale!\n"
"\n"
"Se si è certi di volerlo rimuovere, inserire\n"
"«%s»."
-#: src/pkg_item.cc:219
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:625
#, c-format
msgid "Information about %s"
msgstr "Informazioni su %s"
-#: src/pkg_item.cc:304
-msgid "Available versions of "
+#: src/pkg_item.cc:224 src/pkg_ver_item.cc:627
+#, c-format
+msgid "%s info"
+msgstr ""
+
+#: src/pkg_item.cc:310
+#, fuzzy, c-format
+msgid "Available versions of %s"
msgstr "Versioni disponibili di "
-#: src/pkg_item.cc:312 src/pkg_ver_item.cc:648
+#: src/pkg_item.cc:313
+#, fuzzy, c-format
+msgid "%s versions"
+msgstr "Versioni"
+
+#: src/pkg_item.cc:325 src/pkg_ver_item.cc:655
#, c-format
msgid "Dependencies of %s"
msgstr "Dipendenze di %s"
-#: src/pkg_item.cc:322 src/pkg_ver_item.cc:657
+#: src/pkg_item.cc:327 src/pkg_ver_item.cc:657
+#, c-format
+msgid "%s deps"
+msgstr ""
+
+#: src/pkg_item.cc:338 src/pkg_ver_item.cc:667
#, c-format
msgid "Packages depending on %s"
msgstr "Pacchetti che dipendono da %s"
-#: src/pkg_item.cc:373 src/pkg_ver_item.cc:694
+#: src/pkg_item.cc:340 src/pkg_ver_item.cc:669
+#, c-format
+msgid "%s reverse deps"
+msgstr ""
+
+#: src/pkg_item.cc:392 src/pkg_ver_item.cc:707
#, c-format
msgid "Reporting a bug in %s:\n"
msgstr "Segnalazione di un bug in %s:\n"
-#: src/pkg_item.cc:395
+#: src/pkg_item.cc:414
+#, fuzzy
msgid ""
-"You are not root and I cannot find any way\n"
-"to become root. To reconfigure this package,\n"
-"install the menu package, the login package,\n"
-"or run aptitude as root."
+"You are not root and I cannot find any way to become root. To reconfigure "
+"this package, install the menu package, the login package, or run aptitude "
+"as root."
msgstr ""
"Non si possiedono i permessi di root e non è stato\n"
"possibile trovare alcun modo per diventare root.\n"
"Per riconfigurare questo pacchetto, installare il pacchetto\n"
"«menu», il pacchetto «login», oppure eseguire Aptitude come root."
-#: src/pkg_item.cc:403
+#: src/pkg_item.cc:422
#, c-format
msgid "Reconfiguring %s\n"
msgstr "Riconfigurazione di %s\n"
-#: src/pkg_item.cc:428
+#: src/pkg_item.cc:447
msgid "Hierarchy editor"
msgstr "Editor della gerarchia"
+#: src/pkg_item.cc:447
+#, fuzzy
+msgid "Hierarchy Editor"
+msgstr "Editor della gerarchia"
+
#: src/pkg_tree.cc:325
msgid "Search for: "
msgstr "Cerca: "
-#: src/pkg_tree.cc:585
+#: src/pkg_tree.cc:568
msgid "All Packages"
msgstr "Tutti i pacchetti"
-#: src/pkg_tree.cc:598 src/pkg_tree.cc:607
+#: src/pkg_tree.cc:581 src/pkg_tree.cc:590
msgid "Building view"
msgstr "Costruzione della vista"
-#: src/pkg_tree.cc:649
+#: src/pkg_tree.cc:632
#, c-format
msgid "No packages matched the pattern \"%s\"."
msgstr "Nessun pacchetto corrisponde al modello «%s»."
-#: src/pkg_tree.cc:671
+#: src/pkg_tree.cc:654
msgid "Enter the new package tree limit: "
msgstr "Inserire il nuovo limite dell'albero dei pacchetti: "
-#: src/pkg_tree.cc:705
+#: src/pkg_tree.cc:688
msgid "Enter the new package grouping mechanism for this display: "
msgstr "Nuovo meccanismo di raggruppamento dei pacchetti per questa vista: "
-#: src/pkg_tree.cc:713
+#: src/pkg_tree.cc:696
msgid "Enter the new package sorting mechanism for this display: "
msgstr "Nuovo meccanismo di ordinamento dei pacchetti per questa vista: "
-#: src/pkg_ver_item.cc:623
-msgid "Information about "
-msgstr "Informazioni su "
-
#: src/pkg_view.cc:344
msgid "make_package_view: error in arguments -- two main widgets??"
msgstr "make_package_view: errore negli argomenti (due widget principali)"
@@ -3363,7 +3536,7 @@
msgid "make_package_view: bad argument!"
msgstr "make_package_view: argomento non ammesso"
-#: src/pkg_view.cc:492
+#: src/pkg_view.cc:495
msgid "make_package_view: no main widget found"
msgstr "make_package_view: manca il widget principale"
@@ -3588,6 +3761,74 @@
"I seguenti pacchetti dipendono dalla versione %B%s%b di %B%s%b e, se verrà %"
"s, saranno difettosi."
+#: src/solution_dialog.cc:74
+msgid "The package cache is not available."
+msgstr ""
+
+#: src/solution_dialog.cc:82
+#, fuzzy
+msgid "No packages are broken."
+msgstr "Alcuni pacchetti sono difettosi. Provare a correggerli?"
+
+#: src/solution_dialog.cc:103
+msgid "No resolution found."
+msgstr ""
+
+#: src/solution_dialog.cc:107
+#, c-format
+msgid ""
+"Time exhausted while searching for a solution (you can select \"Next Solution"
+"\" or press %s to try harder)."
+msgstr ""
+
+#: src/solution_dialog.cc:146
+#, fuzzy
+msgid "Previous"
+msgstr "Fornisce"
+
+#: src/solution_dialog.cc:147
+#, fuzzy
+msgid "Next"
+msgstr "^Successivo"
+
+#: src/solution_dialog.cc:148
+msgid "Apply"
+msgstr ""
+
+#: src/solution_dialog.cc:149
+#, fuzzy
+msgid "Close"
+msgstr "^Chiudi"
+
+#: src/solution_fragment.cc:125
+#, fuzzy
+msgid "%BRemove%b the following packages:%n"
+msgstr "I seguenti pacchetti sono DIFETTOSI:"
+
+#: src/solution_fragment.cc:135
+#, fuzzy
+msgid "%BInstall%b the following packages:%n"
+msgstr "I seguenti pacchetti sono DIFETTOSI:"
+
+#: src/solution_fragment.cc:148
+msgid "%BKeep%b the following packages at their current version:%n"
+msgstr ""
+
+#: src/solution_fragment.cc:161
+#, fuzzy
+msgid "%BUpgrade%b the following packages:%n"
+msgstr "I seguenti pacchetti sono DIFETTOSI:"
+
+#: src/solution_fragment.cc:176
+#, fuzzy
+msgid "%BDowngrade%b the following packages:%n"
+msgstr "Scaricamento dei pacchetti"
+
+#: src/solution_fragment.cc:190
+#, c-format
+msgid "Score is %d"
+msgstr ""
+
#: src/trust.cc:17 src/trust.cc:19
msgid "WARNING"
msgstr ""
@@ -3599,53 +3840,53 @@
"system."
msgstr ""
-#: src/ui.cc:143
+#: src/ui.cc:164
msgid "Er, there aren't any errors, this shouldn't have happened.."
msgstr "Ehm, non c'è alcun errore, questo non avrebbe dovuto verificarsi..."
-#: src/ui.cc:149
+#: src/ui.cc:170
msgid "E:"
msgstr ""
-#: src/ui.cc:151
+#: src/ui.cc:172
msgid "W:"
msgstr ""
-#: src/ui.cc:172
+#: src/ui.cc:193
msgid "Search for:"
msgstr "Cerca:"
-#: src/ui.cc:205
+#: src/ui.cc:261
msgid "You already are root!"
msgstr "Si è già root."
-#: src/ui.cc:303
+#: src/ui.cc:359
msgid ""
"Subprocess exited with an error -- did you type your password correctly?"
msgstr ""
"Il sottoprocesso ha restituito un errore: forse la password non è corretta."
-#: src/ui.cc:331
+#: src/ui.cc:387
msgid "Loading cache"
msgstr "Caricamento della cache"
-#: src/ui.cc:353
+#: src/ui.cc:409
msgid "Really quit Aptitude?"
msgstr "Uscire da Aptitude?"
-#: src/ui.cc:432
+#: src/ui.cc:488
msgid "Really discard your personal settings and reload the defaults?"
msgstr "Abbandonare le impostazioni personali e tornare a quelle predefinite?"
-#: src/ui.cc:532
+#: src/ui.cc:588 src/ui.cc:590 src/ui.cc:618 src/ui.cc:620
msgid "Packages"
msgstr "Pacchetti"
-#: src/ui.cc:533 src/ui.cc:560
+#: src/ui.cc:589 src/ui.cc:619
msgid "View available packages and choose actions to perform"
msgstr "Mostra i pacchetti disponibili e sceglie le azioni da eseguire"
-#: src/ui.cc:599
+#: src/ui.cc:666
#, fuzzy
msgid ""
"%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
@@ -3662,15 +3903,15 @@
"ridistribuzione sotto determinate condizioni; fare riferimento a «licenza»\n"
"per maggiori dettagli."
-#: src/ui.cc:620
+#: src/ui.cc:687
msgid "help.txt"
msgstr "help-it.txt"
-#: src/ui.cc:636
+#: src/ui.cc:703
msgid "README"
msgstr "README"
-#: src/ui.cc:718
+#: src/ui.cc:785
msgid ""
"%C%BWARNING%b: untrusted versions of the following packages will be "
"installed!%n%nUntrusted packages could %Bcompromise your system's security%"
@@ -3678,61 +3919,71 @@
"this is what you want to do.%n%n"
msgstr ""
-#: src/ui.cc:732
+#: src/ui.cc:799
#, fuzzy
msgid "Really Continue"
msgstr "Continua"
-#: src/ui.cc:734
+#: src/ui.cc:801
msgid "Abort Installation"
msgstr ""
-#: src/ui.cc:796
+#: src/ui.cc:862
msgid "Preview of package installation"
msgstr "Anteprima dell'installazione dei pacchetti"
-#: src/ui.cc:797
+#: src/ui.cc:863
msgid "View and/or adjust the actions that will be performed"
msgstr "Mostra e modifica le azioni da compiere"
-#: src/ui.cc:837
-msgid "Some packages were broken and have been fixed"
+#: src/ui.cc:864
+#, fuzzy
+msgid "Preview"
+msgstr "^Precedente"
+
+#: src/ui.cc:900
+#, fuzzy
+msgid "Some packages were broken and have been fixed:"
msgstr "Alcuni pacchetti erano difettosi e sono stati corretti"
-#: src/ui.cc:839
-msgid "Some broken packages could not be fixed!"
-msgstr "Non è stato possibile correggere alcuni pacchetti difettosi."
+#: src/ui.cc:906
+msgid "No solution to these dependency problems exists!"
+msgstr ""
-#: src/ui.cc:847 src/ui.cc:959
-msgid "Some packages are broken. Try to fix them?"
-msgstr "Alcuni pacchetti sono difettosi. Provare a correggerli?"
+#: src/ui.cc:912
+#, c-format
+msgid ""
+"Ran out of time while trying to resolver dependencies (press \"%s\" to try "
+"harder)"
+msgstr ""
-#: src/ui.cc:860
+#: src/ui.cc:958
+#, fuzzy
msgid ""
-"Installing/removing packages requires administrative privileges, which\n"
-"you currently do not have. Would you like to change to the root account?\n"
+"Installing/removing packages requires administrative privileges, which you "
+"currently do not have. Would you like to change to the root account?"
msgstr ""
"Per installare e rimuovere pacchetti servono i privilegi di amministratore,\n"
"dei quali al momento si è privi. Passare all'account di root?\n"
-#: src/ui.cc:863 src/ui.cc:993
+#: src/ui.cc:961 src/ui.cc:1077
msgid "Become root"
msgstr "Diventa root"
-#: src/ui.cc:865 src/ui.cc:995
+#: src/ui.cc:963 src/ui.cc:1079
msgid "Don't become root"
msgstr "Non diventare root"
-#: src/ui.cc:870 src/ui.cc:1000
+#: src/ui.cc:968 src/ui.cc:1084
msgid "A package-list update or install run is already taking place."
msgstr ""
"Un aggiornamento dell'elenco dei pacchetti o un'installazione è già in corso."
-#: src/ui.cc:897
+#: src/ui.cc:995
msgid "No packages are scheduled to be installed, removed, or upgraded."
msgstr "Non ci sono pacchetti da installare, rimuovere o aggiornare."
-#: src/ui.cc:903
+#: src/ui.cc:1001
#, fuzzy
msgid ""
"No packages will be installed, removed or upgraded. Some packages could be "
@@ -3744,413 +3995,432 @@
"Alcuni pacchetti potrebbero venire aggiornati ma si è scelto di non farlo.\n"
"Premere «U» per preparare un aggiornamento."
-#: src/ui.cc:990
+#: src/ui.cc:1073
+#, fuzzy
msgid ""
-"Updating the package lists requires administrative privileges, which\n"
-"you currently do not have. Would you like to change to the root account?\n"
+"Updating the package lists requires administrative privileges, which you "
+"currently do not have. Would you like to change to the root account?"
msgstr ""
"Per aggiornare l'elenco dei pacchetti servono i privilegi di "
"amministratore,\n"
"dei quali attualmente si è privi. Passare all'account di root?\n"
-#: src/ui.cc:1005 src/ui.cc:1198
+#: src/ui.cc:1089 src/ui.cc:1345
msgid "Waste time trying to find mines"
msgstr "Perdi tempo cercando di scovare le mine"
-#: src/ui.cc:1012 src/ui.cc:1065
+#: src/ui.cc:1096 src/ui.cc:1149
msgid "Cleaning while a download is in progress is not allowed"
msgstr "Pulire mentre è in corso uno scaricamento non è permesso"
-#: src/ui.cc:1015
+#: src/ui.cc:1099
msgid "Deleting downloaded files"
msgstr "Cancellazione dei file scaricati"
-#: src/ui.cc:1029
+#: src/ui.cc:1113
msgid "Downloaded package files have been deleted"
msgstr "I file dei pacchetti scaricati sono stati cancellati"
-#: src/ui.cc:1090
+#: src/ui.cc:1174
#, fuzzy, c-format
msgid ""
"Obsolete downloaded package files have been deleted, freeing %sB of disk "
"space."
msgstr "I file dei vecchi pacchetti scaricati sono stati cancellati"
-#: src/ui.cc:1174
+#: src/ui.cc:1246
+msgid "All solutions exhausted."
+msgstr ""
+
+#: src/ui.cc:1251 src/ui.cc:1282
+#, fuzzy
+msgid "Ran out of time while trying to find a solution."
+msgstr "Perdi tempo cercando di scovare le mine"
+
+#: src/ui.cc:1276
+msgid "Unable to find a solution to apply."
+msgstr ""
+
+#: src/ui.cc:1321
msgid "^Install/remove packages"
msgstr "^Installa/rimuovi pacchetti"
-#: src/ui.cc:1175
+#: src/ui.cc:1322
msgid "Perform all pending installs and removals"
msgstr "Procede ad installare e rimuovere i pacchetti"
-#: src/ui.cc:1177
+#: src/ui.cc:1324
msgid "^Update package list"
msgstr "^Aggiorna l'elenco dei pacchetti"
-#: src/ui.cc:1178
+#: src/ui.cc:1325
msgid "Check for new versions of packages"
msgstr "Cerca nuove versioni dei pacchetti"
-#: src/ui.cc:1181
+#: src/ui.cc:1328
msgid "^Forget new packages"
msgstr "^Dimentica i nuovi pacchetti"
-#: src/ui.cc:1182
+#: src/ui.cc:1329
msgid "Forget which packages are \"new\""
msgstr "Dimentica quali pacchetti sono «nuovi»"
-#: src/ui.cc:1185
+#: src/ui.cc:1332
msgid "^Clean package cache"
msgstr "^Pulisci la cache dei pacchetti"
-#: src/ui.cc:1186
+#: src/ui.cc:1333
msgid "Delete package files which were previously downloaded"
msgstr "Cancella i file dei pacchetti scaricati precedentemente"
-#: src/ui.cc:1189
+#: src/ui.cc:1336
msgid "Clean ^obsolete files"
msgstr "^Cancella i file vecchi"
-#: src/ui.cc:1190
+#: src/ui.cc:1337
msgid "Delete package files which can no longer be downloaded"
msgstr "Cancella i file dei pacchetti che non si possono più scaricare"
# NdT: La traduzione non è fedele ma è una voce di menu e deve essere breve
# Il significato letterale è: "Segna (= Mark) [tutti i pacchetti che è
# possibile aggiornare] come aggiornabili (= Upgradable)"
-#: src/ui.cc:1193
+#: src/ui.cc:1340
msgid "Mark ^Upgradable"
msgstr "Aggiorna ^tutti i pacchetti"
-#: src/ui.cc:1194
+#: src/ui.cc:1341
msgid "Mark all upgradable packages which are not held for upgrade"
msgstr ""
"Richiede l'aggiornamento di tutti i pacchetti aggiornabili non bloccati"
-#: src/ui.cc:1197
+#: src/ui.cc:1344
msgid "^Play Minesweeper"
msgstr "^Gioca a campo minato"
-#: src/ui.cc:1200
+#: src/ui.cc:1347
msgid "^Become root"
msgstr "Diventa ^root"
-#: src/ui.cc:1201
+#: src/ui.cc:1348
+#, fuzzy
msgid ""
-"Run 'su' to become root; this will restart the program, but your\n"
-"settings will be preserved"
+"Run 'su' to become root; this will restart the program, but your settings "
+"will be preserved"
msgstr ""
"Esegue «su» per diventare root; questo farà ripartire il programma,\n"
"mantenendo però le impostazioni attuali"
-#: src/ui.cc:1204
+#: src/ui.cc:1351
msgid "^Reload package cache"
msgstr "Ricarica ^la cache dei pacchetti"
-#: src/ui.cc:1205
+#: src/ui.cc:1352
msgid "Reload the package cache"
msgstr "Ricarica la cache dei pacchetti"
-#: src/ui.cc:1211
+#: src/ui.cc:1358
msgid "^Quit"
msgstr "^Esci"
-#: src/ui.cc:1212
+#: src/ui.cc:1359
msgid "Exit the program"
msgstr "Esce dal programma"
-#: src/ui.cc:1218 src/ui.cc:1487
+#: src/ui.cc:1365 src/ui.cc:1637
msgid "Undo"
msgstr "Annulla"
-#: src/ui.cc:1219
+#: src/ui.cc:1366
msgid "Undo the last package operation or group of operations"
msgstr ""
"Annulla l'ultima operazione o gruppo di operazioni effettuate sui pacchetti"
-#: src/ui.cc:1226
+#: src/ui.cc:1373
msgid "^Install"
msgstr "^Installa"
-#: src/ui.cc:1227
+#: src/ui.cc:1374
msgid "Flag the currently selected package for installation or upgrade"
msgstr "Richiede l'installazione e l'aggiornamento del pacchetto selezionato"
-#: src/ui.cc:1230
+#: src/ui.cc:1377
msgid "^Remove"
msgstr "^Rimuovi"
-#: src/ui.cc:1231
+#: src/ui.cc:1378
msgid "Flag the currently selected package for removal"
msgstr "Richiede la rimozione del pacchetto selezionato"
-#: src/ui.cc:1234
+#: src/ui.cc:1381
msgid "^Purge"
msgstr "^Elimina"
-#: src/ui.cc:1235
+#: src/ui.cc:1382
msgid ""
"Flag the currently selected package and its configuration files for removal"
msgstr "Richiede la rimozione del pacchetto e dei suoi file di configurazione"
-#: src/ui.cc:1238
+#: src/ui.cc:1385
msgid "^Keep"
msgstr "^Tieni"
-#: src/ui.cc:1239
+#: src/ui.cc:1386
msgid "Cancel any action on the selected package"
msgstr "Annulla ogni azione sul pacchetto selezionato"
-#: src/ui.cc:1242
+#: src/ui.cc:1389
msgid "^Hold"
msgstr "^Blocca"
-#: src/ui.cc:1243
+#: src/ui.cc:1390
msgid ""
"Cancel any action on the selected package, and protect it from future "
"upgrades"
msgstr ""
"Annulla ogni azione sul pacchetto selezionato, impedendo aggiornamenti futuri"
-#: src/ui.cc:1246
+#: src/ui.cc:1393
msgid "Mark ^Auto"
msgstr "Installato ^automaticamente"
-#: src/ui.cc:1247
+#: src/ui.cc:1394
+#, fuzzy
msgid ""
-"Mark the selected package as having been automatically installed;\n"
-"it will automatically be removed if no other packages depend on it"
+"Mark the selected package as having been automatically installed; it will "
+"automatically be removed if no other packages depend on it"
msgstr ""
"Segna il pacchetto selezionato come installato automaticamente;\n"
"verrà rimosso automaticamente se nessun altro pacchetto dipende da esso"
-#: src/ui.cc:1250
+#: src/ui.cc:1397
msgid "Mark ^Manual"
msgstr "Installato ^manualmente"
-#: src/ui.cc:1251
+#: src/ui.cc:1398
+#, fuzzy
msgid ""
-"Mark the selected package as having been manually installed;\n"
-"it will not be removed unless you manually remove it"
+"Mark the selected package as having been manually installed; it will not be "
+"removed unless you manually remove it"
msgstr ""
"Segna il pacchetto selezionato come installato manualmente;\n"
"non verrà rimosso, a meno che non si intervenga manualmente"
-#: src/ui.cc:1254
+#: src/ui.cc:1401
msgid "^Forbid Version"
msgstr "^Proibisci versione"
-#: src/ui.cc:1255
+#: src/ui.cc:1402
+#, fuzzy
msgid ""
-"Forbid the candidate version of the selected package from being installed;\n"
+"Forbid the candidate version of the selected package from being installed; "
"newer versions of the package will be installed as usual"
msgstr ""
"Impedisce che venga installata la versione candidata del pacchetto "
"selezionato;\n"
"le versioni successive verranno installate normalmente"
-#: src/ui.cc:1259
+#: src/ui.cc:1406
msgid "I^nformation"
msgstr "I^nformazioni"
-#: src/ui.cc:1260
+#: src/ui.cc:1407
msgid "Display more information about the selected package"
msgstr "Mostra informazioni dettagliate sul pacchetto selezionato"
-#: src/ui.cc:1263
+#: src/ui.cc:1410
msgid "^Changelog"
msgstr "^Changelog"
-#: src/ui.cc:1264
+#: src/ui.cc:1411
msgid "Display the Debian changelog of the selected package"
msgstr "Mostra il changelog Debian del pacchetto selezionato"
-#: src/ui.cc:1271
+#: src/ui.cc:1418
msgid "^Find"
msgstr "^Trova"
-#: src/ui.cc:1272
+#: src/ui.cc:1419
msgid "Search for a package"
msgstr "Cerca un pacchetto"
-#: src/ui.cc:1275
+#: src/ui.cc:1422
msgid "Find ^Again"
msgstr "Trova ^successivo"
-#: src/ui.cc:1276
+#: src/ui.cc:1423
msgid "Repeat the last search"
msgstr "Ripete l'ultima ricerca"
-#: src/ui.cc:1280
+#: src/ui.cc:1427
msgid "^Limit Display"
msgstr "^Applica filtro"
-#: src/ui.cc:1281
+#: src/ui.cc:1428
msgid "Apply a filter to the package list"
msgstr "Applica un filtro all'elenco dei pacchetti"
-#: src/ui.cc:1284
+#: src/ui.cc:1431
msgid "^Un-Limit Display"
msgstr "^Rimuovi filtro"
-#: src/ui.cc:1285
+#: src/ui.cc:1432
msgid "Remove the filter from the package list"
msgstr "Rimuove il filtro dall'elenco dei pacchetti"
-#: src/ui.cc:1289
+#: src/ui.cc:1436
msgid "Find ^Broken"
msgstr "Trova ^difettosi"
-#: src/ui.cc:1290
+#: src/ui.cc:1437
msgid "Find the next package with unsatisfied dependencies"
msgstr "Trova il prossimo pacchetto con dipendenze non soddisfatte"
-#: src/ui.cc:1297
+#: src/ui.cc:1444
msgid "^UI options"
msgstr "Opzioni dell'interfaccia ^utente"
-#: src/ui.cc:1298
+#: src/ui.cc:1445
msgid "Change the settings which affect the user interface"
msgstr "Cambia le impostazioni che riguardano l'interfaccia utente"
-#: src/ui.cc:1301
+#: src/ui.cc:1448
msgid "^Dependency handling"
msgstr "Gestione delle ^dipendenze"
-#: src/ui.cc:1302
+#: src/ui.cc:1449
msgid "Change the settings which affect how package dependencies are handled"
msgstr ""
"Cambia le impostazioni riguardo alla gestione delle dipendenze tra i "
"pacchetti"
-#: src/ui.cc:1305
+#: src/ui.cc:1452
msgid "^Miscellaneous"
msgstr "^Varie"
-#: src/ui.cc:1306
+#: src/ui.cc:1453
msgid "Change miscellaneous program settings"
msgstr "Cambia altre impostazioni del programma"
-#: src/ui.cc:1311
+#: src/ui.cc:1458
msgid "^Revert options"
msgstr "^Reimposta le opzioni"
-#: src/ui.cc:1312
+#: src/ui.cc:1459
msgid "Reset all settings to the system defaults"
msgstr "Riporta tutte le impostazioni ai valori predefiniti"
-#: src/ui.cc:1323
+#: src/ui.cc:1470
msgid "^Next"
msgstr "^Successivo"
-#: src/ui.cc:1324
+#: src/ui.cc:1471
msgid "View next display"
msgstr "Mostra la vista successiva"
-#: src/ui.cc:1327
+#: src/ui.cc:1474
msgid "^Prev"
msgstr "^Precedente"
-#: src/ui.cc:1328
+#: src/ui.cc:1475
msgid "View previous display"
msgstr "Mostra la vista precedente"
-#: src/ui.cc:1331
+#: src/ui.cc:1478
msgid "^Close"
msgstr "^Chiudi"
-#: src/ui.cc:1332
+#: src/ui.cc:1479
msgid "Close this display"
msgstr "Chiude questa vista"
-#: src/ui.cc:1337
+#: src/ui.cc:1484
msgid "New Package ^View"
msgstr "Nuova ^vista dei pacchetti"
-#: src/ui.cc:1338
+#: src/ui.cc:1485
msgid "Create a new default package view"
msgstr "Crea una nuova vista dei pacchetti"
-#: src/ui.cc:1341
+#: src/ui.cc:1488
msgid "New Categorical ^Browser"
msgstr "Nuova vista per ^categorie"
-#: src/ui.cc:1343
+#: src/ui.cc:1490
msgid "Browse packages by category"
msgstr "Sfoglia i pacchetti per categoria"
-#: src/ui.cc:1351
+#: src/ui.cc:1498
msgid "^About"
msgstr "^Informazioni su"
-#: src/ui.cc:1352
+#: src/ui.cc:1499
msgid "View information about this program"
msgstr "Mostra le informazioni su questo programma"
-#: src/ui.cc:1355
+#: src/ui.cc:1502
msgid "^Help"
msgstr "^Aiuto"
-#: src/ui.cc:1356
+#: src/ui.cc:1503
msgid "View the on-line help"
msgstr "Mostra una breve guida online"
-#: src/ui.cc:1358
+#: src/ui.cc:1505
msgid "User's ^Manual"
msgstr "^Manuale dell'utente"
-#: src/ui.cc:1359
+#: src/ui.cc:1506
msgid "View the detailed program manual"
msgstr "Mostra il manuale dettagliato del programma"
-#: src/ui.cc:1362
+#: src/ui.cc:1509
msgid "^FAQ"
msgstr "^FAQ"
-#: src/ui.cc:1363
+#: src/ui.cc:1510
msgid "View a list of frequently asked questions"
msgstr "Visualizza un elenco delle domande più frequenti"
-#: src/ui.cc:1366
-msgid "^ChangeLog"
-msgstr "^ChangeLog"
+#: src/ui.cc:1513
+msgid "^NEWS"
+msgstr ""
-#: src/ui.cc:1367
-msgid "View the important changes made in each version of the program"
+#: src/ui.cc:1514
+#, fuzzy
+msgid "View the important changes made in each version of "
msgstr ""
"Mostra i cambiamenti più importanti effettuati in ogni versione del programma"
-#: src/ui.cc:1370
+#: src/ui.cc:1517
msgid "^License"
msgstr "^Licenza"
-#: src/ui.cc:1371
+#: src/ui.cc:1518
msgid "View the terms under which you may copy the program"
msgstr ""
"Mostra le condizioni in base alle quali è permessa la copia del programma"
-#: src/ui.cc:1486
+#: src/ui.cc:1636
msgid "Actions"
msgstr "Azioni"
-#: src/ui.cc:1489
+#: src/ui.cc:1639
msgid "Search"
msgstr "Cerca"
-#: src/ui.cc:1490
+#: src/ui.cc:1640
msgid "Options"
msgstr "Opzioni"
-#: src/ui.cc:1491
+#: src/ui.cc:1641
msgid "Views"
msgstr "Viste"
-#: src/ui.cc:1492
+#: src/ui.cc:1642
msgid "Help"
msgstr "Aiuto"
-#: src/ui.cc:1537
+#: src/ui.cc:1699
#, c-format
msgid ""
"%s: Menu %s: Help %s: Quit %s: Update %s: Download/Install/Remove Pkgs"
@@ -4158,12 +4428,12 @@
"%s: menu %s: Aiuto %s: Esci %s: Aggiorna %s: Scarica/Installa/Rimuovi"
# Put the appropriate key for Y/N choices here (lower case)
-#: src/ui.cc:1799 src/vscreen/vscreen.cc:281
+#: src/ui.cc:1968 src/vscreen/vscreen.cc:281
msgid "yes_key"
msgstr "s"
# Put the appropriate key for Y/N choices here (lower case)
-#: src/ui.cc:1800 src/vscreen/vscreen.cc:282
+#: src/ui.cc:1969 src/vscreen/vscreen.cc:282
msgid "no_key"
msgstr "n"
@@ -4175,6 +4445,16 @@
msgid "Downloading Changelog"
msgstr "Scaricamento del Changelog"
+#: src/view_changelog.cc:54
+#, fuzzy
+msgid "Download Changelog"
+msgstr "Scaricamento del Changelog"
+
+#: src/view_changelog.cc:63
+#, c-format
+msgid "%s changes"
+msgstr ""
+
#: src/vscreen/vscreen.cc:119
#, c-format
msgid "Ouch! Got SIGTERM, dying..\n"
@@ -4203,6 +4483,37 @@
msgid "No"
msgstr "No"
+#~ msgid ""
+#~ "Some packages had unmet dependencies. This may mean that you have\n"
+#~ "requested an impossible situation or if you are using the unstable\n"
+#~ "distribution that some required packages have not yet been created\n"
+#~ "or been moved out of Incoming.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Alcuni pacchetti hanno dipendenze non soddisfatte. Questo può voler\n"
+#~ "dire che è stata richiesta una situazione impossibile oppure, se\n"
+#~ "si sta usando la distribuzione «unstable», che alcuni pacchetti\n"
+#~ "richiesti non sono ancora stati creati o spostati da «incoming».\n"
+
+#~ msgid ""
+#~ "Please insert the following disc into the drive \"%s\":\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Inserire il seguente disco nell'unità «%s»:\n"
+#~ "%s"
+
+#~ msgid "Invalid option for interactive mode: -s\n"
+#~ msgstr "Opzione non ammessa nella modalità interattiva: -s\n"
+
+#~ msgid "Information about "
+#~ msgstr "Informazioni su "
+
+#~ msgid "Some broken packages could not be fixed!"
+#~ msgstr "Non è stato possibile correggere alcuni pacchetti difettosi."
+
+#~ msgid "^ChangeLog"
+#~ msgstr "^ChangeLog"
+
#~ msgid "Go away, I'm trying to think.\n"
#~ msgstr "Deixeu-me tranquil, estic intentant pensar.\n"
Modified: branches/aptitude-0.3/aptitude/po/ja.po
==============================================================================
--- branches/aptitude-0.3/aptitude/po/ja.po (original)
+++ branches/aptitude-0.3/aptitude/po/ja.po Sat Apr 30 13:41:32 2005
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: aptitude 0.2.15.6-1\n"
"Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-01-10 16:26-0800\n"
+"POT-Creation-Date: 2005-04-29 18:11-0400\n"
"PO-Revision-Date: 2004-09-20 11:01+0900\n"
"Last-Translator: YasuoEto <yasuo at etou.org>\n"
"Language-Team: \n"
@@ -148,16 +148,103 @@
msgstr "ã“ã®ãƒ•ã‚£ãƒ«ã‚¿ãƒ¼ã«å½“ã¦ã¯ã¾ã‚‹ä½¿ã‚ã‚Œã¦ã„ãªã„パッケージを自動的ã«å‰Šé™¤ã™ã‚‹"
#: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:184 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
-#: src/vscreen/vs_util.cc:329
+#: src/ui.cc:218 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
+#: src/vscreen/vs_util.cc:328
msgid "Ok"
msgstr "OK"
#: src/apt_options.cc:242 src/download_list.cc:71 src/mine/cmine.cc:257
-#: src/mine/cmine.cc:330 src/vscreen/vs_util.cc:329
+#: src/mine/cmine.cc:330 src/vscreen/vs_util.cc:328
msgid "Cancel"
msgstr "ã‚ャンセル"
+#: src/broken_indicator.cc:106 src/solution_dialog.cc:97
+msgid "Internal error: unexpected null solution."
+msgstr ""
+
+#: src/broken_indicator.cc:158
+#, fuzzy
+msgid "Suggest "
+msgstr "推奨"
+
+#: src/broken_indicator.cc:164
+#, fuzzy, c-format
+msgid "%d installs"
+msgstr "インストール"
+
+#: src/broken_indicator.cc:169
+#, fuzzy
+msgid "1 install"
+msgstr "インストール"
+
+#: src/broken_indicator.cc:173
+#, c-format
+msgid "%d removals"
+msgstr ""
+
+#: src/broken_indicator.cc:178
+msgid "1 removal"
+msgstr ""
+
+#: src/broken_indicator.cc:182
+#, c-format
+msgid "%d keeps"
+msgstr ""
+
+#: src/broken_indicator.cc:187
+msgid "1 keep"
+msgstr ""
+
+#: src/broken_indicator.cc:191
+#, fuzzy, c-format
+msgid "%d upgrades"
+msgstr "æ›´æ–°"
+
+#: src/broken_indicator.cc:196
+#, fuzzy
+msgid "1 upgrade"
+msgstr "æ›´æ–°"
+
+#: src/broken_indicator.cc:200
+#, fuzzy, c-format
+msgid "%d downgrades"
+msgstr "ダウングレード"
+
+#: src/broken_indicator.cc:205
+#, fuzzy
+msgid "1 downgrade"
+msgstr "ダウングレード"
+
+#: src/broken_indicator.cc:214
+#, c-format
+msgid "%s: Examine"
+msgstr ""
+
+#: src/broken_indicator.cc:216
+#, c-format
+msgid "%s: Apply"
+msgstr ""
+
+#: src/broken_indicator.cc:218
+#, fuzzy, c-format
+msgid "%s: Next"
+msgstr "次"
+
+#: src/broken_indicator.cc:220
+#, c-format
+msgid "%s: Previous"
+msgstr ""
+
+#: src/broken_indicator.cc:233
+#, c-format
+msgid "%CSolution search failed. %s: try harder"
+msgstr ""
+
+#: src/broken_indicator.cc:239
+#, c-format
+msgid "%CUnable to resolve dependencies."
+msgstr ""
+
#: src/cmdline/cmdline_action.cc:36
#, c-format
msgid ""
@@ -229,22 +316,22 @@
msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
msgstr "%s パッケージã¯ã‚¢ãƒƒãƒ—グレードã§ããªã„ã®ã§æ›´æ–°ç¦æ¢ã«ã§ãã¾ã›ã‚“\n"
-#: src/cmdline/cmdline_action.cc:213
+#: src/cmdline/cmdline_action.cc:198
#, c-format
msgid "Note: selecting the task \"%s: %s\" for installation\n"
msgstr "注: インストールã•ã‚Œã‚‹ \"%s: %s\" タスクをé¸æŠžã—ã¾ã™\n"
-#: src/cmdline/cmdline_action.cc:240
+#: src/cmdline/cmdline_action.cc:225
#, c-format
msgid "You can only specify a package version with an 'install' command.\n"
msgstr "'install'コマンドã¯ç‰¹å®šã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’指定ã§ãã¾ã™ã€‚\n"
-#: src/cmdline/cmdline_action.cc:246
+#: src/cmdline/cmdline_action.cc:231
#, c-format
msgid "You can only specify a package archive with an 'install' command.\n"
msgstr "'install'コマンドã¯ç‰¹å®šã®ã‚¢ãƒ¼ã‚«ã‚¤ãƒ–を指定ã§ãã¾ã™ã€‚\n"
-#: src/cmdline/cmdline_action.cc:280
+#: src/cmdline/cmdline_action.cc:265
#, c-format
msgid ""
"Couldn't find package \"%s\", and more than 40\n"
@@ -253,7 +340,7 @@
"\"%s\"パッケージãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚\n"
"パッケージåã« \"%s\" ã‚’å«ã‚€ã‚‚ã®ãŒ40以上ã‚ã‚Šã¾ã—ãŸã€‚\n"
-#: src/cmdline/cmdline_action.cc:283
+#: src/cmdline/cmdline_action.cc:268
#, c-format
msgid ""
"Couldn't find package \"%s\". However, the following\n"
@@ -262,12 +349,12 @@
"パッケージ \"%s\" ã¯è¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚ã—ã‹ã—ã“ã®\n"
"\"%s\"ã¯ä»¥ä¸‹ã®ãƒ‘ッケージåã«å«ã¾ã‚Œã¦ã„ã¾ã™:\n"
-#: src/cmdline/cmdline_action.cc:307
+#: src/cmdline/cmdline_action.cc:292
#, c-format
msgid "Couldn't find any package whose name or description matched \"%s\"\n"
msgstr "\"%s\" ã¯ãƒ‘ッケージåã¨ã‚‚説明文ã¨ã‚‚マッãƒã—ã¾ã›ã‚“ã§ã—ãŸ\n"
-#: src/cmdline/cmdline_action.cc:309
+#: src/cmdline/cmdline_action.cc:294
#, c-format
msgid ""
"Couldn't find any package matching \"%s\", and more than 40\n"
@@ -276,7 +363,7 @@
"パッケージ \"%s\" ã¯è¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚ãã—ã¦èª¬æ˜Žæ–‡ã«ã¯\n"
"40以上ã®ãƒ‘ッケージ㧠\"%s\" ãŒå«ã¾ã‚Œã¦ã„ã¾ã—ãŸã€‚\n"
-#: src/cmdline/cmdline_action.cc:312
+#: src/cmdline/cmdline_action.cc:297
#, c-format
msgid ""
"Couldn't find any package matching \"%s\". However, the following\n"
@@ -323,13 +410,13 @@
# Should never happen.
# Should never happen.
-#: src/cmdline/cmdline_do_action.cc:67
+#: src/cmdline/cmdline_do_action.cc:71
#, c-format
msgid "Invalid operation %s"
msgstr "ä¸æ£ãªæ“作 %s"
-#: src/cmdline/cmdline_do_action.cc:206 src/cmdline/cmdline_simulate.cc:30
-#: src/cmdline/cmdline_upgrade.cc:89
+#: src/cmdline/cmdline_do_action.cc:201 src/cmdline/cmdline_simulate.cc:31
+#: src/cmdline/cmdline_upgrade.cc:91
#, c-format
msgid "Abort.\n"
msgstr "ä¸æ–。\n"
@@ -340,7 +427,7 @@
msgstr ""
"ダウンãƒãƒ¼ãƒ‰: 最低ã§ã‚‚一ã¤ã®ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã™ã‚‹ãƒ‘ッケージを指定ã—ã¦ãã ã•ã„\n"
-#: src/cmdline/cmdline_download.cc:43 src/download.cc:342
+#: src/cmdline/cmdline_download.cc:43 src/download.cc:344
msgid "Couldn't read source list"
msgstr "ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸å…¥æ‰‹å…ˆæƒ…å ±ã®ä¸€è¦§ã‚’èªã¿è¾¼ã‚ã¾ã›ã‚“ã§ã—ãŸ"
@@ -407,96 +494,96 @@
msgid "What is it? It's an elephant being eaten by a snake, of course.\n"
msgstr "ãªã«ãã‚Œ? ã‚‚ã¡ã‚んウワãƒãƒŸã«é£Ÿã¹ã‚‰ã‚Œã¦ã‚‹è±¡ã«æ±ºã£ã¦ã‚‹ã˜ã‚ƒã‚“。\n"
-#: src/cmdline/cmdline_prompt.cc:44
+#: src/cmdline/cmdline_prompt.cc:45
msgid "Couldn't read list of sources"
msgstr "パッケージ入手先一覧をèªã¿è¾¼ã‚ã¾ã›ã‚“ã§ã—ãŸ"
-#: src/cmdline/cmdline_prompt.cc:219 src/cmdline/cmdline_show_broken.cc:73
+#: src/cmdline/cmdline_prompt.cc:220 src/cmdline/cmdline_show_broken.cc:73
#, c-format
msgid "but %s is to be installed."
msgstr "ã—ã‹ã—ã€%s ã¯ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«äºˆå®šã§ã™ã€‚"
-#: src/cmdline/cmdline_prompt.cc:222 src/cmdline/cmdline_show_broken.cc:76
+#: src/cmdline/cmdline_prompt.cc:223 src/cmdline/cmdline_show_broken.cc:76
#, c-format
msgid "but %s is installed and it is kept back."
msgstr "ã—ã‹ã—ã€%s ã¯ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ãŠã‚Šä¿æŒã•ã‚Œã¦ã„ã¾ã™ã€‚"
-#: src/cmdline/cmdline_prompt.cc:225 src/cmdline/cmdline_show_broken.cc:79
+#: src/cmdline/cmdline_prompt.cc:226 src/cmdline/cmdline_show_broken.cc:79
#, c-format
msgid "but %s is installed."
msgstr "ã—ã‹ã— %s ã¯ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã¾ã™ã€‚"
-#: src/cmdline/cmdline_prompt.cc:229 src/cmdline/cmdline_show_broken.cc:83
+#: src/cmdline/cmdline_prompt.cc:230 src/cmdline/cmdline_show_broken.cc:83
#, c-format
msgid "but it is not installable"
msgstr "ã—ã‹ã—ãã‚Œã¯ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã§ãã¾ã›ã‚“"
# FIXME: do something sensible here!
-#: src/cmdline/cmdline_prompt.cc:233 src/cmdline/cmdline_show_broken.cc:87
+#: src/cmdline/cmdline_prompt.cc:234 src/cmdline/cmdline_show_broken.cc:87
#, c-format
msgid " which is a virtual package."
msgstr "ã—ã‹ã—ã€ã“ã‚Œã¯ä»®æƒ³ãƒ‘ッケージã§ã™ã€‚"
-#: src/cmdline/cmdline_prompt.cc:236 src/cmdline/cmdline_show_broken.cc:90
+#: src/cmdline/cmdline_prompt.cc:237 src/cmdline/cmdline_show_broken.cc:90
#, c-format
msgid " or"
msgstr " ã¾ãŸã¯"
-#: src/cmdline/cmdline_prompt.cc:248
+#: src/cmdline/cmdline_prompt.cc:249
msgid "The following packages are BROKEN:"
msgstr "以下ã®ãƒ‘ッケージãŒå£Šã‚Œã¦ã„ã¾ã™:"
-#: src/cmdline/cmdline_prompt.cc:249
+#: src/cmdline/cmdline_prompt.cc:250
msgid "The following packages are unused and will be REMOVED:"
msgstr "以下ã®ãƒ‘ッケージãŒä½¿ã‚ã‚Œã¦ã„ãªã„ã®ã§å‰Šé™¤ã•ã‚Œã¾ã™:"
-#: src/cmdline/cmdline_prompt.cc:250
+#: src/cmdline/cmdline_prompt.cc:251
msgid "The following packages have been automatically kept back:"
msgstr "以下ã®ãƒ‘ッケージãŒè‡ªå‹•çš„ã«ä¿æŒã•ã‚Œã¾ã™:"
-#: src/cmdline/cmdline_prompt.cc:251
+#: src/cmdline/cmdline_prompt.cc:252
msgid "The following NEW packages will be automatically installed:"
msgstr "以下ã®æ–°ã—ã„パッケージãŒè‡ªå‹•çš„ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¾ã™:"
-#: src/cmdline/cmdline_prompt.cc:252
+#: src/cmdline/cmdline_prompt.cc:253
msgid "The following packages will be automatically REMOVED:"
msgstr "以下ã®ãƒ‘ッケージãŒè‡ªå‹•çš„ã«å‰Šé™¤ã•ã‚Œã¾ã™:"
-#: src/cmdline/cmdline_prompt.cc:253
+#: src/cmdline/cmdline_prompt.cc:254
msgid "The following packages will be DOWNGRADED:"
msgstr "以下ã®ãƒ‘ッケージãŒãƒ€ã‚¦ãƒ³ã‚°ãƒ¬ãƒ¼ãƒ‰ã•ã‚Œã¾ã™:"
-#: src/cmdline/cmdline_prompt.cc:254
+#: src/cmdline/cmdline_prompt.cc:255
msgid "The following packages have been kept back:"
msgstr "以下ã®ãƒ‘ッケージãŒä¿æŒã•ã‚Œã¾ã™:"
-#: src/cmdline/cmdline_prompt.cc:255
+#: src/cmdline/cmdline_prompt.cc:256
msgid "The following packages will be REINSTALLED:"
msgstr "以下ã®ãƒ‘ッケージãŒå†ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¾ã™:"
-#: src/cmdline/cmdline_prompt.cc:256
+#: src/cmdline/cmdline_prompt.cc:257
msgid "The following NEW packages will be installed:"
msgstr "以下ã®æ–°ã—ã„パッケージãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¾ã™:"
-#: src/cmdline/cmdline_prompt.cc:257
+#: src/cmdline/cmdline_prompt.cc:258
msgid "The following packages will be REMOVED:"
msgstr "以下ã®ãƒ‘ッケージãŒå‰Šé™¤ã•ã‚Œã¾ã™:"
-#: src/cmdline/cmdline_prompt.cc:258
+#: src/cmdline/cmdline_prompt.cc:259
msgid "The following packages will be upgraded:"
msgstr "以下ã®ãƒ‘ッケージãŒæ›´æ–°ã•ã‚Œã¾ã™:"
-#: src/cmdline/cmdline_prompt.cc:307
+#: src/cmdline/cmdline_prompt.cc:311
#, c-format
msgid "The following ESSENTIAL packages will be REMOVED!\n"
msgstr "以下ã®å¿…é ˆãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ãŒå‰Šé™¤ã•ã‚Œã¾ã™!\n"
-#: src/cmdline/cmdline_prompt.cc:316
+#: src/cmdline/cmdline_prompt.cc:320
#, c-format
msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
msgstr "ã“ã®ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ã«ã‚ˆã‚Šä»¥ä¸‹ã®å¿…é ˆãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ãŒå£Šã‚Œã¾ã™:\n"
-#: src/cmdline/cmdline_prompt.cc:326
+#: src/cmdline/cmdline_prompt.cc:330
#, c-format
msgid ""
"WARNING: Performing this action will probably cause your system to break!\n"
@@ -505,100 +592,103 @@
"è¦å‘Š: ã“ã®ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ã‚·ã‚¹ãƒ†ãƒ を壊ã™åŽŸå› ã«ãªã‚Šã‹ãã¾ã›ã‚“。\n"
" 何をã—よã†ã¨ã—ã¦ã„ã‚‹ã‹ãŒç†è§£ã—ã¦ã„ãªã„å ´åˆã¯ã€å®Ÿè¡Œã—ã¦ã¯ã„ã‘ã¾ã›ã‚“!\n"
-#: src/cmdline/cmdline_prompt.cc:328
+#: src/cmdline/cmdline_prompt.cc:332
msgid "I am aware that this is a very bad idea"
msgstr "I am aware that this is a very bad idea"
-#: src/cmdline/cmdline_prompt.cc:331
+#: src/cmdline/cmdline_prompt.cc:335
#, c-format
msgid "To continue, type the phrase \"%s\":\n"
msgstr "続行ã™ã‚‹ã«ã¯ã€'%s' ã¨ã„ã†ãƒ•ãƒ¬ãƒ¼ã‚ºã‚’タイプã—ã¦ãã ã•ã„:\n"
-#: src/cmdline/cmdline_prompt.cc:434
+#: src/cmdline/cmdline_prompt.cc:438
#, c-format
msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
msgstr "以下ã®ãƒ‘ッケージãŒæ案ã•ã‚Œã¦ã„ã¾ã™ãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¾ã›ã‚“:\n"
-#: src/cmdline/cmdline_prompt.cc:440
+#: src/cmdline/cmdline_prompt.cc:444
#, c-format
msgid "The following packages are SUGGESTED but will NOT be installed:\n"
msgstr "以下ã®ãƒ‘ッケージãŒæ案ã•ã‚Œã¦ã„ã¾ã™ãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¾ã›ã‚“:\n"
-#: src/cmdline/cmdline_prompt.cc:445
+#: src/cmdline/cmdline_prompt.cc:449
#, c-format
msgid "No packages will be installed, upgraded, or removed.\n"
msgstr "å°Žå…¥ã€å‰Šé™¤ã€æ›´æ–°ã‚’ã™ã‚‹ãƒ‘ッケージãŒã‚ã‚Šã¾ã›ã‚“。\n"
-#: src/cmdline/cmdline_prompt.cc:447
+#: src/cmdline/cmdline_prompt.cc:451
#, c-format
msgid "%lu packages upgraded, %lu newly installed, "
msgstr "æ›´æ–°: %lu 個ã€æ–°è¦ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«: %lu 個ã€"
-#: src/cmdline/cmdline_prompt.cc:451
+#: src/cmdline/cmdline_prompt.cc:455
#, c-format
msgid "%lu reinstalled, "
msgstr "å†ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«: %lu 個ã€"
-#: src/cmdline/cmdline_prompt.cc:453
+#: src/cmdline/cmdline_prompt.cc:457
#, c-format
msgid "%lu downgraded, "
msgstr "ダウングレード: %lu 個ã€"
-#: src/cmdline/cmdline_prompt.cc:455
+#: src/cmdline/cmdline_prompt.cc:459
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "削除: %lu 個ã€ä¿ç•™: %lu 個。\n"
-#: src/cmdline/cmdline_prompt.cc:462
+#: src/cmdline/cmdline_prompt.cc:466
#, c-format
msgid "Need to get %sB/%sB of archives. "
msgstr "%2$sB ä¸ %1$sB ã®ã‚¢ãƒ¼ã‚«ã‚¤ãƒ–ã‚’å–å¾—ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚"
-#: src/cmdline/cmdline_prompt.cc:465
+#: src/cmdline/cmdline_prompt.cc:469
#, c-format
msgid "Need to get %sB of archives. "
msgstr "%sB ã®ã‚¢ãƒ¼ã‚«ã‚¤ãƒ–ã‚’å–å¾—ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™"
-#: src/cmdline/cmdline_prompt.cc:472
+#: src/cmdline/cmdline_prompt.cc:476
#, c-format
msgid "After unpacking %sB will be used.\n"
msgstr "展開後ã«è¿½åŠ 㧠%sB ã®ãƒ‡ã‚£ã‚¹ã‚¯å®¹é‡ãŒæ¶ˆè²»ã•ã‚Œã¾ã™ã€‚\n"
-#: src/cmdline/cmdline_prompt.cc:475
+#: src/cmdline/cmdline_prompt.cc:479
#, c-format
msgid "After unpacking %sB will be freed.\n"
msgstr "展開後㫠%sB ã®ãƒ‡ã‚£ã‚¹ã‚¯å®¹é‡ãŒè§£æ”¾ã•ã‚Œã¾ã™ã€‚\n"
-#: src/cmdline/cmdline_prompt.cc:521
+#: src/cmdline/cmdline_prompt.cc:524
#, c-format
msgid "Bad action character '%c'\n"
msgstr "ä¸æ£ãªã‚¢ã‚¯ã‚·ãƒ§ãƒ³ã‚ャラクタ '%c'\n"
-#: src/cmdline/cmdline_prompt.cc:596
+#: src/cmdline/cmdline_prompt.cc:595
#, c-format
msgid "No packages to show -- enter the package names on the line after 'i'.\n"
msgstr ""
"表示ã™ã‚‹ãƒ‘ッケージãŒã‚ã‚Šã¾ã›ã‚“ -- 'i' ã®å¾Œã«ãƒ‘ッケージåを入力ã—ã¦ãã ã•"
"ã„。\n"
-#: src/cmdline/cmdline_prompt.cc:598 src/cmdline/cmdline_prompt.cc:629
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:597
msgid "Press Return to continue."
msgstr "続ã‘ã‚‹ã«ã¯ RETURN を押ã—ã¦ãã ã•ã„。"
-#: src/cmdline/cmdline_prompt.cc:625
+#: src/cmdline/cmdline_prompt.cc:623
#, c-format
msgid "No packages found -- enter the package names on the line after 'c'.\n"
msgstr ""
"表示ã™ã‚‹ãƒ‘ッケージãŒã‚ã‚Šã¾ã›ã‚“ -- 'c' ã®å¾Œã«ãƒ‘ッケージåを入力ã—ã¦ãã ã•"
"ã„。\n"
-#: src/cmdline/cmdline_prompt.cc:665
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:627
+#, fuzzy
+msgid "Press Return to continue"
+msgstr "続ã‘ã‚‹ã«ã¯ RETURN を押ã—ã¦ãã ã•ã„。"
+
+#: src/cmdline/cmdline_prompt.cc:675
msgid "Do you want to continue? [Y/n/?] "
msgstr "続ã‘ã¾ã™ã‹ï¼Ÿ [Y/n/?] "
-#: src/cmdline/cmdline_prompt.cc:690
+#: src/cmdline/cmdline_prompt.cc:700
#, c-format
msgid ""
"\n"
@@ -609,7 +699,7 @@
"ä¾å˜é–¢ä¿‚æƒ…å ±ã‚’è¡¨ç¤ºã—ã¾ã™ã€‚\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:692
+#: src/cmdline/cmdline_prompt.cc:702
#, c-format
msgid ""
"\n"
@@ -620,7 +710,7 @@
"ä¾å˜é–¢ä¿‚æƒ…å ±ã‚’è¡¨ç¤ºã—ã¾ã›ã‚“。\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:698
+#: src/cmdline/cmdline_prompt.cc:708
#, c-format
msgid ""
"\n"
@@ -631,7 +721,7 @@
"ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’表示ã—ã¾ã™ã€‚\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:700
+#: src/cmdline/cmdline_prompt.cc:710
#, c-format
msgid ""
"\n"
@@ -642,7 +732,7 @@
"ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’表示ã—ã¾ã›ã‚“。\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:705
+#: src/cmdline/cmdline_prompt.cc:715
#, c-format
msgid ""
"\n"
@@ -653,7 +743,7 @@
"サイズã®å¤‰æ›´ã‚’表示ã—ã¾ã™ã€‚\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:717
#, c-format
msgid ""
"\n"
@@ -664,7 +754,7 @@
"サイズã®å¤‰æ›´ã‚’表示ã—ã¾ã›ã‚“。\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:737
#, c-format
msgid ""
"Commands:\n"
@@ -713,33 +803,86 @@
" _ : 完全削除\n"
" = : ä¿æŒ\n"
-#: src/cmdline/cmdline_prompt.cc:751
+#: src/cmdline/cmdline_prompt.cc:761
#, c-format
msgid "Invalid response. Please enter a valid command or '?' for help.\n"
msgstr ""
"ä¸æ£ãªå¿œç”。æ£ã—ã„コマンドを入力ã™ã‚‹ã‹ '?' ã§ãƒ˜ãƒ«ãƒ—ã‚’å‚ç…§ã—ã¦ãã ã•ã„。\n"
+#: src/cmdline/cmdline_resolver.cc:84
+#, c-format
+msgid "y: %F%nn: %F%nq: %F%n,: %F%n.: %F%n"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:90
+msgid "accept the proposed changes"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:92
+msgid "reject the proposed changes and search for another solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:94
+#, fuzzy
+msgid "give up and quit the program"
+msgstr "プãƒã‚°ãƒ©ãƒ ã®çµ‚了"
+
+#: src/cmdline/cmdline_resolver.cc:96
+msgid "move to the next solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:98
+msgid "move to the previous solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:131
+#, fuzzy
+msgid "The following actions will resolve these dependencies:"
+msgstr "以下ã®ãƒ‘ッケージã«ã¯è§£æ±ºã§ããªã„ä¾å˜é–¢ä¿‚ãŒã‚ã‚Šã¾ã™:\n"
+
+#: src/cmdline/cmdline_resolver.cc:146
+msgid "Accept this solution? [Y/n/q/?]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:174
+msgid "Abandoning all efforts to resolve these dependencies."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:184
+#, fuzzy
+msgid "The following commands are available:"
+msgstr "以下ã®ãƒ‘ッケージãŒå£Šã‚Œã¦ã„ã¾ã™:"
+
+#: src/cmdline/cmdline_resolver.cc:188
+#, fuzzy
+msgid "Invalid response; please enter one of the following commands:"
+msgstr ""
+"ä¸æ£ãªå¿œç”。æ£ã—ã„コマンドを入力ã™ã‚‹ã‹ '?' ã§ãƒ˜ãƒ«ãƒ—ã‚’å‚ç…§ã—ã¦ãã ã•ã„。\n"
+
+#: src/cmdline/cmdline_resolver.cc:198
+msgid "No solution found within the allotted time. Try harder? [Y/n]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:226
+#, fuzzy
+msgid "Invalid response; please enter 'y' or 'n'."
+msgstr ""
+"ä¸æ£ãªå¿œç”。æ£ã—ã„コマンドを入力ã™ã‚‹ã‹ '?' ã§ãƒ˜ãƒ«ãƒ—ã‚’å‚ç…§ã—ã¦ãã ã•ã„。\n"
+
+#: src/cmdline/cmdline_resolver.cc:235
+msgid "Unable to resolve dependencies! Giving up..."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:240
+msgid "No more solutions."
+msgstr ""
+
#: src/cmdline/cmdline_search.cc:78
#, c-format
msgid "search: You must provide at least one search term\n"
msgstr "search: å°‘ãªãã¨ã‚‚一ã¤ã®æ¤œç´¢èªžãŒå¿…è¦ã§ã™\n"
-# Use apt-get's familiar error message,
-#: src/cmdline/cmdline_show_broken.cc:114
-#, c-format
-msgid ""
-"Some packages had unmet dependencies. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming.\n"
-"\n"
-msgstr ""
-"インストールã§ããªã„パッケージãŒã‚ã‚Šã¾ã—ãŸã€‚ãŠãらãã€ã‚ã‚Šãˆãªã„状æ³\n"
-"ã‚’è¦æ±‚ã—ãŸã‹ã€ä¸å®‰å®šç‰ˆãƒ‡ã‚£ã‚¹ãƒˆãƒªãƒ“ューションを使用ã—ã¦ã„ã‚‹ãªã‚‰å¿…è¦ãª\n"
-"パッケージãŒã¾ã 作æˆã•ã‚Œã¦ã„ãªã„ã‹ Incoming ã‹ã‚‰ç§»å‹•ã•ã‚Œã¦ã„ãªã„ã¨è€ƒ\n"
-"ãˆã‚‰ã‚Œã¾ã™ã€‚\n"
-
-#: src/cmdline/cmdline_show_broken.cc:115
+#: src/cmdline/cmdline_show_broken.cc:113
#, c-format
msgid "The following packages have unmet dependencies:\n"
msgstr "以下ã®ãƒ‘ッケージã«ã¯è§£æ±ºã§ããªã„ä¾å˜é–¢ä¿‚ãŒã‚ã‚Šã¾ã™:\n"
@@ -937,12 +1080,12 @@
msgid "Description: "
msgstr "詳細: "
-#: src/cmdline/cmdline_simulate.cc:36
+#: src/cmdline/cmdline_simulate.cc:37
#, c-format
msgid "Would download/install/remove packages.\n"
msgstr "パッケージã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã¾ãŸã¯å‰Šé™¤ã€‚\n"
-#: src/cmdline/cmdline_simulate.cc:47
+#: src/cmdline/cmdline_simulate.cc:48
msgid "Internal Error, Ordering didn't finish"
msgstr "内部エラーã€ä¸æ–ã—ã¾ã™"
@@ -984,26 +1127,24 @@
msgid "UNAVAILABLE"
msgstr "入手ä¸å¯"
-#: src/download_bar.cc:57 src/download_list.cc:265
+#: src/download_bar.cc:56 src/download_list.cc:263 src/download_screen.cc:57
#, c-format
-msgid ""
-"Please insert the following disc into the drive \"%s\":\n"
-"%s"
-msgstr "ドライブ \"%s\": ã«ã€ãƒ‡ã‚£ã‚¹ã‚¯ %s を入れã¦ãã ã•ã„"
+msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
+msgstr "\"%s\" ã¨æ›¸ã‹ã‚ŒãŸãƒ‡ã‚£ã‚¹ã‚¯ã‚’ \"%s\" ドライブã«å…¥ã‚Œã¦ãã ã•ã„"
-#: src/download_bar.cc:76 src/generic/acqprogress.cc:63
+#: src/download_bar.cc:77 src/generic/acqprogress.cc:63
msgid "Hit "
msgstr "発見 "
-#: src/download_bar.cc:89
+#: src/download_bar.cc:90
msgid "Downloading "
msgstr "ダウンãƒãƒ¼ãƒ‰ä¸ "
-#: src/download_bar.cc:102
+#: src/download_bar.cc:103
msgid "Got "
msgstr "å–å¾— "
-#: src/download_bar.cc:156
+#: src/download_bar.cc:157
msgid "Downloading..."
msgstr "ダウンãƒãƒ¼ãƒ‰ä¸..."
@@ -1011,7 +1152,7 @@
msgid "Couldn't read list of package sources"
msgstr "パッケージ入手先一覧をèªã¿è¾¼ã¿ã«å¤±æ•—ã—ã¾ã—ãŸ"
-#: src/download.cc:104 src/download.cc:321
+#: src/download.cc:104 src/download.cc:322
msgid "Couldn't lock list directory..are you root?"
msgstr "入手先一覧ã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªãŒãƒãƒƒã‚¯ã§ãã¾ã›ã‚“…rootã«ãªã£ã¦ã„ã¾ã™ã‹?"
@@ -1023,29 +1164,33 @@
msgid "View the progress of the package list update"
msgstr "パッケージリストã®æ›´æ–°ã®çµŒéŽã‚’表示"
-#: src/download.cc:159
+#: src/download.cc:113
+msgid "List Update"
+msgstr ""
+
+#: src/download.cc:160
msgid "Couldn't clean out list directories"
msgstr "入手先一覧ã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’綺麗ã«ã§ãã¾ã›ã‚“ã§ã—ãŸ"
-#: src/download.cc:176 src/ui.cc:1068
+#: src/download.cc:177 src/ui.cc:1152
msgid "Deleting obsolete downloaded files"
msgstr "ダウンãƒãƒ¼ãƒ‰ã•ã‚ŒãŸå¤ã„ファイルを削除ã—ã¦ã„ã¾ã™"
-#: src/download.cc:181
+#: src/download.cc:182
#, c-format
msgid "Deleting obsolete downloaded files\n"
msgstr "å¤ã„ダウンãƒãƒ¼ãƒ‰æ¸ˆã¿ãƒ•ã‚¡ã‚¤ãƒ«ã‚’削除ã—ã¾ã™\n"
-#: src/download.cc:223
+#: src/download.cc:224
#, c-format
msgid "Unable to open %s to log actions"
msgstr "ãƒã‚°è¨˜éŒ²ã®ãŸã‚ã® %s ã‚’é–‹ãã“ã¨ãŒã§ãã¾ã›ã‚“"
-#: src/download.cc:229
+#: src/download.cc:230
msgid "log report"
msgstr "ãƒã‚°å ±å‘Š"
-#: src/download.cc:230
+#: src/download.cc:231
#, c-format
msgid ""
"IMPORTANT: this log only lists intended actions; actions which fail due to\n"
@@ -1056,77 +1201,77 @@
" ã¤ã¾ã‚Šã€dpkgã®å•é¡Œã«ã‚ˆã‚‹ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ã¯è¨˜éŒ²ã•ã‚Œãªã„å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚\n"
"\n"
-#: src/download.cc:231
+#: src/download.cc:232
#, c-format
msgid "Will install %li packages, and remove %li packages.\n"
msgstr "%liã®ãƒ‘ッケージをインストールã—ã€%liã®ãƒ‘ッケージを削除ã—ã¾ã™ã€‚\n"
-#: src/download.cc:233
+#: src/download.cc:234
#, c-format
msgid "%sB of disk space will be used\n"
msgstr "%sB ã®ãƒ‡ã‚£ã‚¹ã‚¯é ˜åŸŸã‚’使用ã—ã¾ã™\n"
-#: src/download.cc:236
+#: src/download.cc:237
#, c-format
msgid "%sB bytes of disk space will be freed\n"
msgstr "%sBãƒã‚¤ãƒˆã®ãƒ‡ã‚£ã‚¹ã‚¯é ˜åŸŸã‚’解放ã—ã¾ã™\n"
-#: src/download.cc:244
+#: src/download.cc:245
#, c-format
msgid "[UPGRADE] %s %s -> %s\n"
msgstr "[æ›´æ–°] %s %s -> %s\n"
-#: src/download.cc:248
+#: src/download.cc:249
#, c-format
msgid "[DOWNGRADE] %s %s -> %s\n"
msgstr "[ダウングレード] %s %s -> %s\n"
-#: src/download.cc:258
+#: src/download.cc:259
msgid "REMOVE"
msgstr "削除"
-#: src/download.cc:264
+#: src/download.cc:265
msgid "INSTALL"
msgstr "インストール"
-#: src/download.cc:267
+#: src/download.cc:268
msgid "REINSTALL"
msgstr "å†ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«"
-#: src/download.cc:270
+#: src/download.cc:271
msgid "HOLD"
msgstr "ç¶æŒ"
-#: src/download.cc:273
+#: src/download.cc:274
msgid "BROKEN"
msgstr "壊れã¦ã„ã‚‹"
-#: src/download.cc:276
+#: src/download.cc:277
msgid "REMOVE, NOT USED"
msgstr "使ã‚ã‚Œã¦ã„ãªã„ãŸã‚削除"
-#: src/download.cc:279
+#: src/download.cc:280
msgid "REMOVE, DEPENDENCIES"
msgstr "ä¾å˜é–¢ä¿‚ã«ã‚ˆã‚Šå‰Šé™¤"
-#: src/download.cc:282
+#: src/download.cc:283
msgid "INSTALL, DEPENDENCIES"
msgstr "ä¾å˜é–¢ä¿‚ã«ã‚ˆã‚Šã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«"
-#: src/download.cc:285
+#: src/download.cc:286
msgid "HOLD, DEPENDENCIES"
msgstr "ä¾å˜é–¢ä¿‚ã«ã‚ˆã‚Šç¶æŒ"
-#: src/download.cc:287
+#: src/download.cc:288
msgid "????????"
msgstr "????????"
-#: src/download.cc:291
+#: src/download.cc:292
#, c-format
msgid "[%s] %s\n"
msgstr "[%s] %s\n"
-#: src/download.cc:294
+#: src/download.cc:295
#, c-format
msgid ""
"===============================================================================\n"
@@ -1137,32 +1282,37 @@
"\n"
"ãƒã‚°å®Œäº†ã€‚\n"
-#: src/download.cc:329
+#: src/download.cc:330
msgid "Downloading packages"
msgstr "ダウンãƒãƒ¼ãƒ‰ä¸ "
-#: src/download.cc:330
+#: src/download.cc:331
msgid "View the progress of the package download"
msgstr "パッケージã®ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰çµŒéŽã‚’表示"
-#: src/download.cc:352
+#: src/download.cc:332
+#, fuzzy
+msgid "Package Download"
+msgstr "パッケージ: "
+
+#: src/download.cc:354
msgid "Internal error: couldn't generate list of packages to download"
msgstr "内部エラー: ダウンãƒãƒ¼ãƒ‰ã™ã‚‹ãƒ‘ッケージã®ä¸€è¦§ã‚’作æˆã§ãã¾ã›ã‚“"
-#: src/download.cc:413
+#: src/download.cc:415
msgid "Unable to correct for unavailable packages"
msgstr "入手ä¸å¯èƒ½ãªãƒ‘ッケージã®ä¿®æ£ãŒã§ãã¾ã›ã‚“"
-#: src/download.cc:465
+#: src/download.cc:467
msgid ""
"Ack! Something bad happened while installing packages. Trying to recover:"
msgstr " パッケージã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ä¸ã«å•é¡ŒãŒèµ·ã“ã‚Šã¾ã—ãŸã€‚修復を試ã¿ã¾ã™: "
-#: src/download.cc:475 src/pkg_item.cc:413
+#: src/download.cc:477 src/pkg_item.cc:432
msgid "Press return to continue.\n"
msgstr "続ã‘ã‚‹ã«ã¯ RETURN を押ã—ã¦ãã ã•ã„。\n"
-#: src/download.cc:506
+#: src/download.cc:508
msgid ""
"Could not regain the system lock! (Perhaps another apt or dpkg is running?)"
msgstr "システムãƒãƒƒã‚¯ã‚’復帰ã§ãã¾ã›ã‚“(ä»–ã«aptã‹dpkgãŒå‹•ã„ã¦ã„ã¾ã›ã‚“ã‹ï¼Ÿ)"
@@ -1223,11 +1373,6 @@
msgid "[ERROR]"
msgstr "[エラー]"
-#: src/download_screen.cc:57
-#, c-format
-msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
-msgstr "\"%s\" ã¨æ›¸ã‹ã‚ŒãŸãƒ‡ã‚£ã‚¹ã‚¯ã‚’ \"%s\" ドライブã«å…¥ã‚Œã¦ãã ã•ã„"
-
#: src/download_screen.cc:181
#, c-format
msgid "Downloaded %sB in %ss (%sB/s)."
@@ -1265,113 +1410,113 @@
"press enter\n"
msgstr "\"%s\" ã¨æ›¸ã‹ã‚ŒãŸãƒ‡ã‚£ã‚¹ã‚¯ã‚’ \"%s\" ドライブã«å…¥ã‚Œã¦ãã ã•ã„\n"
-#: src/generic/aptcache.cc:245
+#: src/generic/aptcache.cc:253
msgid "Can't open Aptitude extended state file"
msgstr "Aptitudeã®æ‹¡å¼µã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é–‹ã‘ã¾ã›ã‚“"
-#: src/generic/aptcache.cc:252 src/generic/aptcache.cc:305
-#: src/generic/aptcache.cc:307
+#: src/generic/aptcache.cc:260 src/generic/aptcache.cc:313
+#: src/generic/aptcache.cc:315
msgid "Reading extended state information"
msgstr "æ‹¡å¼µã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹æƒ…å ±ã‚’èªã¿è¾¼ã‚“ã§ã„ã¾ã™"
-#: src/generic/aptcache.cc:313 src/generic/aptcache.cc:387
-#: src/generic/aptcache.cc:390
+#: src/generic/aptcache.cc:321 src/generic/aptcache.cc:395
+#: src/generic/aptcache.cc:398
msgid "Initializing package states"
msgstr "パッケージステータスã®åˆæœŸåŒ–"
-#: src/generic/aptcache.cc:501
+#: src/generic/aptcache.cc:509
msgid "Cannot open Aptitude state file"
msgstr "Aptitudeã®ã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é–‹ã‘ã¾ã›ã‚“"
-#: src/generic/aptcache.cc:505 src/generic/aptcache.cc:560
-#: src/generic/aptcache.cc:563
+#: src/generic/aptcache.cc:513 src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:571
msgid "Writing extended state information"
msgstr "æ‹¡å¼µã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹æƒ…å ±ã‚’æ›¸ã込んã§ã„ã¾ã™"
-#: src/generic/aptcache.cc:542
+#: src/generic/aptcache.cc:550
#, c-format
msgid "Internal buffer overflow on package \"%s\" while writing state file"
msgstr ""
" \"%s\" パッケージã®ã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹ãƒ•ã‚¡ã‚¤ãƒ«æ›¸ãè¾¼ã¿æ™‚ã«å†…部ãƒãƒƒãƒ•ã‚¡ã‚ªãƒ¼ãƒãƒ¼ãƒ•ãƒãƒ¼"
"ãŒç™ºç”Ÿã—ã¾ã—ãŸ"
-#: src/generic/aptcache.cc:551
+#: src/generic/aptcache.cc:559
msgid "Couldn't write state file"
msgstr "ステータスファイルã«æ›¸ãè¾¼ã‚ã¾ã›ã‚“ã§ã—ãŸ"
-#: src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:576
msgid "Error writing state file"
msgstr "ステータスファイルã®æ›¸ãè¾¼ã¿ã®éš›ã«ã‚¨ãƒ©ãƒ¼ãŒèµ·ãã¾ã—ãŸ"
-#: src/generic/aptcache.cc:584
+#: src/generic/aptcache.cc:592
msgid "couldn't replace old state file"
msgstr "å¤ã„ステータスファイルを置ã替ãˆã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“ã§ã—ãŸ"
-#: src/generic/aptcache.cc:960
+#: src/generic/aptcache.cc:1000
msgid "Unable to correct dependencies, some packages cannot be installed"
msgstr "ä¾å˜é–¢ä¿‚を解決ã§ããªã„ãŸã‚ã€ãƒ‘ッケージをインストールã§ãã¾ã›ã‚“"
-#: src/generic/aptcache.cc:1325
+#: src/generic/aptcache.cc:1546
msgid "The list of sources could not be read."
msgstr "ソースã®ä¸€è¦§ãŒèªã‚ã¾ã›ã‚“"
-#: src/generic/aptcache.cc:1332
+#: src/generic/aptcache.cc:1553
msgid "The package lists or status file could not be parsed or opened."
msgstr ""
"パッケージã®ä¸€è¦§ã¾ãŸã¯ã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é–‹ãã¾ãŸã¯ãƒ‘ースã™ã‚‹ã“ã¨ãŒã§ãã¾ã›"
"ã‚“ã§ã—ãŸ"
-#: src/generic/aptcache.cc:1335
+#: src/generic/aptcache.cc:1556
msgid "You may want to update the package lists to correct these missing files"
msgstr "見当ãŸã‚‰ãªã„ファイルを補ã†ãŸã‚ã«ãƒ‘ッケージリストを更新ã—ã¦ãã ã•ã„"
-#: src/generic/apt.cc:141
+#: src/generic/apt.cc:142
#, c-format
msgid "Unable to open %s for writing"
msgstr "%s を書ãè¾¼ã¿å¯èƒ½ãªçŠ¶æ…‹ã§é–‹ã‘ã¾ã›ã‚“"
-#: src/generic/apt.cc:151
+#: src/generic/apt.cc:152
#, c-format
msgid "Unable to replace %s with new configuration file"
msgstr "%sã‚’æ–°è¦ã®è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã¨å…¥ã‚Œæ›¿ãˆã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“"
-#: src/generic/apt.cc:226
+#: src/generic/apt.cc:227
msgid "Warning: could not lock the cache file. Opening in read-only mode"
msgstr "è¦å‘Š: ã‚ャッシュファイルをãƒãƒƒã‚¯ã§ãã¾ã›ã‚“。表示ã®ã¿ãƒ¢ãƒ¼ãƒ‰ã§é–‹ãã¾ã™"
-#: src/generic/matchers.cc:780
+#: src/generic/matchers.cc:797
msgid "Unmatched '('"
msgstr "'('ã®ã‹ã£ã“対応ãŒã¨ã‚Œã¾ã›ã‚“"
-#: src/generic/matchers.cc:870 src/generic/matchers.cc:949
+#: src/generic/matchers.cc:887 src/generic/matchers.cc:968
#, c-format
msgid "Unknown dependency type: %s"
msgstr "ä¸æ˜Žãªä¾å˜å½¢å¼: %s"
-#: src/generic/matchers.cc:931
+#: src/generic/matchers.cc:950
#, c-format
msgid "Unknown action type: %s"
msgstr "ä¸æ˜Žãªå‹•ä½œ: %s"
-#: src/generic/matchers.cc:998
+#: src/generic/matchers.cc:1017
#, c-format
msgid "Unknown priority %s"
msgstr "ä¸æ˜Žãªå„ªå…ˆåº¦: %s"
-#: src/generic/matchers.cc:1020
+#: src/generic/matchers.cc:1039
#, c-format
msgid "Unknown pattern type: %c"
msgstr "ä¸æ˜Žãªãƒ‘ターン: %c"
-#: src/generic/matchers.cc:1065
+#: src/generic/matchers.cc:1084
msgid "Unexpected empty expression"
msgstr "想定外ã®ç©ºã®å¼ã§ã™"
-#: src/generic/matchers.cc:1100
+#: src/generic/matchers.cc:1119
msgid "Badly formed expression"
msgstr "書å¼ãŒæ£ã—ãã‚ã‚Šã¾ã›ã‚“"
-#: src/generic/matchers.cc:1129
+#: src/generic/matchers.cc:1148
msgid "Unexpected ')'"
msgstr "想定外ã®')'ã§ã™"
@@ -1396,7 +1541,7 @@
msgid "Can't get value of $HOME, using TMPDIR (insecure)"
msgstr "$HOME ãŒå–å¾—ã§ãã¾ã›ã‚“〠TMPディレクトリを使用ã—ã¾ã™ã€‚"
-#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:60
+#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:61
#, c-format
msgid "ChangeLog of %s"
msgstr "%s ã®æ›´æ–°å±¥æ´"
@@ -1606,17 +1751,17 @@
msgid "Invalid sorting policy type '%s'"
msgstr "'%s'ã¯ç„¡åŠ¹ãªä¸¦ã³æ›¿ãˆãƒãƒªã‚·ãƒ¼ã§ã™"
-#: src/main.cc:68
+#: src/main.cc:67
#, c-format
msgid "%s %s compiled at %s %s\n"
msgstr "%s %s 㯠%s %s ã§ã‚³ãƒ³ãƒ‘イルã•ã‚Œã¾ã—㟠\n"
-#: src/main.cc:71
+#: src/main.cc:70
#, c-format
msgid "Compiler: g++ %s\n"
msgstr "コンパイラ: g++ %s\n"
-#: src/main.cc:74
+#: src/main.cc:73
#, c-format
msgid ""
"\n"
@@ -1625,7 +1770,7 @@
"\n"
"NCurseãƒãƒ¼ã‚¸ãƒ§ãƒ³: %s\n"
-#: src/main.cc:76
+#: src/main.cc:75
#, c-format
msgid ""
"\n"
@@ -1634,22 +1779,22 @@
"\n"
"Cursesãƒãƒ¼ã‚¸ãƒ§ãƒ³: %s\n"
-#: src/main.cc:78
+#: src/main.cc:77
#, c-format
msgid "libsigc++ version: %s\n"
msgstr "libsigc++ãƒãƒ¼ã‚¸ãƒ§ãƒ³ : %s\n"
-#: src/main.cc:84
+#: src/main.cc:83
#, c-format
msgid "Usage: aptitude [-S fname] [-u|-i]"
msgstr "使用方法: aptitude [-S ファイルå] [-u|-i]"
-#: src/main.cc:86
+#: src/main.cc:85
#, c-format
msgid " aptitude [options] <action> ..."
msgstr " aptitude [オプション]<アクション> ..."
-#: src/main.cc:88
+#: src/main.cc:87
#, c-format
msgid ""
" Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -1659,117 +1804,117 @@
"ã™):\n"
"\n"
-#: src/main.cc:89
+#: src/main.cc:88
#, c-format
msgid " install - Install/upgrade packages\n"
msgstr " install - パッケージã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«/æ›´æ–°\n"
-#: src/main.cc:90
+#: src/main.cc:89
#, c-format
msgid " remove - Remove packages\n"
msgstr " remove - パッケージã®å‰Šé™¤\n"
-#: src/main.cc:91
+#: src/main.cc:90
#, c-format
msgid " purge - Remove packages and their configuration files\n"
msgstr " purge - パッケージã¨è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã‚’削除ã™ã‚‹\n"
-#: src/main.cc:92
+#: src/main.cc:91
#, c-format
msgid " hold - Place packages on hold\n"
msgstr " hold - パッケージã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’ä¿æŒã™ã‚‹\n"
-#: src/main.cc:93
+#: src/main.cc:92
#, c-format
msgid " unhold - Cancel a hold command for a package\n"
msgstr " unhold - パッケージã®ä¿æŒã‚’解除ã™ã‚‹\n"
-#: src/main.cc:94
+#: src/main.cc:93
#, c-format
msgid " markauto - Mark packages as having been automatically installed\n"
msgstr " markauto - パッケージã«è‡ªå‹•ã§ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã®å°ã‚’付ã‘ã‚‹\n"
-#: src/main.cc:95
+#: src/main.cc:94
#, c-format
msgid " unmarkauto - Mark packages as having been manually installed\n"
msgstr " unmarkauto - パッケージã«æ‰‹å‹•ã§ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã®å°ã‚’付ã‘ã‚‹\n"
-#: src/main.cc:100
+#: src/main.cc:99
#, c-format
msgid ""
" forbid-version - Forbid aptitude from upgrading to a specific package "
"version.\n"
msgstr " forbid-version - 特定ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®ãƒ‘ッケージを更新ç¦æ¢ã«ã™ã‚‹ã€‚\n"
-#: src/main.cc:101
+#: src/main.cc:100
#, c-format
msgid " update - Download lists of new/upgradable packages\n"
msgstr ""
" update - æ–°è¦ãŠã‚ˆã³æ›´æ–°å¯èƒ½ãªãƒ‘ッケージã®ä¸€è¦§ã‚’ダウンãƒãƒ¼ãƒ‰ã™ã‚‹\n"
-#: src/main.cc:102
+#: src/main.cc:101
#, c-format
msgid " upgrade - Perform a safe upgrade\n"
msgstr " upgrade - 安全ãªæ›´æ–°ã‚’è¡Œãªã†\n"
-#: src/main.cc:103
+#: src/main.cc:102
#, c-format
msgid ""
" dist-upgrade - Perform an upgrade, possibly installing and removing "
"packages\n"
msgstr " dist-upgrade - パッケージã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚„削除を伴ã†æ›´æ–°ã‚’è¡Œãªã†\n"
-#: src/main.cc:104
+#: src/main.cc:103
#, c-format
msgid " forget-new - Forget what packages are \"new\"\n"
msgstr " forget-new - \"æ–°è¦\"ã«åˆ†é¡žã•ã‚Œã¦ã„ã‚‹ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ä¸€è¦§æƒ…å ±ã‚’æ¶ˆåŽ» \n"
-#: src/main.cc:105
+#: src/main.cc:104
#, c-format
msgid " search - Search for a package by name and/or expression\n"
msgstr " search - パッケージをåå‰ã‚„æ£è¦è¡¨ç¾ã§æ¤œç´¢ã™ã‚‹\n"
-#: src/main.cc:106
+#: src/main.cc:105
#, c-format
msgid " show - Display detailed information about a package\n"
msgstr " show - 詳細ãªãƒ‘ãƒƒã‚±ãƒ¼ã‚¸æƒ…å ±ã‚’è¡¨ç¤ºã™ã‚‹\n"
-#: src/main.cc:107
+#: src/main.cc:106
#, c-format
msgid " clean - Erase downloaded package files\n"
msgstr " clean - ダウンãƒãƒ¼ãƒ‰ã—ãŸãƒ‘ッケージファイルを削除ã™ã‚‹\n"
-#: src/main.cc:108
+#: src/main.cc:107
#, c-format
msgid " autoclean - Erase old downloaded package files\n"
msgstr " autoclean - å¤ã„ダウンãƒãƒ¼ãƒ‰ã—ãŸãƒ‘ッケージファイルを削除ã™ã‚‹\n"
-#: src/main.cc:109
+#: src/main.cc:108
#, c-format
msgid " changelog - View a package's changelog\n"
msgstr "changelog - パッケージ㮠changelog を表示ã™ã‚‹\n"
-#: src/main.cc:110
+#: src/main.cc:109
#, c-format
msgid " download - Download the .deb file for a package\n"
msgstr " download - パッケージã®.debファイルをダウンãƒãƒ¼ãƒ‰ã™ã‚‹\n"
-#: src/main.cc:112
+#: src/main.cc:111
#, c-format
msgid " Options:\n"
msgstr " オプション: \n"
-#: src/main.cc:113
+#: src/main.cc:112
#, c-format
msgid " -h This help text\n"
msgstr " -h ã“ã®æ‰‹å¼•ãを表示ã™ã‚‹\n"
-#: src/main.cc:114
+#: src/main.cc:113
#, c-format
msgid " -s Simulate actions, but do not actually perform them.\n"
msgstr " -s 実際ã«ã¯ä½•ã‚‚ã›ãšã€ã‚·ãƒŸãƒ¥ãƒ¬ãƒ¼ãƒˆã®ã¿è¡Œãªã†\n"
-#: src/main.cc:115
+#: src/main.cc:114
#, c-format
msgid ""
" -d Only download packages, do not install or remove anything.\n"
@@ -1777,76 +1922,76 @@
" -d パッケージã®ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã®ã¿è¡Œãªã„ã€ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚„削除ãªã©ã¯"
"è¡Œãªã‚ãªã„\n"
-#: src/main.cc:116
+#: src/main.cc:115
#, c-format
msgid " -P Always prompt for confirmation or actions\n"
msgstr " -P 常ã«ãƒ—ãƒãƒ³ãƒ—トã§ç¢ºèªã¾ãŸã¯å®Ÿè¡Œã™ã‚‹\n"
-#: src/main.cc:117
+#: src/main.cc:116
#, c-format
msgid ""
" -y Assume that the answer to simple yes/no questions is 'yes'\n"
msgstr " -y ã™ã¹ã¦ã®yes/noã®è³ªå•ã«å¯¾ã—㦠'yes' ã¨ç”ãˆãŸã¨ã¿ãªã™\n"
-#: src/main.cc:118
+#: src/main.cc:117
#, c-format
msgid ""
" -F format Specify a format for displaying search results; see the "
"manual\n"
msgstr " -F å½¢å¼ æ¤œç´¢çµæžœã®è¡¨ç¤ºãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆã‚’指定； マニュアルをå‚ç…§\n"
-#: src/main.cc:119
+#: src/main.cc:118
#, c-format
msgid ""
" -O order Specify how search results should be sorted; see the manual\n"
msgstr " -O é †åº æ¤œç´¢çµæžœã®ä¸¦ã³ã‚’指定； マニュアルをå‚ç…§\n"
-#: src/main.cc:120
+#: src/main.cc:119
#, c-format
msgid ""
" -w width Specify the display width for formatting search results\n"
msgstr " -w å¹… 検索çµæžœã®è¡¨ç¤ºã®å¹…を指定ã™ã‚‹\n"
-#: src/main.cc:121
+#: src/main.cc:120
#, c-format
msgid " -f Aggressively try to fix broken packages.\n"
msgstr " -f ç©æ¥µçš„ã«å£Šã‚Œã¦ã„るパッケージを修復ã—よã†ã¨ã™ã‚‹\n"
-#: src/main.cc:122
+#: src/main.cc:121
#, c-format
msgid " -V Show which versions of packages are to be installed.\n"
msgstr " -V インストールã•ã‚Œã¦ã„ã‚‹ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’表示ã™ã‚‹\n"
-#: src/main.cc:123
+#: src/main.cc:122
#, c-format
msgid ""
" -D Show the dependencies of automatically changed packages.\n"
msgstr " -D 自動的ã«å¤‰æ›´ã—ãŸãƒ‘ッケージã®ä¾å˜é–¢ä¿‚を表示ã™ã‚‹\n"
-#: src/main.cc:124
+#: src/main.cc:123
#, c-format
msgid " -Z\t\t Show the change in installed size of each package.\n"
msgstr " -Z\t\t インストールã•ã‚Œã¦ã„るパッケージã®ã‚µã‚¤ã‚ºã‚’表示ã™ã‚‹\n"
-#: src/main.cc:125
+#: src/main.cc:124
#, c-format
msgid ""
" -v Display extra information. (may be supplied multiple times)\n"
msgstr " -v 詳細ãªæƒ…å ±ã‚’è¡¨ç¤ºã™ã‚‹\n"
-#: src/main.cc:126
+#: src/main.cc:125
#, c-format
msgid ""
" -t [release] Set the release from which packages should be installed\n"
msgstr ""
" -t [リリース] インストールã•ã‚Œã¦ã„るパッケージã‹ã‚‰ãƒªãƒªãƒ¼ã‚¹ã‚’セットã™ã‚‹\n"
-#: src/main.cc:127
+#: src/main.cc:126
#, c-format
msgid " -o key=val Directly set the configuration option named 'key'\n"
msgstr " -o key=val ディレクトリã«è¨å®šå¯èƒ½ã‚ªãƒ—ション 'key' ã‚’è¨å®šã™ã‚‹\n"
-#: src/main.cc:128
+#: src/main.cc:127
#, c-format
msgid ""
" --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -1855,59 +2000,67 @@
" --with(out)-recommends\tSpecify \n"
" recommendパッケージを強ã„ä¾å˜é–¢ä¿‚ã¿ãªã™ã‹è¨å®šã™ã‚‹\n"
-#: src/main.cc:129
+#: src/main.cc:128
#, c-format
msgid " -S fname: Read the aptitude extended status info from fname.\n"
msgstr " -S ファイルå: ファイルåã‹ã‚‰aptitudeã®è©³ç´°ã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹èªã‚€\n"
-#: src/main.cc:130
+#: src/main.cc:129
#, c-format
msgid " -u : Download new package lists on startup.\n"
msgstr " -u : 起動時ã«æ–°è¦ã®ãƒ‘ッケージ一覧をダウンãƒãƒ¼ãƒ‰ã™ã‚‹ \n"
-#: src/main.cc:131
+#: src/main.cc:130
#, c-format
msgid " -i : Perform an install run on startup.\n"
msgstr " -i : 起動時ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚’è¡Œãªã†\n"
-#: src/main.cc:133
+#: src/main.cc:132
#, c-format
msgid " This aptitude does not have Super Cow Powers.\n"
msgstr " aptitudeã¯ã‚¹ãƒ¼ãƒ‘ー牛ã•ã‚“パワーãªã©æŒã£ã¦ã„ã¾ã›ã‚“\n"
-#: src/main.cc:254
+#: src/main.cc:253
#, c-format
msgid "-o requires an argument of the form key=value, got %s"
msgstr "-o 㯠%s ã® key=value ã®å¼•ãæ•°ãŒå¿…è¦ã§ã™"
-#: src/main.cc:300 src/main.cc:309
+#: src/main.cc:299 src/main.cc:308
msgid "WEIRDNESS: unknown option code received\n"
msgstr "ä¸å¯æ€è°: 未知ã®ã‚ªãƒ—ションã®ã‚³ãƒ¼ãƒ‰ã‚’å—ã‘ã¾ã—ãŸ\n"
-#: src/main.cc:318
+#: src/main.cc:317
msgid "Only one of -u and -i may be specified\n"
msgstr "-u 㨠-i ã¯ç‰‡æ–¹ã—ã‹æŒ‡å®šã§ãã¾ã›ã‚“\n"
-#: src/main.cc:326
+#: src/main.cc:325
msgid ""
"-u and -i may not be specified in command-line mode (eg, with 'install')"
msgstr ""
"-u 㨠-i ã¯ã‚³ãƒžãƒ³ãƒ‰ãƒ©ã‚¤ãƒ³ãƒ¢ãƒ¼ãƒ‰ã®ã‚ªãƒ—ションã§ã¯ã‚ã‚Šã¾ã›ã‚“(例ã€'install'ã¨ä½¿"
"ã†)"
-#: src/main.cc:337
+#: src/main.cc:342
msgid "-u and -i may not be specified with a command"
msgstr "-u 㨠-i ã¯ã‚³ãƒžãƒ³ãƒ‰ã®æŒ‡å®šã§ã¯ã‚ã‚Šã¾ã›ã‚“"
-#: src/main.cc:392
+#: src/main.cc:399
#, c-format
msgid "Unknown command \"%s\"\n"
msgstr "ä¸æ˜Žãªã‚³ãƒžãƒ³ãƒ‰ \"%s\"\n"
-#: src/main.cc:400
+#: src/main.cc:406 src/main.cc:463
+msgid "Internal error: uncaught 'out of solutions' exception.\n"
+msgstr ""
+
+#: src/main.cc:411 src/main.cc:468
+msgid "Internal error: uncaught 'out of time' exception.\n"
+msgstr ""
+
+#: src/main.cc:418
#, c-format
-msgid "Invalid option for interactive mode: -s\n"
-msgstr "インタラクティブモードã§ä¸æ£ãªã‚ªãƒ—ション: -s\n"
+msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
+msgstr ""
#: src/mine/cmine.cc:93
#, c-format
@@ -1935,7 +2088,7 @@
msgid "Lost"
msgstr "敗北"
-#: src/mine/cmine.cc:119 src/ui.cc:1005
+#: src/mine/cmine.cc:119 src/ui.cc:1089
msgid "Minesweeper"
msgstr "マインスイーパ"
@@ -2110,7 +2263,7 @@
msgid "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
msgstr "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
-#: src/pkg_columnizer.cc:84 src/ui.cc:1488
+#: src/pkg_columnizer.cc:84 src/ui.cc:1638
msgid "Package"
msgstr "パッケージ"
@@ -2371,13 +2524,14 @@
"ケージ"
#: src/pkg_grouppolicy.cc:158
+#, fuzzy
msgid ""
"Programs for faxmodems and other communications devices\n"
" Packages in the 'comm' section are used to control modems and other "
"hardware communications devices. This includes software to control faxmodems "
"(for instance, PPP for dial-up internet connections and programs originally "
-"written for that purpose (zmodem/kermit), as well as software to control "
-"cellular phones, interface with FidoNet, and run a BBS."
+"written for that purpose, such as zmodem/kermit), as well as software to "
+"control cellular phones, interface with FidoNet, and run a BBS."
msgstr ""
" FAXモデムやãã®ä»–ã®é€šä¿¡ãƒ‡ãƒã‚¤ã‚¹é–¢é€£ã®ãƒ—ãƒã‚°ãƒ©ãƒ \n"
" 'comm' ã«åˆ†é¡žã•ã‚ŒãŸãƒ‘ッケージã¯ãƒ¢ãƒ‡ãƒ ã‚„ãã®ä»–通信機器ã®ã‚³ãƒ³ãƒˆãƒãƒ¼ãƒ«ã®ãŸã‚ã«"
@@ -2820,14 +2974,15 @@
"main ã«ç§»ã£ã¦ã„る。"
#: src/pkg_grouppolicy.cc:193
+#, fuzzy
msgid ""
"Programs which are not free software\n"
" Packages in the 'non-free' section are not part of Debian.\n"
" .\n"
" These packages fail to meet one or more of the requirements of the Debian "
-"Free Software Guidelines (see below) You should read the license of programs "
-"in this section to be sure that you are allowed to use them in the way you "
-"intend.\n"
+"Free Software Guidelines (see below). You should read the license of "
+"programs in this section to be sure that you are allowed to use them in the "
+"way you intend.\n"
" .\n"
" For more information about what Debian considers to be Free Software, see "
"http://www.debian.org/social_contract#guidelines"
@@ -2890,11 +3045,12 @@
" æ–°ã—ã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒåˆ©ç”¨å¯èƒ½ãªãƒ‘ッケージ"
#: src/pkg_grouppolicy.cc:320
+#, fuzzy
msgid ""
"New Packages\n"
" These packages have been added to Debian since the last time you cleared "
-"the list of \"new\" packages. (choose \"Forget new packages\" from the "
-"Actions menu to empty this list)"
+"the list of \"new\" packages (choose \"Forget new packages\" from the "
+"Actions menu to empty this list)."
msgstr ""
"æ–°è¦ãƒ‘ッケージ\n"
" \"æ–°è¦\" パッケージ最後ã«ãƒªã‚¹ãƒˆã‚’消ã—ã¦ã‹ã‚‰ Debian ã«è¿½åŠ ã•ã‚ŒãŸãƒ‘ッケージ群"
@@ -3143,101 +3299,121 @@
msgid "Versions"
msgstr "ãƒãƒ¼ã‚¸ãƒ§ãƒ³"
-#: src/pkg_item.cc:54
+#: src/pkg_item.cc:55
msgid "Yes, I am aware this is a very bad idea"
msgstr "Yes, I am aware this is a very bad idea"
#: src/pkg_item.cc:80
-#, c-format
+#, fuzzy, c-format
msgid ""
-"%s is an essential package!\n"
-"\n"
-"Are you sure you want to remove it?\n"
-"Type '%s' if you are."
+"%s is an essential package!%n%nAre you sure you want to remove it?%nType '%"
+"s' if you are."
msgstr ""
"%sã¯ä¸å¯æ¬ ã®ãƒ‘ッケージã§ã™!\n"
"\n"
"本当ã«å‰Šé™¤ã—ãŸã„ã§ã™ã‹?\n"
"削除ã™ã‚‹å ´åˆã°'%s'ã¨å…¥åŠ›ã—ã¦ãã ã•ã„。"
-#: src/pkg_item.cc:219
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:625
#, c-format
msgid "Information about %s"
msgstr "%s ã®æƒ…å ±"
-#: src/pkg_item.cc:304
-msgid "Available versions of "
+#: src/pkg_item.cc:224 src/pkg_ver_item.cc:627
+#, c-format
+msgid "%s info"
+msgstr ""
+
+#: src/pkg_item.cc:310
+#, fuzzy, c-format
+msgid "Available versions of %s"
msgstr "利用å¯èƒ½ãƒãƒ¼ã‚¸ãƒ§ãƒ³"
-#: src/pkg_item.cc:312 src/pkg_ver_item.cc:648
+#: src/pkg_item.cc:313
+#, fuzzy, c-format
+msgid "%s versions"
+msgstr "ãƒãƒ¼ã‚¸ãƒ§ãƒ³"
+
+#: src/pkg_item.cc:325 src/pkg_ver_item.cc:655
#, c-format
msgid "Dependencies of %s"
msgstr "%s ã®ä¾å˜é–¢ä¿‚"
-#: src/pkg_item.cc:322 src/pkg_ver_item.cc:657
+#: src/pkg_item.cc:327 src/pkg_ver_item.cc:657
+#, c-format
+msgid "%s deps"
+msgstr ""
+
+#: src/pkg_item.cc:338 src/pkg_ver_item.cc:667
#, c-format
msgid "Packages depending on %s"
msgstr "%s ã«ä¾å˜ã—ã¦ã„るパッケージ"
-#: src/pkg_item.cc:373 src/pkg_ver_item.cc:694
+#: src/pkg_item.cc:340 src/pkg_ver_item.cc:669
+#, c-format
+msgid "%s reverse deps"
+msgstr ""
+
+#: src/pkg_item.cc:392 src/pkg_ver_item.cc:707
#, c-format
msgid "Reporting a bug in %s:\n"
msgstr "%s ã®ãƒã‚°ã‚’å ±å‘Šã—ã¾ã™ã€‚ \n"
-#: src/pkg_item.cc:395
+#: src/pkg_item.cc:414
+#, fuzzy
msgid ""
-"You are not root and I cannot find any way\n"
-"to become root. To reconfigure this package,\n"
-"install the menu package, the login package,\n"
-"or run aptitude as root."
+"You are not root and I cannot find any way to become root. To reconfigure "
+"this package, install the menu package, the login package, or run aptitude "
+"as root."
msgstr ""
"ç¾åœ¨ root 権é™ã‚’æŒã£ã¦ã„ã¾ã›ã‚“。ã¾ãŸ root ã«ãªã‚‹ä»–ã®æ–¹æ³•ã‚‚\n"
"見ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚ ã“ã®ãƒ‘ッケージをè¨å®šã—ç›´ã™ã«ã¯ã€\n"
"menu ã‚„ login パッケージをインストールã™ã‚‹ã‹ã€\n"
"aptitude ã‚’ root ã§èµ·å‹•ã—ã¦ãã ã•ã„。"
-#: src/pkg_item.cc:403
+#: src/pkg_item.cc:422
#, c-format
msgid "Reconfiguring %s\n"
msgstr "%s ã‚’å†è¨å®š \n"
-#: src/pkg_item.cc:428
+#: src/pkg_item.cc:447
msgid "Hierarchy editor"
msgstr "階層エディタ"
+#: src/pkg_item.cc:447
+#, fuzzy
+msgid "Hierarchy Editor"
+msgstr "階層エディタ"
+
#: src/pkg_tree.cc:325
msgid "Search for: "
msgstr "検索: "
-#: src/pkg_tree.cc:585
+#: src/pkg_tree.cc:568
msgid "All Packages"
msgstr "ã™ã¹ã¦ã®ãƒ‘ッケージ"
-#: src/pkg_tree.cc:598 src/pkg_tree.cc:607
+#: src/pkg_tree.cc:581 src/pkg_tree.cc:590
msgid "Building view"
msgstr "表示画é¢ã‚’構築ä¸"
-#: src/pkg_tree.cc:649
+#: src/pkg_tree.cc:632
#, c-format
msgid "No packages matched the pattern \"%s\"."
msgstr "\"%s\" ã«ãƒžãƒƒãƒã™ã‚‹ãƒ‘ッケージãŒã‚ã‚Šã¾ã›ã‚“。"
-#: src/pkg_tree.cc:671
+#: src/pkg_tree.cc:654
msgid "Enter the new package tree limit: "
msgstr "æ–°ã—ã„パッケージツリーã®åˆ¶é™ã‚’入力ã—ã¦ãã ã•ã„： "
-#: src/pkg_tree.cc:705
+#: src/pkg_tree.cc:688
msgid "Enter the new package grouping mechanism for this display: "
msgstr "æ–°è¦ãƒ‘ッケージã®åˆ†é¡žã®ãƒ«ãƒ¼ãƒ«ã‚’入力ã—ã¦ãã ã•ã„: "
-#: src/pkg_tree.cc:713
+#: src/pkg_tree.cc:696
msgid "Enter the new package sorting mechanism for this display: "
msgstr "æ–°è¦ãƒ‘ッケージã®ä¸¦ã³æ›¿ãˆãƒ«ãƒ¼ãƒ«ã‚’入力ã—ã¦ãã ã•ã„: "
-#: src/pkg_ver_item.cc:623
-msgid "Information about "
-msgstr "æƒ…å ±"
-
#: src/pkg_view.cc:344
msgid "make_package_view: error in arguments -- two main widgets??"
msgstr "make_package_view: 引数エラー -- 二ã¤ã®ãƒ¡ã‚¤ãƒ³ã‚¦ã‚£ã‚¸ã‚§ãƒƒãƒˆ??"
@@ -3251,7 +3427,7 @@
msgid "make_package_view: bad argument!"
msgstr "make_package_view: ä¸æ£ãªå¼•æ•°!"
-#: src/pkg_view.cc:492
+#: src/pkg_view.cc:495
msgid "make_package_view: no main widget found"
msgstr "make_package_view: メインウィジェットãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“"
@@ -3476,6 +3652,74 @@
"以下ã®ãƒ‘ッケージ㯠%B%2$s%b ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ %B%1$s%b ã«ä¾å˜ã—ã¦ã„ã¾ã™ã®ã§ã€%s ã®"
"ä¾å˜é–¢ä¿‚を解決ã§ãã¾ã›ã‚“。"
+#: src/solution_dialog.cc:74
+msgid "The package cache is not available."
+msgstr ""
+
+#: src/solution_dialog.cc:82
+#, fuzzy
+msgid "No packages are broken."
+msgstr "パッケージãŒå£Šã‚Œã¦ã„ã¾ã™ã€‚修復を試ã¿ã¾ã™ã‹?"
+
+#: src/solution_dialog.cc:103
+msgid "No resolution found."
+msgstr ""
+
+#: src/solution_dialog.cc:107
+#, c-format
+msgid ""
+"Time exhausted while searching for a solution (you can select \"Next Solution"
+"\" or press %s to try harder)."
+msgstr ""
+
+#: src/solution_dialog.cc:146
+#, fuzzy
+msgid "Previous"
+msgstr "æä¾›"
+
+#: src/solution_dialog.cc:147
+#, fuzzy
+msgid "Next"
+msgstr "次"
+
+#: src/solution_dialog.cc:148
+msgid "Apply"
+msgstr ""
+
+#: src/solution_dialog.cc:149
+#, fuzzy
+msgid "Close"
+msgstr "é–‰ã˜ã‚‹"
+
+#: src/solution_fragment.cc:125
+#, fuzzy
+msgid "%BRemove%b the following packages:%n"
+msgstr "以下ã®ãƒ‘ッケージãŒå£Šã‚Œã¦ã„ã¾ã™:"
+
+#: src/solution_fragment.cc:135
+#, fuzzy
+msgid "%BInstall%b the following packages:%n"
+msgstr "以下ã®ãƒ‘ッケージãŒå£Šã‚Œã¦ã„ã¾ã™:"
+
+#: src/solution_fragment.cc:148
+msgid "%BKeep%b the following packages at their current version:%n"
+msgstr ""
+
+#: src/solution_fragment.cc:161
+#, fuzzy
+msgid "%BUpgrade%b the following packages:%n"
+msgstr "以下ã®ãƒ‘ッケージãŒå£Šã‚Œã¦ã„ã¾ã™:"
+
+#: src/solution_fragment.cc:176
+#, fuzzy
+msgid "%BDowngrade%b the following packages:%n"
+msgstr "ダウンãƒãƒ¼ãƒ‰ä¸ "
+
+#: src/solution_fragment.cc:190
+#, c-format
+msgid "Score is %d"
+msgstr ""
+
#: src/trust.cc:17 src/trust.cc:19
msgid "WARNING"
msgstr ""
@@ -3487,53 +3731,53 @@
"system."
msgstr ""
-#: src/ui.cc:143
+#: src/ui.cc:164
msgid "Er, there aren't any errors, this shouldn't have happened.."
msgstr ""
"ãŠã£ã¨ã€äºˆæœŸã›ã¬ã‚¨ãƒ©ãƒ¼ã§ã™ã€‚ã“ã†ã„ã†ã“ã¨ã¯èµ·ãã¦æ¬²ã—ããªã‹ã£ãŸã®ã§ã™ãŒâ€¦ "
-#: src/ui.cc:149
+#: src/ui.cc:170
msgid "E:"
msgstr ""
-#: src/ui.cc:151
+#: src/ui.cc:172
msgid "W:"
msgstr ""
-#: src/ui.cc:172
+#: src/ui.cc:193
msgid "Search for:"
msgstr "検索: "
-#: src/ui.cc:205
+#: src/ui.cc:261
msgid "You already are root!"
msgstr "既㫠root ã§ã™!"
-#: src/ui.cc:303
+#: src/ui.cc:359
msgid ""
"Subprocess exited with an error -- did you type your password correctly?"
msgstr "サブプãƒã‚»ã‚¹ã¯ã‚¨ãƒ©ãƒ¼ã§çµ‚了ã—ã¾ã—ãŸã€‚入力ã—ãŸãƒ‘スワードã¯æ£ã—ã„ã§ã™ã‹?"
-#: src/ui.cc:331
+#: src/ui.cc:387
msgid "Loading cache"
msgstr "ã‚ャッシュをèªã¿è¾¼ã‚“ã§ã„ã¾ã™"
-#: src/ui.cc:353
+#: src/ui.cc:409
msgid "Really quit Aptitude?"
msgstr "本当㫠aptitude を終了ã—ã¾ã™ã‹?"
-#: src/ui.cc:432
+#: src/ui.cc:488
msgid "Really discard your personal settings and reload the defaults?"
msgstr "変更ã•ã‚ŒãŸè¨å®šã‚’ç ´æ£„ã—ã¦ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®è¨å®šã«æˆ»ã—ã¾ã™ã‹?"
-#: src/ui.cc:532
+#: src/ui.cc:588 src/ui.cc:590 src/ui.cc:618 src/ui.cc:620
msgid "Packages"
msgstr "パッケージ"
-#: src/ui.cc:533 src/ui.cc:560
+#: src/ui.cc:589 src/ui.cc:619
msgid "View available packages and choose actions to perform"
msgstr "利用å¯èƒ½ãªãƒ‘ッケージを閲覧ã—ã€å®Ÿè¡Œã™ã‚‹ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ã‚’é¸æŠžã—ãŸã‚Šã™ã‚‹"
-#: src/ui.cc:599
+#: src/ui.cc:666
#, fuzzy
msgid ""
"%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
@@ -3550,15 +3794,15 @@
"ã“ã®ã‚½ãƒ•ãƒˆã¯ãƒ•ãƒªãƒ¼ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢ã§ã™ã€ãƒ©ã‚¤ã‚»ãƒ³ã‚¹ã«å¾“ã£ã¦å†é…布ãŒèªã‚られã¦ã„ã¾"
"ã™ã€‚詳ã—ãã¯'license' を見ã¦ãã ã•ã„"
-#: src/ui.cc:620
+#: src/ui.cc:687
msgid "help.txt"
msgstr "help-ja.txt"
-#: src/ui.cc:636
+#: src/ui.cc:703
msgid "README"
msgstr "README"
-#: src/ui.cc:718
+#: src/ui.cc:785
msgid ""
"%C%BWARNING%b: untrusted versions of the following packages will be "
"installed!%n%nUntrusted packages could %Bcompromise your system's security%"
@@ -3566,60 +3810,70 @@
"this is what you want to do.%n%n"
msgstr ""
-#: src/ui.cc:732
+#: src/ui.cc:799
#, fuzzy
msgid "Really Continue"
msgstr "続行"
-#: src/ui.cc:734
+#: src/ui.cc:801
msgid "Abort Installation"
msgstr ""
-#: src/ui.cc:796
+#: src/ui.cc:862
msgid "Preview of package installation"
msgstr "å°Žå…¥ã™ã‚‹ãƒ‘ッケージã®ãƒ—レビュー"
-#: src/ui.cc:797
+#: src/ui.cc:863
msgid "View and/or adjust the actions that will be performed"
msgstr "実行ã•ã‚Œã‚‹ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ã®è¡¨ç¤ºã‚„è¨å®šã‚’è¡Œãªã†"
-#: src/ui.cc:837
-msgid "Some packages were broken and have been fixed"
+#: src/ui.cc:864
+#, fuzzy
+msgid "Preview"
+msgstr "å‰"
+
+#: src/ui.cc:900
+#, fuzzy
+msgid "Some packages were broken and have been fixed:"
msgstr "一部ã®ãƒ‘ッケージãŒå£Šã‚Œã¦ã„ã¾ã™ã€‚修復ã—ã¾ã—ãŸ"
-#: src/ui.cc:839
-msgid "Some broken packages could not be fixed!"
-msgstr "壊れãŸãƒ‘ッケージを修復ã§ãã¾ã›ã‚“!"
+#: src/ui.cc:906
+msgid "No solution to these dependency problems exists!"
+msgstr ""
-#: src/ui.cc:847 src/ui.cc:959
-msgid "Some packages are broken. Try to fix them?"
-msgstr "パッケージãŒå£Šã‚Œã¦ã„ã¾ã™ã€‚修復を試ã¿ã¾ã™ã‹?"
+#: src/ui.cc:912
+#, c-format
+msgid ""
+"Ran out of time while trying to resolver dependencies (press \"%s\" to try "
+"harder)"
+msgstr ""
-#: src/ui.cc:860
+#: src/ui.cc:958
+#, fuzzy
msgid ""
-"Installing/removing packages requires administrative privileges, which\n"
-"you currently do not have. Would you like to change to the root account?\n"
+"Installing/removing packages requires administrative privileges, which you "
+"currently do not have. Would you like to change to the root account?"
msgstr ""
"パッケージã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚‚ã—ãã¯å‰Šé™¤ã‚’è¡Œã†ã«ã¯ç®¡ç†è€…権é™ãŒå¿…è¦ã§ã™ã€‚ \n"
"ç¾åœ¨æ¨©é™ãŒã‚ã‚Šã¾ã›ã‚“。rootã«ãªã‚Šã¾ã™ã‹ï¼Ÿ \n"
-#: src/ui.cc:863 src/ui.cc:993
+#: src/ui.cc:961 src/ui.cc:1077
msgid "Become root"
msgstr "root ã«ãªã‚‹"
-#: src/ui.cc:865 src/ui.cc:995
+#: src/ui.cc:963 src/ui.cc:1079
msgid "Don't become root"
msgstr "root ã«ãªã‚‰ãªã„"
-#: src/ui.cc:870 src/ui.cc:1000
+#: src/ui.cc:968 src/ui.cc:1084
msgid "A package-list update or install run is already taking place."
msgstr "ç¾åœ¨ãƒ‘ッケージリストã®ã‚¢ãƒƒãƒ—デートã€ã¾ãŸã¯ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚’実行ä¸ã§ã™ã€‚"
-#: src/ui.cc:897
+#: src/ui.cc:995
msgid "No packages are scheduled to be installed, removed, or upgraded."
msgstr "å°Žå…¥ã€å‰Šé™¤ã€æ›´æ–°ã‚’ã™ã‚‹äºˆå®šã®ãƒ‘ッケージãŒã‚ã‚Šã¾ã›ã‚“。"
-#: src/ui.cc:903
+#: src/ui.cc:1001
#, fuzzy
msgid ""
"No packages will be installed, removed or upgraded. Some packages could be "
@@ -3631,413 +3885,432 @@
"å¹¾ã¤ã‹ã®ãƒ‘ッケージã¯æ›´æ–°å¯èƒ½ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“ãŒã€æ›´æ–°ã‚’é¸æŠžã•ã‚Œã¦ã„ã¾ã›ã‚“。\n"
"\"U\"ã¨æ‰“ã£ã¦æ›´æ–°ã®æº–備をã—ã¦ãã ã•ã„。"
-#: src/ui.cc:990
+#: src/ui.cc:1073
+#, fuzzy
msgid ""
-"Updating the package lists requires administrative privileges, which\n"
-"you currently do not have. Would you like to change to the root account?\n"
+"Updating the package lists requires administrative privileges, which you "
+"currently do not have. Would you like to change to the root account?"
msgstr ""
"パッケージリストã®æ›´æ–°ã«ã¯ç®¡ç†è€…権é™ãŒå¿…è¦ã§ã™ã€‚ \n"
"ç¾åœ¨æ¨©é™ãŒã‚ã‚Šã¾ã›ã‚“。root ã«ãªã‚Šã¾ã™ã‹ï¼Ÿ \n"
-#: src/ui.cc:1005 src/ui.cc:1198
+#: src/ui.cc:1089 src/ui.cc:1345
msgid "Waste time trying to find mines"
msgstr "地雷探ã—ã«æŒ‘戦ã—ã¦æ™‚é–“ã¤ã¶ã—"
-#: src/ui.cc:1012 src/ui.cc:1065
+#: src/ui.cc:1096 src/ui.cc:1149
msgid "Cleaning while a download is in progress is not allowed"
msgstr "ダウンãƒãƒ¼ãƒ‰ä¸ã®å‰Šé™¤ã¯è¨±å¯ã•ã‚Œã¦ã„ã¾ã›ã‚“"
-#: src/ui.cc:1015
+#: src/ui.cc:1099
msgid "Deleting downloaded files"
msgstr "ダウンãƒãƒ¼ãƒ‰ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’削除ã—ã¦ã„ã¾ã™"
-#: src/ui.cc:1029
+#: src/ui.cc:1113
msgid "Downloaded package files have been deleted"
msgstr "ダウンãƒãƒ¼ãƒ‰ã•ã‚ŒãŸãƒ‘ッケージファイルã¯æ—¢ã«å‰Šé™¤ã•ã‚Œã¦ã„ã¾ã™"
-#: src/ui.cc:1090
+#: src/ui.cc:1174
#, fuzzy, c-format
msgid ""
"Obsolete downloaded package files have been deleted, freeing %sB of disk "
"space."
msgstr "ダウンãƒãƒ¼ãƒ‰ã•ã‚ŒãŸå¤ã„パッケージã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯å‰Šé™¤ã•ã‚Œã¾ã—ãŸ"
-#: src/ui.cc:1174
+#: src/ui.cc:1246
+msgid "All solutions exhausted."
+msgstr ""
+
+#: src/ui.cc:1251 src/ui.cc:1282
+#, fuzzy
+msgid "Ran out of time while trying to find a solution."
+msgstr "地雷探ã—ã«æŒ‘戦ã—ã¦æ™‚é–“ã¤ã¶ã—"
+
+#: src/ui.cc:1276
+msgid "Unable to find a solution to apply."
+msgstr ""
+
+#: src/ui.cc:1321
msgid "^Install/remove packages"
msgstr "パッケージã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã¾ãŸã¯å‰Šé™¤"
-#: src/ui.cc:1175
+#: src/ui.cc:1322
msgid "Perform all pending installs and removals"
msgstr "é¸æŠžã•ã‚Œã¦ã„るパッケージã®å°Žå…¥ã‚„削除"
-#: src/ui.cc:1177
+#: src/ui.cc:1324
msgid "^Update package list"
msgstr "パッケージã®ãƒªã‚¹ãƒˆã‚’æ›´æ–°ã™ã‚‹"
-#: src/ui.cc:1178
+#: src/ui.cc:1325
msgid "Check for new versions of packages"
msgstr "パッケージã®æ–°ã—ã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’確èªã™ã‚‹"
-#: src/ui.cc:1181
+#: src/ui.cc:1328
msgid "^Forget new packages"
msgstr "æ–°è¦ãƒ‘ッケージ一覧を消去"
-#: src/ui.cc:1182
+#: src/ui.cc:1329
msgid "Forget which packages are \"new\""
msgstr "ã©ã®ãƒ‘ッケージ㌠\"æ–°è¦\"ã‹ã‚’消去"
-#: src/ui.cc:1185
+#: src/ui.cc:1332
msgid "^Clean package cache"
msgstr "パッケージã®ã‚ャッシュを消去"
-#: src/ui.cc:1186
+#: src/ui.cc:1333
msgid "Delete package files which were previously downloaded"
msgstr "ダウンãƒãƒ¼ãƒ‰ã•ã‚ŒãŸãƒ‘ッケージã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’削除ã™ã‚‹"
-#: src/ui.cc:1189
+#: src/ui.cc:1336
msgid "Clean ^obsolete files"
msgstr "使ã‚ã‚Œã¦ã„ãªã„ファイルを消ã™"
-#: src/ui.cc:1190
+#: src/ui.cc:1337
msgid "Delete package files which can no longer be downloaded"
msgstr "ã‚‚ã†ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã§ããªã„パッケージã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’削除ã™ã‚‹"
-#: src/ui.cc:1193
+#: src/ui.cc:1340
msgid "Mark ^Upgradable"
msgstr "æ›´æ–°å¯èƒ½ãªã‚‚ã®ã‚’マークã™ã‚‹"
-#: src/ui.cc:1194
+#: src/ui.cc:1341
msgid "Mark all upgradable packages which are not held for upgrade"
msgstr "更新用ã«ãƒžãƒ¼ã‚¯ã•ã‚Œã¦ã„ãªã„æ›´æ–°å¯èƒ½ãªãƒ‘ッケージをã™ã¹ã¦ãƒžãƒ¼ã‚¯ã™ã‚‹"
-#: src/ui.cc:1197
+#: src/ui.cc:1344
msgid "^Play Minesweeper"
msgstr "マインスイーパã§éŠã¶"
-#: src/ui.cc:1200
+#: src/ui.cc:1347
msgid "^Become root"
msgstr "root ã«ãªã‚‹"
-#: src/ui.cc:1201
+#: src/ui.cc:1348
+#, fuzzy
msgid ""
-"Run 'su' to become root; this will restart the program, but your\n"
-"settings will be preserved"
+"Run 'su' to become root; this will restart the program, but your settings "
+"will be preserved"
msgstr ""
"su を実行ã—㦠root ã«ãªã‚Šã€ãƒ—ãƒã‚°ãƒ©ãƒ ã‚’å†èµ·å‹•ã—ã¾ã™ã€‚\n"
"ãã®éš›ã€ç¾åœ¨ã®è¨å®šã¯ä¿æŒã•ã‚Œã¾ã™ã€‚"
-#: src/ui.cc:1204
+#: src/ui.cc:1351
msgid "^Reload package cache"
msgstr "パッケージã‚ャッシュã®å†èªã¿è¾¼ã¿"
-#: src/ui.cc:1205
+#: src/ui.cc:1352
msgid "Reload the package cache"
msgstr "パッケージã®ã‚ャッシュをå†åº¦èªã¿è¾¼ã‚€"
-#: src/ui.cc:1211
+#: src/ui.cc:1358
msgid "^Quit"
msgstr "終了"
-#: src/ui.cc:1212
+#: src/ui.cc:1359
msgid "Exit the program"
msgstr "プãƒã‚°ãƒ©ãƒ ã®çµ‚了"
-#: src/ui.cc:1218 src/ui.cc:1487
+#: src/ui.cc:1365 src/ui.cc:1637
msgid "Undo"
msgstr "戻る"
-#: src/ui.cc:1219
+#: src/ui.cc:1366
msgid "Undo the last package operation or group of operations"
msgstr "最後ã«è¡Œãªã£ãŸãƒ‘ッケージ管ç†æ“作を戻ã™"
-#: src/ui.cc:1226
+#: src/ui.cc:1373
msgid "^Install"
msgstr "インストール"
-#: src/ui.cc:1227
+#: src/ui.cc:1374
msgid "Flag the currently selected package for installation or upgrade"
msgstr "インストールã‹ã‚¢ãƒƒãƒ—グレードã™ã‚‹ã‚ˆã†é¸æŠžã•ã‚ŒãŸãƒ‘ッケージ"
-#: src/ui.cc:1230
+#: src/ui.cc:1377
msgid "^Remove"
msgstr "削除"
-#: src/ui.cc:1231
+#: src/ui.cc:1378
msgid "Flag the currently selected package for removal"
msgstr "削除ã•ã‚Œã‚‹ã‚ˆã†é¸æŠžã•ã‚ŒãŸãƒ‘ッケージ"
-#: src/ui.cc:1234
+#: src/ui.cc:1381
msgid "^Purge"
msgstr "完全削除"
-#: src/ui.cc:1235
+#: src/ui.cc:1382
msgid ""
"Flag the currently selected package and its configuration files for removal"
msgstr "パッケージåŠã³è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã‚’削除ã™ã‚‹ã‚ˆã†é¸æŠžã•ã‚ŒãŸãƒ‘ッケージ"
-#: src/ui.cc:1238
+#: src/ui.cc:1385
msgid "^Keep"
msgstr "ä¿æŒ"
-#: src/ui.cc:1239
+#: src/ui.cc:1386
msgid "Cancel any action on the selected package"
msgstr "é¸æŠžã•ã‚ŒãŸãƒ‘ッケージã¯ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ãŒå–り消ã•ã‚Œã‚‹"
-#: src/ui.cc:1242
+#: src/ui.cc:1389
msgid "^Hold"
msgstr "ç¶æŒ"
-#: src/ui.cc:1243
+#: src/ui.cc:1390
msgid ""
"Cancel any action on the selected package, and protect it from future "
"upgrades"
msgstr ""
"é¸æŠžã•ã‚ŒãŸãƒ‘ッケージã¯ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ãŒå–り消ã•ã‚Œã€ä»Šå¾Œã‚‚アップグレードも 防ãŒã‚Œã‚‹"
-#: src/ui.cc:1246
+#: src/ui.cc:1393
msgid "Mark ^Auto"
msgstr "自動マーク"
-#: src/ui.cc:1247
+#: src/ui.cc:1394
+#, fuzzy
msgid ""
-"Mark the selected package as having been automatically installed;\n"
-"it will automatically be removed if no other packages depend on it"
+"Mark the selected package as having been automatically installed; it will "
+"automatically be removed if no other packages depend on it"
msgstr ""
"é¸æŠžã•ã‚ŒãŸãƒ‘ッケージã«è‡ªå‹•ã§ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚ŒãŸå°ã‚’付ã‘ã‚‹;\n"
"ä¾å˜ã—ã¦ã„ãŸãƒ‘ッケージãŒãªããªã‚‹ã¨ã¨è‡ªå‹•çš„削除ã•ã‚Œã‚‹ã ã‚ã†"
-#: src/ui.cc:1250
+#: src/ui.cc:1397
msgid "Mark ^Manual"
msgstr "手動マーク"
-#: src/ui.cc:1251
+#: src/ui.cc:1398
+#, fuzzy
msgid ""
-"Mark the selected package as having been manually installed;\n"
-"it will not be removed unless you manually remove it"
+"Mark the selected package as having been manually installed; it will not be "
+"removed unless you manually remove it"
msgstr ""
"é¸æŠžã•ã‚ŒãŸãƒ‘ッケージã«æ‰‹å‹•ã§ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚ŒãŸå°ã‚’付ã‘ã‚‹;\n"
"手動ã§å‰Šé™¤ã•ã‚Œãªã„é™ã‚Šå‰Šé™¤ã•ã‚Œãªã„ã ã‚ã†"
-#: src/ui.cc:1254
+#: src/ui.cc:1401
msgid "^Forbid Version"
msgstr "ç¦æ¢ãƒãƒ¼ã‚¸ãƒ§ãƒ³"
-#: src/ui.cc:1255
+#: src/ui.cc:1402
+#, fuzzy
msgid ""
-"Forbid the candidate version of the selected package from being installed;\n"
+"Forbid the candidate version of the selected package from being installed; "
"newer versions of the package will be installed as usual"
msgstr ""
"é¸æŠžã•ã‚ŒãŸãƒ‘ッケージã®å€™è£œãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã‚‹ã®ã‚’ç¦æ¢ã™ã‚‹;\n"
"通常インストールã•ã‚Œã¦ã„ã‚‹ã‚‚ã®ã‚ˆã‚Šæ–°ã—ã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®ãƒ‘ッケージã§ã™"
-#: src/ui.cc:1259
+#: src/ui.cc:1406
msgid "I^nformation"
msgstr "æƒ…å ±"
-#: src/ui.cc:1260
+#: src/ui.cc:1407
msgid "Display more information about the selected package"
msgstr "é¸æŠžã•ã‚ŒãŸãƒ‘ッケージã®ã‚ˆã‚Šè©³ã—ã„æƒ…å ±ãŒè¡¨ç¤ºã•ã‚Œã‚‹"
-#: src/ui.cc:1263
+#: src/ui.cc:1410
msgid "^Changelog"
msgstr "変更履æ´"
-#: src/ui.cc:1264
+#: src/ui.cc:1411
msgid "Display the Debian changelog of the selected package"
msgstr "é¸æŠžã•ã‚ŒãŸãƒ‘ッケージã®æ›´æ–°å±¥æ´ãŒè¡¨ç¤ºã•ã‚Œã‚‹"
-#: src/ui.cc:1271
+#: src/ui.cc:1418
msgid "^Find"
msgstr "検索"
-#: src/ui.cc:1272
+#: src/ui.cc:1419
msgid "Search for a package"
msgstr "パッケージを検索ã™ã‚‹"
-#: src/ui.cc:1275
+#: src/ui.cc:1422
msgid "Find ^Again"
msgstr "å†æ¤œç´¢"
-#: src/ui.cc:1276
+#: src/ui.cc:1423
msgid "Repeat the last search"
msgstr "最後ã«è¡Œãªã£ãŸæ¤œç´¢ã‚’ç¹°ã‚Šæ›ãˆã™"
-#: src/ui.cc:1280
+#: src/ui.cc:1427
msgid "^Limit Display"
msgstr "表示制é™"
-#: src/ui.cc:1281
+#: src/ui.cc:1428
msgid "Apply a filter to the package list"
msgstr "パッケージリストをフィルタリングã™ã‚‹"
-#: src/ui.cc:1284
+#: src/ui.cc:1431
msgid "^Un-Limit Display"
msgstr "表示制é™è§£é™¤"
-#: src/ui.cc:1285
+#: src/ui.cc:1432
msgid "Remove the filter from the package list"
msgstr "パッケージリストã®ãƒ•ã‚£ãƒ«ã‚¿ãƒ¼ã‚’削除ã™ã‚‹"
-#: src/ui.cc:1289
+#: src/ui.cc:1436
msgid "Find ^Broken"
msgstr "壊れã¦ã„ã‚‹ã‚‚ã®ã‚’探ã™"
-#: src/ui.cc:1290
+#: src/ui.cc:1437
msgid "Find the next package with unsatisfied dependencies"
msgstr "解決ã§ããªã„ä¾å˜é–¢ä¿‚ãŒã‚るパッケージを探ã™"
-#: src/ui.cc:1297
+#: src/ui.cc:1444
msgid "^UI options"
msgstr "UIオプション"
-#: src/ui.cc:1298
+#: src/ui.cc:1445
msgid "Change the settings which affect the user interface"
msgstr "ユーザインターフェースã«å½±éŸ¿ã™ã‚‹è¨å®šã‚’変更ã™ã‚‹ã€‚"
-#: src/ui.cc:1301
+#: src/ui.cc:1448
msgid "^Dependency handling"
msgstr "ä¾å˜é–¢ä¿‚ã®å‡¦ç†"
-#: src/ui.cc:1302
+#: src/ui.cc:1449
msgid "Change the settings which affect how package dependencies are handled"
msgstr "パッケージä¾å˜é–¢ä¿‚ã®å‡¦ç†ã«é–¢ã™ã‚‹è¨å®šã‚’変更"
-#: src/ui.cc:1305
+#: src/ui.cc:1452
msgid "^Miscellaneous"
msgstr "ãã®ä»–"
-#: src/ui.cc:1306
+#: src/ui.cc:1453
msgid "Change miscellaneous program settings"
msgstr "ãã®ä»–ã®è¨å®šã®å¤‰æ›´"
-#: src/ui.cc:1311
+#: src/ui.cc:1458
msgid "^Revert options"
msgstr "オプションを元ã«æˆ»ã™"
-#: src/ui.cc:1312
+#: src/ui.cc:1459
msgid "Reset all settings to the system defaults"
msgstr "ã™ã¹ã¦ã®è¨å®šã‚’デフォルトã®è¨å®šã«æˆ»ã™"
-#: src/ui.cc:1323
+#: src/ui.cc:1470
msgid "^Next"
msgstr "次"
-#: src/ui.cc:1324
+#: src/ui.cc:1471
msgid "View next display"
msgstr "次ã®ç”»é¢ã‚’表示"
-#: src/ui.cc:1327
+#: src/ui.cc:1474
msgid "^Prev"
msgstr "å‰"
-#: src/ui.cc:1328
+#: src/ui.cc:1475
msgid "View previous display"
msgstr "å‰ã®ç”»é¢ã‚’表示"
-#: src/ui.cc:1331
+#: src/ui.cc:1478
msgid "^Close"
msgstr "é–‰ã˜ã‚‹"
-#: src/ui.cc:1332
+#: src/ui.cc:1479
msgid "Close this display"
msgstr "ã“ã®ç”»é¢ã‚’é–‰ã˜ã‚‹"
-#: src/ui.cc:1337
+#: src/ui.cc:1484
msgid "New Package ^View"
msgstr "æ–°ã—ã„パッケージ画é¢"
-#: src/ui.cc:1338
+#: src/ui.cc:1485
msgid "Create a new default package view"
msgstr "æ–°è¦ã«æ¨™æº–ã®ãƒ‘ッケージ画é¢ã‚’作æˆ"
-#: src/ui.cc:1341
+#: src/ui.cc:1488
msgid "New Categorical ^Browser"
msgstr "æ–°ã—ã„カテゴリーã§è¡¨ç¤º"
-#: src/ui.cc:1343
+#: src/ui.cc:1490
msgid "Browse packages by category"
msgstr "パッケージを詳ã—ã分類ã—ã¦è¡¨ç¤ºã—ã¾ã™ã€‚"
-#: src/ui.cc:1351
+#: src/ui.cc:1498
msgid "^About"
msgstr "ã“ã®ãƒ—ãƒã‚°ãƒ©ãƒ ã«ã¤ã„ã¦"
-#: src/ui.cc:1352
+#: src/ui.cc:1499
msgid "View information about this program"
msgstr "ã“ã®ãƒ—ãƒã‚°ãƒ©ãƒ ã«ã¤ã„ã¦ã®èª¬æ˜Ž"
-#: src/ui.cc:1355
+#: src/ui.cc:1502
msgid "^Help"
msgstr "ヘルプ"
-#: src/ui.cc:1356
+#: src/ui.cc:1503
msgid "View the on-line help"
msgstr "オンラインヘルプを表示ã—ã¾ã™"
-#: src/ui.cc:1358
+#: src/ui.cc:1505
msgid "User's ^Manual"
msgstr "ユーザマニュアル"
-#: src/ui.cc:1359
+#: src/ui.cc:1506
msgid "View the detailed program manual"
msgstr "詳細ãªãƒžãƒ‹ãƒ¥ã‚¢ãƒ«ã‚’表示ã—ã¾ã™"
-#: src/ui.cc:1362
+#: src/ui.cc:1509
msgid "^FAQ"
msgstr "FAQ"
-#: src/ui.cc:1363
+#: src/ui.cc:1510
msgid "View a list of frequently asked questions"
msgstr "é »ç¹ã«è³ªå•ã•ã‚Œã‚‹äº‹ã‚’表示ã—ã¾ã™"
-#: src/ui.cc:1366
-msgid "^ChangeLog"
-msgstr "変更履æ´"
+#: src/ui.cc:1513
+msgid "^NEWS"
+msgstr ""
-#: src/ui.cc:1367
-msgid "View the important changes made in each version of the program"
+#: src/ui.cc:1514
+#, fuzzy
+msgid "View the important changes made in each version of "
msgstr "プãƒã‚°ãƒ©ãƒ ã®é‡è¦ãªãƒãƒ¼ã‚¸ãƒ§ãƒ³ã”ã¨ã®å¤‰æ›´ç‚¹ã‚’表示ã—ã¾ã™"
-#: src/ui.cc:1370
+#: src/ui.cc:1517
msgid "^License"
msgstr "ライセンス"
-#: src/ui.cc:1371
+#: src/ui.cc:1518
msgid "View the terms under which you may copy the program"
msgstr "プãƒã‚°ãƒ©ãƒ ã‚’å†é…布ã™ã‚‹éš›ãªã©ã®æ¡ä»¶ã‚’表示"
-#: src/ui.cc:1486
+#: src/ui.cc:1636
msgid "Actions"
msgstr "アクション"
-#: src/ui.cc:1489
+#: src/ui.cc:1639
msgid "Search"
msgstr "検索"
-#: src/ui.cc:1490
+#: src/ui.cc:1640
msgid "Options"
msgstr "オプション"
-#: src/ui.cc:1491
+#: src/ui.cc:1641
msgid "Views"
msgstr "表示"
-#: src/ui.cc:1492
+#: src/ui.cc:1642
msgid "Help"
msgstr "ヘルプ"
-#: src/ui.cc:1537
+#: src/ui.cc:1699
#, c-format
msgid ""
"%s: Menu %s: Help %s: Quit %s: Update %s: Download/Install/Remove Pkgs"
msgstr ""
"%s: メニュー %s: ヘルプ %s: 終了 %s: æ›´æ–° %s: パッケージ㮠å–å¾—/å°Žå…¥/削除"
-#: src/ui.cc:1799 src/vscreen/vscreen.cc:281
+#: src/ui.cc:1968 src/vscreen/vscreen.cc:281
msgid "yes_key"
msgstr "yes keu"
-#: src/ui.cc:1800 src/vscreen/vscreen.cc:282
+#: src/ui.cc:1969 src/vscreen/vscreen.cc:282
msgid "no_key"
msgstr "no key"
@@ -4049,6 +4322,16 @@
msgid "Downloading Changelog"
msgstr "æ›´æ–°å±¥æ´ã‚’ダウンãƒãƒ¼ãƒ‰ä¸"
+#: src/view_changelog.cc:54
+#, fuzzy
+msgid "Download Changelog"
+msgstr "æ›´æ–°å±¥æ´ã‚’ダウンãƒãƒ¼ãƒ‰ä¸"
+
+#: src/view_changelog.cc:63
+#, c-format
+msgid "%s changes"
+msgstr ""
+
#: src/vscreen/vscreen.cc:119
#, c-format
msgid "Ouch! Got SIGTERM, dying..\n"
@@ -4077,6 +4360,36 @@
msgid "No"
msgstr "No"
+# Use apt-get's familiar error message,
+#~ msgid ""
+#~ "Some packages had unmet dependencies. This may mean that you have\n"
+#~ "requested an impossible situation or if you are using the unstable\n"
+#~ "distribution that some required packages have not yet been created\n"
+#~ "or been moved out of Incoming.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "インストールã§ããªã„パッケージãŒã‚ã‚Šã¾ã—ãŸã€‚ãŠãらãã€ã‚ã‚Šãˆãªã„状æ³\n"
+#~ "ã‚’è¦æ±‚ã—ãŸã‹ã€ä¸å®‰å®šç‰ˆãƒ‡ã‚£ã‚¹ãƒˆãƒªãƒ“ューションを使用ã—ã¦ã„ã‚‹ãªã‚‰å¿…è¦ãª\n"
+#~ "パッケージãŒã¾ã 作æˆã•ã‚Œã¦ã„ãªã„ã‹ Incoming ã‹ã‚‰ç§»å‹•ã•ã‚Œã¦ã„ãªã„ã¨è€ƒ\n"
+#~ "ãˆã‚‰ã‚Œã¾ã™ã€‚\n"
+
+#~ msgid ""
+#~ "Please insert the following disc into the drive \"%s\":\n"
+#~ "%s"
+#~ msgstr "ドライブ \"%s\": ã«ã€ãƒ‡ã‚£ã‚¹ã‚¯ %s を入れã¦ãã ã•ã„"
+
+#~ msgid "Invalid option for interactive mode: -s\n"
+#~ msgstr "インタラクティブモードã§ä¸æ£ãªã‚ªãƒ—ション: -s\n"
+
+#~ msgid "Information about "
+#~ msgstr "æƒ…å ±"
+
+#~ msgid "Some broken packages could not be fixed!"
+#~ msgstr "壊れãŸãƒ‘ッケージを修復ã§ãã¾ã›ã‚“!"
+
+#~ msgid "^ChangeLog"
+#~ msgstr "変更履æ´"
+
#~ msgid "Go away, I'm trying to think.\n"
#~ msgstr "他所行ã£ã¦ãŠãれ。\n"
Modified: branches/aptitude-0.3/aptitude/po/lt.po
==============================================================================
--- branches/aptitude-0.3/aptitude/po/lt.po (original)
+++ branches/aptitude-0.3/aptitude/po/lt.po Sat Apr 30 13:41:32 2005
@@ -12,7 +12,7 @@
msgstr ""
"Project-Id-Version: aptitude_0.2.15.8-1_lt\n"
"Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-01-10 16:26-0800\n"
+"POT-Creation-Date: 2005-04-29 18:11-0400\n"
"PO-Revision-Date: 2004-11-06 23:37+0200\n"
"Last-Translator: Darius Žitkevicius <skystis at splius.lt>\n"
"Language-Team: Lithuankian <komp_lt at konferencijos.lt>\n"
@@ -156,16 +156,103 @@
msgstr "Automatiškai pašalinti nebenaudojamus paketus pagal filtrą"
#: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:184 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
-#: src/vscreen/vs_util.cc:329
+#: src/ui.cc:218 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
+#: src/vscreen/vs_util.cc:328
msgid "Ok"
msgstr "Gerai"
#: src/apt_options.cc:242 src/download_list.cc:71 src/mine/cmine.cc:257
-#: src/mine/cmine.cc:330 src/vscreen/vs_util.cc:329
+#: src/mine/cmine.cc:330 src/vscreen/vs_util.cc:328
msgid "Cancel"
msgstr "Atšaukti"
+#: src/broken_indicator.cc:106 src/solution_dialog.cc:97
+msgid "Internal error: unexpected null solution."
+msgstr ""
+
+#: src/broken_indicator.cc:158
+#, fuzzy
+msgid "Suggest "
+msgstr "Siūlo"
+
+#: src/broken_indicator.cc:164
+#, fuzzy, c-format
+msgid "%d installs"
+msgstr "įdiegti"
+
+#: src/broken_indicator.cc:169
+#, fuzzy
+msgid "1 install"
+msgstr "įdiegti"
+
+#: src/broken_indicator.cc:173
+#, c-format
+msgid "%d removals"
+msgstr ""
+
+#: src/broken_indicator.cc:178
+msgid "1 removal"
+msgstr ""
+
+#: src/broken_indicator.cc:182
+#, c-format
+msgid "%d keeps"
+msgstr ""
+
+#: src/broken_indicator.cc:187
+msgid "1 keep"
+msgstr ""
+
+#: src/broken_indicator.cc:191
+#, fuzzy, c-format
+msgid "%d upgrades"
+msgstr "atnaujinti"
+
+#: src/broken_indicator.cc:196
+#, fuzzy
+msgid "1 upgrade"
+msgstr "atnaujinti"
+
+#: src/broken_indicator.cc:200
+#, fuzzy, c-format
+msgid "%d downgrades"
+msgstr "pasendinta"
+
+#: src/broken_indicator.cc:205
+#, fuzzy
+msgid "1 downgrade"
+msgstr "pasendinta"
+
+#: src/broken_indicator.cc:214
+#, c-format
+msgid "%s: Examine"
+msgstr ""
+
+#: src/broken_indicator.cc:216
+#, c-format
+msgid "%s: Apply"
+msgstr ""
+
+#: src/broken_indicator.cc:218
+#, fuzzy, c-format
+msgid "%s: Next"
+msgstr "^Sekantis"
+
+#: src/broken_indicator.cc:220
+#, c-format
+msgid "%s: Previous"
+msgstr ""
+
+#: src/broken_indicator.cc:233
+#, c-format
+msgid "%CSolution search failed. %s: try harder"
+msgstr ""
+
+#: src/broken_indicator.cc:239
+#, c-format
+msgid "%CUnable to resolve dependencies."
+msgstr ""
+
#: src/cmdline/cmdline_action.cc:36
#, c-format
msgid ""
@@ -237,22 +324,22 @@
msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
msgstr "Paketas %s neatnaujinamas, todėl negaliu uždrausti jo atnaujinimo\n"
-#: src/cmdline/cmdline_action.cc:213
+#: src/cmdline/cmdline_action.cc:198
#, c-format
msgid "Note: selecting the task \"%s: %s\" for installation\n"
msgstr "Dėmesio: parenku užduotį „%s: %s“ diegimui\n"
-#: src/cmdline/cmdline_action.cc:240
+#: src/cmdline/cmdline_action.cc:225
#, c-format
msgid "You can only specify a package version with an 'install' command.\n"
msgstr "Naudojant komandą „install“ galima nurodyti tik paketo versiją\n"
-#: src/cmdline/cmdline_action.cc:246
+#: src/cmdline/cmdline_action.cc:231
#, c-format
msgid "You can only specify a package archive with an 'install' command.\n"
msgstr "Naudojant komandą „install“ galima nurodyti tik paketo archyvą\n"
-#: src/cmdline/cmdline_action.cc:280
+#: src/cmdline/cmdline_action.cc:265
#, c-format
msgid ""
"Couldn't find package \"%s\", and more than 40\n"
@@ -261,7 +348,7 @@
"Negaliu rasti paketo „%s“, daugiau nei 40\n"
"paketų pavadinime turi frazę „%s“.\n"
-#: src/cmdline/cmdline_action.cc:283
+#: src/cmdline/cmdline_action.cc:268
#, c-format
msgid ""
"Couldn't find package \"%s\". However, the following\n"
@@ -270,14 +357,14 @@
"Negaliu rasti paketo „%s“. TaÄiau Å¡ie \n"
"paketai pavadinime turi frazę „%s“.\n"
-#: src/cmdline/cmdline_action.cc:307
+#: src/cmdline/cmdline_action.cc:292
#, c-format
msgid "Couldn't find any package whose name or description matched \"%s\"\n"
msgstr ""
"Negaliu rasti nei vieno paketo, kurio pavadinime arba apraše būtų frazė „%"
"s“\n"
-#: src/cmdline/cmdline_action.cc:309
+#: src/cmdline/cmdline_action.cc:294
#, c-format
msgid ""
"Couldn't find any package matching \"%s\", and more than 40\n"
@@ -286,7 +373,7 @@
"Negaliu rasti paketo su fraze „%s“, ir yra daugiau nei 40\n"
"paketų kurių apraše yra frazė „%s“.\n"
-#: src/cmdline/cmdline_action.cc:312
+#: src/cmdline/cmdline_action.cc:297
#, c-format
msgid ""
"Couldn't find any package matching \"%s\". However, the following\n"
@@ -330,13 +417,13 @@
msgid "Freed %sB of disk space\n"
msgstr "Atsilaisvins %sB"
-#: src/cmdline/cmdline_do_action.cc:67
+#: src/cmdline/cmdline_do_action.cc:71
#, c-format
msgid "Invalid operation %s"
msgstr "Klaidingas veiksmas %s"
-#: src/cmdline/cmdline_do_action.cc:206 src/cmdline/cmdline_simulate.cc:30
-#: src/cmdline/cmdline_upgrade.cc:89
+#: src/cmdline/cmdline_do_action.cc:201 src/cmdline/cmdline_simulate.cc:31
+#: src/cmdline/cmdline_upgrade.cc:91
#, c-format
msgid "Abort.\n"
msgstr "Atšaukti.\n"
@@ -346,7 +433,7 @@
msgid "download: you must specify at least one package to download\n"
msgstr "atsisiuntimas: reikia nurodyti bent vienÄ… paketÄ… atsisiuntimui\n"
-#: src/cmdline/cmdline_download.cc:43 src/download.cc:342
+#: src/cmdline/cmdline_download.cc:43 src/download.cc:344
msgid "Couldn't read source list"
msgstr "Negaliu nuskaityti šaltinių sąrašo"
@@ -410,96 +497,96 @@
msgid "What is it? It's an elephant being eaten by a snake, of course.\n"
msgstr "Kas tai? Tai dramblys, kurį suvalgė gyvatė, žinoma.\n"
-#: src/cmdline/cmdline_prompt.cc:44
+#: src/cmdline/cmdline_prompt.cc:45
msgid "Couldn't read list of sources"
msgstr "Negaliu nuskaityti šaltinių sąrašo"
-#: src/cmdline/cmdline_prompt.cc:219 src/cmdline/cmdline_show_broken.cc:73
+#: src/cmdline/cmdline_prompt.cc:220 src/cmdline/cmdline_show_broken.cc:73
#, c-format
msgid "but %s is to be installed."
msgstr "taÄiau %s bus įdiegtas"
-#: src/cmdline/cmdline_prompt.cc:222 src/cmdline/cmdline_show_broken.cc:76
+#: src/cmdline/cmdline_prompt.cc:223 src/cmdline/cmdline_show_broken.cc:76
#, c-format
msgid "but %s is installed and it is kept back."
msgstr "taÄiau %s įdiegtas ir jo atnaujinimas sulaikomas"
-#: src/cmdline/cmdline_prompt.cc:225 src/cmdline/cmdline_show_broken.cc:79
+#: src/cmdline/cmdline_prompt.cc:226 src/cmdline/cmdline_show_broken.cc:79
#, c-format
msgid "but %s is installed."
msgstr "taÄiau %s yra įdiegtas."
-#: src/cmdline/cmdline_prompt.cc:229 src/cmdline/cmdline_show_broken.cc:83
+#: src/cmdline/cmdline_prompt.cc:230 src/cmdline/cmdline_show_broken.cc:83
#, c-format
msgid "but it is not installable"
msgstr "taÄiau jis negali bÅ«ti įdiegtas"
# FIXME: do something sensible here!
-#: src/cmdline/cmdline_prompt.cc:233 src/cmdline/cmdline_show_broken.cc:87
+#: src/cmdline/cmdline_prompt.cc:234 src/cmdline/cmdline_show_broken.cc:87
#, c-format
msgid " which is a virtual package."
msgstr " kuris yra virtualus paketas."
-#: src/cmdline/cmdline_prompt.cc:236 src/cmdline/cmdline_show_broken.cc:90
+#: src/cmdline/cmdline_prompt.cc:237 src/cmdline/cmdline_show_broken.cc:90
#, c-format
msgid " or"
msgstr " arba"
-#: src/cmdline/cmdline_prompt.cc:248
+#: src/cmdline/cmdline_prompt.cc:249
msgid "The following packages are BROKEN:"
msgstr "Å ie paketai yra SUGADINTI:"
-#: src/cmdline/cmdline_prompt.cc:249
+#: src/cmdline/cmdline_prompt.cc:250
msgid "The following packages are unused and will be REMOVED:"
msgstr "Å ie paketai nebenaudojami, todÄ—l dabar bus PAÅ ALINTI:"
-#: src/cmdline/cmdline_prompt.cc:250
+#: src/cmdline/cmdline_prompt.cc:251
msgid "The following packages have been automatically kept back:"
msgstr "Šių paketų atnaujinimas automatiškai sulaikomas:"
-#: src/cmdline/cmdline_prompt.cc:251
+#: src/cmdline/cmdline_prompt.cc:252
msgid "The following NEW packages will be automatically installed:"
msgstr "Šie NAUJI paketai bus įdiegti automatiškai:"
-#: src/cmdline/cmdline_prompt.cc:252
+#: src/cmdline/cmdline_prompt.cc:253
msgid "The following packages will be automatically REMOVED:"
msgstr "Šie paketai bus PAŠALINTI automatiškai:"
-#: src/cmdline/cmdline_prompt.cc:253
+#: src/cmdline/cmdline_prompt.cc:254
msgid "The following packages will be DOWNGRADED:"
msgstr "Šie paketai bus PASENDINTI (įdiegtos jų senesnės versijos):"
-#: src/cmdline/cmdline_prompt.cc:254
+#: src/cmdline/cmdline_prompt.cc:255
msgid "The following packages have been kept back:"
msgstr "Šių paketų atnaujinimas sulaikomas:"
-#: src/cmdline/cmdline_prompt.cc:255
+#: src/cmdline/cmdline_prompt.cc:256
msgid "The following packages will be REINSTALLED:"
msgstr "Šie paketai bus įdiegti iš naujo (PERINSTALIUOTI):"
-#: src/cmdline/cmdline_prompt.cc:256
+#: src/cmdline/cmdline_prompt.cc:257
msgid "The following NEW packages will be installed:"
msgstr "Bus įdiegti šie NAUJI paketai:"
-#: src/cmdline/cmdline_prompt.cc:257
+#: src/cmdline/cmdline_prompt.cc:258
msgid "The following packages will be REMOVED:"
msgstr "Å ie paketai bus PAÅ ALINTI:"
-#: src/cmdline/cmdline_prompt.cc:258
+#: src/cmdline/cmdline_prompt.cc:259
msgid "The following packages will be upgraded:"
msgstr "Å ie paketai bus atnaujinti:"
-#: src/cmdline/cmdline_prompt.cc:307
+#: src/cmdline/cmdline_prompt.cc:311
#, c-format
msgid "The following ESSENTIAL packages will be REMOVED!\n"
msgstr "Å ie ESMINIAI paketai bus PAÅ ALINTI!\n"
-#: src/cmdline/cmdline_prompt.cc:316
+#: src/cmdline/cmdline_prompt.cc:320
#, c-format
msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
msgstr "Jūsų veiksmai šiuos ESMINIUS paketus SUGADINS:\n"
-#: src/cmdline/cmdline_prompt.cc:326
+#: src/cmdline/cmdline_prompt.cc:330
#, c-format
msgid ""
"WARNING: Performing this action will probably cause your system to break!\n"
@@ -508,97 +595,100 @@
"DÄ–MESIO: Å ie JÅ«sų veiksmai greiÄiausiai sugadins JÅ«sų sistemÄ…!\n"
" SUSTOKITE dabar, nebent jūs TIKSLIAI žinote ką darote!\n"
-#: src/cmdline/cmdline_prompt.cc:328
+#: src/cmdline/cmdline_prompt.cc:332
msgid "I am aware that this is a very bad idea"
msgstr "Aš sunerimęs, nes manau kad tai tikrai bloga mintis"
-#: src/cmdline/cmdline_prompt.cc:331
+#: src/cmdline/cmdline_prompt.cc:335
#, c-format
msgid "To continue, type the phrase \"%s\":\n"
msgstr "Norėdami tęsti parašykite frazę „%s“:\n"
-#: src/cmdline/cmdline_prompt.cc:434
+#: src/cmdline/cmdline_prompt.cc:438
#, c-format
msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
msgstr "Å ie paketai yra SIŪLOMI, taÄiau jie nebus įdiegti:\n"
-#: src/cmdline/cmdline_prompt.cc:440
+#: src/cmdline/cmdline_prompt.cc:444
#, c-format
msgid "The following packages are SUGGESTED but will NOT be installed:\n"
msgstr "Å ie paketai yra SIŪLOMI, taÄiau jie nebus įdiegti:\n"
-#: src/cmdline/cmdline_prompt.cc:445
+#: src/cmdline/cmdline_prompt.cc:449
#, c-format
msgid "No packages will be installed, upgraded, or removed.\n"
msgstr "Nei vienas paketas nebus įdiegtas, pašalintas arba atnaujintas.\n"
-#: src/cmdline/cmdline_prompt.cc:447
+#: src/cmdline/cmdline_prompt.cc:451
#, c-format
msgid "%lu packages upgraded, %lu newly installed, "
msgstr "%lu paketų atnaujinta, %lu naujų paketų įdiegta, "
-#: src/cmdline/cmdline_prompt.cc:451
+#: src/cmdline/cmdline_prompt.cc:455
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu įdiegta iš naujo, "
-#: src/cmdline/cmdline_prompt.cc:453
+#: src/cmdline/cmdline_prompt.cc:457
#, c-format
msgid "%lu downgraded, "
msgstr "%lu pasendinta, "
-#: src/cmdline/cmdline_prompt.cc:455
+#: src/cmdline/cmdline_prompt.cc:459
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu bus pašalinta ir %lu ne atnaujinta.\n"
-#: src/cmdline/cmdline_prompt.cc:462
+#: src/cmdline/cmdline_prompt.cc:466
#, c-format
msgid "Need to get %sB/%sB of archives. "
msgstr "Reikia gauti %sB/%sB archyvų. "
-#: src/cmdline/cmdline_prompt.cc:465
+#: src/cmdline/cmdline_prompt.cc:469
#, c-format
msgid "Need to get %sB of archives. "
msgstr "Reikia gauti %sB archyvų. "
-#: src/cmdline/cmdline_prompt.cc:472
+#: src/cmdline/cmdline_prompt.cc:476
#, c-format
msgid "After unpacking %sB will be used.\n"
msgstr "Po archyvų išpakavimo bus panaudota %sB.\n"
-#: src/cmdline/cmdline_prompt.cc:475
+#: src/cmdline/cmdline_prompt.cc:479
#, c-format
msgid "After unpacking %sB will be freed.\n"
msgstr "Po archyvų išpakavimo bus atlaisvinta %sB.\n"
-#: src/cmdline/cmdline_prompt.cc:521
+#: src/cmdline/cmdline_prompt.cc:524
#, c-format
msgid "Bad action character '%c'\n"
msgstr "Netinkamas veiksmo simbolis „%c“\n"
-#: src/cmdline/cmdline_prompt.cc:596
+#: src/cmdline/cmdline_prompt.cc:595
#, c-format
msgid "No packages to show -- enter the package names on the line after 'i'.\n"
msgstr "Nėra rodomų paketų -- įveskite paketų vardus eilutėje po „i“.\n"
-#: src/cmdline/cmdline_prompt.cc:598 src/cmdline/cmdline_prompt.cc:629
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:597
msgid "Press Return to continue."
msgstr "Kad tęsti spauskite ENTER."
-#: src/cmdline/cmdline_prompt.cc:625
+#: src/cmdline/cmdline_prompt.cc:623
#, c-format
msgid "No packages found -- enter the package names on the line after 'c'.\n"
msgstr ""
"Nerastas joks paketas -- įveskite paketų pavadinimus eilutėje po „c“.\n"
-#: src/cmdline/cmdline_prompt.cc:665
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:627
+#, fuzzy
+msgid "Press Return to continue"
+msgstr "Kad tęsti spauskite ENTER."
+
+#: src/cmdline/cmdline_prompt.cc:675
msgid "Do you want to continue? [Y/n/?] "
msgstr "Ar tęsti? [Y/n/?] "
-#: src/cmdline/cmdline_prompt.cc:690
+#: src/cmdline/cmdline_prompt.cc:700
#, c-format
msgid ""
"\n"
@@ -609,7 +699,7 @@
"Bus rodoma priklausomybių informacija.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:692
+#: src/cmdline/cmdline_prompt.cc:702
#, c-format
msgid ""
"\n"
@@ -620,7 +710,7 @@
"Priklausomybių informacija nebus rodoma.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:698
+#: src/cmdline/cmdline_prompt.cc:708
#, c-format
msgid ""
"\n"
@@ -631,7 +721,7 @@
"Bus rodomos versijos.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:700
+#: src/cmdline/cmdline_prompt.cc:710
#, c-format
msgid ""
"\n"
@@ -642,7 +732,7 @@
"Versijos nebus rodomos.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:705
+#: src/cmdline/cmdline_prompt.cc:715
#, c-format
msgid ""
"\n"
@@ -653,7 +743,7 @@
"Bus rodomi dydžio pakeitimai.\n"
" \n"
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:717
#, c-format
msgid ""
"\n"
@@ -664,7 +754,7 @@
"Dydžio pakeitimai nebus rodomi.\n"
" \n"
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:737
#, c-format
msgid ""
"Commands:\n"
@@ -715,32 +805,83 @@
" _ : IÅ¡valyti\n"
" = : sulaikyti\n"
-#: src/cmdline/cmdline_prompt.cc:751
+#: src/cmdline/cmdline_prompt.cc:761
#, c-format
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:84
+#, c-format
+msgid "y: %F%nn: %F%nq: %F%n,: %F%n.: %F%n"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:90
+msgid "accept the proposed changes"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:92
+msgid "reject the proposed changes and search for another solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:94
+#, fuzzy
+msgid "give up and quit the program"
+msgstr "Išeiti iš programos"
+
+#: src/cmdline/cmdline_resolver.cc:96
+msgid "move to the next solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:98
+msgid "move to the previous solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:131
+#, fuzzy
+msgid "The following actions will resolve these dependencies:"
+msgstr "Šių paketų priklausomybės netenkinamos:\n"
+
+#: src/cmdline/cmdline_resolver.cc:146
+msgid "Accept this solution? [Y/n/q/?]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:174
+msgid "Abandoning all efforts to resolve these dependencies."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:184
+#, fuzzy
+msgid "The following commands are available:"
+msgstr "Å ie paketai yra SUGADINTI:"
+
+#: src/cmdline/cmdline_resolver.cc:188
+#, fuzzy
+msgid "Invalid response; please enter one of the following commands:"
+msgstr "Neteisinga komanda. Įveskite teisingą komandą, arba spauskite „?“.\n"
+
+#: src/cmdline/cmdline_resolver.cc:198
+msgid "No solution found within the allotted time. Try harder? [Y/n]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:226
+#, fuzzy
+msgid "Invalid response; please enter 'y' or 'n'."
+msgstr "Neteisinga komanda. Įveskite teisingą komandą, arba spauskite „?“.\n"
+
+#: src/cmdline/cmdline_resolver.cc:235
+msgid "Unable to resolve dependencies! Giving up..."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:240
+msgid "No more solutions."
+msgstr ""
+
#: src/cmdline/cmdline_search.cc:78
#, c-format
msgid "search: You must provide at least one search term\n"
msgstr "paieška: Jūs turite įvesti bent vieną paieškos žodį\n"
-#: src/cmdline/cmdline_show_broken.cc:114
-#, c-format
-msgid ""
-"Some packages had unmet dependencies. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming.\n"
-"\n"
-msgstr ""
-"Kai kurių paketų priklausomybės netenkinamos. Tai galėjo atsitikti todėl\n"
-"kad Jūs atliekate neįmanomus veiksmus arba naudojate nestabilią\n"
-"distribuciją, kurioje kai kurie būtini paketai dar nesukurti arba iškelti \n"
-"iš incoming katalogo.\n"
-"\n"
-
-#: src/cmdline/cmdline_show_broken.cc:115
+#: src/cmdline/cmdline_show_broken.cc:113
#, c-format
msgid "The following packages have unmet dependencies:\n"
msgstr "Šių paketų priklausomybės netenkinamos:\n"
@@ -938,12 +1079,12 @@
msgid "Description: "
msgstr "Aprašas: "
-#: src/cmdline/cmdline_simulate.cc:36
+#: src/cmdline/cmdline_simulate.cc:37
#, c-format
msgid "Would download/install/remove packages.\n"
msgstr "Siųstu/diegtu/šalintu paketus.\n"
-#: src/cmdline/cmdline_simulate.cc:47
+#: src/cmdline/cmdline_simulate.cc:48
msgid "Internal Error, Ordering didn't finish"
msgstr "Vidinė klaida, nebaigtas rūšiavimas"
@@ -989,28 +1130,24 @@
msgid "UNAVAILABLE"
msgstr "NEEGZISTUOJA"
-#: src/download_bar.cc:57 src/download_list.cc:265
+#: src/download_bar.cc:56 src/download_list.cc:263 src/download_screen.cc:57
#, c-format
-msgid ""
-"Please insert the following disc into the drive \"%s\":\n"
-"%s"
-msgstr ""
-"Prašome įdėti diską į įrenginį „%s“:\n"
-"%s"
+msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
+msgstr "Į įrenginį „%1$s“ įdėkite diską, pažymėtą „%2$s“"
-#: src/download_bar.cc:76 src/generic/acqprogress.cc:63
+#: src/download_bar.cc:77 src/generic/acqprogress.cc:63
msgid "Hit "
msgstr "Spauskite "
-#: src/download_bar.cc:89
+#: src/download_bar.cc:90
msgid "Downloading "
msgstr "Gaunu "
-#: src/download_bar.cc:102
+#: src/download_bar.cc:103
msgid "Got "
msgstr "Gavau "
-#: src/download_bar.cc:156
+#: src/download_bar.cc:157
msgid "Downloading..."
msgstr "Gaunu..."
@@ -1018,7 +1155,7 @@
msgid "Couldn't read list of package sources"
msgstr "Negaliu perskaityti paketų sąrašo"
-#: src/download.cc:104 src/download.cc:321
+#: src/download.cc:104 src/download.cc:322
msgid "Couldn't lock list directory..are you root?"
msgstr "Negaliu užrakinti sąrašo katalogo. Ar Jūs root?"
@@ -1030,29 +1167,33 @@
msgid "View the progress of the package list update"
msgstr "Žiūrėti paketų sąrašo atnaujinimo progresą"
-#: src/download.cc:159
+#: src/download.cc:113
+msgid "List Update"
+msgstr ""
+
+#: src/download.cc:160
msgid "Couldn't clean out list directories"
msgstr "Negaliu išvalyti katalogų sąrašo"
-#: src/download.cc:176 src/ui.cc:1068
+#: src/download.cc:177 src/ui.cc:1152
msgid "Deleting obsolete downloaded files"
msgstr "Trinamos pasenusios gautos bylos"
-#: src/download.cc:181
+#: src/download.cc:182
#, c-format
msgid "Deleting obsolete downloaded files\n"
msgstr "Trinamos pasenusios gautos bylos\n"
-#: src/download.cc:223
+#: src/download.cc:224
#, c-format
msgid "Unable to open %s to log actions"
msgstr "Negaliu atidaryti žurnalo %s"
-#: src/download.cc:229
+#: src/download.cc:230
msgid "log report"
msgstr "žurnalo ataskaita"
-#: src/download.cc:230
+#: src/download.cc:231
#, c-format
msgid ""
"IMPORTANT: this log only lists intended actions; actions which fail due to\n"
@@ -1063,77 +1204,77 @@
"dėl dpkg klaidos. Šie veiksmai negali būti užbaigt.\n"
"\n"
-#: src/download.cc:231
+#: src/download.cc:232
#, c-format
msgid "Will install %li packages, and remove %li packages.\n"
msgstr "Diegiamų paketų skaiÄius %li, Å¡alinamų paketų skaiÄius %li.\n"
-#: src/download.cc:233
+#: src/download.cc:234
#, c-format
msgid "%sB of disk space will be used\n"
msgstr "Bus sunaudota %sB disko vietos\n"
-#: src/download.cc:236
+#: src/download.cc:237
#, c-format
msgid "%sB bytes of disk space will be freed\n"
msgstr "Bus atlaisvinta %sB\n"
-#: src/download.cc:244
+#: src/download.cc:245
#, c-format
msgid "[UPGRADE] %s %s -> %s\n"
msgstr "[ATNAUJINTI] %s %s -> %s\n"
-#: src/download.cc:248
+#: src/download.cc:249
#, c-format
msgid "[DOWNGRADE] %s %s -> %s\n"
msgstr "[PASENDINTI] %s %s -> %s\n"
-#: src/download.cc:258
+#: src/download.cc:259
msgid "REMOVE"
msgstr "PAÅ ALINTI"
-#: src/download.cc:264
+#: src/download.cc:265
msgid "INSTALL"
msgstr "ĮDIEGTI"
-#: src/download.cc:267
+#: src/download.cc:268
msgid "REINSTALL"
msgstr "ĮDIEGTI IŠNAUJO"
-#: src/download.cc:270
+#: src/download.cc:271
msgid "HOLD"
msgstr "SULAIKYTI"
-#: src/download.cc:273
+#: src/download.cc:274
msgid "BROKEN"
msgstr "SUGADINTA"
-#: src/download.cc:276
+#: src/download.cc:277
msgid "REMOVE, NOT USED"
msgstr "PAÅ ALINTI, NEBENAUDOJAMAS"
-#: src/download.cc:279
+#: src/download.cc:280
msgid "REMOVE, DEPENDENCIES"
msgstr "PAÅ ALINTI, PRIKLAUSOMYBÄ–S"
-#: src/download.cc:282
+#: src/download.cc:283
msgid "INSTALL, DEPENDENCIES"
msgstr "ĮDIEGTI, PRIKLAUSOMYBĖS"
-#: src/download.cc:285
+#: src/download.cc:286
msgid "HOLD, DEPENDENCIES"
msgstr "SULAIKYTI, PRIKLAUSOMYBÄ–S"
-#: src/download.cc:287
+#: src/download.cc:288
msgid "????????"
msgstr "????????"
-#: src/download.cc:291
+#: src/download.cc:292
#, c-format
msgid "[%s] %s\n"
msgstr "[%s] %s\n"
-#: src/download.cc:294
+#: src/download.cc:295
#, c-format
msgid ""
"===============================================================================\n"
@@ -1144,32 +1285,37 @@
"\n"
"Žurnalas užbaigtas.\n"
-#: src/download.cc:329
+#: src/download.cc:330
msgid "Downloading packages"
msgstr "Gaunu paketus"
-#: src/download.cc:330
+#: src/download.cc:331
msgid "View the progress of the package download"
msgstr "Rodyti paketo gavimo progresÄ…"
-#: src/download.cc:352
+#: src/download.cc:332
+#, fuzzy
+msgid "Package Download"
+msgstr "Paketas: "
+
+#: src/download.cc:354
msgid "Internal error: couldn't generate list of packages to download"
msgstr "VidinÄ— klaida: negaliu sugeneruoti atsisiunÄiamų paketų sÄ…raÅ¡o"
-#: src/download.cc:413
+#: src/download.cc:415
msgid "Unable to correct for unavailable packages"
msgstr "Negaliu iÅ¡taisyti neegzistuojanÄių paketų"
-#: src/download.cc:465
+#: src/download.cc:467
msgid ""
"Ack! Something bad happened while installing packages. Trying to recover:"
msgstr "Oi! Įvyko klaida diegiant paketus. Bandau sutvarkyti:"
-#: src/download.cc:475 src/pkg_item.cc:413
+#: src/download.cc:477 src/pkg_item.cc:432
msgid "Press return to continue.\n"
msgstr "Norėdami tęsti spauskite ENTER.\n"
-#: src/download.cc:506
+#: src/download.cc:508
msgid ""
"Could not regain the system lock! (Perhaps another apt or dpkg is running?)"
msgstr ""
@@ -1231,11 +1377,6 @@
msgid "[ERROR]"
msgstr "[KLAIDA]"
-#: src/download_screen.cc:57
-#, c-format
-msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
-msgstr "Į įrenginį „%1$s“ įdėkite diską, pažymėtą „%2$s“"
-
#: src/download_screen.cc:181
#, c-format
msgid "Downloaded %sB in %ss (%sB/s)."
@@ -1275,113 +1416,113 @@
"KeiÄiasi laikmena: PraÅ¡ome į įrenginį „%1$s“ įdÄ—ti diskÄ… „%2$s“ ir spauskite "
"ENTER\n"
-#: src/generic/aptcache.cc:245
+#: src/generic/aptcache.cc:253
msgid "Can't open Aptitude extended state file"
msgstr "Negaliu atidaryti Aptitude išplėstinės būsenos bylos"
-#: src/generic/aptcache.cc:252 src/generic/aptcache.cc:305
-#: src/generic/aptcache.cc:307
+#: src/generic/aptcache.cc:260 src/generic/aptcache.cc:313
+#: src/generic/aptcache.cc:315
msgid "Reading extended state information"
msgstr "Skaitoma išplėstinė būsenos informacija"
-#: src/generic/aptcache.cc:313 src/generic/aptcache.cc:387
-#: src/generic/aptcache.cc:390
+#: src/generic/aptcache.cc:321 src/generic/aptcache.cc:395
+#: src/generic/aptcache.cc:398
msgid "Initializing package states"
msgstr "Ruošiamos paketų būsenos"
-#: src/generic/aptcache.cc:501
+#: src/generic/aptcache.cc:509
msgid "Cannot open Aptitude state file"
msgstr "Negaliu atidaryti Aptitude būsenos bylos"
-#: src/generic/aptcache.cc:505 src/generic/aptcache.cc:560
-#: src/generic/aptcache.cc:563
+#: src/generic/aptcache.cc:513 src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:571
msgid "Writing extended state information"
msgstr "Rašoma išplėstinė būsenos informacija"
-#: src/generic/aptcache.cc:542
+#: src/generic/aptcache.cc:550
#, c-format
msgid "Internal buffer overflow on package \"%s\" while writing state file"
msgstr "Bandant įrašyti būsenos bylą paketo „%s“ vidinis buferis persipildė"
-#: src/generic/aptcache.cc:551
+#: src/generic/aptcache.cc:559
msgid "Couldn't write state file"
msgstr "Negaliu įrašyti būsenos bylos"
-#: src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:576
msgid "Error writing state file"
msgstr "Klaida rašant būsenos bylą"
-#: src/generic/aptcache.cc:584
+#: src/generic/aptcache.cc:592
msgid "couldn't replace old state file"
msgstr "negaliu pakeisti senos būsenos bylos"
-#: src/generic/aptcache.cc:960
+#: src/generic/aptcache.cc:1000
msgid "Unable to correct dependencies, some packages cannot be installed"
msgstr ""
"Neįmanoma išspręsti priklausomybių problemas, kai kurie paketai negali būti "
"įdiegti"
-#: src/generic/aptcache.cc:1325
+#: src/generic/aptcache.cc:1546
msgid "The list of sources could not be read."
msgstr "Nepavyko perskaityti šaltinių sąrašo."
-#: src/generic/aptcache.cc:1332
+#: src/generic/aptcache.cc:1553
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 interpretuotas arba atidarytas."
-#: src/generic/aptcache.cc:1335
+#: src/generic/aptcache.cc:1556
msgid "You may want to update the package lists to correct these missing files"
msgstr "Trūksta bylų, tikriausiai reikia atnaujinti paketų sąrašą"
-#: src/generic/apt.cc:141
+#: src/generic/apt.cc:142
#, c-format
msgid "Unable to open %s for writing"
msgstr "Negaliu atidaryti %s rašymui"
-#: src/generic/apt.cc:151
+#: src/generic/apt.cc:152
#, c-format
msgid "Unable to replace %s with new configuration file"
msgstr "Negaliu pakeisti bylos %s nauja parinkÄių byla"
-#: src/generic/apt.cc:226
+#: src/generic/apt.cc:227
msgid "Warning: could not lock the cache file. Opening in read-only mode"
msgstr ""
"Dėmesio: negaliu užrakinti talpyklos (cache) bylos. Atidarau tik skaitymui"
-#: src/generic/matchers.cc:780
+#: src/generic/matchers.cc:797
msgid "Unmatched '('"
msgstr "Neatitikęs „(“"
-#: src/generic/matchers.cc:870 src/generic/matchers.cc:949
+#: src/generic/matchers.cc:887 src/generic/matchers.cc:968
#, c-format
msgid "Unknown dependency type: %s"
msgstr "Nežinomas priklausomybės tipas: %s"
-#: src/generic/matchers.cc:931
+#: src/generic/matchers.cc:950
#, c-format
msgid "Unknown action type: %s"
msgstr "Nežinomas veiksmo tipas: %s"
-#: src/generic/matchers.cc:998
+#: src/generic/matchers.cc:1017
#, c-format
msgid "Unknown priority %s"
msgstr "Nežinomas prioritetas: %s"
-#: src/generic/matchers.cc:1020
+#: src/generic/matchers.cc:1039
#, c-format
msgid "Unknown pattern type: %c"
msgstr "Nežinomas šablono tipas: %c"
-#: src/generic/matchers.cc:1065
+#: src/generic/matchers.cc:1084
msgid "Unexpected empty expression"
msgstr "NetikÄ—tas tuÅ¡Äias reiÅ¡kinys"
-#: src/generic/matchers.cc:1100
+#: src/generic/matchers.cc:1119
msgid "Badly formed expression"
msgstr "Blogai suformuotas reiškinys"
-#: src/generic/matchers.cc:1129
+#: src/generic/matchers.cc:1148
msgid "Unexpected ')'"
msgstr "Netikėtas „)“"
@@ -1404,7 +1545,7 @@
msgid "Can't get value of $HOME, using TMPDIR (insecure)"
msgstr "Nerandu kintamojo $HOME reikÅ¡mÄ—s. Naudoju TMPDIR, taÄiau tai nesaugu"
-#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:60
+#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:61
#, c-format
msgid "ChangeLog of %s"
msgstr "Pasikeitimų sąrašas paketui %s"
@@ -1613,17 +1754,17 @@
msgid "Invalid sorting policy type '%s'"
msgstr "Netinkamas rūšiavimo taisyklių tipas „%s“"
-#: src/main.cc:68
+#: src/main.cc:67
#, c-format
msgid "%s %s compiled at %s %s\n"
msgstr "%s %s kompiliuotas %s %s\n"
-#: src/main.cc:71
+#: src/main.cc:70
#, c-format
msgid "Compiler: g++ %s\n"
msgstr "Kompiliatorius: g++ %s\n"
-#: src/main.cc:74
+#: src/main.cc:73
#, c-format
msgid ""
"\n"
@@ -1632,7 +1773,7 @@
"\n"
"NCurses versija: %s\n"
-#: src/main.cc:76
+#: src/main.cc:75
#, c-format
msgid ""
"\n"
@@ -1641,22 +1782,22 @@
"\n"
"Curses versija: %s\n"
-#: src/main.cc:78
+#: src/main.cc:77
#, c-format
msgid "libsigc++ version: %s\n"
msgstr "libsigc++ versija: %s\n"
-#: src/main.cc:84
+#: src/main.cc:83
#, c-format
msgid "Usage: aptitude [-S fname] [-u|-i]"
msgstr "Naudojimas: aptitude [-S fname] [-u|-i]"
-#: src/main.cc:86
+#: src/main.cc:85
#, c-format
msgid " aptitude [options] <action> ..."
msgstr " aptitude [parametrai] <veiksmas> ..."
-#: src/main.cc:88
+#: src/main.cc:87
#, c-format
msgid ""
" Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -1665,63 +1806,63 @@
" Veiksmai (jei nenurodyti jokie parametrai, aptitude veiks interaktyviai):\n"
"\n"
-#: src/main.cc:89
+#: src/main.cc:88
#, c-format
msgid " install - Install/upgrade packages\n"
msgstr " install - Įdiegti/atnaujinti paketus\n"
-#: src/main.cc:90
+#: src/main.cc:89
#, c-format
msgid " remove - Remove packages\n"
msgstr " remove - Pašalinti paketus\n"
-#: src/main.cc:91
+#: src/main.cc:90
#, c-format
msgid " purge - Remove packages and their configuration files\n"
msgstr " purge - Pašalinti paketus ir jų nustatymų bylas\n"
-#: src/main.cc:92
+#: src/main.cc:91
#, c-format
msgid " hold - Place packages on hold\n"
msgstr " hold - Sulaikyti paketų atnaujinimą\n"
-#: src/main.cc:93
+#: src/main.cc:92
#, c-format
msgid " unhold - Cancel a hold command for a package\n"
msgstr " unhold - Atšaukti paketų sulaikymą\n"
-#: src/main.cc:94
+#: src/main.cc:93
#, c-format
msgid " markauto - Mark packages as having been automatically installed\n"
msgstr ""
" markauto - Pažymėti paketus taip, kad atrodytu jog jie įdiegti "
"automatiškai\n"
-#: src/main.cc:95
+#: src/main.cc:94
#, c-format
msgid " unmarkauto - Mark packages as having been manually installed\n"
msgstr ""
" unmarkauto - Pažymėti paketus taip, kad atrodytu jog jie įdiegti rankiniu "
"būdu\n"
-#: src/main.cc:100
+#: src/main.cc:99
#, c-format
msgid ""
" forbid-version - Forbid aptitude from upgrading to a specific package "
"version.\n"
msgstr " forbid-version - Uždrausti atnaujinimą į nurodytą versiją.\n"
-#: src/main.cc:101
+#: src/main.cc:100
#, c-format
msgid " update - Download lists of new/upgradable packages\n"
msgstr " update - Atsisiųsti naują paketų sąrašą\n"
-#: src/main.cc:102
+#: src/main.cc:101
#, c-format
msgid " upgrade - Perform a safe upgrade\n"
msgstr " upgrade - Saugiai atnaujinti\n"
-#: src/main.cc:103
+#: src/main.cc:102
#, c-format
msgid ""
" dist-upgrade - Perform an upgrade, possibly installing and removing "
@@ -1730,57 +1871,57 @@
" dist-upgrade - Atnaujinti ir leisti pašalinti nereikalingus ir įdiegti "
"naujus paketus\n"
-#: src/main.cc:104
+#: src/main.cc:103
#, c-format
msgid " forget-new - Forget what packages are \"new\"\n"
msgstr " forget-new - Užmiršti kurie paketai yra „nauji“\n"
-#: src/main.cc:105
+#: src/main.cc:104
#, c-format
msgid " search - Search for a package by name and/or expression\n"
msgstr " search - Paketo paieška pagal pavadinimą ir/arba išraišką\n"
-#: src/main.cc:106
+#: src/main.cc:105
#, c-format
msgid " show - Display detailed information about a package\n"
msgstr " show - Rodyti smulkiÄ… paketo informacijÄ…\n"
-#: src/main.cc:107
+#: src/main.cc:106
#, c-format
msgid " clean - Erase downloaded package files\n"
msgstr " clean - Pašalinti gautų paketų bylas\n"
-#: src/main.cc:108
+#: src/main.cc:107
#, c-format
msgid " autoclean - Erase old downloaded package files\n"
msgstr " autoclean - Pašalinti senus atsisiųstus paketus\n"
-#: src/main.cc:109
+#: src/main.cc:108
#, c-format
msgid " changelog - View a package's changelog\n"
msgstr " changelog - Žiūrėti paketo pakeitimų sąrašą\n"
-#: src/main.cc:110
+#: src/main.cc:109
#, c-format
msgid " download - Download the .deb file for a package\n"
msgstr " download - Gauti paketÄ…\n"
-#: src/main.cc:112
+#: src/main.cc:111
#, c-format
msgid " Options:\n"
msgstr " Parametrai:\n"
-#: src/main.cc:113
+#: src/main.cc:112
#, c-format
msgid " -h This help text\n"
msgstr " -h Å i pagalbos informacija\n"
-#: src/main.cc:114
+#: src/main.cc:113
#, c-format
msgid " -s Simulate actions, but do not actually perform them.\n"
msgstr " -s Simuliuoti veiksmus, taÄiau nieko realaus nevykdyti.\n"
-#: src/main.cc:115
+#: src/main.cc:114
#, c-format
msgid ""
" -d Only download packages, do not install or remove anything.\n"
@@ -1788,18 +1929,18 @@
" -d Tik atsisiųsti reikalingus paketus nieko nediegti ir "
"nešalinti.\n"
-#: src/main.cc:116
+#: src/main.cc:115
#, c-format
msgid " -P Always prompt for confirmation or actions\n"
msgstr " -P Visada klausti veiksmų patvirtinimo\n"
-#: src/main.cc:117
+#: src/main.cc:116
#, c-format
msgid ""
" -y Assume that the answer to simple yes/no questions is 'yes'\n"
msgstr " -y Į klausimus taip/ne automatiškai atsakyti „taip“\n"
-#: src/main.cc:118
+#: src/main.cc:117
#, c-format
msgid ""
" -F format Specify a format for displaying search results; see the "
@@ -1808,7 +1949,7 @@
" -F formatas Nurodyti kokių formatu rodyti paieškos rezultatus žr. "
"instrukcijÄ…\n"
-#: src/main.cc:119
+#: src/main.cc:118
#, c-format
msgid ""
" -O order Specify how search results should be sorted; see the manual\n"
@@ -1816,34 +1957,34 @@
" -O tvarka Nurodyti kaip rūšiuoti paieškos rezultatus; žr. "
"instrukcijoje\n"
-#: src/main.cc:120
+#: src/main.cc:119
#, c-format
msgid ""
" -w width Specify the display width for formatting search results\n"
msgstr " -w plotis Nuodyti ekrano plotį, paieškos rezultatų formavimui\n"
-#: src/main.cc:121
+#: src/main.cc:120
#, c-format
msgid " -f Aggressively try to fix broken packages.\n"
msgstr " -f Bandyti tvarkyti sugadintus paketus agresyviai.\n"
-#: src/main.cc:122
+#: src/main.cc:121
#, c-format
msgid " -V Show which versions of packages are to be installed.\n"
msgstr " -V Rodyti kurios paketų versijos bus įdiegtos.\n"
-#: src/main.cc:123
+#: src/main.cc:122
#, c-format
msgid ""
" -D Show the dependencies of automatically changed packages.\n"
msgstr " -D Rodyti automatiškai pakeistų paketų priklausomybes.\n"
-#: src/main.cc:124
+#: src/main.cc:123
#, c-format
msgid " -Z\t\t Show the change in installed size of each package.\n"
msgstr " -Z\t\t Rodyti įdiegtų paketų dydžio pasikeitimus.\n"
-#: src/main.cc:125
+#: src/main.cc:124
#, c-format
msgid ""
" -v Display extra information. (may be supplied multiple times)\n"
@@ -1851,18 +1992,18 @@
" -v Rodyti papildomą informaciją.( gali būti naudojamas kelis "
"kartus)\n"
-#: src/main.cc:126
+#: src/main.cc:125
#, c-format
msgid ""
" -t [release] Set the release from which packages should be installed\n"
msgstr " -t [release] Nustatyti kuri versija turi būti įdiegta.\n"
-#: src/main.cc:127
+#: src/main.cc:126
#, c-format
msgid " -o key=val Directly set the configuration option named 'key'\n"
msgstr " -o raktas=reikšmė Tiesiogiai siųsti nustatymą „raktas“\n"
-#: src/main.cc:128
+#: src/main.cc:127
#, c-format
msgid ""
" --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -1872,59 +2013,67 @@
"paketus\n"
" kaip reikalingus\n"
-#: src/main.cc:129
+#: src/main.cc:128
#, c-format
msgid " -S fname: Read the aptitude extended status info from fname.\n"
msgstr ""
" -S fname: Skaityti aptitude išplėstinės būsenos informaciją iš bylos "
"fname.\n"
-#: src/main.cc:130
+#: src/main.cc:129
#, c-format
msgid " -u : Download new package lists on startup.\n"
msgstr " -u : Siųstis naują paketų sąrašą tik paleidus programą.\n"
-#: src/main.cc:131
+#: src/main.cc:130
#, c-format
msgid " -i : Perform an install run on startup.\n"
msgstr " -i : Paleidus programą automatiškai vykdyti diegimą.\n"
-#: src/main.cc:133
+#: src/main.cc:132
#, c-format
msgid " This aptitude does not have Super Cow Powers.\n"
msgstr " aptitude neturi Superkarvės galių.\n"
-#: src/main.cc:254
+#: src/main.cc:253
#, c-format
msgid "-o requires an argument of the form key=value, got %s"
msgstr " o reikalauja argumentų formate „raktas=reikšmė“, gavau %s"
-#: src/main.cc:300 src/main.cc:309
+#: src/main.cc:299 src/main.cc:308
msgid "WEIRDNESS: unknown option code received\n"
msgstr "KEISTA: gautas nežinomas kodas\n"
-#: src/main.cc:318
+#: src/main.cc:317
msgid "Only one of -u and -i may be specified\n"
msgstr "Gali būti nurodytas tik vienas iš -u ir -i\n"
-#: src/main.cc:326
+#: src/main.cc:325
msgid ""
"-u and -i may not be specified in command-line mode (eg, with 'install')"
msgstr "-u ir -i nenaudojami komandinės eilutės režime(pvz., su „install“)"
-#: src/main.cc:337
+#: src/main.cc:342
msgid "-u and -i may not be specified with a command"
msgstr "-u ir -i negali būti nurodyti su komanda"
-#: src/main.cc:392
+#: src/main.cc:399
#, c-format
msgid "Unknown command \"%s\"\n"
msgstr "Nežinoma komanda „%s“\n"
-#: src/main.cc:400
+#: src/main.cc:406 src/main.cc:463
+msgid "Internal error: uncaught 'out of solutions' exception.\n"
+msgstr ""
+
+#: src/main.cc:411 src/main.cc:468
+msgid "Internal error: uncaught 'out of time' exception.\n"
+msgstr ""
+
+#: src/main.cc:418
#, c-format
-msgid "Invalid option for interactive mode: -s\n"
-msgstr "Neteisingas interaktyvaus režimo nustatymas -s\n"
+msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
+msgstr ""
#: src/mine/cmine.cc:93
#, c-format
@@ -1952,7 +2101,7 @@
msgid "Lost"
msgstr "Pralošėt"
-#: src/mine/cmine.cc:119 src/ui.cc:1005
+#: src/mine/cmine.cc:119 src/ui.cc:1089
msgid "Minesweeper"
msgstr "Minų laukas"
@@ -2128,7 +2277,7 @@
msgid "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
msgstr "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
-#: src/pkg_columnizer.cc:84 src/ui.cc:1488
+#: src/pkg_columnizer.cc:84 src/ui.cc:1638
msgid "Package"
msgstr "Paketas"
@@ -2386,13 +2535,14 @@
" Sekcijos „base“ paketai - tai dalis pradinės sistemos."
#: src/pkg_grouppolicy.cc:158
+#, fuzzy
msgid ""
"Programs for faxmodems and other communications devices\n"
" Packages in the 'comm' section are used to control modems and other "
"hardware communications devices. This includes software to control faxmodems "
"(for instance, PPP for dial-up internet connections and programs originally "
-"written for that purpose (zmodem/kermit), as well as software to control "
-"cellular phones, interface with FidoNet, and run a BBS."
+"written for that purpose, such as zmodem/kermit), as well as software to "
+"control cellular phones, interface with FidoNet, and run a BBS."
msgstr ""
"Programos darbui su faks/modemais ir kitais komunikaciniais prietaisais\n"
" Paketai „comm“ sekcijoje skirti valdyti modemus ir kitus komunikacinius "
@@ -2836,14 +2986,15 @@
"sekcijoje, gali būti rasti ir „main“ sekcijoje."
#: src/pkg_grouppolicy.cc:193
+#, fuzzy
msgid ""
"Programs which are not free software\n"
" Packages in the 'non-free' section are not part of Debian.\n"
" .\n"
" These packages fail to meet one or more of the requirements of the Debian "
-"Free Software Guidelines (see below) You should read the license of programs "
-"in this section to be sure that you are allowed to use them in the way you "
-"intend.\n"
+"Free Software Guidelines (see below). You should read the license of "
+"programs in this section to be sure that you are allowed to use them in the "
+"way you intend.\n"
" .\n"
" For more information about what Debian considers to be Free Software, see "
"http://www.debian.org/social_contract#guidelines"
@@ -2906,11 +3057,12 @@
" Egzistuoja naujesnės šių paketų versijos."
#: src/pkg_grouppolicy.cc:320
+#, fuzzy
msgid ""
"New Packages\n"
" These packages have been added to Debian since the last time you cleared "
-"the list of \"new\" packages. (choose \"Forget new packages\" from the "
-"Actions menu to empty this list)"
+"the list of \"new\" packages (choose \"Forget new packages\" from the "
+"Actions menu to empty this list)."
msgstr ""
"Nauji paketai\n"
" Šie paketai atsirado po paskutinio naujų paketų sąrašo išvalymo. "
@@ -3157,53 +3309,72 @@
msgid "Versions"
msgstr "Versijos"
-#: src/pkg_item.cc:54
+#: src/pkg_item.cc:55
msgid "Yes, I am aware this is a very bad idea"
msgstr "Taip, aš suprantu, kad tai labai bloga mintis"
#: src/pkg_item.cc:80
-#, c-format
+#, fuzzy, c-format
msgid ""
-"%s is an essential package!\n"
-"\n"
-"Are you sure you want to remove it?\n"
-"Type '%s' if you are."
+"%s is an essential package!%n%nAre you sure you want to remove it?%nType '%"
+"s' if you are."
msgstr ""
"%s yra esminis paketas!\n"
"\n"
"Ar Jūs tikrai norite jį pašalinti?\n"
"Jei Jūs tikras įveskite: „%s“."
-#: src/pkg_item.cc:219
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:625
#, c-format
msgid "Information about %s"
msgstr "Informacija apie %s"
-#: src/pkg_item.cc:304
-msgid "Available versions of "
+#: src/pkg_item.cc:224 src/pkg_ver_item.cc:627
+#, c-format
+msgid "%s info"
+msgstr ""
+
+#: src/pkg_item.cc:310
+#, fuzzy, c-format
+msgid "Available versions of %s"
msgstr "EgzistuojanÄios versijos paketo "
-#: src/pkg_item.cc:312 src/pkg_ver_item.cc:648
+#: src/pkg_item.cc:313
+#, fuzzy, c-format
+msgid "%s versions"
+msgstr "Versijos"
+
+#: src/pkg_item.cc:325 src/pkg_ver_item.cc:655
#, c-format
msgid "Dependencies of %s"
msgstr "Paketo %s priklausomybÄ—s."
-#: src/pkg_item.cc:322 src/pkg_ver_item.cc:657
+#: src/pkg_item.cc:327 src/pkg_ver_item.cc:657
+#, c-format
+msgid "%s deps"
+msgstr ""
+
+#: src/pkg_item.cc:338 src/pkg_ver_item.cc:667
#, c-format
msgid "Packages depending on %s"
msgstr "Paketai, kuriems reikia %s"
-#: src/pkg_item.cc:373 src/pkg_ver_item.cc:694
+#: src/pkg_item.cc:340 src/pkg_ver_item.cc:669
+#, c-format
+msgid "%s reverse deps"
+msgstr ""
+
+#: src/pkg_item.cc:392 src/pkg_ver_item.cc:707
#, c-format
msgid "Reporting a bug in %s:\n"
msgstr "Pranešam apie klaidas %s:\n"
-#: src/pkg_item.cc:395
+#: src/pkg_item.cc:414
+#, fuzzy
msgid ""
-"You are not root and I cannot find any way\n"
-"to become root. To reconfigure this package,\n"
-"install the menu package, the login package,\n"
-"or run aptitude as root."
+"You are not root and I cannot find any way to become root. To reconfigure "
+"this package, install the menu package, the login package, or run aptitude "
+"as root."
msgstr ""
"Jūs neturite root teisių ir aš nematau\n"
"būdo šias teises gauti. Norėdami šį\n"
@@ -3211,48 +3382,49 @@
"„menu“ ir „login“ arba paleiskite aptitude\n"
"turÄ—dami root teises."
-#: src/pkg_item.cc:403
+#: src/pkg_item.cc:422
#, c-format
msgid "Reconfiguring %s\n"
msgstr "Perkonfigūruojamas paketas %s\n"
-#: src/pkg_item.cc:428
+#: src/pkg_item.cc:447
msgid "Hierarchy editor"
msgstr "Hierarchijos redaktorius"
+#: src/pkg_item.cc:447
+#, fuzzy
+msgid "Hierarchy Editor"
+msgstr "Hierarchijos redaktorius"
+
#: src/pkg_tree.cc:325
msgid "Search for: "
msgstr "Ieškoti: "
-#: src/pkg_tree.cc:585
+#: src/pkg_tree.cc:568
msgid "All Packages"
msgstr "Visi paketai"
-#: src/pkg_tree.cc:598 src/pkg_tree.cc:607
+#: src/pkg_tree.cc:581 src/pkg_tree.cc:590
msgid "Building view"
msgstr "Kuriu vaizdÄ…"
-#: src/pkg_tree.cc:649
+#: src/pkg_tree.cc:632
#, c-format
msgid "No packages matched the pattern \"%s\"."
msgstr "Joks paketas neatitiko šabloną „%s“."
-#: src/pkg_tree.cc:671
+#: src/pkg_tree.cc:654
msgid "Enter the new package tree limit: "
msgstr "Įveskite naują paketų medžio ribą: "
-#: src/pkg_tree.cc:705
+#: src/pkg_tree.cc:688
msgid "Enter the new package grouping mechanism for this display: "
msgstr "Įveskite naują grupavimo mechanizmą šiam ekranui: "
-#: src/pkg_tree.cc:713
+#: src/pkg_tree.cc:696
msgid "Enter the new package sorting mechanism for this display: "
msgstr "Įveskite naują rūšiavimo mechanizmą šiam ekranui: "
-#: src/pkg_ver_item.cc:623
-msgid "Information about "
-msgstr "Informacija apie "
-
#: src/pkg_view.cc:344
msgid "make_package_view: error in arguments -- two main widgets??"
msgstr "make_package_view: klaida argumentuose -- du pagrindiniai elementai??"
@@ -3268,7 +3440,7 @@
msgid "make_package_view: bad argument!"
msgstr "make_package_view: blogas argumentas!"
-#: src/pkg_view.cc:492
+#: src/pkg_view.cc:495
msgid "make_package_view: no main widget found"
msgstr "make_package_view: nėra pagrindinio raktažodžio"
@@ -3477,6 +3649,74 @@
"Å iems paketams reikia versijos %B%s%b paketo %B%s%b, jei tai bus %s paketas "
"bus sugadintas."
+#: src/solution_dialog.cc:74
+msgid "The package cache is not available."
+msgstr ""
+
+#: src/solution_dialog.cc:82
+#, fuzzy
+msgid "No packages are broken."
+msgstr "Keli paketai sugadint. Ar man bandyti juos sutvarkyti?"
+
+#: src/solution_dialog.cc:103
+msgid "No resolution found."
+msgstr ""
+
+#: src/solution_dialog.cc:107
+#, c-format
+msgid ""
+"Time exhausted while searching for a solution (you can select \"Next Solution"
+"\" or press %s to try harder)."
+msgstr ""
+
+#: src/solution_dialog.cc:146
+#, fuzzy
+msgid "Previous"
+msgstr "Pateikia"
+
+#: src/solution_dialog.cc:147
+#, fuzzy
+msgid "Next"
+msgstr "^Sekantis"
+
+#: src/solution_dialog.cc:148
+msgid "Apply"
+msgstr ""
+
+#: src/solution_dialog.cc:149
+#, fuzzy
+msgid "Close"
+msgstr "^Uždaryti"
+
+#: src/solution_fragment.cc:125
+#, fuzzy
+msgid "%BRemove%b the following packages:%n"
+msgstr "Å ie paketai yra SUGADINTI:"
+
+#: src/solution_fragment.cc:135
+#, fuzzy
+msgid "%BInstall%b the following packages:%n"
+msgstr "Å ie paketai yra SUGADINTI:"
+
+#: src/solution_fragment.cc:148
+msgid "%BKeep%b the following packages at their current version:%n"
+msgstr ""
+
+#: src/solution_fragment.cc:161
+#, fuzzy
+msgid "%BUpgrade%b the following packages:%n"
+msgstr "Å ie paketai yra SUGADINTI:"
+
+#: src/solution_fragment.cc:176
+#, fuzzy
+msgid "%BDowngrade%b the following packages:%n"
+msgstr "Gaunu paketus"
+
+#: src/solution_fragment.cc:190
+#, c-format
+msgid "Score is %d"
+msgstr ""
+
#: src/trust.cc:17 src/trust.cc:19
msgid "WARNING"
msgstr ""
@@ -3488,54 +3728,54 @@
"system."
msgstr ""
-#: src/ui.cc:143
+#: src/ui.cc:164
msgid "Er, there aren't any errors, this shouldn't have happened.."
msgstr "Brrr, Äia nÄ—ra jokių klaidų, tai neturÄ—jo įvykti.."
-#: src/ui.cc:149
+#: src/ui.cc:170
msgid "E:"
msgstr ""
-#: src/ui.cc:151
+#: src/ui.cc:172
msgid "W:"
msgstr ""
-#: src/ui.cc:172
+#: src/ui.cc:193
msgid "Search for:"
msgstr "Ieškoti: "
-#: src/ui.cc:205
+#: src/ui.cc:261
msgid "You already are root!"
msgstr "JÅ«s jau turite root teises!"
-#: src/ui.cc:303
+#: src/ui.cc:359
msgid ""
"Subprocess exited with an error -- did you type your password correctly?"
msgstr "Įvyko klaida -- ar Jūs teisingai įrašėte slaptažodį?"
-#: src/ui.cc:331
+#: src/ui.cc:387
msgid "Loading cache"
msgstr "Paimu duomenis"
-#: src/ui.cc:353
+#: src/ui.cc:409
msgid "Really quit Aptitude?"
msgstr "Tikrai išeinate iš Aptitude?"
-#: src/ui.cc:432
+#: src/ui.cc:488
msgid "Really discard your personal settings and reload the defaults?"
msgstr ""
"Jūs tikrai norite prarasti savo asmeninius nustatymus ir įkelti "
"standartinius?"
-#: src/ui.cc:532
+#: src/ui.cc:588 src/ui.cc:590 src/ui.cc:618 src/ui.cc:620
msgid "Packages"
msgstr "Paketai"
-#: src/ui.cc:533 src/ui.cc:560
+#: src/ui.cc:589 src/ui.cc:619
msgid "View available packages and choose actions to perform"
msgstr "Peržiūrėti turimus paketus ir atlikti veiksmus"
-#: src/ui.cc:599
+#: src/ui.cc:666
#, fuzzy
msgid ""
"%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
@@ -3552,15 +3792,15 @@
"jūs galite ją platinti pagal tam tikras sąlygas;\n"
"norėdami sužinoti daugiau žiūrėkite „licencija“."
-#: src/ui.cc:620
+#: src/ui.cc:687
msgid "help.txt"
msgstr "help.txt"
-#: src/ui.cc:636
+#: src/ui.cc:703
msgid "README"
msgstr "README"
-#: src/ui.cc:718
+#: src/ui.cc:785
msgid ""
"%C%BWARNING%b: untrusted versions of the following packages will be "
"installed!%n%nUntrusted packages could %Bcompromise your system's security%"
@@ -3568,60 +3808,70 @@
"this is what you want to do.%n%n"
msgstr ""
-#: src/ui.cc:732
+#: src/ui.cc:799
#, fuzzy
msgid "Really Continue"
msgstr "Tęsti"
-#: src/ui.cc:734
+#: src/ui.cc:801
msgid "Abort Installation"
msgstr ""
-#: src/ui.cc:796
+#: src/ui.cc:862
msgid "Preview of package installation"
msgstr "Peržiūrėti paketo diegimą"
-#: src/ui.cc:797
+#: src/ui.cc:863
msgid "View and/or adjust the actions that will be performed"
msgstr "Žiūrėti ir/arba keisti veiksmus, kurie bus vykdomi"
-#: src/ui.cc:837
-msgid "Some packages were broken and have been fixed"
+#: src/ui.cc:864
+#, fuzzy
+msgid "Preview"
+msgstr "^Atgal"
+
+#: src/ui.cc:900
+#, fuzzy
+msgid "Some packages were broken and have been fixed:"
msgstr "Kai kurie paketai buvo sugadinti ir aš juos sutvarkiau"
-#: src/ui.cc:839
-msgid "Some broken packages could not be fixed!"
-msgstr "Keli sugadinti paketai negali būti sutvarkyti!"
+#: src/ui.cc:906
+msgid "No solution to these dependency problems exists!"
+msgstr ""
-#: src/ui.cc:847 src/ui.cc:959
-msgid "Some packages are broken. Try to fix them?"
-msgstr "Keli paketai sugadint. Ar man bandyti juos sutvarkyti?"
+#: src/ui.cc:912
+#, c-format
+msgid ""
+"Ran out of time while trying to resolver dependencies (press \"%s\" to try "
+"harder)"
+msgstr ""
-#: src/ui.cc:860
+#: src/ui.cc:958
+#, fuzzy
msgid ""
-"Installing/removing packages requires administrative privileges, which\n"
-"you currently do not have. Would you like to change to the root account?\n"
+"Installing/removing packages requires administrative privileges, which you "
+"currently do not have. Would you like to change to the root account?"
msgstr ""
"Norėdami įdiegti/pašalinti paketus turite turėti administratoriaus (root)\n"
"privilegijas, kurių jūs neturite. Ar norite pereiti į „root“ paskyrą?\n"
-#: src/ui.cc:863 src/ui.cc:993
+#: src/ui.cc:961 src/ui.cc:1077
msgid "Become root"
msgstr "Tapti „root“"
-#: src/ui.cc:865 src/ui.cc:995
+#: src/ui.cc:963 src/ui.cc:1079
msgid "Don't become root"
msgstr "Netapti „root“"
-#: src/ui.cc:870 src/ui.cc:1000
+#: src/ui.cc:968 src/ui.cc:1084
msgid "A package-list update or install run is already taking place."
msgstr "Paketų atnaujinimas arba diegimas jau vyksta."
-#: src/ui.cc:897
+#: src/ui.cc:995
msgid "No packages are scheduled to be installed, removed, or upgraded."
msgstr "Jokio paketo įdiegimas, pašalinimas ar atnaujinimas neplanuojamas."
-#: src/ui.cc:903
+#: src/ui.cc:1001
#, fuzzy
msgid ""
"No packages will be installed, removed or upgraded. Some packages could be "
@@ -3634,164 +3884,179 @@
"atnaujinti.\n"
"Spauskite „U“ kad paruošti atnaujinimą."
-#: src/ui.cc:990
+#: src/ui.cc:1073
+#, fuzzy
msgid ""
-"Updating the package lists requires administrative privileges, which\n"
-"you currently do not have. Would you like to change to the root account?\n"
+"Updating the package lists requires administrative privileges, which you "
+"currently do not have. Would you like to change to the root account?"
msgstr ""
"Norint atnaujinti paketų sąrašą Jūs turite turėtu root teises., kurių\n"
"jūs neturite. Ar norite jas įgyti?\n"
-#: src/ui.cc:1005 src/ui.cc:1198
+#: src/ui.cc:1089 src/ui.cc:1345
msgid "Waste time trying to find mines"
msgstr "Gaištate laiką bandydami rasti minas"
-#: src/ui.cc:1012 src/ui.cc:1065
+#: src/ui.cc:1096 src/ui.cc:1149
msgid "Cleaning while a download is in progress is not allowed"
msgstr "Valymas tuo metu, kai gaunami paketai, draudžiamas"
-#: src/ui.cc:1015
+#: src/ui.cc:1099
msgid "Deleting downloaded files"
msgstr "Trinu gautus paketus"
-#: src/ui.cc:1029
+#: src/ui.cc:1113
msgid "Downloaded package files have been deleted"
msgstr "Gauti paketai ištrinti"
-#: src/ui.cc:1090
+#: src/ui.cc:1174
#, fuzzy, c-format
msgid ""
"Obsolete downloaded package files have been deleted, freeing %sB of disk "
"space."
msgstr "Pasenę gauti paketai ištrinti"
-#: src/ui.cc:1174
+#: src/ui.cc:1246
+msgid "All solutions exhausted."
+msgstr ""
+
+#: src/ui.cc:1251 src/ui.cc:1282
+#, fuzzy
+msgid "Ran out of time while trying to find a solution."
+msgstr "Gaištate laiką bandydami rasti minas"
+
+#: src/ui.cc:1276
+msgid "Unable to find a solution to apply."
+msgstr ""
+
+#: src/ui.cc:1321
msgid "^Install/remove packages"
msgstr "^Diegti/Å¡alinti paketus"
-#: src/ui.cc:1175
+#: src/ui.cc:1322
msgid "Perform all pending installs and removals"
msgstr "Vykdyti numatytus veiksmus"
-#: src/ui.cc:1177
+#: src/ui.cc:1324
msgid "^Update package list"
msgstr "^Atnaujinti paketų sąrašą"
-#: src/ui.cc:1178
+#: src/ui.cc:1325
msgid "Check for new versions of packages"
msgstr "Ieškoti naujų paketų versijų"
-#: src/ui.cc:1181
+#: src/ui.cc:1328
msgid "^Forget new packages"
msgstr "^Pamiršti naujus paketus"
-#: src/ui.cc:1182
+#: src/ui.cc:1329
msgid "Forget which packages are \"new\""
msgstr "Pamiršti kurie paketai yra „nauji“"
-#: src/ui.cc:1185
+#: src/ui.cc:1332
msgid "^Clean package cache"
msgstr "^Valyti paketų talpyklą"
-#: src/ui.cc:1186
+#: src/ui.cc:1333
msgid "Delete package files which were previously downloaded"
msgstr "IÅ¡trinti paketus, kurie buvo atsiųsti anksÄiau"
-#: src/ui.cc:1189
+#: src/ui.cc:1336
msgid "Clean ^obsolete files"
msgstr "^IÅ¡valyti pasenusius paketus"
-#: src/ui.cc:1190
+#: src/ui.cc:1337
msgid "Delete package files which can no longer be downloaded"
msgstr "Pašalinti paketus, kurių nebeįmanoma gauti"
-#: src/ui.cc:1193
+#: src/ui.cc:1340
msgid "Mark ^Upgradable"
msgstr "Pažymėti ^kaip atnaujinamą"
-#: src/ui.cc:1194
+#: src/ui.cc:1341
msgid "Mark all upgradable packages which are not held for upgrade"
msgstr ""
"Pažymėti visus atnaujinamus paketus, kurie nesulaikomi nuo atnaujinimo."
-#: src/ui.cc:1197
+#: src/ui.cc:1344
msgid "^Play Minesweeper"
msgstr "Žaisti ^Minų lauką"
-#: src/ui.cc:1200
+#: src/ui.cc:1347
msgid "^Become root"
msgstr "^Tapti „root“"
-#: src/ui.cc:1201
+#: src/ui.cc:1348
+#, fuzzy
msgid ""
-"Run 'su' to become root; this will restart the program, but your\n"
-"settings will be preserved"
+"Run 'su' to become root; this will restart the program, but your settings "
+"will be preserved"
msgstr ""
"Paleiskite komandą „su“, kad taptumėte root. Programa startuos\n"
"iš naujo, bet visi jūsų nustatymai išliks."
-#: src/ui.cc:1204
+#: src/ui.cc:1351
msgid "^Reload package cache"
msgstr "^Perdaryti paketų bylas"
-#: src/ui.cc:1205
+#: src/ui.cc:1352
msgid "Reload the package cache"
msgstr "Perkrauti paketų talpyklą"
-#: src/ui.cc:1211
+#: src/ui.cc:1358
msgid "^Quit"
msgstr "^Baigti"
-#: src/ui.cc:1212
+#: src/ui.cc:1359
msgid "Exit the program"
msgstr "Išeiti iš programos"
-#: src/ui.cc:1218 src/ui.cc:1487
+#: src/ui.cc:1365 src/ui.cc:1637
msgid "Undo"
msgstr "Atšaukti"
-#: src/ui.cc:1219
+#: src/ui.cc:1366
msgid "Undo the last package operation or group of operations"
msgstr "Atšaukti paskutinį veiksmą, arba operacijų grupę."
-#: src/ui.cc:1226
+#: src/ui.cc:1373
msgid "^Install"
msgstr "Įd^iegti"
-#: src/ui.cc:1227
+#: src/ui.cc:1374
msgid "Flag the currently selected package for installation or upgrade"
msgstr "Pažymėti dabartinį paketą diegti arba atnaujinti"
-#: src/ui.cc:1230
+#: src/ui.cc:1377
msgid "^Remove"
msgstr "^Pašalinti"
-#: src/ui.cc:1231
+#: src/ui.cc:1378
msgid "Flag the currently selected package for removal"
msgstr "Pažymėti šį paketą, kaip šalinamą"
-#: src/ui.cc:1234
+#: src/ui.cc:1381
msgid "^Purge"
msgstr "iš^naikinti"
-#: src/ui.cc:1235
+#: src/ui.cc:1382
msgid ""
"Flag the currently selected package and its configuration files for removal"
msgstr "Pažymėti šį paketą ir jo konfigūracinius failus, kaip šalinamus"
-#: src/ui.cc:1238
+#: src/ui.cc:1385
msgid "^Keep"
msgstr "^Palikti"
-#: src/ui.cc:1239
+#: src/ui.cc:1386
msgid "Cancel any action on the selected package"
msgstr "Atšaukti šiam paketui visus veiksmus"
-#: src/ui.cc:1242
+#: src/ui.cc:1389
msgid "^Hold"
msgstr "^Sulaikyti"
-#: src/ui.cc:1243
+#: src/ui.cc:1390
msgid ""
"Cancel any action on the selected package, and protect it from future "
"upgrades"
@@ -3799,252 +4064,256 @@
"Atšaukti šiam paketui visus veiksmus, ir apsaugoti jį nuo ateities "
"atnaujinimų"
-#: src/ui.cc:1246
+#: src/ui.cc:1393
msgid "Mark ^Auto"
msgstr "Pažymėti ^Auto"
-#: src/ui.cc:1247
+#: src/ui.cc:1394
+#, fuzzy
msgid ""
-"Mark the selected package as having been automatically installed;\n"
-"it will automatically be removed if no other packages depend on it"
+"Mark the selected package as having been automatically installed; it will "
+"automatically be removed if no other packages depend on it"
msgstr ""
"Pažymėti pažymėtus paketus kaip įdiegtus automatiškai;\n"
"tuomet jie bus automatiškai pašalinti, kai jų nebereikės kitiems paketams"
-#: src/ui.cc:1250
+#: src/ui.cc:1397
msgid "Mark ^Manual"
msgstr "Žymėti ^Ne automatinis"
-#: src/ui.cc:1251
+#: src/ui.cc:1398
+#, fuzzy
msgid ""
-"Mark the selected package as having been manually installed;\n"
-"it will not be removed unless you manually remove it"
+"Mark the selected package as having been manually installed; it will not be "
+"removed unless you manually remove it"
msgstr ""
"Pažymėti pasirinktus paketus, kaip įdiegtus rankiniu būdu;\n"
"jie nebus pašalinti tol, kol to nepadarysite rankiniu būdu"
-#: src/ui.cc:1254
+#: src/ui.cc:1401
msgid "^Forbid Version"
msgstr "^Uždraustos Versijos"
-#: src/ui.cc:1255
+#: src/ui.cc:1402
+#, fuzzy
msgid ""
-"Forbid the candidate version of the selected package from being installed;\n"
+"Forbid the candidate version of the selected package from being installed; "
"newer versions of the package will be installed as usual"
msgstr ""
"Uždrausti pažymėto paketo šią versiją;\n"
"naujesnės paketo versijos bus įdiegtos kaip įprasta"
-#: src/ui.cc:1259
+#: src/ui.cc:1406
msgid "I^nformation"
msgstr "I^informacija"
-#: src/ui.cc:1260
+#: src/ui.cc:1407
msgid "Display more information about the selected package"
msgstr "Parodyti daugiau informacijos apie pažymėtą paketą"
-#: src/ui.cc:1263
+#: src/ui.cc:1410
msgid "^Changelog"
msgstr "Pakeitimų ^sąrašas"
-#: src/ui.cc:1264
+#: src/ui.cc:1411
msgid "Display the Debian changelog of the selected package"
msgstr "Rodyti šio paketo Debian pakeitimų sąrašą (Changelog)"
-#: src/ui.cc:1271
+#: src/ui.cc:1418
msgid "^Find"
msgstr "^Rasti"
-#: src/ui.cc:1272
+#: src/ui.cc:1419
msgid "Search for a package"
msgstr "Ieškoti paketo: "
-#: src/ui.cc:1275
+#: src/ui.cc:1422
msgid "Find ^Again"
msgstr "Rasti ^VÄ—l"
-#: src/ui.cc:1276
+#: src/ui.cc:1423
msgid "Repeat the last search"
msgstr "Pakartoti paiešką"
-#: src/ui.cc:1280
+#: src/ui.cc:1427
msgid "^Limit Display"
msgstr "^Apriboti ekranÄ…"
-#: src/ui.cc:1281
+#: src/ui.cc:1428
msgid "Apply a filter to the package list"
msgstr "Pritaikyti filtrą paketų sąrašui"
-#: src/ui.cc:1284
+#: src/ui.cc:1431
msgid "^Un-Limit Display"
msgstr "^Neberiboti ekrano"
-#: src/ui.cc:1285
+#: src/ui.cc:1432
msgid "Remove the filter from the package list"
msgstr "Nebenaudoti"
-#: src/ui.cc:1289
+#: src/ui.cc:1436
msgid "Find ^Broken"
msgstr "Rasti ^BlogÄ…"
-#: src/ui.cc:1290
+#: src/ui.cc:1437
msgid "Find the next package with unsatisfied dependencies"
msgstr "Rasti sekantį blogą paketą"
-#: src/ui.cc:1297
+#: src/ui.cc:1444
msgid "^UI options"
msgstr "^Aplinkos nustatymai"
-#: src/ui.cc:1298
+#: src/ui.cc:1445
msgid "Change the settings which affect the user interface"
msgstr "Pakeisti nustatymus, susijusius su naudotojo aplinka"
-#: src/ui.cc:1301
+#: src/ui.cc:1448
msgid "^Dependency handling"
msgstr "^Priklausomybių tvarkymas"
-#: src/ui.cc:1302
+#: src/ui.cc:1449
msgid "Change the settings which affect how package dependencies are handled"
msgstr "Keisti nustatymus, kurie turi įtakos darbui su paketų priklausomybėmis"
-#: src/ui.cc:1305
+#: src/ui.cc:1452
msgid "^Miscellaneous"
msgstr "^Kitkas"
-#: src/ui.cc:1306
+#: src/ui.cc:1453
msgid "Change miscellaneous program settings"
msgstr "Keisti kitas Aptitude nustatymus"
-#: src/ui.cc:1311
+#: src/ui.cc:1458
msgid "^Revert options"
msgstr "Atstatyti ^nustatymus"
-#: src/ui.cc:1312
+#: src/ui.cc:1459
msgid "Reset all settings to the system defaults"
msgstr "Atstatyti sistemos pradinius nustatymus"
-#: src/ui.cc:1323
+#: src/ui.cc:1470
msgid "^Next"
msgstr "^Sekantis"
-#: src/ui.cc:1324
+#: src/ui.cc:1471
msgid "View next display"
msgstr "Pereiti į sekantį ekraną"
-#: src/ui.cc:1327
+#: src/ui.cc:1474
msgid "^Prev"
msgstr "^Atgal"
-#: src/ui.cc:1328
+#: src/ui.cc:1475
msgid "View previous display"
msgstr "Pereiti į ankstesnį ekraną"
-#: src/ui.cc:1331
+#: src/ui.cc:1478
msgid "^Close"
msgstr "^Uždaryti"
-#: src/ui.cc:1332
+#: src/ui.cc:1479
msgid "Close this display"
msgstr "Uždaryti šį ekraną"
-#: src/ui.cc:1337
+#: src/ui.cc:1484
msgid "New Package ^View"
msgstr "Sekantis paketų ^vaizdas"
-#: src/ui.cc:1338
+#: src/ui.cc:1485
msgid "Create a new default package view"
msgstr "Sukurti naują standartinį paketų rodymą"
-#: src/ui.cc:1341
+#: src/ui.cc:1488
msgid "New Categorical ^Browser"
msgstr "^Nauja kategorijų naršyklė"
-#: src/ui.cc:1343
+#: src/ui.cc:1490
msgid "Browse packages by category"
msgstr "Naršyti paketus pagal kategorijas"
-#: src/ui.cc:1351
+#: src/ui.cc:1498
msgid "^About"
msgstr "^Apie"
-#: src/ui.cc:1352
+#: src/ui.cc:1499
msgid "View information about this program"
msgstr "Rodyti informacijÄ… apie Å¡iÄ… programÄ…"
-#: src/ui.cc:1355
+#: src/ui.cc:1502
msgid "^Help"
msgstr "^Pagalba"
-#: src/ui.cc:1356
+#: src/ui.cc:1503
msgid "View the on-line help"
msgstr "Rodyti pagalbÄ…"
-#: src/ui.cc:1358
+#: src/ui.cc:1505
msgid "User's ^Manual"
msgstr "Naudotojo ^instrukcijos"
-#: src/ui.cc:1359
+#: src/ui.cc:1506
msgid "View the detailed program manual"
msgstr "Rodyti detalizuotas naudotojo instrukcijas"
-#: src/ui.cc:1362
+#: src/ui.cc:1509
msgid "^FAQ"
msgstr "^DUK"
-#: src/ui.cc:1363
+#: src/ui.cc:1510
msgid "View a list of frequently asked questions"
msgstr "Rodyti dažniausiai užduodamus klausimus"
-#: src/ui.cc:1366
-msgid "^ChangeLog"
-msgstr "Pakeitimų ^sąrašas"
+#: src/ui.cc:1513
+msgid "^NEWS"
+msgstr ""
-#: src/ui.cc:1367
-msgid "View the important changes made in each version of the program"
+#: src/ui.cc:1514
+#, fuzzy
+msgid "View the important changes made in each version of "
msgstr ""
"Rodyti svarbiausius pakeitimus, kurie atsirado kiekvienoje programos "
"versijoje"
-#: src/ui.cc:1370
+#: src/ui.cc:1517
msgid "^License"
msgstr "^Licencija"
-#: src/ui.cc:1371
+#: src/ui.cc:1518
msgid "View the terms under which you may copy the program"
msgstr "Rodyti sÄ…lygas, pagal kurias JÅ«s galite kopijuoti Å¡iÄ… programÄ…"
-#: src/ui.cc:1486
+#: src/ui.cc:1636
msgid "Actions"
msgstr "Veiksmai"
-#: src/ui.cc:1489
+#: src/ui.cc:1639
msgid "Search"
msgstr "Paieška"
-#: src/ui.cc:1490
+#: src/ui.cc:1640
msgid "Options"
msgstr "Nuostatos"
-#: src/ui.cc:1491
+#: src/ui.cc:1641
msgid "Views"
msgstr "Rodymas"
-#: src/ui.cc:1492
+#: src/ui.cc:1642
msgid "Help"
msgstr "Pagalba"
-#: src/ui.cc:1537
+#: src/ui.cc:1699
#, c-format
msgid ""
"%s: Menu %s: Help %s: Quit %s: Update %s: Download/Install/Remove Pkgs"
msgstr ""
"%s: Meniu %s: Pagalba %s: Baigti %s: Atnaujinti %s: Pritaikyti pakeitimus"
-#: src/ui.cc:1799 src/vscreen/vscreen.cc:281
+#: src/ui.cc:1968 src/vscreen/vscreen.cc:281
msgid "yes_key"
msgstr "t"
-#: src/ui.cc:1800 src/vscreen/vscreen.cc:282
+#: src/ui.cc:1969 src/vscreen/vscreen.cc:282
msgid "no_key"
msgstr "n"
@@ -4056,6 +4325,16 @@
msgid "Downloading Changelog"
msgstr "Gaunu pakeitimų sąrašą"
+#: src/view_changelog.cc:54
+#, fuzzy
+msgid "Download Changelog"
+msgstr "Gaunu pakeitimų sąrašą"
+
+#: src/view_changelog.cc:63
+#, c-format
+msgid "%s changes"
+msgstr ""
+
#: src/vscreen/vscreen.cc:119
#, c-format
msgid "Ouch! Got SIGTERM, dying..\n"
@@ -4083,3 +4362,37 @@
#: src/vscreen/vs_util.cc:175 src/vscreen/vs_util.cc:212
msgid "No"
msgstr "Ne"
+
+#~ msgid ""
+#~ "Some packages had unmet dependencies. This may mean that you have\n"
+#~ "requested an impossible situation or if you are using the unstable\n"
+#~ "distribution that some required packages have not yet been created\n"
+#~ "or been moved out of Incoming.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Kai kurių paketų priklausomybės netenkinamos. Tai galėjo atsitikti "
+#~ "todÄ—l\n"
+#~ "kad Jūs atliekate neįmanomus veiksmus arba naudojate nestabilią\n"
+#~ "distribuciją, kurioje kai kurie būtini paketai dar nesukurti arba "
+#~ "iškelti \n"
+#~ "iš incoming katalogo.\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Please insert the following disc into the drive \"%s\":\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Prašome įdėti diską į įrenginį „%s“:\n"
+#~ "%s"
+
+#~ msgid "Invalid option for interactive mode: -s\n"
+#~ msgstr "Neteisingas interaktyvaus režimo nustatymas -s\n"
+
+#~ msgid "Information about "
+#~ msgstr "Informacija apie "
+
+#~ msgid "Some broken packages could not be fixed!"
+#~ msgstr "Keli sugadinti paketai negali būti sutvarkyti!"
+
+#~ msgid "^ChangeLog"
+#~ msgstr "Pakeitimų ^sąrašas"
Modified: branches/aptitude-0.3/aptitude/po/nb.po
==============================================================================
--- branches/aptitude-0.3/aptitude/po/nb.po (original)
+++ branches/aptitude-0.3/aptitude/po/nb.po Sat Apr 30 13:41:32 2005
@@ -17,7 +17,7 @@
msgstr ""
"Project-Id-Version: aptitude\n"
"Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-01-10 16:26-0800\n"
+"POT-Creation-Date: 2005-04-29 18:11-0400\n"
"PO-Revision-Date: 2004-09-12 20:36+0200\n"
"Last-Translator: Bjørn Steensrud <bjornst at powertech.no>\n"
"Language-Team: Norwegian <i18n-nb>\n"
@@ -162,16 +162,103 @@
msgstr "Fjern ubrukte pakker som passer med dette filteret automatisk "
#: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:184 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
-#: src/vscreen/vs_util.cc:329
+#: src/ui.cc:218 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
+#: src/vscreen/vs_util.cc:328
msgid "Ok"
msgstr "Ok"
#: src/apt_options.cc:242 src/download_list.cc:71 src/mine/cmine.cc:257
-#: src/mine/cmine.cc:330 src/vscreen/vs_util.cc:329
+#: src/mine/cmine.cc:330 src/vscreen/vs_util.cc:328
msgid "Cancel"
msgstr "Avbryt"
+#: src/broken_indicator.cc:106 src/solution_dialog.cc:97
+msgid "Internal error: unexpected null solution."
+msgstr ""
+
+#: src/broken_indicator.cc:158
+#, fuzzy
+msgid "Suggest "
+msgstr "Forslag"
+
+#: src/broken_indicator.cc:164
+#, fuzzy, c-format
+msgid "%d installs"
+msgstr "installer"
+
+#: src/broken_indicator.cc:169
+#, fuzzy
+msgid "1 install"
+msgstr "installer"
+
+#: src/broken_indicator.cc:173
+#, c-format
+msgid "%d removals"
+msgstr ""
+
+#: src/broken_indicator.cc:178
+msgid "1 removal"
+msgstr ""
+
+#: src/broken_indicator.cc:182
+#, c-format
+msgid "%d keeps"
+msgstr ""
+
+#: src/broken_indicator.cc:187
+msgid "1 keep"
+msgstr ""
+
+#: src/broken_indicator.cc:191
+#, fuzzy, c-format
+msgid "%d upgrades"
+msgstr "oppgrader"
+
+#: src/broken_indicator.cc:196
+#, fuzzy
+msgid "1 upgrade"
+msgstr "oppgrader"
+
+#: src/broken_indicator.cc:200
+#, fuzzy, c-format
+msgid "%d downgrades"
+msgstr "nedgradert"
+
+#: src/broken_indicator.cc:205
+#, fuzzy
+msgid "1 downgrade"
+msgstr "nedgradert"
+
+#: src/broken_indicator.cc:214
+#, c-format
+msgid "%s: Examine"
+msgstr ""
+
+#: src/broken_indicator.cc:216
+#, c-format
+msgid "%s: Apply"
+msgstr ""
+
+#: src/broken_indicator.cc:218
+#, fuzzy, c-format
+msgid "%s: Next"
+msgstr "^Neste"
+
+#: src/broken_indicator.cc:220
+#, c-format
+msgid "%s: Previous"
+msgstr ""
+
+#: src/broken_indicator.cc:233
+#, c-format
+msgid "%CSolution search failed. %s: try harder"
+msgstr ""
+
+#: src/broken_indicator.cc:239
+#, c-format
+msgid "%CUnable to resolve dependencies."
+msgstr ""
+
#: src/cmdline/cmdline_action.cc:36
#, c-format
msgid ""
@@ -243,22 +330,22 @@
msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
msgstr "Pakke %s kan ikke oppgraderes, kan ikke forby oppgradering\n"
-#: src/cmdline/cmdline_action.cc:213
+#: src/cmdline/cmdline_action.cc:198
#, c-format
msgid "Note: selecting the task \"%s: %s\" for installation\n"
msgstr "Merk: Velg oppgaven «%s: %s» for installasjon\n"
-#: src/cmdline/cmdline_action.cc:240
+#: src/cmdline/cmdline_action.cc:225
#, c-format
msgid "You can only specify a package version with an 'install' command.\n"
msgstr "Du kan bare oppgi en pakkeversjon med «install»-kommandoen\n"
-#: src/cmdline/cmdline_action.cc:246
+#: src/cmdline/cmdline_action.cc:231
#, c-format
msgid "You can only specify a package archive with an 'install' command.\n"
msgstr "Du kan bare oppgi et arkiv med «install»-kommandoen\n"
-#: src/cmdline/cmdline_action.cc:280
+#: src/cmdline/cmdline_action.cc:265
#, c-format
msgid ""
"Couldn't find package \"%s\", and more than 40\n"
@@ -267,7 +354,7 @@
"Klarte ikke å finne pakken «%s», og mer enn 40\n"
"pakker har «%s» i navnet.\n"
-#: src/cmdline/cmdline_action.cc:283
+#: src/cmdline/cmdline_action.cc:268
#, c-format
msgid ""
"Couldn't find package \"%s\". However, the following\n"
@@ -276,13 +363,13 @@
"Klarte ikke å finne pakken «%s». Men disse pakkene\n"
"har «%s» i navnet:\n"
-#: src/cmdline/cmdline_action.cc:307
+#: src/cmdline/cmdline_action.cc:292
#, c-format
msgid "Couldn't find any package whose name or description matched \"%s\"\n"
msgstr ""
"Fant ingen pakke med et navn eller en beskrivelse som passer med «%s»\n"
-#: src/cmdline/cmdline_action.cc:309
+#: src/cmdline/cmdline_action.cc:294
#, c-format
msgid ""
"Couldn't find any package matching \"%s\", and more than 40\n"
@@ -291,7 +378,7 @@
"Fant ingen pakke som passer med «%s», og mer enn 40\n"
"pakker har «%s» i beskrivelsen.\n"
-#: src/cmdline/cmdline_action.cc:312
+#: src/cmdline/cmdline_action.cc:297
#, c-format
msgid ""
"Couldn't find any package matching \"%s\". However, the following\n"
@@ -335,13 +422,13 @@
msgid "Freed %sB of disk space\n"
msgstr "Vil frigjøre %sB av plassen på harddisken"
-#: src/cmdline/cmdline_do_action.cc:67
+#: src/cmdline/cmdline_do_action.cc:71
#, c-format
msgid "Invalid operation %s"
msgstr "Ugyldig operasjon %s"
-#: src/cmdline/cmdline_do_action.cc:206 src/cmdline/cmdline_simulate.cc:30
-#: src/cmdline/cmdline_upgrade.cc:89
+#: src/cmdline/cmdline_do_action.cc:201 src/cmdline/cmdline_simulate.cc:31
+#: src/cmdline/cmdline_upgrade.cc:91
#, c-format
msgid "Abort.\n"
msgstr "Avbryt.\n"
@@ -351,7 +438,7 @@
msgid "download: you must specify at least one package to download\n"
msgstr "nedlasting: Du må oppgi minst en pakke som skal lastes ned\n"
-#: src/cmdline/cmdline_download.cc:43 src/download.cc:342
+#: src/cmdline/cmdline_download.cc:43 src/download.cc:344
msgid "Couldn't read source list"
msgstr "Klarte ikke å lese kildelista"
@@ -417,95 +504,95 @@
msgstr ""
"Hva dette er? Det er selvsagt en elefant som blir spist av en slange.\n"
-#: src/cmdline/cmdline_prompt.cc:44
+#: src/cmdline/cmdline_prompt.cc:45
msgid "Couldn't read list of sources"
msgstr "Klarte ikke å lese kildelista"
-#: src/cmdline/cmdline_prompt.cc:219 src/cmdline/cmdline_show_broken.cc:73
+#: src/cmdline/cmdline_prompt.cc:220 src/cmdline/cmdline_show_broken.cc:73
#, c-format
msgid "but %s is to be installed."
msgstr "men %s blir installert."
-#: src/cmdline/cmdline_prompt.cc:222 src/cmdline/cmdline_show_broken.cc:76
+#: src/cmdline/cmdline_prompt.cc:223 src/cmdline/cmdline_show_broken.cc:76
#, c-format
msgid "but %s is installed and it is kept back."
msgstr "men %s er installert og blir holdt tilbake."
-#: src/cmdline/cmdline_prompt.cc:225 src/cmdline/cmdline_show_broken.cc:79
+#: src/cmdline/cmdline_prompt.cc:226 src/cmdline/cmdline_show_broken.cc:79
#, c-format
msgid "but %s is installed."
msgstr "men %s er installert."
-#: src/cmdline/cmdline_prompt.cc:229 src/cmdline/cmdline_show_broken.cc:83
+#: src/cmdline/cmdline_prompt.cc:230 src/cmdline/cmdline_show_broken.cc:83
#, c-format
msgid "but it is not installable"
msgstr "men lar seg ikke installere"
-#: src/cmdline/cmdline_prompt.cc:233 src/cmdline/cmdline_show_broken.cc:87
+#: src/cmdline/cmdline_prompt.cc:234 src/cmdline/cmdline_show_broken.cc:87
#, c-format
msgid " which is a virtual package."
msgstr " som er en virtuell pakke."
-#: src/cmdline/cmdline_prompt.cc:236 src/cmdline/cmdline_show_broken.cc:90
+#: src/cmdline/cmdline_prompt.cc:237 src/cmdline/cmdline_show_broken.cc:90
#, c-format
msgid " or"
msgstr " eller"
-#: src/cmdline/cmdline_prompt.cc:248
+#: src/cmdline/cmdline_prompt.cc:249
msgid "The following packages are BROKEN:"
msgstr "Disse pakkene er ØDELAGTE:"
-#: src/cmdline/cmdline_prompt.cc:249
+#: src/cmdline/cmdline_prompt.cc:250
msgid "The following packages are unused and will be REMOVED:"
msgstr "Disse pakkene er ikke i bruk og vil bli FJERNET:"
-#: src/cmdline/cmdline_prompt.cc:250
+#: src/cmdline/cmdline_prompt.cc:251
msgid "The following packages have been automatically kept back:"
msgstr "Disse pakkene er holdt tilbake automatisk:"
-#: src/cmdline/cmdline_prompt.cc:251
+#: src/cmdline/cmdline_prompt.cc:252
msgid "The following NEW packages will be automatically installed:"
msgstr "Disse NYE pakkene vil bli installert automatisk:"
-#: src/cmdline/cmdline_prompt.cc:252
+#: src/cmdline/cmdline_prompt.cc:253
msgid "The following packages will be automatically REMOVED:"
msgstr "Disse pakkene vil bli fjernet automatisk:"
-#: src/cmdline/cmdline_prompt.cc:253
+#: src/cmdline/cmdline_prompt.cc:254
msgid "The following packages will be DOWNGRADED:"
msgstr "Disse pakkene vil bli NEDGRADERT:"
-#: src/cmdline/cmdline_prompt.cc:254
+#: src/cmdline/cmdline_prompt.cc:255
msgid "The following packages have been kept back:"
msgstr "Disse pakkene blir holdt tilbake:"
-#: src/cmdline/cmdline_prompt.cc:255
+#: src/cmdline/cmdline_prompt.cc:256
msgid "The following packages will be REINSTALLED:"
msgstr "Disse pakkene vil bli INSTALLERT PÃ… NYTT:"
-#: src/cmdline/cmdline_prompt.cc:256
+#: src/cmdline/cmdline_prompt.cc:257
msgid "The following NEW packages will be installed:"
msgstr "Disse NYE pakkene vil bli installert:"
-#: src/cmdline/cmdline_prompt.cc:257
+#: src/cmdline/cmdline_prompt.cc:258
msgid "The following packages will be REMOVED:"
msgstr "Disse pakkene vil bli FJERNET:"
-#: src/cmdline/cmdline_prompt.cc:258
+#: src/cmdline/cmdline_prompt.cc:259
msgid "The following packages will be upgraded:"
msgstr "Disse pakkene vil bli oppgradert:"
-#: src/cmdline/cmdline_prompt.cc:307
+#: src/cmdline/cmdline_prompt.cc:311
#, c-format
msgid "The following ESSENTIAL packages will be REMOVED!\n"
msgstr "Disse VIKTIGE pakkene vil bli FJERNET!\n"
-#: src/cmdline/cmdline_prompt.cc:316
+#: src/cmdline/cmdline_prompt.cc:320
#, c-format
msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
msgstr "Disse VIKTIGE pakkene vil bli ØDELAGT med denne handlingen:\n"
-#: src/cmdline/cmdline_prompt.cc:326
+#: src/cmdline/cmdline_prompt.cc:330
#, c-format
msgid ""
"WARNING: Performing this action will probably cause your system to break!\n"
@@ -515,96 +602,99 @@
"ødelagt!\n"
" IKKE fortsett dersom du ikke vet NØYAKTIG hva du gjør!\n"
-#: src/cmdline/cmdline_prompt.cc:328
+#: src/cmdline/cmdline_prompt.cc:332
msgid "I am aware that this is a very bad idea"
msgstr "Jeg er klar over at dette er en svært dårlig ide"
-#: src/cmdline/cmdline_prompt.cc:331
+#: src/cmdline/cmdline_prompt.cc:335
#, c-format
msgid "To continue, type the phrase \"%s\":\n"
msgstr "For å fortsette, skriv inn teksten «%s»:\n"
-#: src/cmdline/cmdline_prompt.cc:434
+#: src/cmdline/cmdline_prompt.cc:438
#, c-format
msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
msgstr "Disse pakkene er ANBEFALT men blir IKKE installert:\n"
-#: src/cmdline/cmdline_prompt.cc:440
+#: src/cmdline/cmdline_prompt.cc:444
#, c-format
msgid "The following packages are SUGGESTED but will NOT be installed:\n"
msgstr "Disse pakkene er FORESLÃ…TT men blir IKKE installert:\n"
-#: src/cmdline/cmdline_prompt.cc:445
+#: src/cmdline/cmdline_prompt.cc:449
#, c-format
msgid "No packages will be installed, upgraded, or removed.\n"
msgstr "Ingen pakker vil bli installert, oppgradert eller fjernet.\n"
-#: src/cmdline/cmdline_prompt.cc:447
+#: src/cmdline/cmdline_prompt.cc:451
#, c-format
msgid "%lu packages upgraded, %lu newly installed, "
msgstr "%lu pakker oppgradert, %lu nylig installert, "
-#: src/cmdline/cmdline_prompt.cc:451
+#: src/cmdline/cmdline_prompt.cc:455
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu installert på nytt, "
-#: src/cmdline/cmdline_prompt.cc:453
+#: src/cmdline/cmdline_prompt.cc:457
#, c-format
msgid "%lu downgraded, "
msgstr "%lu nedgraderte, "
-#: src/cmdline/cmdline_prompt.cc:455
+#: src/cmdline/cmdline_prompt.cc:459
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu skal fjernes og %lu skal ikke oppgraderes.\n"
-#: src/cmdline/cmdline_prompt.cc:462
+#: src/cmdline/cmdline_prompt.cc:466
#, c-format
msgid "Need to get %sB/%sB of archives. "
msgstr "Trenger å hente %sB/%sB i installasjonspakker. "
-#: src/cmdline/cmdline_prompt.cc:465
+#: src/cmdline/cmdline_prompt.cc:469
#, c-format
msgid "Need to get %sB of archives. "
msgstr "Trenger å hente %sB i installasjonspakker. "
-#: src/cmdline/cmdline_prompt.cc:472
+#: src/cmdline/cmdline_prompt.cc:476
#, c-format
msgid "After unpacking %sB will be used.\n"
msgstr "Etter utpakking vil %sB bli brukt.\n"
-#: src/cmdline/cmdline_prompt.cc:475
+#: src/cmdline/cmdline_prompt.cc:479
#, c-format
msgid "After unpacking %sB will be freed.\n"
msgstr "Etter utpakking vil %sB bli frigjort.\n"
-#: src/cmdline/cmdline_prompt.cc:521
+#: src/cmdline/cmdline_prompt.cc:524
#, c-format
msgid "Bad action character '%c'\n"
msgstr "Feil handlingstegn «%c»\n"
-#: src/cmdline/cmdline_prompt.cc:596
+#: src/cmdline/cmdline_prompt.cc:595
#, c-format
msgid "No packages to show -- enter the package names on the line after 'i'.\n"
msgstr "Ingen pakker å vise -- oppgi pakkenavnene på linja etter «i».\n"
-#: src/cmdline/cmdline_prompt.cc:598 src/cmdline/cmdline_prompt.cc:629
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:597
msgid "Press Return to continue."
msgstr "Trykk Enter for å fortsette."
-#: src/cmdline/cmdline_prompt.cc:625
+#: src/cmdline/cmdline_prompt.cc:623
#, c-format
msgid "No packages found -- enter the package names on the line after 'c'.\n"
msgstr "Ingen pakker funnet -- oppgi pakkenavnene på linja etter «c».\n"
-#: src/cmdline/cmdline_prompt.cc:665
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:627
+#, fuzzy
+msgid "Press Return to continue"
+msgstr "Trykk Enter for å fortsette."
+
+#: src/cmdline/cmdline_prompt.cc:675
msgid "Do you want to continue? [Y/n/?] "
msgstr "Vil du fortsette? [J/n/?]"
-#: src/cmdline/cmdline_prompt.cc:690
+#: src/cmdline/cmdline_prompt.cc:700
#, c-format
msgid ""
"\n"
@@ -615,7 +705,7 @@
"Viser informasjon om avhengigheter.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:692
+#: src/cmdline/cmdline_prompt.cc:702
#, c-format
msgid ""
"\n"
@@ -626,7 +716,7 @@
"Viser ikke informasjon om avhengigheter.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:698
+#: src/cmdline/cmdline_prompt.cc:708
#, c-format
msgid ""
"\n"
@@ -637,7 +727,7 @@
"Versjoner vil bli vist.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:700
+#: src/cmdline/cmdline_prompt.cc:710
#, c-format
msgid ""
"\n"
@@ -648,7 +738,7 @@
"Versjoner vil ikke bli vist.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:705
+#: src/cmdline/cmdline_prompt.cc:715
#, c-format
msgid ""
"\n"
@@ -659,7 +749,7 @@
"Størrelsesendringer vil bli vist.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:717
#, c-format
msgid ""
"\n"
@@ -670,7 +760,7 @@
"Størrelsesendringer vil ikke bli vist.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:737
#, c-format
msgid ""
"Commands:\n"
@@ -722,33 +812,83 @@
" _ : Slett helt\n"
" = : Hold igjen\n"
-#: src/cmdline/cmdline_prompt.cc:751
+#: src/cmdline/cmdline_prompt.cc:761
#, c-format
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:84
+#, c-format
+msgid "y: %F%nn: %F%nq: %F%n,: %F%n.: %F%n"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:90
+msgid "accept the proposed changes"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:92
+msgid "reject the proposed changes and search for another solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:94
+#, fuzzy
+msgid "give up and quit the program"
+msgstr "Avslutt programmet"
+
+#: src/cmdline/cmdline_resolver.cc:96
+msgid "move to the next solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:98
+msgid "move to the previous solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:131
+#, fuzzy
+msgid "The following actions will resolve these dependencies:"
+msgstr "Disse pakkene hadde utilfredsstilte avhengigheter:\n"
+
+#: src/cmdline/cmdline_resolver.cc:146
+msgid "Accept this solution? [Y/n/q/?]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:174
+msgid "Abandoning all efforts to resolve these dependencies."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:184
+#, fuzzy
+msgid "The following commands are available:"
+msgstr "Disse pakkene er ØDELAGTE:"
+
+#: src/cmdline/cmdline_resolver.cc:188
+#, fuzzy
+msgid "Invalid response; please enter one of the following commands:"
+msgstr "Ugyldig respons. Skriv inn en gyldig kommando eller «?» for hjelp.\n"
+
+#: src/cmdline/cmdline_resolver.cc:198
+msgid "No solution found within the allotted time. Try harder? [Y/n]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:226
+#, fuzzy
+msgid "Invalid response; please enter 'y' or 'n'."
+msgstr "Ugyldig respons. Skriv inn en gyldig kommando eller «?» for hjelp.\n"
+
+#: src/cmdline/cmdline_resolver.cc:235
+msgid "Unable to resolve dependencies! Giving up..."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:240
+msgid "No more solutions."
+msgstr ""
+
#: src/cmdline/cmdline_search.cc:78
#, c-format
msgid "search: You must provide at least one search term\n"
msgstr "søk: Du må oppgi minst ett søkeord\n"
-#: src/cmdline/cmdline_show_broken.cc:114
-#, c-format
-msgid ""
-"Some packages had unmet dependencies. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming.\n"
-"\n"
-msgstr ""
-"Noen pakker hadde utilfredsstilte avhengigheter. Dette kan bety at du har "
-"bedt\n"
-"om en umulig situasjon, eller at du bruker den ustabile utgaven og\n"
-"at noen av de pakkene som er nødvendige ikke er laget ennå eller er flyttet "
-"ut fra incoming.\n"
-"\n"
-
-#: src/cmdline/cmdline_show_broken.cc:115
+#: src/cmdline/cmdline_show_broken.cc:113
#, c-format
msgid "The following packages have unmet dependencies:\n"
msgstr "Disse pakkene hadde utilfredsstilte avhengigheter:\n"
@@ -946,12 +1086,12 @@
msgid "Description: "
msgstr "Beskrivelse: "
-#: src/cmdline/cmdline_simulate.cc:36
+#: src/cmdline/cmdline_simulate.cc:37
#, c-format
msgid "Would download/install/remove packages.\n"
msgstr "Vil laste ned, installere og/eller fjerne pakker.\n"
-#: src/cmdline/cmdline_simulate.cc:47
+#: src/cmdline/cmdline_simulate.cc:48
msgid "Internal Error, Ordering didn't finish"
msgstr "Intern feil, bestillingen ble ikke ferdig"
@@ -993,28 +1133,24 @@
msgid "UNAVAILABLE"
msgstr "UTILGJENGELIG"
-#: src/download_bar.cc:57 src/download_list.cc:265
+#: src/download_bar.cc:56 src/download_list.cc:263 src/download_screen.cc:57
#, c-format
-msgid ""
-"Please insert the following disc into the drive \"%s\":\n"
-"%s"
-msgstr ""
-"Sett denne CD-en inn i CD-spilleren «%s»:\n"
-"%s"
+msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
+msgstr "Sett inn CD-en merket med «%s» i stasjonen «%s»"
-#: src/download_bar.cc:76 src/generic/acqprogress.cc:63
+#: src/download_bar.cc:77 src/generic/acqprogress.cc:63
msgid "Hit "
msgstr "Treff "
-#: src/download_bar.cc:89
+#: src/download_bar.cc:90
msgid "Downloading "
msgstr "Laster ned "
-#: src/download_bar.cc:102
+#: src/download_bar.cc:103
msgid "Got "
msgstr "Fikk "
-#: src/download_bar.cc:156
+#: src/download_bar.cc:157
msgid "Downloading..."
msgstr "Laster ned ..."
@@ -1022,7 +1158,7 @@
msgid "Couldn't read list of package sources"
msgstr "Klarte ikke å lese lista over pakkekilder"
-#: src/download.cc:104 src/download.cc:321
+#: src/download.cc:104 src/download.cc:322
msgid "Couldn't lock list directory..are you root?"
msgstr "Klarte ikke å låse listekatalogen.. er du root?"
@@ -1034,29 +1170,33 @@
msgid "View the progress of the package list update"
msgstr "Vis framgangen i oppdatering av pakkelista"
-#: src/download.cc:159
+#: src/download.cc:113
+msgid "List Update"
+msgstr ""
+
+#: src/download.cc:160
msgid "Couldn't clean out list directories"
msgstr "Klarte ikke å slette listemappene"
-#: src/download.cc:176 src/ui.cc:1068
+#: src/download.cc:177 src/ui.cc:1152
msgid "Deleting obsolete downloaded files"
msgstr "Sletter nedlastede filer som er foreldet"
-#: src/download.cc:181
+#: src/download.cc:182
#, c-format
msgid "Deleting obsolete downloaded files\n"
msgstr "Sletter nedlastede filer som er foreldet\n"
-#: src/download.cc:223
+#: src/download.cc:224
#, c-format
msgid "Unable to open %s to log actions"
msgstr "Ikke i stand til å åpne %s for å logge handlinger"
-#: src/download.cc:229
+#: src/download.cc:230
msgid "log report"
msgstr "loggrapport"
-#: src/download.cc:230
+#: src/download.cc:231
#, c-format
msgid ""
"IMPORTANT: this log only lists intended actions; actions which fail due to\n"
@@ -1068,77 +1208,77 @@
"på grunn av dpkg-problemer kan være ufullstendige.\n"
"\n"
-#: src/download.cc:231
+#: src/download.cc:232
#, c-format
msgid "Will install %li packages, and remove %li packages.\n"
msgstr "Vil installere %li pakker, og fjerne %li pakker.\n"
-#: src/download.cc:233
+#: src/download.cc:234
#, c-format
msgid "%sB of disk space will be used\n"
msgstr "%sB med diskplass vil bli brukt\n"
-#: src/download.cc:236
+#: src/download.cc:237
#, c-format
msgid "%sB bytes of disk space will be freed\n"
msgstr "%sB med diskplass vil bli frigjort\n"
-#: src/download.cc:244
+#: src/download.cc:245
#, c-format
msgid "[UPGRADE] %s %s -> %s\n"
msgstr "[OPPGRADER] %s %s -> %s\n"
-#: src/download.cc:248
+#: src/download.cc:249
#, c-format
msgid "[DOWNGRADE] %s %s -> %s\n"
msgstr "[NEDGRADER] %s %s -> %s\n"
-#: src/download.cc:258
+#: src/download.cc:259
msgid "REMOVE"
msgstr "FJERN"
-#: src/download.cc:264
+#: src/download.cc:265
msgid "INSTALL"
msgstr "INSTALLER"
-#: src/download.cc:267
+#: src/download.cc:268
msgid "REINSTALL"
msgstr "INSTALLER PÃ… NYTT"
-#: src/download.cc:270
+#: src/download.cc:271
msgid "HOLD"
msgstr "BEHOLD"
-#: src/download.cc:273
+#: src/download.cc:274
msgid "BROKEN"
msgstr "ØDELAGT"
-#: src/download.cc:276
+#: src/download.cc:277
msgid "REMOVE, NOT USED"
msgstr "FJERN, UBRUKTE"
-#: src/download.cc:279
+#: src/download.cc:280
msgid "REMOVE, DEPENDENCIES"
msgstr "FJERN, PAKKEKRAV"
-#: src/download.cc:282
+#: src/download.cc:283
msgid "INSTALL, DEPENDENCIES"
msgstr "INSTALLER, PAKKEKRAV"
-#: src/download.cc:285
+#: src/download.cc:286
msgid "HOLD, DEPENDENCIES"
msgstr "BEHOLD, PAKKEKRAV"
-#: src/download.cc:287
+#: src/download.cc:288
msgid "????????"
msgstr "????????"
-#: src/download.cc:291
+#: src/download.cc:292
#, c-format
msgid "[%s] %s\n"
msgstr "[%s] %s\n"
-#: src/download.cc:294
+#: src/download.cc:295
#, c-format
msgid ""
"===============================================================================\n"
@@ -1149,34 +1289,39 @@
"\n"
"Logg ferdig.\n"
-#: src/download.cc:329
+#: src/download.cc:330
msgid "Downloading packages"
msgstr "Laster ned pakker"
-#: src/download.cc:330
+#: src/download.cc:331
msgid "View the progress of the package download"
msgstr "Vis framgangen i pakkenedlasting"
-#: src/download.cc:352
+#: src/download.cc:332
+#, fuzzy
+msgid "Package Download"
+msgstr "Pakke: "
+
+#: src/download.cc:354
msgid "Internal error: couldn't generate list of packages to download"
msgstr ""
"Intern feil: klarte ikke å lage en liste over pakker som skal lastes ned"
-#: src/download.cc:413
+#: src/download.cc:415
msgid "Unable to correct for unavailable packages"
msgstr "Ikke i stand til å korrigere for utilgjengelige pakker"
-#: src/download.cc:465
+#: src/download.cc:467
msgid ""
"Ack! Something bad happened while installing packages. Trying to recover:"
msgstr ""
"Uff! Noe gikk galt under installasjonen av pakker. Prøver å gjenopprette:"
-#: src/download.cc:475 src/pkg_item.cc:413
+#: src/download.cc:477 src/pkg_item.cc:432
msgid "Press return to continue.\n"
msgstr "Trykk Enter for å fortsette.\n"
-#: src/download.cc:506
+#: src/download.cc:508
msgid ""
"Could not regain the system lock! (Perhaps another apt or dpkg is running?)"
msgstr ""
@@ -1237,11 +1382,6 @@
msgid "[ERROR]"
msgstr "[FEIL]"
-#: src/download_screen.cc:57
-#, c-format
-msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
-msgstr "Sett inn CD-en merket med «%s» i stasjonen «%s»"
-
#: src/download_screen.cc:181
#, c-format
msgid "Downloaded %sB in %ss (%sB/s)."
@@ -1280,111 +1420,111 @@
msgstr ""
"CD-skift: Sett inn CD-en som er merket «%s» i stasjonen «%s» og trykk Enter\n"
-#: src/generic/aptcache.cc:245
+#: src/generic/aptcache.cc:253
msgid "Can't open Aptitude extended state file"
msgstr "Klarer ikke å åpne Aptitude utvidet tilstandsfil"
-#: src/generic/aptcache.cc:252 src/generic/aptcache.cc:305
-#: src/generic/aptcache.cc:307
+#: src/generic/aptcache.cc:260 src/generic/aptcache.cc:313
+#: src/generic/aptcache.cc:315
msgid "Reading extended state information"
msgstr "Les utvidet tilstandsinformasjon"
-#: src/generic/aptcache.cc:313 src/generic/aptcache.cc:387
-#: src/generic/aptcache.cc:390
+#: src/generic/aptcache.cc:321 src/generic/aptcache.cc:395
+#: src/generic/aptcache.cc:398
msgid "Initializing package states"
msgstr "Oppdater pakkenes status"
-#: src/generic/aptcache.cc:501
+#: src/generic/aptcache.cc:509
msgid "Cannot open Aptitude state file"
msgstr "Klarer ikke åpne Aptitude tilstandsfil"
-#: src/generic/aptcache.cc:505 src/generic/aptcache.cc:560
-#: src/generic/aptcache.cc:563
+#: src/generic/aptcache.cc:513 src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:571
msgid "Writing extended state information"
msgstr "Skriv utvidet tilstandsinformasjon"
-#: src/generic/aptcache.cc:542
+#: src/generic/aptcache.cc:550
#, 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/aptcache.cc:551
+#: src/generic/aptcache.cc:559
msgid "Couldn't write state file"
msgstr "Klarte ikke å skrive tilstandsfil"
-#: src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:576
msgid "Error writing state file"
msgstr "Feil under skriving av tilstandsfil"
-#: src/generic/aptcache.cc:584
+#: src/generic/aptcache.cc:592
msgid "couldn't replace old state file"
msgstr "klarte ikke å bytte ut tidligere tilstandsfil"
-#: src/generic/aptcache.cc:960
+#: src/generic/aptcache.cc:1000
msgid "Unable to correct dependencies, some packages cannot be installed"
msgstr ""
"Klarte ikke å rette opp avhengigheter, noen pakker kan ikke installeres"
-#: src/generic/aptcache.cc:1325
+#: src/generic/aptcache.cc:1546
msgid "The list of sources could not be read."
msgstr "Kildelista kan ikke leses."
-#: src/generic/aptcache.cc:1332
+#: src/generic/aptcache.cc:1553
msgid "The package lists or status file could not be parsed or opened."
msgstr "Klarte ikke å tolke eller åpne pakkelista eller tilstandsfila."
-#: src/generic/aptcache.cc:1335
+#: src/generic/aptcache.cc:1556
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"
-#: src/generic/apt.cc:141
+#: src/generic/apt.cc:142
#, c-format
msgid "Unable to open %s for writing"
msgstr "Klarer ikke å åpne %s for å skrive til den"
-#: src/generic/apt.cc:151
+#: src/generic/apt.cc:152
#, c-format
msgid "Unable to replace %s with new configuration file"
msgstr "Klarer ikke å bytte ut %s med ny oppsettsfil"
-#: src/generic/apt.cc:226
+#: src/generic/apt.cc:227
msgid "Warning: could not lock the cache file. Opening in read-only mode"
msgstr ""
"Advarsel: klarer ikke å låse mellomlagerfila. åpner i skrivebeskyttet modus"
-#: src/generic/matchers.cc:780
+#: src/generic/matchers.cc:797
msgid "Unmatched '('"
msgstr "Mangler motsvar til «(»"
-#: src/generic/matchers.cc:870 src/generic/matchers.cc:949
+#: src/generic/matchers.cc:887 src/generic/matchers.cc:968
#, c-format
msgid "Unknown dependency type: %s"
msgstr "Ukjent kravtype: %s"
-#: src/generic/matchers.cc:931
+#: src/generic/matchers.cc:950
#, c-format
msgid "Unknown action type: %s"
msgstr "Ukjent handlingstype: %s"
-#: src/generic/matchers.cc:998
+#: src/generic/matchers.cc:1017
#, c-format
msgid "Unknown priority %s"
msgstr "Ukjent prioritet %s"
-#: src/generic/matchers.cc:1020
+#: src/generic/matchers.cc:1039
#, c-format
msgid "Unknown pattern type: %c"
msgstr "Ukjent mønstertype: %c"
-#: src/generic/matchers.cc:1065
+#: src/generic/matchers.cc:1084
msgid "Unexpected empty expression"
msgstr "Uventet tomt uttrykk"
-#: src/generic/matchers.cc:1100
+#: src/generic/matchers.cc:1119
msgid "Badly formed expression"
msgstr "DÃ¥rlig utformet uttrykk"
-#: src/generic/matchers.cc:1129
+#: src/generic/matchers.cc:1148
msgid "Unexpected ')'"
msgstr "Uventet «)»"
@@ -1408,7 +1548,7 @@
msgid "Can't get value of $HOME, using TMPDIR (insecure)"
msgstr "Finner ingen verdi for $HOME, bruker TMPDIR (utrygt)"
-#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:60
+#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:61
#, c-format
msgid "ChangeLog of %s"
msgstr "Endringslogg for %s"
@@ -1614,17 +1754,17 @@
msgid "Invalid sorting policy type '%s'"
msgstr "Som sorteringsmåte er «%s» ugyldig"
-#: src/main.cc:68
+#: src/main.cc:67
#, c-format
msgid "%s %s compiled at %s %s\n"
msgstr "%s %s kompilert på %s %s\n"
-#: src/main.cc:71
+#: src/main.cc:70
#, c-format
msgid "Compiler: g++ %s\n"
msgstr "Kompilator: g++ %s\n"
-#: src/main.cc:74
+#: src/main.cc:73
#, c-format
msgid ""
"\n"
@@ -1633,7 +1773,7 @@
"\n"
"NCurses-versjon: %s\n"
-#: src/main.cc:76
+#: src/main.cc:75
#, c-format
msgid ""
"\n"
@@ -1642,22 +1782,22 @@
"\n"
"Curses-versjon: %s\n"
-#: src/main.cc:78
+#: src/main.cc:77
#, c-format
msgid "libsigc++ version: %s\n"
msgstr "«libsigc++»-versjon: %s\n"
-#: src/main.cc:84
+#: src/main.cc:83
#, c-format
msgid "Usage: aptitude [-S fname] [-u|-i]"
msgstr "Bruk: aptitude [-S fnavn] [-u|-i]"
-#: src/main.cc:86
+#: src/main.cc:85
#, c-format
msgid " aptitude [options] <action> ..."
msgstr " aptitude [valg] <handling> ..."
-#: src/main.cc:88
+#: src/main.cc:87
#, c-format
msgid ""
" Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -1667,42 +1807,42 @@
"modus):\n"
"\n"
-#: src/main.cc:89
+#: src/main.cc:88
#, c-format
msgid " install - Install/upgrade packages\n"
msgstr " install - Installer/oppgrader pakker\n"
-#: src/main.cc:90
+#: src/main.cc:89
#, c-format
msgid " remove - Remove packages\n"
msgstr " remove - Fjerner pakker\n"
-#: src/main.cc:91
+#: src/main.cc:90
#, c-format
msgid " purge - Remove packages and their configuration files\n"
msgstr " purge - Fjerner pakker og oppsettsfilene deres\n"
-#: src/main.cc:92
+#: src/main.cc:91
#, c-format
msgid " hold - Place packages on hold\n"
msgstr " hold - Beholder pakkevalget\n"
-#: src/main.cc:93
+#: src/main.cc:92
#, c-format
msgid " unhold - Cancel a hold command for a package\n"
msgstr " unhold - Fjern en hold-kommando for en pakke\n"
-#: src/main.cc:94
+#: src/main.cc:93
#, c-format
msgid " markauto - Mark packages as having been automatically installed\n"
msgstr " markauto - Merk pakker som automatisk installert k\n"
-#: src/main.cc:95
+#: src/main.cc:94
#, c-format
msgid " unmarkauto - Mark packages as having been manually installed\n"
msgstr " unmarkauto - Merk pakker som manuelt installert\n"
-#: src/main.cc:100
+#: src/main.cc:99
#, c-format
msgid ""
" forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -1710,17 +1850,17 @@
msgstr ""
" forby versjon - Forby aptitude å oppgradere til en bestemt pakkeversjon.\n"
-#: src/main.cc:101
+#: src/main.cc:100
#, c-format
msgid " update - Download lists of new/upgradable packages\n"
msgstr " update - Last ned listene over nye/oppgraderbare pakker\n"
-#: src/main.cc:102
+#: src/main.cc:101
#, c-format
msgid " upgrade - Perform a safe upgrade\n"
msgstr " upgrade - Utfør en trygg oppgradering\n"
-#: src/main.cc:103
+#: src/main.cc:102
#, c-format
msgid ""
" dist-upgrade - Perform an upgrade, possibly installing and removing "
@@ -1729,75 +1869,75 @@
" dist-upgrade - Utfør en oppgradering, det kan være pakker blir installert "
"og fjernet\n"
-#: src/main.cc:104
+#: src/main.cc:103
#, c-format
msgid " forget-new - Forget what packages are \"new\"\n"
msgstr " forget-new - Glem hvilke pakker som er «nye»\n"
-#: src/main.cc:105
+#: src/main.cc:104
#, c-format
msgid " search - Search for a package by name and/or expression\n"
msgstr " search - Søk etter en pakke utifra navn og/eller uttrykk\n"
-#: src/main.cc:106
+#: src/main.cc:105
#, c-format
msgid " show - Display detailed information about a package\n"
msgstr " show - Vis detaljert informasjon om en pakke\n"
-#: src/main.cc:107
+#: src/main.cc:106
#, c-format
msgid " clean - Erase downloaded package files\n"
msgstr " clean - Slett nedlastede pakkefiler\n"
-#: src/main.cc:108
+#: src/main.cc:107
#, c-format
msgid " autoclean - Erase old downloaded package files\n"
msgstr " autoclean - Slett eldre nedlastede pakkefiler\n"
-#: src/main.cc:109
+#: src/main.cc:108
#, c-format
msgid " changelog - View a package's changelog\n"
msgstr " endringslogg - Vis en pakkes endringslogg\n"
-#: src/main.cc:110
+#: src/main.cc:109
#, c-format
msgid " download - Download the .deb file for a package\n"
msgstr " download - Les ned .deb-fila til en pakke\n"
-#: src/main.cc:112
+#: src/main.cc:111
#, c-format
msgid " Options:\n"
msgstr " Valg:\n"
-#: src/main.cc:113
+#: src/main.cc:112
#, c-format
msgid " -h This help text\n"
msgstr " -h Denne hjelpeteksten\n"
-#: src/main.cc:114
+#: src/main.cc:113
#, c-format
msgid " -s Simulate actions, but do not actually perform them.\n"
msgstr " -s Simuler handlinger, men ikke utfør dem.\n"
-#: src/main.cc:115
+#: src/main.cc:114
#, c-format
msgid ""
" -d Only download packages, do not install or remove anything.\n"
msgstr ""
" -d Bare last ned pakker, ikke installer eller slett noe.\n"
-#: src/main.cc:116
+#: src/main.cc:115
#, c-format
msgid " -P Always prompt for confirmation or actions\n"
msgstr " -P Spør alltid om bekreftelse eller handlinger\n"
-#: src/main.cc:117
+#: src/main.cc:116
#, c-format
msgid ""
" -y Assume that the answer to simple yes/no questions is 'yes'\n"
msgstr " -y Forutset at svaret på enkle ja/nei-spørsmål er «Ja»\n"
-#: src/main.cc:118
+#: src/main.cc:117
#, c-format
msgid ""
" -F format Specify a format for displaying search results; see the "
@@ -1805,59 +1945,59 @@
msgstr ""
" -F format Oppgi et format for visning av søkeresultatet; se manualen\n"
-#: src/main.cc:119
+#: src/main.cc:118
#, c-format
msgid ""
" -O order Specify how search results should be sorted; see the manual\n"
msgstr ""
" -O rekkefølge Oppgir hvordan et søkeresultat skal sorteres; se manualen\n"
-#: src/main.cc:120
+#: src/main.cc:119
#, c-format
msgid ""
" -w width Specify the display width for formatting search results\n"
msgstr " -w bredde Oppgi visingsbredde for formatering av søkeresultatet\n"
-#: src/main.cc:121
+#: src/main.cc:120
#, c-format
msgid " -f Aggressively try to fix broken packages.\n"
msgstr " -f Prøv hardt å reparere ødelagte pakker.\n"
-#: src/main.cc:122
+#: src/main.cc:121
#, c-format
msgid " -V Show which versions of packages are to be installed.\n"
msgstr ""
" -V Vis hvilke versjoner av pakkene som skal installeres.\n"
-#: src/main.cc:123
+#: src/main.cc:122
#, c-format
msgid ""
" -D Show the dependencies of automatically changed packages.\n"
msgstr " -D Vis pakkekrava til automatisk endrede pakker.\n"
-#: src/main.cc:124
+#: src/main.cc:123
#, c-format
msgid " -Z\t\t Show the change in installed size of each package.\n"
msgstr " -Z\t\t Vis endringene på installert størrelse på hver pakke.\n"
-#: src/main.cc:125
+#: src/main.cc:124
#, c-format
msgid ""
" -v Display extra information. (may be supplied multiple times)\n"
msgstr " -v Vis ekstra informasjon. (kan tilføyes flere ganger)\n"
-#: src/main.cc:126
+#: src/main.cc:125
#, c-format
msgid ""
" -t [release] Set the release from which packages should be installed\n"
msgstr " -t [slippversjon] Angi hvilken versjon pakker skal installeres fra\n"
-#: src/main.cc:127
+#: src/main.cc:126
#, c-format
msgid " -o key=val Directly set the configuration option named 'key'\n"
msgstr " -o nøkkel=verdi Sett direkte oppsettsvalget «nøkkel»\n"
-#: src/main.cc:128
+#: src/main.cc:127
#, c-format
msgid ""
" --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -1866,57 +2006,65 @@
" --with(out)-recommends\t Oppgi om anbefalte pakker skal håndteres\n"
" som strenge avhengigheter\n"
-#: src/main.cc:129
+#: src/main.cc:128
#, c-format
msgid " -S fname: Read the aptitude extended status info from fname.\n"
msgstr " -S fnavn: Les den utvidede statusinfo-fila for aptitude fra fnavn.\n"
-#: src/main.cc:130
+#: src/main.cc:129
#, c-format
msgid " -u : Download new package lists on startup.\n"
msgstr " -u : Last ned ny pakkeliste ved oppstart.\n"
-#: src/main.cc:131
+#: src/main.cc:130
#, c-format
msgid " -i : Perform an install run on startup.\n"
msgstr " -i : Utfør en installasjonskjøring ved oppstart.\n"
-#: src/main.cc:133
+#: src/main.cc:132
#, c-format
msgid " This aptitude does not have Super Cow Powers.\n"
msgstr " Denne aptituden har ikke superku-krefter.\n"
-#: src/main.cc:254
+#: src/main.cc:253
#, c-format
msgid "-o requires an argument of the form key=value, got %s"
msgstr "-o krever et argument av formen nøkkel=verdi, fikk %s"
-#: src/main.cc:300 src/main.cc:309
+#: src/main.cc:299 src/main.cc:308
msgid "WEIRDNESS: unknown option code received\n"
msgstr "MERKELIG: mottok en ukjent valgkode\n"
-#: src/main.cc:318
+#: src/main.cc:317
msgid "Only one of -u and -i may be specified\n"
msgstr "Du kan bare oppgi enten -u eller -i\n"
-#: src/main.cc:326
+#: src/main.cc:325
msgid ""
"-u and -i may not be specified in command-line mode (eg, with 'install')"
msgstr "-u og -i kan ikke oppgis i kommandolinjemodus (dvs, med «install»)"
-#: src/main.cc:337
+#: src/main.cc:342
msgid "-u and -i may not be specified with a command"
msgstr "-u og -i kan ikke oppgis med en kommando"
-#: src/main.cc:392
+#: src/main.cc:399
#, c-format
msgid "Unknown command \"%s\"\n"
msgstr "Ukjent kommando «%s»\n"
-#: src/main.cc:400
+#: src/main.cc:406 src/main.cc:463
+msgid "Internal error: uncaught 'out of solutions' exception.\n"
+msgstr ""
+
+#: src/main.cc:411 src/main.cc:468
+msgid "Internal error: uncaught 'out of time' exception.\n"
+msgstr ""
+
+#: src/main.cc:418
#, c-format
-msgid "Invalid option for interactive mode: -s\n"
-msgstr "Ugyldig valg for interaktiv modus: -s\n"
+msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
+msgstr ""
#: src/mine/cmine.cc:93
#, c-format
@@ -1944,7 +2092,7 @@
msgid "Lost"
msgstr "Tapt"
-#: src/mine/cmine.cc:119 src/ui.cc:1005
+#: src/mine/cmine.cc:119 src/ui.cc:1089
msgid "Minesweeper"
msgstr "Minesveiper"
@@ -2121,7 +2269,7 @@
msgid "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
msgstr "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 12 30 15 15"
-#: src/pkg_columnizer.cc:84 src/ui.cc:1488
+#: src/pkg_columnizer.cc:84 src/ui.cc:1638
msgid "Package"
msgstr "Pakke"
@@ -2380,13 +2528,14 @@
"installasjonen."
#: src/pkg_grouppolicy.cc:158
+#, fuzzy
msgid ""
"Programs for faxmodems and other communications devices\n"
" Packages in the 'comm' section are used to control modems and other "
"hardware communications devices. This includes software to control faxmodems "
"(for instance, PPP for dial-up internet connections and programs originally "
-"written for that purpose (zmodem/kermit), as well as software to control "
-"cellular phones, interface with FidoNet, and run a BBS."
+"written for that purpose, such as zmodem/kermit), as well as software to "
+"control cellular phones, interface with FidoNet, and run a BBS."
msgstr ""
"Programmer for faksmodem og andre kommunikasjonsenheter\n"
" Pakkene i bolken «Kommunikasjon» brukes til å kontrollere modemer og andre "
@@ -2838,14 +2987,15 @@
"denne bolken er derfor flyttet til «hoved»."
#: src/pkg_grouppolicy.cc:193
+#, fuzzy
msgid ""
"Programs which are not free software\n"
" Packages in the 'non-free' section are not part of Debian.\n"
" .\n"
" These packages fail to meet one or more of the requirements of the Debian "
-"Free Software Guidelines (see below) You should read the license of programs "
-"in this section to be sure that you are allowed to use them in the way you "
-"intend.\n"
+"Free Software Guidelines (see below). You should read the license of "
+"programs in this section to be sure that you are allowed to use them in the "
+"way you intend.\n"
" .\n"
" For more information about what Debian considers to be Free Software, see "
"http://www.debian.org/social_contract#guidelines"
@@ -2909,11 +3059,12 @@
" En nyere versjon av disse pakkene er tilgjengelige."
#: src/pkg_grouppolicy.cc:320
+#, fuzzy
msgid ""
"New Packages\n"
" These packages have been added to Debian since the last time you cleared "
-"the list of \"new\" packages. (choose \"Forget new packages\" from the "
-"Actions menu to empty this list)"
+"the list of \"new\" packages (choose \"Forget new packages\" from the "
+"Actions menu to empty this list)."
msgstr ""
"Nye pakker\n"
" Disse pakkene er blitt lagt til Debian siden sist du slettet lista over "
@@ -3166,103 +3317,123 @@
msgid "Versions"
msgstr "Versjoner"
-#: src/pkg_item.cc:54
+#: src/pkg_item.cc:55
msgid "Yes, I am aware this is a very bad idea"
msgstr "Ja, jeg vet at dette er en meget dårlig ide"
#: src/pkg_item.cc:80
-#, c-format
+#, fuzzy, c-format
msgid ""
-"%s is an essential package!\n"
-"\n"
-"Are you sure you want to remove it?\n"
-"Type '%s' if you are."
+"%s is an essential package!%n%nAre you sure you want to remove it?%nType '%"
+"s' if you are."
msgstr ""
"%s er en grunnleggende pakke!\n"
"\n"
"Er du sikker på at du vil fjerne den?\n"
"Skriv %s hvis du er sikker."
-#: src/pkg_item.cc:219
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:625
#, c-format
msgid "Information about %s"
msgstr "Informasjon om %s"
-#: src/pkg_item.cc:304
-msgid "Available versions of "
+#: src/pkg_item.cc:224 src/pkg_ver_item.cc:627
+#, c-format
+msgid "%s info"
+msgstr ""
+
+#: src/pkg_item.cc:310
+#, fuzzy, c-format
+msgid "Available versions of %s"
msgstr "Tilgjengelige versjoner av "
-#: src/pkg_item.cc:312 src/pkg_ver_item.cc:648
+#: src/pkg_item.cc:313
+#, fuzzy, c-format
+msgid "%s versions"
+msgstr "Versjoner"
+
+#: src/pkg_item.cc:325 src/pkg_ver_item.cc:655
#, c-format
msgid "Dependencies of %s"
msgstr "Avhengigheter av %s"
-#: src/pkg_item.cc:322 src/pkg_ver_item.cc:657
+#: src/pkg_item.cc:327 src/pkg_ver_item.cc:657
+#, c-format
+msgid "%s deps"
+msgstr ""
+
+#: src/pkg_item.cc:338 src/pkg_ver_item.cc:667
#, c-format
msgid "Packages depending on %s"
msgstr "Pakker som er avhengige av %s"
-#: src/pkg_item.cc:373 src/pkg_ver_item.cc:694
+#: src/pkg_item.cc:340 src/pkg_ver_item.cc:669
+#, c-format
+msgid "%s reverse deps"
+msgstr ""
+
+#: src/pkg_item.cc:392 src/pkg_ver_item.cc:707
#, c-format
msgid "Reporting a bug in %s:\n"
msgstr "Rapporterer en feil i %s:\n"
-#: src/pkg_item.cc:395
+#: src/pkg_item.cc:414
+#, fuzzy
msgid ""
-"You are not root and I cannot find any way\n"
-"to become root. To reconfigure this package,\n"
-"install the menu package, the login package,\n"
-"or run aptitude as root."
+"You are not root and I cannot find any way to become root. To reconfigure "
+"this package, install the menu package, the login package, or run aptitude "
+"as root."
msgstr ""
"Du er ikke root, og programmet finner ingen\n"
"måte det kan bli root på. For å sette opp denne \n"
"pakken på nytt, installer menypakken, logg inn-\n"
"pakken, eller kjør aptitude som root."
-#: src/pkg_item.cc:403
+#: src/pkg_item.cc:422
#, c-format
msgid "Reconfiguring %s\n"
msgstr "Setter opp %s på nytt\n"
-#: src/pkg_item.cc:428
+#: src/pkg_item.cc:447
msgid "Hierarchy editor"
msgstr "Gjør om på hierarkiet"
+#: src/pkg_item.cc:447
+#, fuzzy
+msgid "Hierarchy Editor"
+msgstr "Gjør om på hierarkiet"
+
#: src/pkg_tree.cc:325
msgid "Search for: "
msgstr "Søk etter: "
-#: src/pkg_tree.cc:585
+#: src/pkg_tree.cc:568
msgid "All Packages"
msgstr "Alle pakkene"
-#: src/pkg_tree.cc:598 src/pkg_tree.cc:607
+#: src/pkg_tree.cc:581 src/pkg_tree.cc:590
msgid "Building view"
msgstr "Bygger visning"
-#: src/pkg_tree.cc:649
+#: src/pkg_tree.cc:632
#, c-format
msgid "No packages matched the pattern \"%s\"."
msgstr "Ingen pakker passet med mønsteret «%s»."
-#: src/pkg_tree.cc:671
+#: src/pkg_tree.cc:654
msgid "Enter the new package tree limit: "
msgstr "Skriv inn en ny grense for pakketreet: "
-#: src/pkg_tree.cc:705
+#: src/pkg_tree.cc:688
msgid "Enter the new package grouping mechanism for this display: "
msgstr ""
"Skriv inn den nye mekanismen for å gruppere pakker på dette skjermbildet: "
-#: src/pkg_tree.cc:713
+#: src/pkg_tree.cc:696
msgid "Enter the new package sorting mechanism for this display: "
msgstr ""
"Skriv inn den nye mekanismen for å sortere pakker på dette skjermbildet: "
-#: src/pkg_ver_item.cc:623
-msgid "Information about "
-msgstr "Informasjon om "
-
#: src/pkg_view.cc:344
msgid "make_package_view: error in arguments -- two main widgets??"
msgstr "make_package_view: feil i argumentene -- er det to hovedelementer??"
@@ -3278,7 +3449,7 @@
msgid "make_package_view: bad argument!"
msgstr "make_package_view: ugyldig argument."
-#: src/pkg_view.cc:492
+#: src/pkg_view.cc:495
msgid "make_package_view: no main widget found"
msgstr "make_package_view: fant intet hovedelement"
@@ -3496,6 +3667,74 @@
"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:74
+msgid "The package cache is not available."
+msgstr ""
+
+#: src/solution_dialog.cc:82
+#, fuzzy
+msgid "No packages are broken."
+msgstr "Noen pakker er skadet. Vil du prøve å fikse dem?"
+
+#: src/solution_dialog.cc:103
+msgid "No resolution found."
+msgstr ""
+
+#: src/solution_dialog.cc:107
+#, c-format
+msgid ""
+"Time exhausted while searching for a solution (you can select \"Next Solution"
+"\" or press %s to try harder)."
+msgstr ""
+
+#: src/solution_dialog.cc:146
+#, fuzzy
+msgid "Previous"
+msgstr "Skaffer"
+
+#: src/solution_dialog.cc:147
+#, fuzzy
+msgid "Next"
+msgstr "^Neste"
+
+#: src/solution_dialog.cc:148
+msgid "Apply"
+msgstr ""
+
+#: src/solution_dialog.cc:149
+#, fuzzy
+msgid "Close"
+msgstr "^Lukk"
+
+#: src/solution_fragment.cc:125
+#, fuzzy
+msgid "%BRemove%b the following packages:%n"
+msgstr "Disse pakkene er ØDELAGTE:"
+
+#: src/solution_fragment.cc:135
+#, fuzzy
+msgid "%BInstall%b the following packages:%n"
+msgstr "Disse pakkene er ØDELAGTE:"
+
+#: src/solution_fragment.cc:148
+msgid "%BKeep%b the following packages at their current version:%n"
+msgstr ""
+
+#: src/solution_fragment.cc:161
+#, fuzzy
+msgid "%BUpgrade%b the following packages:%n"
+msgstr "Disse pakkene er ØDELAGTE:"
+
+#: src/solution_fragment.cc:176
+#, fuzzy
+msgid "%BDowngrade%b the following packages:%n"
+msgstr "Laster ned pakker"
+
+#: src/solution_fragment.cc:190
+#, c-format
+msgid "Score is %d"
+msgstr ""
+
#: src/trust.cc:17 src/trust.cc:19
msgid "WARNING"
msgstr ""
@@ -3507,54 +3746,54 @@
"system."
msgstr ""
-#: src/ui.cc:143
+#: src/ui.cc:164
msgid "Er, there aren't any errors, this shouldn't have happened.."
msgstr "Ehm, det er ingen feil. Dette burde ikke ha skjedd ..."
-#: src/ui.cc:149
+#: src/ui.cc:170
msgid "E:"
msgstr ""
-#: src/ui.cc:151
+#: src/ui.cc:172
msgid "W:"
msgstr ""
-#: src/ui.cc:172
+#: src/ui.cc:193
msgid "Search for:"
msgstr "Søk etter:"
-#: src/ui.cc:205
+#: src/ui.cc:261
msgid "You already are root!"
msgstr "Du er allerede root."
-#: src/ui.cc:303
+#: src/ui.cc:359
msgid ""
"Subprocess exited with an error -- did you type your password correctly?"
msgstr "Underprosessen avsluttet med en feil -- skrev du inn rett passord?"
-#: src/ui.cc:331
+#: src/ui.cc:387
msgid "Loading cache"
msgstr "Laster mellomlageret"
-#: src/ui.cc:353
+#: src/ui.cc:409
msgid "Really quit Aptitude?"
msgstr "Vil du virkelig avslutte aptitude?"
-#: src/ui.cc:432
+#: src/ui.cc:488
msgid "Really discard your personal settings and reload the defaults?"
msgstr ""
"Vil du virkelig slette dine selvvalgte innstillinger og bruke "
"standardinnstillingene?"
-#: src/ui.cc:532
+#: src/ui.cc:588 src/ui.cc:590 src/ui.cc:618 src/ui.cc:620
msgid "Packages"
msgstr "Pakker"
-#: src/ui.cc:533 src/ui.cc:560
+#: src/ui.cc:589 src/ui.cc:619
msgid "View available packages and choose actions to perform"
msgstr "Vis tilgjengelige pakker og velg hvilken handlinger du vil utføre"
-#: src/ui.cc:599
+#: src/ui.cc:666
#, fuzzy
msgid ""
"%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
@@ -3571,15 +3810,15 @@
"andre,\n"
"men under bestemte betingelser, se «lisens» for mer informasjon."
-#: src/ui.cc:620
+#: src/ui.cc:687
msgid "help.txt"
msgstr "hjelp.txt"
-#: src/ui.cc:636
+#: src/ui.cc:703
msgid "README"
msgstr "LES_MEG"
-#: src/ui.cc:718
+#: src/ui.cc:785
msgid ""
"%C%BWARNING%b: untrusted versions of the following packages will be "
"installed!%n%nUntrusted packages could %Bcompromise your system's security%"
@@ -3587,61 +3826,71 @@
"this is what you want to do.%n%n"
msgstr ""
-#: src/ui.cc:732
+#: src/ui.cc:799
#, fuzzy
msgid "Really Continue"
msgstr "Fortsett"
-#: src/ui.cc:734
+#: src/ui.cc:801
msgid "Abort Installation"
msgstr ""
-#: src/ui.cc:796
+#: src/ui.cc:862
msgid "Preview of package installation"
msgstr "Forhåndsvisning av pakkeinstallasjonen"
-#: src/ui.cc:797
+#: src/ui.cc:863
msgid "View and/or adjust the actions that will be performed"
msgstr "Vis og/eller juster handlingene som vil bli utført"
-#: src/ui.cc:837
-msgid "Some packages were broken and have been fixed"
+#: src/ui.cc:864
+#, fuzzy
+msgid "Preview"
+msgstr "^Forh"
+
+#: src/ui.cc:900
+#, fuzzy
+msgid "Some packages were broken and have been fixed:"
msgstr "Noen pakker var skadet og har blitt reparert"
-#: src/ui.cc:839
-msgid "Some broken packages could not be fixed!"
-msgstr "Noen pakker kunne ikke repareres!"
+#: src/ui.cc:906
+msgid "No solution to these dependency problems exists!"
+msgstr ""
-#: src/ui.cc:847 src/ui.cc:959
-msgid "Some packages are broken. Try to fix them?"
-msgstr "Noen pakker er skadet. Vil du prøve å fikse dem?"
+#: src/ui.cc:912
+#, c-format
+msgid ""
+"Ran out of time while trying to resolver dependencies (press \"%s\" to try "
+"harder)"
+msgstr ""
-#: src/ui.cc:860
+#: src/ui.cc:958
+#, fuzzy
msgid ""
-"Installing/removing packages requires administrative privileges, which\n"
-"you currently do not have. Would you like to change to the root account?\n"
+"Installing/removing packages requires administrative privileges, which you "
+"currently do not have. Would you like to change to the root account?"
msgstr ""
"Ã… installere eller fjerne pakker krever at du er logget inn som root,\n"
"noe du ikke er. Vil du logge deg inn som root nå?\n"
-#: src/ui.cc:863 src/ui.cc:993
+#: src/ui.cc:961 src/ui.cc:1077
msgid "Become root"
msgstr "Bli root"
-#: src/ui.cc:865 src/ui.cc:995
+#: src/ui.cc:963 src/ui.cc:1079
msgid "Don't become root"
msgstr "Ikke bli root"
-#: src/ui.cc:870 src/ui.cc:1000
+#: src/ui.cc:968 src/ui.cc:1084
msgid "A package-list update or install run is already taking place."
msgstr ""
"Det foregår allerede en oppdatering av pakkelistene eller en installasjon."
-#: src/ui.cc:897
+#: src/ui.cc:995
msgid "No packages are scheduled to be installed, removed, or upgraded."
msgstr "Ingen pakker vil bli installert, oppgradert eller fjernet."
-#: src/ui.cc:903
+#: src/ui.cc:1001
#, fuzzy
msgid ""
"No packages will be installed, removed or upgraded. Some packages could be "
@@ -3654,163 +3903,178 @@
"oppgraderes.\n"
"Tast «U» for å forberede oppgradering."
-#: src/ui.cc:990
+#: src/ui.cc:1073
+#, fuzzy
msgid ""
-"Updating the package lists requires administrative privileges, which\n"
-"you currently do not have. Would you like to change to the root account?\n"
+"Updating the package lists requires administrative privileges, which you "
+"currently do not have. Would you like to change to the root account?"
msgstr ""
"Ã… oppdatere pakkelistene krever at du er logget inn som root,\n"
"noe du ikke er. Vil du logge deg inn som root nå?\n"
-#: src/ui.cc:1005 src/ui.cc:1198
+#: src/ui.cc:1089 src/ui.cc:1345
msgid "Waste time trying to find mines"
msgstr "Kast bort tid på å finne miner"
-#: src/ui.cc:1012 src/ui.cc:1065
+#: src/ui.cc:1096 src/ui.cc:1149
msgid "Cleaning while a download is in progress is not allowed"
msgstr "Du kan ikke slette nedlastede filer mens nedlasting foregår"
-#: src/ui.cc:1015
+#: src/ui.cc:1099
msgid "Deleting downloaded files"
msgstr "Sletter nedlastede filer"
-#: src/ui.cc:1029
+#: src/ui.cc:1113
msgid "Downloaded package files have been deleted"
msgstr "Nedlastede filer er slettet"
-#: src/ui.cc:1090
+#: src/ui.cc:1174
#, fuzzy, c-format
msgid ""
"Obsolete downloaded package files have been deleted, freeing %sB of disk "
"space."
msgstr "Foreldede, nedlastede pakkefiler er blitt slettet"
-#: src/ui.cc:1174
+#: src/ui.cc:1246
+msgid "All solutions exhausted."
+msgstr ""
+
+#: src/ui.cc:1251 src/ui.cc:1282
+#, fuzzy
+msgid "Ran out of time while trying to find a solution."
+msgstr "Kast bort tid på å finne miner"
+
+#: src/ui.cc:1276
+msgid "Unable to find a solution to apply."
+msgstr ""
+
+#: src/ui.cc:1321
msgid "^Install/remove packages"
msgstr "^installer/slett pakker"
-#: src/ui.cc:1175
+#: src/ui.cc:1322
msgid "Perform all pending installs and removals"
msgstr "Utfør alle ventende installeringer og slettinger"
-#: src/ui.cc:1177
+#: src/ui.cc:1324
msgid "^Update package list"
msgstr "^Oppdater pakkelista"
-#: src/ui.cc:1178
+#: src/ui.cc:1325
msgid "Check for new versions of packages"
msgstr "Se etter nye versjoner av pakkene"
-#: src/ui.cc:1181
+#: src/ui.cc:1328
msgid "^Forget new packages"
msgstr "^Glem nye pakker"
-#: src/ui.cc:1182
+#: src/ui.cc:1329
msgid "Forget which packages are \"new\""
msgstr "Glem hvilke pakker som er «nye»"
-#: src/ui.cc:1185
+#: src/ui.cc:1332
msgid "^Clean package cache"
msgstr "^Slett mellomlageret for pakker"
-#: src/ui.cc:1186
+#: src/ui.cc:1333
msgid "Delete package files which were previously downloaded"
msgstr "Slett alle pakkefiler som ble lastet ned tidligere"
-#: src/ui.cc:1189
+#: src/ui.cc:1336
msgid "Clean ^obsolete files"
msgstr "Fjern ^foreldede filer"
-#: src/ui.cc:1190
+#: src/ui.cc:1337
msgid "Delete package files which can no longer be downloaded"
msgstr "Slett pakkefiler som ikke lenger kan lastes ned"
-#: src/ui.cc:1193
+#: src/ui.cc:1340
msgid "Mark ^Upgradable"
msgstr "Marker ^oppgraderbare"
-#: src/ui.cc:1194
+#: src/ui.cc:1341
msgid "Mark all upgradable packages which are not held for upgrade"
msgstr "Marker alle oppgraderbare pakker som ikke holdes tilbake"
-#: src/ui.cc:1197
+#: src/ui.cc:1344
msgid "^Play Minesweeper"
msgstr "^Spill minesveiper"
-#: src/ui.cc:1200
+#: src/ui.cc:1347
msgid "^Become root"
msgstr "^Bli root"
-#: src/ui.cc:1201
+#: src/ui.cc:1348
+#, fuzzy
msgid ""
-"Run 'su' to become root; this will restart the program, but your\n"
-"settings will be preserved"
+"Run 'su' to become root; this will restart the program, but your settings "
+"will be preserved"
msgstr ""
"Kjør «su» for å bli root. Dette vil starte programmet på nytt, men \n"
"innstillingene blir bevart"
-#: src/ui.cc:1204
+#: src/ui.cc:1351
msgid "^Reload package cache"
msgstr "^Last pakkelageret på nytt"
-#: src/ui.cc:1205
+#: src/ui.cc:1352
msgid "Reload the package cache"
msgstr "Last mellomlageret for pakker på nytt"
-#: src/ui.cc:1211
+#: src/ui.cc:1358
msgid "^Quit"
msgstr "^Avslutt"
-#: src/ui.cc:1212
+#: src/ui.cc:1359
msgid "Exit the program"
msgstr "Avslutt programmet"
-#: src/ui.cc:1218 src/ui.cc:1487
+#: src/ui.cc:1365 src/ui.cc:1637
msgid "Undo"
msgstr "Angre"
-#: src/ui.cc:1219
+#: src/ui.cc:1366
msgid "Undo the last package operation or group of operations"
msgstr "Angre den siste pakkeoperasjonen eller en gruppe operasjoner"
-#: src/ui.cc:1226
+#: src/ui.cc:1373
msgid "^Install"
msgstr "^Installer"
-#: src/ui.cc:1227
+#: src/ui.cc:1374
msgid "Flag the currently selected package for installation or upgrade"
msgstr "Merk den valgte pakken for installasjon eller oppgradering"
-#: src/ui.cc:1230
+#: src/ui.cc:1377
msgid "^Remove"
msgstr "^Fjern"
-#: src/ui.cc:1231
+#: src/ui.cc:1378
msgid "Flag the currently selected package for removal"
msgstr "Merk den valgte pakken for fjerning"
-#: src/ui.cc:1234
+#: src/ui.cc:1381
msgid "^Purge"
msgstr "^Slett helt"
-#: src/ui.cc:1235
+#: src/ui.cc:1382
msgid ""
"Flag the currently selected package and its configuration files for removal"
msgstr "Merk den valgte pakken og dens oppsettsfiler for fjerning"
-#: src/ui.cc:1238
+#: src/ui.cc:1385
msgid "^Keep"
msgstr "^Behold"
-#: src/ui.cc:1239
+#: src/ui.cc:1386
msgid "Cancel any action on the selected package"
msgstr "Opphev alle handlinger med den valgte pakken"
-#: src/ui.cc:1242
+#: src/ui.cc:1389
msgid "^Hold"
msgstr "^Hold"
-#: src/ui.cc:1243
+#: src/ui.cc:1390
msgid ""
"Cancel any action on the selected package, and protect it from future "
"upgrades"
@@ -3818,242 +4082,246 @@
"Opphev alle handlinger med den valgte pakken og beskytt den mot senere "
"oppgradering"
-#: src/ui.cc:1246
+#: src/ui.cc:1393
msgid "Mark ^Auto"
msgstr "Merk ^Auto"
-#: src/ui.cc:1247
+#: src/ui.cc:1394
+#, fuzzy
msgid ""
-"Mark the selected package as having been automatically installed;\n"
-"it will automatically be removed if no other packages depend on it"
+"Mark the selected package as having been automatically installed; it will "
+"automatically be removed if no other packages depend on it"
msgstr ""
"Merk den valgte pakka som automatisk installert, \n"
"den blir automatisk fjernet hvis ingen andre pakker avhenger av den"
-#: src/ui.cc:1250
+#: src/ui.cc:1397
msgid "Mark ^Manual"
msgstr "Merk ^Manuell"
-#: src/ui.cc:1251
+#: src/ui.cc:1398
+#, fuzzy
msgid ""
-"Mark the selected package as having been manually installed;\n"
-"it will not be removed unless you manually remove it"
+"Mark the selected package as having been manually installed; it will not be "
+"removed unless you manually remove it"
msgstr ""
"Merk den valgte pakka som manuelt installert,\n"
"den blir ikke fjernet hvis du ikke fjerner den manuelt"
-#: src/ui.cc:1254
+#: src/ui.cc:1401
msgid "^Forbid Version"
msgstr "^Forby versjon"
-#: src/ui.cc:1255
+#: src/ui.cc:1402
+#, fuzzy
msgid ""
-"Forbid the candidate version of the selected package from being installed;\n"
+"Forbid the candidate version of the selected package from being installed; "
"newer versions of the package will be installed as usual"
msgstr ""
"Forby installasjon av kandidatversjonen av den valgte pakka,\n"
"nyere versjoner av pakka vil bli installert som vanlig"
-#: src/ui.cc:1259
+#: src/ui.cc:1406
msgid "I^nformation"
msgstr "I^nformasjon"
-#: src/ui.cc:1260
+#: src/ui.cc:1407
msgid "Display more information about the selected package"
msgstr "Vis mer informasjon om den valgte pakka"
-#: src/ui.cc:1263
+#: src/ui.cc:1410
msgid "^Changelog"
msgstr "^Endringslogg"
-#: src/ui.cc:1264
+#: src/ui.cc:1411
msgid "Display the Debian changelog of the selected package"
msgstr "Vis Debians endringslogg for den valgte pakka"
-#: src/ui.cc:1271
+#: src/ui.cc:1418
msgid "^Find"
msgstr "^Finn"
-#: src/ui.cc:1272
+#: src/ui.cc:1419
msgid "Search for a package"
msgstr "Søk etter en pakke"
-#: src/ui.cc:1275
+#: src/ui.cc:1422
msgid "Find ^Again"
msgstr "Finn ^igjen"
-#: src/ui.cc:1276
+#: src/ui.cc:1423
msgid "Repeat the last search"
msgstr "Gjenta siste søk"
-#: src/ui.cc:1280
+#: src/ui.cc:1427
msgid "^Limit Display"
msgstr "Be^grens visning"
-#: src/ui.cc:1281
+#: src/ui.cc:1428
msgid "Apply a filter to the package list"
msgstr "Bruk et filter på pakkelista"
-#: src/ui.cc:1284
+#: src/ui.cc:1431
msgid "^Un-Limit Display"
msgstr "^Ubegrenset visning"
-#: src/ui.cc:1285
+#: src/ui.cc:1432
msgid "Remove the filter from the package list"
msgstr "Fjern filtrering av pakkelista"
-#: src/ui.cc:1289
+#: src/ui.cc:1436
msgid "Find ^Broken"
msgstr "Finn ^Ødelagt"
-#: src/ui.cc:1290
+#: src/ui.cc:1437
msgid "Find the next package with unsatisfied dependencies"
msgstr "Finn neste pakke med utilfredsstilte avhengigheter"
-#: src/ui.cc:1297
+#: src/ui.cc:1444
msgid "^UI options"
msgstr "^Innstillinger av grensesnittet"
-#: src/ui.cc:1298
+#: src/ui.cc:1445
msgid "Change the settings which affect the user interface"
msgstr "Gjør om på innstillingene som berører grensesnittet"
-#: src/ui.cc:1301
+#: src/ui.cc:1448
msgid "^Dependency handling"
msgstr "^HÃ¥ndtering av avhengigheter"
-#: src/ui.cc:1302
+#: src/ui.cc:1449
msgid "Change the settings which affect how package dependencies are handled"
msgstr ""
"Gjør om på innstillingene som berører hvordan pakkeavhengigheter behandles"
-#: src/ui.cc:1305
+#: src/ui.cc:1452
msgid "^Miscellaneous"
msgstr "^Annet"
-#: src/ui.cc:1306
+#: src/ui.cc:1453
msgid "Change miscellaneous program settings"
msgstr "Gjør endringer i andre programinnstillinger"
-#: src/ui.cc:1311
+#: src/ui.cc:1458
msgid "^Revert options"
msgstr "^Slett valgene"
-#: src/ui.cc:1312
+#: src/ui.cc:1459
msgid "Reset all settings to the system defaults"
msgstr "Gjenopprett standardinnstillingene"
-#: src/ui.cc:1323
+#: src/ui.cc:1470
msgid "^Next"
msgstr "^Neste"
-#: src/ui.cc:1324
+#: src/ui.cc:1471
msgid "View next display"
msgstr "Vis neste skjermbilde"
-#: src/ui.cc:1327
+#: src/ui.cc:1474
msgid "^Prev"
msgstr "^Forh"
-#: src/ui.cc:1328
+#: src/ui.cc:1475
msgid "View previous display"
msgstr "Vis forrige skjermbilde"
-#: src/ui.cc:1331
+#: src/ui.cc:1478
msgid "^Close"
msgstr "^Lukk"
-#: src/ui.cc:1332
+#: src/ui.cc:1479
msgid "Close this display"
msgstr "Lukk dette skjermbildet"
-#: src/ui.cc:1337
+#: src/ui.cc:1484
msgid "New Package ^View"
msgstr "Ny pakke^visning"
-#: src/ui.cc:1338
+#: src/ui.cc:1485
msgid "Create a new default package view"
msgstr "Lag en ny pakkevisning"
-#: src/ui.cc:1341
+#: src/ui.cc:1488
msgid "New Categorical ^Browser"
msgstr "Ny visning etter ^kategori"
-#: src/ui.cc:1343
+#: src/ui.cc:1490
msgid "Browse packages by category"
msgstr "Vis pakker etter pakketype"
-#: src/ui.cc:1351
+#: src/ui.cc:1498
msgid "^About"
msgstr "^Om"
-#: src/ui.cc:1352
+#: src/ui.cc:1499
msgid "View information about this program"
msgstr "Vis informasjon om dette programmet"
-#: src/ui.cc:1355
+#: src/ui.cc:1502
msgid "^Help"
msgstr "^Hjelp"
-#: src/ui.cc:1356
+#: src/ui.cc:1503
msgid "View the on-line help"
msgstr "Vis hjelpen"
-#: src/ui.cc:1358
+#: src/ui.cc:1505
msgid "User's ^Manual"
msgstr "Bruker^håndbok"
-#: src/ui.cc:1359
+#: src/ui.cc:1506
msgid "View the detailed program manual"
msgstr "Vis en detaljert brukerhåndbok"
-#: src/ui.cc:1362
+#: src/ui.cc:1509
msgid "^FAQ"
msgstr "^OSS"
-#: src/ui.cc:1363
+#: src/ui.cc:1510
msgid "View a list of frequently asked questions"
msgstr "Vis en liste over Ofte Spurte Spørsmål"
-#: src/ui.cc:1366
-msgid "^ChangeLog"
-msgstr "^Endringslogg"
+#: src/ui.cc:1513
+msgid "^NEWS"
+msgstr ""
-#: src/ui.cc:1367
-msgid "View the important changes made in each version of the program"
+#: src/ui.cc:1514
+#, fuzzy
+msgid "View the important changes made in each version of "
msgstr ""
"Vis hvilke viktige endringer som er blitt gjort i hver ny versjon av "
"programmet"
-#: src/ui.cc:1370
+#: src/ui.cc:1517
msgid "^License"
msgstr "^Lisens"
-#: src/ui.cc:1371
+#: src/ui.cc:1518
msgid "View the terms under which you may copy the program"
msgstr "Vis under hvilke betingelser du kan kopiere dette programmet"
-#: src/ui.cc:1486
+#: src/ui.cc:1636
msgid "Actions"
msgstr "Handlinger"
-#: src/ui.cc:1489
+#: src/ui.cc:1639
msgid "Search"
msgstr "Søk"
-#: src/ui.cc:1490
+#: src/ui.cc:1640
msgid "Options"
msgstr "Valg"
-#: src/ui.cc:1491
+#: src/ui.cc:1641
msgid "Views"
msgstr "Visninger"
-#: src/ui.cc:1492
+#: src/ui.cc:1642
msgid "Help"
msgstr "Hjelp"
-#: src/ui.cc:1537
+#: src/ui.cc:1699
#, c-format
msgid ""
"%s: Menu %s: Help %s: Quit %s: Update %s: Download/Install/Remove Pkgs"
@@ -4061,11 +4329,11 @@
"%s: Meny %s: Hjelp %s: avslutt %s: Oppdater %s: Last ned/installer/slett "
"pakker"
-#: src/ui.cc:1799 src/vscreen/vscreen.cc:281
+#: src/ui.cc:1968 src/vscreen/vscreen.cc:281
msgid "yes_key"
msgstr "ja_tast"
-#: src/ui.cc:1800 src/vscreen/vscreen.cc:282
+#: src/ui.cc:1969 src/vscreen/vscreen.cc:282
msgid "no_key"
msgstr "nei_tast"
@@ -4077,6 +4345,16 @@
msgid "Downloading Changelog"
msgstr "Laster ned endringslogg"
+#: src/view_changelog.cc:54
+#, fuzzy
+msgid "Download Changelog"
+msgstr "Laster ned endringslogg"
+
+#: src/view_changelog.cc:63
+#, c-format
+msgid "%s changes"
+msgstr ""
+
#: src/vscreen/vscreen.cc:119
#, c-format
msgid "Ouch! Got SIGTERM, dying..\n"
@@ -4104,3 +4382,36 @@
#: src/vscreen/vs_util.cc:175 src/vscreen/vs_util.cc:212
msgid "No"
msgstr "Nei"
+
+#~ msgid ""
+#~ "Some packages had unmet dependencies. This may mean that you have\n"
+#~ "requested an impossible situation or if you are using the unstable\n"
+#~ "distribution that some required packages have not yet been created\n"
+#~ "or been moved out of Incoming.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Noen pakker hadde utilfredsstilte avhengigheter. Dette kan bety at du har "
+#~ "bedt\n"
+#~ "om en umulig situasjon, eller at du bruker den ustabile utgaven og\n"
+#~ "at noen av de pakkene som er nødvendige ikke er laget ennå eller er "
+#~ "flyttet ut fra incoming.\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Please insert the following disc into the drive \"%s\":\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Sett denne CD-en inn i CD-spilleren «%s»:\n"
+#~ "%s"
+
+#~ msgid "Invalid option for interactive mode: -s\n"
+#~ msgstr "Ugyldig valg for interaktiv modus: -s\n"
+
+#~ msgid "Information about "
+#~ msgstr "Informasjon om "
+
+#~ msgid "Some broken packages could not be fixed!"
+#~ msgstr "Noen pakker kunne ikke repareres!"
+
+#~ msgid "^ChangeLog"
+#~ msgstr "^Endringslogg"
Modified: branches/aptitude-0.3/aptitude/po/nl.po
==============================================================================
--- branches/aptitude-0.3/aptitude/po/nl.po (original)
+++ branches/aptitude-0.3/aptitude/po/nl.po Sat Apr 30 13:41:32 2005
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: aptitude\n"
"Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-01-10 16:26-0800\n"
+"POT-Creation-Date: 2005-04-29 18:11-0400\n"
"PO-Revision-Date: 2004-08-17 15:21+0100\n"
"Last-Translator: Luk Claes <luk.claes at ugent.be>\n"
"Language-Team: Debian l10n Dutch <debian-l10n-dutch at lists.debian.org>\n"
@@ -159,16 +159,103 @@
"Verwijder automatisch ongebruikte pakketten die voldoen aan deze filter"
#: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:184 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
-#: src/vscreen/vs_util.cc:329
+#: src/ui.cc:218 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
+#: src/vscreen/vs_util.cc:328
msgid "Ok"
msgstr "Ok"
#: src/apt_options.cc:242 src/download_list.cc:71 src/mine/cmine.cc:257
-#: src/mine/cmine.cc:330 src/vscreen/vs_util.cc:329
+#: src/mine/cmine.cc:330 src/vscreen/vs_util.cc:328
msgid "Cancel"
msgstr "Annuleren"
+#: src/broken_indicator.cc:106 src/solution_dialog.cc:97
+msgid "Internal error: unexpected null solution."
+msgstr ""
+
+#: src/broken_indicator.cc:158
+#, fuzzy
+msgid "Suggest "
+msgstr "Suggereert"
+
+#: src/broken_indicator.cc:164
+#, fuzzy, c-format
+msgid "%d installs"
+msgstr "installeren"
+
+#: src/broken_indicator.cc:169
+#, fuzzy
+msgid "1 install"
+msgstr "installeren"
+
+#: src/broken_indicator.cc:173
+#, c-format
+msgid "%d removals"
+msgstr ""
+
+#: src/broken_indicator.cc:178
+msgid "1 removal"
+msgstr ""
+
+#: src/broken_indicator.cc:182
+#, c-format
+msgid "%d keeps"
+msgstr ""
+
+#: src/broken_indicator.cc:187
+msgid "1 keep"
+msgstr ""
+
+#: src/broken_indicator.cc:191
+#, fuzzy, c-format
+msgid "%d upgrades"
+msgstr "opwaarderen"
+
+#: src/broken_indicator.cc:196
+#, fuzzy
+msgid "1 upgrade"
+msgstr "opwaarderen"
+
+#: src/broken_indicator.cc:200
+#, fuzzy, c-format
+msgid "%d downgrades"
+msgstr "gedegradeerd"
+
+#: src/broken_indicator.cc:205
+#, fuzzy
+msgid "1 downgrade"
+msgstr "gedegradeerd"
+
+#: src/broken_indicator.cc:214
+#, c-format
+msgid "%s: Examine"
+msgstr ""
+
+#: src/broken_indicator.cc:216
+#, c-format
+msgid "%s: Apply"
+msgstr ""
+
+#: src/broken_indicator.cc:218
+#, fuzzy, c-format
+msgid "%s: Next"
+msgstr "^Volgende"
+
+#: src/broken_indicator.cc:220
+#, c-format
+msgid "%s: Previous"
+msgstr ""
+
+#: src/broken_indicator.cc:233
+#, c-format
+msgid "%CSolution search failed. %s: try harder"
+msgstr ""
+
+#: src/broken_indicator.cc:239
+#, c-format
+msgid "%CUnable to resolve dependencies."
+msgstr ""
+
#: src/cmdline/cmdline_action.cc:36
#, c-format
msgid ""
@@ -243,22 +330,22 @@
msgstr ""
"Pakket %s is niet opwaardeerbaar, kan een opwaardering niet verbieden\n"
-#: src/cmdline/cmdline_action.cc:213
+#: src/cmdline/cmdline_action.cc:198
#, c-format
msgid "Note: selecting the task \"%s: %s\" for installation\n"
msgstr "Opmerking: de taak \"%s: %s\" geselecteerd voor installatie\n"
-#: src/cmdline/cmdline_action.cc:240
+#: src/cmdline/cmdline_action.cc:225
#, c-format
msgid "You can only specify a package version with an 'install' command.\n"
msgstr "U kunt enkel een pakketversie aangeven met een 'install'-commando.\n"
-#: src/cmdline/cmdline_action.cc:246
+#: src/cmdline/cmdline_action.cc:231
#, c-format
msgid "You can only specify a package archive with an 'install' command.\n"
msgstr "U kunt enkel een pakketarchief aangeven met een 'install'-commando.\n"
-#: src/cmdline/cmdline_action.cc:280
+#: src/cmdline/cmdline_action.cc:265
#, c-format
msgid ""
"Couldn't find package \"%s\", and more than 40\n"
@@ -267,7 +354,7 @@
"Pakket \"%s\" is niet gevonden, en meer dan 40\n"
"pakketten hebben \"%s\" in hun naam.\n"
-#: src/cmdline/cmdline_action.cc:283
+#: src/cmdline/cmdline_action.cc:268
#, c-format
msgid ""
"Couldn't find package \"%s\". However, the following\n"
@@ -276,14 +363,14 @@
"Pakket \"%s\" is niet gevonden. Wel hebben de volgende\n"
"pakketten \"%s\" in hun naam:\n"
-#: src/cmdline/cmdline_action.cc:307
+#: src/cmdline/cmdline_action.cc:292
#, c-format
msgid "Couldn't find any package whose name or description matched \"%s\"\n"
msgstr ""
"Geen enkel pakket gevonden waarvan de naam of beschrijving overeenkomen met "
"\"%s\"\n"
-#: src/cmdline/cmdline_action.cc:309
+#: src/cmdline/cmdline_action.cc:294
#, c-format
msgid ""
"Couldn't find any package matching \"%s\", and more than 40\n"
@@ -292,7 +379,7 @@
"Geen enkel pakket gevonden dat overeenkomt met \"%s\", en meer dan 40\n"
"pakketten hebben \"%s\" in hun beschrijving.\n"
-#: src/cmdline/cmdline_action.cc:312
+#: src/cmdline/cmdline_action.cc:297
#, c-format
msgid ""
"Couldn't find any package matching \"%s\". However, the following\n"
@@ -336,13 +423,13 @@
msgid "Freed %sB of disk space\n"
msgstr "Zal %sB schrijfruimte vrijmaken"
-#: src/cmdline/cmdline_do_action.cc:67
+#: src/cmdline/cmdline_do_action.cc:71
#, c-format
msgid "Invalid operation %s"
msgstr "Ongeldige operatie %s"
-#: src/cmdline/cmdline_do_action.cc:206 src/cmdline/cmdline_simulate.cc:30
-#: src/cmdline/cmdline_upgrade.cc:89
+#: src/cmdline/cmdline_do_action.cc:201 src/cmdline/cmdline_simulate.cc:31
+#: src/cmdline/cmdline_upgrade.cc:91
#, c-format
msgid "Abort.\n"
msgstr "Breek af.\n"
@@ -352,7 +439,7 @@
msgid "download: you must specify at least one package to download\n"
msgstr "ophalen: u moet minstens één pakket aangeven om op te halen\n"
-#: src/cmdline/cmdline_download.cc:43 src/download.cc:342
+#: src/cmdline/cmdline_download.cc:43 src/download.cc:344
msgid "Couldn't read source list"
msgstr "Kon bronnenlijst niet lezen"
@@ -419,97 +506,97 @@
"Wat het is? Het is een olifant die wordt opgegeten door een slang, "
"natuurlijk.\n"
-#: src/cmdline/cmdline_prompt.cc:44
+#: src/cmdline/cmdline_prompt.cc:45
msgid "Couldn't read list of sources"
msgstr "Kon bronnenlijst niet lezen"
-#: src/cmdline/cmdline_prompt.cc:219 src/cmdline/cmdline_show_broken.cc:73
+#: src/cmdline/cmdline_prompt.cc:220 src/cmdline/cmdline_show_broken.cc:73
#, c-format
msgid "but %s is to be installed."
msgstr "maar %s wordt geïnstalleerd."
-#: src/cmdline/cmdline_prompt.cc:222 src/cmdline/cmdline_show_broken.cc:76
+#: src/cmdline/cmdline_prompt.cc:223 src/cmdline/cmdline_show_broken.cc:76
#, c-format
msgid "but %s is installed and it is kept back."
msgstr "maar %s wordt geïnstalleerd en wordt achtergehouden."
-#: src/cmdline/cmdline_prompt.cc:225 src/cmdline/cmdline_show_broken.cc:79
+#: src/cmdline/cmdline_prompt.cc:226 src/cmdline/cmdline_show_broken.cc:79
#, c-format
msgid "but %s is installed."
msgstr "maar %s is geïnstalleerd."
-#: src/cmdline/cmdline_prompt.cc:229 src/cmdline/cmdline_show_broken.cc:83
+#: src/cmdline/cmdline_prompt.cc:230 src/cmdline/cmdline_show_broken.cc:83
#, c-format
msgid "but it is not installable"
msgstr "maar het is niet installeerbaar"
-#: src/cmdline/cmdline_prompt.cc:233 src/cmdline/cmdline_show_broken.cc:87
+#: src/cmdline/cmdline_prompt.cc:234 src/cmdline/cmdline_show_broken.cc:87
#, c-format
msgid " which is a virtual package."
msgstr " dat een virtueel pakket is."
-#: src/cmdline/cmdline_prompt.cc:236 src/cmdline/cmdline_show_broken.cc:90
+#: src/cmdline/cmdline_prompt.cc:237 src/cmdline/cmdline_show_broken.cc:90
#, c-format
msgid " or"
msgstr " of"
-#: src/cmdline/cmdline_prompt.cc:248
+#: src/cmdline/cmdline_prompt.cc:249
msgid "The following packages are BROKEN:"
msgstr "De volgende pakketten zijn BESCHADIGD:"
-#: src/cmdline/cmdline_prompt.cc:249
+#: src/cmdline/cmdline_prompt.cc:250
msgid "The following packages are unused and will be REMOVED:"
msgstr ""
"De volgende pakketten zijn niet in gebruik en zullen worden VERWIJDERD:"
-#: src/cmdline/cmdline_prompt.cc:250
+#: src/cmdline/cmdline_prompt.cc:251
msgid "The following packages have been automatically kept back:"
msgstr "De volgende pakketten zijn automatisch achtergehouden:"
-#: src/cmdline/cmdline_prompt.cc:251
+#: src/cmdline/cmdline_prompt.cc:252
msgid "The following NEW packages will be automatically installed:"
msgstr "De volgende NIEUWE pakketten zullen automatisch worden geïnstalleerd:"
-#: src/cmdline/cmdline_prompt.cc:252
+#: src/cmdline/cmdline_prompt.cc:253
msgid "The following packages will be automatically REMOVED:"
msgstr "De volgende pakketten zullen automatisch worden VERWIJDERD:"
-#: src/cmdline/cmdline_prompt.cc:253
+#: src/cmdline/cmdline_prompt.cc:254
msgid "The following packages will be DOWNGRADED:"
msgstr "De volgende pakketten zullen automatisch worden GEDEGRADEERD:"
-#: src/cmdline/cmdline_prompt.cc:254
+#: src/cmdline/cmdline_prompt.cc:255
msgid "The following packages have been kept back:"
msgstr "De volgende pakketen zijn achtergehouden:"
-#: src/cmdline/cmdline_prompt.cc:255
+#: src/cmdline/cmdline_prompt.cc:256
msgid "The following packages will be REINSTALLED:"
msgstr "De volgende pakketten zullen worden GEHERINSTALLEERD:"
-#: src/cmdline/cmdline_prompt.cc:256
+#: src/cmdline/cmdline_prompt.cc:257
msgid "The following NEW packages will be installed:"
msgstr "De volgende NIEUWE pakketten zullen worden geïnstalleerd:"
-#: src/cmdline/cmdline_prompt.cc:257
+#: src/cmdline/cmdline_prompt.cc:258
msgid "The following packages will be REMOVED:"
msgstr "De volgende pakketten zullen worden VERWIJDERD:"
-#: src/cmdline/cmdline_prompt.cc:258
+#: src/cmdline/cmdline_prompt.cc:259
msgid "The following packages will be upgraded:"
msgstr "De volgende pakketten zullen worden opgewaardeerd:"
-#: src/cmdline/cmdline_prompt.cc:307
+#: src/cmdline/cmdline_prompt.cc:311
#, c-format
msgid "The following ESSENTIAL packages will be REMOVED!\n"
msgstr "De volgende ESSENTIELE pakketten zullen worden VERWIJDERD!\n"
-#: src/cmdline/cmdline_prompt.cc:316
+#: src/cmdline/cmdline_prompt.cc:320
#, c-format
msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
msgstr ""
"De volgende ESSENTIELE pakketten zullen worden BESCHADIGD door deze actie:\n"
-#: src/cmdline/cmdline_prompt.cc:326
+#: src/cmdline/cmdline_prompt.cc:330
#, c-format
msgid ""
"WARNING: Performing this action will probably cause your system to break!\n"
@@ -519,105 +606,108 @@
"beschadigen!\n"
" Ga NIET verder, tenzij u EXACT weet wat u aan het doen bent!\n"
-#: src/cmdline/cmdline_prompt.cc:328
+#: src/cmdline/cmdline_prompt.cc:332
msgid "I am aware that this is a very bad idea"
msgstr "Ik weet dat dit een heel slecht idee is"
-#: src/cmdline/cmdline_prompt.cc:331
+#: src/cmdline/cmdline_prompt.cc:335
#, c-format
msgid "To continue, type the phrase \"%s\":\n"
msgstr "Om verder te gaan, typ de zin \"%s\":\n"
-#: src/cmdline/cmdline_prompt.cc:434
+#: src/cmdline/cmdline_prompt.cc:438
#, c-format
msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
msgstr ""
"De volgende pakketten worden AANGERADEN, maar zullen NIET worden "
"geïnstalleerd:\n"
-#: src/cmdline/cmdline_prompt.cc:440
+#: src/cmdline/cmdline_prompt.cc:444
#, c-format
msgid "The following packages are SUGGESTED but will NOT be installed:\n"
msgstr ""
"De volgende pakketten worden GESUGGEREERD, maar zullen NIET worden "
"geïnstalleerd:\n"
-#: src/cmdline/cmdline_prompt.cc:445
+#: src/cmdline/cmdline_prompt.cc:449
#, c-format
msgid "No packages will be installed, upgraded, or removed.\n"
msgstr ""
"Er zullen geen pakketten worden geïnstalleerd, opgewaardeerd of verwijderd.\n"
-#: src/cmdline/cmdline_prompt.cc:447
+#: src/cmdline/cmdline_prompt.cc:451
#, c-format
msgid "%lu packages upgraded, %lu newly installed, "
msgstr "%lu pakketten opgewaardeerd, %lu nieuwe geïnstalleerd, "
-#: src/cmdline/cmdline_prompt.cc:451
+#: src/cmdline/cmdline_prompt.cc:455
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu geherinstalleerd, "
-#: src/cmdline/cmdline_prompt.cc:453
+#: src/cmdline/cmdline_prompt.cc:457
#, c-format
msgid "%lu downgraded, "
msgstr "%lu gedegradeerd, "
-#: src/cmdline/cmdline_prompt.cc:455
+#: src/cmdline/cmdline_prompt.cc:459
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu te verwijderen en %lu niet opwaarderen.\n"
-#: src/cmdline/cmdline_prompt.cc:462
+#: src/cmdline/cmdline_prompt.cc:466
#, c-format
msgid "Need to get %sB/%sB of archives. "
msgstr "Heb %sB/%sB archieven nodig. "
-#: src/cmdline/cmdline_prompt.cc:465
+#: src/cmdline/cmdline_prompt.cc:469
#, c-format
msgid "Need to get %sB of archives. "
msgstr "Heb %sB archieven nodig. "
-#: src/cmdline/cmdline_prompt.cc:472
+#: src/cmdline/cmdline_prompt.cc:476
#, c-format
msgid "After unpacking %sB will be used.\n"
msgstr "Na uitpakken zal %sB worden gebruikt.\n"
-#: src/cmdline/cmdline_prompt.cc:475
+#: src/cmdline/cmdline_prompt.cc:479
#, c-format
msgid "After unpacking %sB will be freed.\n"
msgstr "Na uitpakken zal %sB worden vrijgemaakt.\n"
-#: src/cmdline/cmdline_prompt.cc:521
+#: src/cmdline/cmdline_prompt.cc:524
#, c-format
msgid "Bad action character '%c'\n"
msgstr "Slecht actiekarakter '%c'\n"
-#: src/cmdline/cmdline_prompt.cc:596
+#: src/cmdline/cmdline_prompt.cc:595
#, c-format
msgid "No packages to show -- enter the package names on the line after 'i'.\n"
msgstr ""
"Er zijn geen te tonen pakketten -- geef de pakketnamen op de regel achter "
"'i'.\n"
-#: src/cmdline/cmdline_prompt.cc:598 src/cmdline/cmdline_prompt.cc:629
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:597
msgid "Press Return to continue."
msgstr "Druk op return om verder te gaan."
-#: src/cmdline/cmdline_prompt.cc:625
+#: src/cmdline/cmdline_prompt.cc:623
#, c-format
msgid "No packages found -- enter the package names on the line after 'c'.\n"
msgstr ""
"Er zijn geen pakketten gevonden -- geef de pakketnamen op de regel achter "
"'c'.\n"
-#: src/cmdline/cmdline_prompt.cc:665
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:627
+#, fuzzy
+msgid "Press Return to continue"
+msgstr "Druk op return om verder te gaan."
+
+#: src/cmdline/cmdline_prompt.cc:675
msgid "Do you want to continue? [Y/n/?] "
msgstr "Wilt u verder gaan? [Y/n/?] "
-#: src/cmdline/cmdline_prompt.cc:690
+#: src/cmdline/cmdline_prompt.cc:700
#, c-format
msgid ""
"\n"
@@ -628,7 +718,7 @@
"Er zal afhankelijkheidsinformatie worden getoond.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:692
+#: src/cmdline/cmdline_prompt.cc:702
#, c-format
msgid ""
"\n"
@@ -639,7 +729,7 @@
"Er zal geen afhankelijkheidsinformatie worden getoond.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:698
+#: src/cmdline/cmdline_prompt.cc:708
#, c-format
msgid ""
"\n"
@@ -650,7 +740,7 @@
"Er zullen versies worden getoond.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:700
+#: src/cmdline/cmdline_prompt.cc:710
#, c-format
msgid ""
"\n"
@@ -661,7 +751,7 @@
"Er zullen geen versies worden getoond.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:705
+#: src/cmdline/cmdline_prompt.cc:715
#, c-format
msgid ""
"\n"
@@ -672,7 +762,7 @@
"Er zullen groottewijzigingen worden getoond.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:717
#, c-format
msgid ""
"\n"
@@ -683,7 +773,7 @@
"Er zullen geen groottewijzigingen worden getoond.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:737
#, c-format
msgid ""
"Commands:\n"
@@ -735,34 +825,83 @@
" _ : Wis (Purge)\n"
" = : Behoud\n"
-#: src/cmdline/cmdline_prompt.cc:751
+#: src/cmdline/cmdline_prompt.cc:761
#, c-format
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:84
+#, c-format
+msgid "y: %F%nn: %F%nq: %F%n,: %F%n.: %F%n"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:90
+msgid "accept the proposed changes"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:92
+msgid "reject the proposed changes and search for another solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:94
+#, fuzzy
+msgid "give up and quit the program"
+msgstr "Sluit het programma af"
+
+#: src/cmdline/cmdline_resolver.cc:96
+msgid "move to the next solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:98
+msgid "move to the previous solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:131
+#, fuzzy
+msgid "The following actions will resolve these dependencies:"
+msgstr "De volgende pakketten hebben niet-voldane afhankelijkheden:\n"
+
+#: src/cmdline/cmdline_resolver.cc:146
+msgid "Accept this solution? [Y/n/q/?]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:174
+msgid "Abandoning all efforts to resolve these dependencies."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:184
+#, fuzzy
+msgid "The following commands are available:"
+msgstr "De volgende pakketten zijn BESCHADIGD:"
+
+#: src/cmdline/cmdline_resolver.cc:188
+#, fuzzy
+msgid "Invalid response; please enter one of the following commands:"
+msgstr "Ongeldig antwoord. Geef een geldig commando of '?' voor hulp.\n"
+
+#: src/cmdline/cmdline_resolver.cc:198
+msgid "No solution found within the allotted time. Try harder? [Y/n]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:226
+#, fuzzy
+msgid "Invalid response; please enter 'y' or 'n'."
+msgstr "Ongeldig antwoord. Geef een geldig commando of '?' voor hulp.\n"
+
+#: src/cmdline/cmdline_resolver.cc:235
+msgid "Unable to resolve dependencies! Giving up..."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:240
+msgid "No more solutions."
+msgstr ""
+
#: src/cmdline/cmdline_search.cc:78
#, c-format
msgid "search: You must provide at least one search term\n"
msgstr "opzoeking: U moet minstens één zoekterm opgeven\n"
-#: src/cmdline/cmdline_show_broken.cc:114
-#, c-format
-msgid ""
-"Some packages had unmet dependencies. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming.\n"
-"\n"
-msgstr ""
-"Enkele pakketten hebben niet-voldane afhankelijkheden. Dit kan betekenen dat "
-"u\n"
-"een onmogelijke situatie vroeg of, indien u de onstabiele distributie "
-"gebruikt\n"
-"dat enkele vereiste pakketten nog niet zijn aangemaakt\n"
-"of uit Incoming zijn verplaatst.\n"
-"\n"
-
-#: src/cmdline/cmdline_show_broken.cc:115
+#: src/cmdline/cmdline_show_broken.cc:113
#, c-format
msgid "The following packages have unmet dependencies:\n"
msgstr "De volgende pakketten hebben niet-voldane afhankelijkheden:\n"
@@ -960,12 +1099,12 @@
msgid "Description: "
msgstr "Beschrijving: "
-#: src/cmdline/cmdline_simulate.cc:36
+#: src/cmdline/cmdline_simulate.cc:37
#, c-format
msgid "Would download/install/remove packages.\n"
msgstr "Zou ophalen/installeren/verwijderen van pakketten.\n"
-#: src/cmdline/cmdline_simulate.cc:47
+#: src/cmdline/cmdline_simulate.cc:48
msgid "Internal Error, Ordering didn't finish"
msgstr "Interne Fout, Ordening is nog niet gedaan"
@@ -1007,28 +1146,24 @@
msgid "UNAVAILABLE"
msgstr "NIET AANWEZIG"
-#: src/download_bar.cc:57 src/download_list.cc:265
+#: src/download_bar.cc:56 src/download_list.cc:263 src/download_screen.cc:57
#, c-format
-msgid ""
-"Please insert the following disc into the drive \"%s\":\n"
-"%s"
-msgstr ""
-"Steek de volgende schijf in het station \"%s\":\n"
-"%s"
+msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
+msgstr "Steek de schijf gelabeled \"%s\" in het station \"%s\""
-#: src/download_bar.cc:76 src/generic/acqprogress.cc:63
+#: src/download_bar.cc:77 src/generic/acqprogress.cc:63
msgid "Hit "
msgstr "Getroffen "
-#: src/download_bar.cc:89
+#: src/download_bar.cc:90
msgid "Downloading "
msgstr "Ophalen "
-#: src/download_bar.cc:102
+#: src/download_bar.cc:103
msgid "Got "
msgstr "Hebbes "
-#: src/download_bar.cc:156
+#: src/download_bar.cc:157
msgid "Downloading..."
msgstr "Ophalen..."
@@ -1036,7 +1171,7 @@
msgid "Couldn't read list of package sources"
msgstr "Kon lijst van pakketbronnen niet lezen"
-#: src/download.cc:104 src/download.cc:321
+#: src/download.cc:104 src/download.cc:322
msgid "Couldn't lock list directory..are you root?"
msgstr "Kon lijstmap niet vergrendelen, bent u root?"
@@ -1048,29 +1183,33 @@
msgid "View the progress of the package list update"
msgstr "Bekijk de voortgang van de bijwerking van de pakketlijst"
-#: src/download.cc:159
+#: src/download.cc:113
+msgid "List Update"
+msgstr ""
+
+#: src/download.cc:160
msgid "Couldn't clean out list directories"
msgstr "Kon lijstmappen niet opkuisen"
-#: src/download.cc:176 src/ui.cc:1068
+#: src/download.cc:177 src/ui.cc:1152
msgid "Deleting obsolete downloaded files"
msgstr "Verwijderen van verouderde, opgehaalde bestanden"
-#: src/download.cc:181
+#: src/download.cc:182
#, c-format
msgid "Deleting obsolete downloaded files\n"
msgstr "Verwijderen van verouderde, opgehaalde bestanden\n"
-#: src/download.cc:223
+#: src/download.cc:224
#, c-format
msgid "Unable to open %s to log actions"
msgstr "Onmogelijk om %s te openen om acties bij te houden"
-#: src/download.cc:229
+#: src/download.cc:230
msgid "log report"
msgstr "lograpport"
-#: src/download.cc:230
+#: src/download.cc:231
#, c-format
msgid ""
"IMPORTANT: this log only lists intended actions; actions which fail due to\n"
@@ -1082,77 +1221,77 @@
"dpkg-problemen zijn misschien niet afgerond.\n"
"\n"
-#: src/download.cc:231
+#: src/download.cc:232
#, c-format
msgid "Will install %li packages, and remove %li packages.\n"
msgstr "Zal %li pakketten installeren en %li pakketten verwijderen.\n"
-#: src/download.cc:233
+#: src/download.cc:234
#, c-format
msgid "%sB of disk space will be used\n"
msgstr "%sB schijfruimte zal worden gebruikt\n"
-#: src/download.cc:236
+#: src/download.cc:237
#, c-format
msgid "%sB bytes of disk space will be freed\n"
msgstr "%sB bytes schijfruimte zal worden vrijgemaakt\n"
-#: src/download.cc:244
+#: src/download.cc:245
#, c-format
msgid "[UPGRADE] %s %s -> %s\n"
msgstr "[OPWAARDEREN] %s %s -> %s\n"
-#: src/download.cc:248
+#: src/download.cc:249
#, c-format
msgid "[DOWNGRADE] %s %s -> %s\n"
msgstr "[DEGRADEREN] %s %s -> %s\n"
-#: src/download.cc:258
+#: src/download.cc:259
msgid "REMOVE"
msgstr "VERWIJDER"
-#: src/download.cc:264
+#: src/download.cc:265
msgid "INSTALL"
msgstr "INSTALLEER"
-#: src/download.cc:267
+#: src/download.cc:268
msgid "REINSTALL"
msgstr "HERINSTALLEER"
-#: src/download.cc:270
+#: src/download.cc:271
msgid "HOLD"
msgstr "BEHOUD"
-#: src/download.cc:273
+#: src/download.cc:274
msgid "BROKEN"
msgstr "BESCHADIGD"
-#: src/download.cc:276
+#: src/download.cc:277
msgid "REMOVE, NOT USED"
msgstr "VERWIJDER, NIET GEBRUIKT"
-#: src/download.cc:279
+#: src/download.cc:280
msgid "REMOVE, DEPENDENCIES"
msgstr "VERWIJDER, AFHANKELIJKHEDEN"
-#: src/download.cc:282
+#: src/download.cc:283
msgid "INSTALL, DEPENDENCIES"
msgstr "INSTALLEER, AFHANKELIJKHEDEN"
-#: src/download.cc:285
+#: src/download.cc:286
msgid "HOLD, DEPENDENCIES"
msgstr "BEHOUD, AFHANKELIJKHEDEN"
-#: src/download.cc:287
+#: src/download.cc:288
msgid "????????"
msgstr "????????"
-#: src/download.cc:291
+#: src/download.cc:292
#, c-format
msgid "[%s] %s\n"
msgstr "[%s] %s\n"
-#: src/download.cc:294
+#: src/download.cc:295
#, c-format
msgid ""
"===============================================================================\n"
@@ -1163,34 +1302,39 @@
"\n"
"Logboek volledig.\n"
-#: src/download.cc:329
+#: src/download.cc:330
msgid "Downloading packages"
msgstr "Ophalen pakketten"
-#: src/download.cc:330
+#: src/download.cc:331
msgid "View the progress of the package download"
msgstr "Bekijk de voortgang van het afhalen van het pakket"
-#: src/download.cc:352
+#: src/download.cc:332
+#, fuzzy
+msgid "Package Download"
+msgstr "Pakket: "
+
+#: src/download.cc:354
msgid "Internal error: couldn't generate list of packages to download"
msgstr "Interne fout: kon lijst van op te halen pakketten niet genereren"
-#: src/download.cc:413
+#: src/download.cc:415
msgid "Unable to correct for unavailable packages"
msgstr "Onmogelijk om niet aanwezige pakketten te corrigeren"
-#: src/download.cc:465
+#: src/download.cc:467
msgid ""
"Ack! Something bad happened while installing packages. Trying to recover:"
msgstr ""
"Bevestigd! Er is iets ergs gebeurd bij het installeren van pakketten. "
"Erwordt geprobeerd van te herstellen:"
-#: src/download.cc:475 src/pkg_item.cc:413
+#: src/download.cc:477 src/pkg_item.cc:432
msgid "Press return to continue.\n"
msgstr "Druk op return om verder te gaan.\n"
-#: src/download.cc:506
+#: src/download.cc:508
msgid ""
"Could not regain the system lock! (Perhaps another apt or dpkg is running?)"
msgstr ""
@@ -1252,11 +1396,6 @@
msgid "[ERROR]"
msgstr "[FOUT]"
-#: src/download_screen.cc:57
-#, c-format
-msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
-msgstr "Steek de schijf gelabeled \"%s\" in het station \"%s\""
-
#: src/download_screen.cc:181
#, c-format
msgid "Downloaded %sB in %ss (%sB/s)."
@@ -1296,117 +1435,117 @@
"Wijziging van media: steek de schijf gelabeled '%s' in het station '%s' en "
"druk op enter\n"
-#: src/generic/aptcache.cc:245
+#: src/generic/aptcache.cc:253
msgid "Can't open Aptitude extended state file"
msgstr "Kan het uitgebreide statusbestand van Aptitude niet openen"
-#: src/generic/aptcache.cc:252 src/generic/aptcache.cc:305
-#: src/generic/aptcache.cc:307
+#: src/generic/aptcache.cc:260 src/generic/aptcache.cc:313
+#: src/generic/aptcache.cc:315
msgid "Reading extended state information"
msgstr "Uitgebreide statusinformatie aan het lezen"
-#: src/generic/aptcache.cc:313 src/generic/aptcache.cc:387
-#: src/generic/aptcache.cc:390
+#: src/generic/aptcache.cc:321 src/generic/aptcache.cc:395
+#: src/generic/aptcache.cc:398
msgid "Initializing package states"
msgstr "Initialiseren van pakketstatussen"
-#: src/generic/aptcache.cc:501
+#: src/generic/aptcache.cc:509
msgid "Cannot open Aptitude state file"
msgstr "Kan het statusbestand van Aptitude niet openen"
-#: src/generic/aptcache.cc:505 src/generic/aptcache.cc:560
-#: src/generic/aptcache.cc:563
+#: src/generic/aptcache.cc:513 src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:571
msgid "Writing extended state information"
msgstr "Schrijven van uitgebreide statusinformatie"
-#: src/generic/aptcache.cc:542
+#: src/generic/aptcache.cc:550
#, 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/aptcache.cc:551
+#: src/generic/aptcache.cc:559
msgid "Couldn't write state file"
msgstr "Kon statusbestand niet beschrijven"
-#: src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:576
msgid "Error writing state file"
msgstr "Fout bij schrijven naar statusbestand"
-#: src/generic/aptcache.cc:584
+#: src/generic/aptcache.cc:592
msgid "couldn't replace old state file"
msgstr "kon oud statusbestand niet vervangen"
-#: src/generic/aptcache.cc:960
+#: src/generic/aptcache.cc:1000
msgid "Unable to correct dependencies, some packages cannot be installed"
msgstr ""
"Onmogelijk om afhankelijkheden te corrigeren, enkele pakketten kunnen niet "
"geïnstalleerd worden"
-#: src/generic/aptcache.cc:1325
+#: src/generic/aptcache.cc:1546
msgid "The list of sources could not be read."
msgstr "De bronnenlijst kon niet gelezen worden."
-#: src/generic/aptcache.cc:1332
+#: src/generic/aptcache.cc:1553
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/aptcache.cc:1335
+#: src/generic/aptcache.cc:1556
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 "
"corrigeren."
-#: src/generic/apt.cc:141
+#: src/generic/apt.cc:142
#, c-format
msgid "Unable to open %s for writing"
msgstr "Onmogelijk om %s te openen voor schrijven"
-#: src/generic/apt.cc:151
+#: src/generic/apt.cc:152
#, c-format
msgid "Unable to replace %s with new configuration file"
msgstr "Onmogelijk om %s te vervangen met nieuw configuratiebestand"
-#: src/generic/apt.cc:226
+#: src/generic/apt.cc:227
msgid "Warning: could not lock the cache file. Opening in read-only mode"
msgstr ""
"Waarschuwing: kon het cachebestand niet vergrendelen. Openen in alleen-lezen-"
"mode"
-#: src/generic/matchers.cc:780
+#: src/generic/matchers.cc:797
msgid "Unmatched '('"
msgstr "Ongebalanceerd '('"
-#: src/generic/matchers.cc:870 src/generic/matchers.cc:949
+#: src/generic/matchers.cc:887 src/generic/matchers.cc:968
#, c-format
msgid "Unknown dependency type: %s"
msgstr "Onbekend afhankelijkheidstype: %s"
-#: src/generic/matchers.cc:931
+#: src/generic/matchers.cc:950
#, c-format
msgid "Unknown action type: %s"
msgstr "Onbekend actietype: %s"
-#: src/generic/matchers.cc:998
+#: src/generic/matchers.cc:1017
#, c-format
msgid "Unknown priority %s"
msgstr "Onbekende prioriteit %s"
-#: src/generic/matchers.cc:1020
+#: src/generic/matchers.cc:1039
#, c-format
msgid "Unknown pattern type: %c"
msgstr "Onbekend patroontype: %c"
-#: src/generic/matchers.cc:1065
+#: src/generic/matchers.cc:1084
msgid "Unexpected empty expression"
msgstr "Onverwachte lege expressie"
-#: src/generic/matchers.cc:1100
+#: src/generic/matchers.cc:1119
msgid "Badly formed expression"
msgstr "Slecht gevormde expressie"
-#: src/generic/matchers.cc:1129
+#: src/generic/matchers.cc:1148
msgid "Unexpected ')'"
msgstr "Onverwacht ')'"
@@ -1431,7 +1570,7 @@
msgid "Can't get value of $HOME, using TMPDIR (insecure)"
msgstr "Kan waarde van $HOME niet verkrijgen, gebruik TMPDIR(wat onveilig is)"
-#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:60
+#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:61
#, c-format
msgid "ChangeLog of %s"
msgstr "ChangeLog van %s"
@@ -1640,17 +1779,17 @@
msgid "Invalid sorting policy type '%s'"
msgstr "Ongeldig sorteerpolitiektype '%s'"
-#: src/main.cc:68
+#: src/main.cc:67
#, c-format
msgid "%s %s compiled at %s %s\n"
msgstr "%s %s gecompileerd in %s %s\n"
-#: src/main.cc:71
+#: src/main.cc:70
#, c-format
msgid "Compiler: g++ %s\n"
msgstr "Compiler: g++ %s\n"
-#: src/main.cc:74
+#: src/main.cc:73
#, c-format
msgid ""
"\n"
@@ -1659,7 +1798,7 @@
"\n"
"NCurses-versie: %s\n"
-#: src/main.cc:76
+#: src/main.cc:75
#, c-format
msgid ""
"\n"
@@ -1668,22 +1807,22 @@
"\n"
"Curses-versie: %s\n"
-#: src/main.cc:78
+#: src/main.cc:77
#, c-format
msgid "libsigc++ version: %s\n"
msgstr "libsigc++-versie: %s\n"
-#: src/main.cc:84
+#: src/main.cc:83
#, c-format
msgid "Usage: aptitude [-S fname] [-u|-i]"
msgstr "Gebruik: aptitude [-S fnaam] [-u|-i]"
-#: src/main.cc:86
+#: src/main.cc:85
#, c-format
msgid " aptitude [options] <action> ..."
msgstr " aptitude [opties] <actie> ..."
-#: src/main.cc:88
+#: src/main.cc:87
#, c-format
msgid ""
" Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -1693,42 +1832,42 @@
"modus starten):\n"
"\n"
-#: src/main.cc:89
+#: src/main.cc:88
#, c-format
msgid " install - Install/upgrade packages\n"
msgstr " install - Pakketten installeren/opwaarderen\n"
-#: src/main.cc:90
+#: src/main.cc:89
#, c-format
msgid " remove - Remove packages\n"
msgstr " remove - Pakketten verwijderen\n"
-#: src/main.cc:91
+#: src/main.cc:90
#, c-format
msgid " purge - Remove packages and their configuration files\n"
msgstr " purge - Pakketten en hun configuratiebestanden verwijderen\n"
-#: src/main.cc:92
+#: src/main.cc:91
#, c-format
msgid " hold - Place packages on hold\n"
msgstr " hold - Pakketten behouden\n"
-#: src/main.cc:93
+#: src/main.cc:92
#, c-format
msgid " unhold - Cancel a hold command for a package\n"
msgstr " unhold - Annuleer het behouden van een pakket\n"
-#: src/main.cc:94
+#: src/main.cc:93
#, c-format
msgid " markauto - Mark packages as having been automatically installed\n"
msgstr " markauto - Pakketten aanduiden als automatisch geïnstalleerd\n"
-#: src/main.cc:95
+#: src/main.cc:94
#, c-format
msgid " unmarkauto - Mark packages as having been manually installed\n"
msgstr " unmarkauto - Pakketten aanduiden als handmatig geïnstalleerd\n"
-#: src/main.cc:100
+#: src/main.cc:99
#, c-format
msgid ""
" forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -1737,17 +1876,17 @@
" verboden-versie - Verbied aptitude van op te waarderen naar een specifieke "
"pakketversie.\n"
-#: src/main.cc:101
+#: src/main.cc:100
#, c-format
msgid " update - Download lists of new/upgradable packages\n"
msgstr " update - Lijsten van nieuwe/opwaardeerbare pakketten ophalen\n"
-#: src/main.cc:102
+#: src/main.cc:101
#, c-format
msgid " upgrade - Perform a safe upgrade\n"
msgstr " upgrade - Een veilige opwaardering uitvoeren\n"
-#: src/main.cc:103
+#: src/main.cc:102
#, c-format
msgid ""
" dist-upgrade - Perform an upgrade, possibly installing and removing "
@@ -1756,69 +1895,69 @@
" dist-upgrade - Een opwaardering uitvoeren, waarbij mogelijk pakketten "
"worden geïnstalleerd of verwijderd\n"
-#: src/main.cc:104
+#: src/main.cc:103
#, c-format
msgid " forget-new - Forget what packages are \"new\"\n"
msgstr "forget-new - Vergeet welke pakketten \"nieuw\" zijn\n"
-#: src/main.cc:105
+#: src/main.cc:104
#, c-format
msgid " search - Search for a package by name and/or expression\n"
msgstr " search - Een pakket opzoeken op naam en/of op expressie\n"
-#: src/main.cc:106
+#: src/main.cc:105
#, c-format
msgid " show - Display detailed information about a package\n"
msgstr " show - Gedetailleerde informatie tonen van een pakket\n"
-#: src/main.cc:107
+#: src/main.cc:106
#, c-format
msgid " clean - Erase downloaded package files\n"
msgstr " clean - Opgehaalde pakketbestanden wissen\n"
-#: src/main.cc:108
+#: src/main.cc:107
#, c-format
msgid " autoclean - Erase old downloaded package files\n"
msgstr " autoclean - Oude opgehaalde pakketbestanden wissen\n"
-#: src/main.cc:109
+#: src/main.cc:108
#, c-format
msgid " changelog - View a package's changelog\n"
msgstr " changelog - Bekijk de changelog van een pakket\n"
-#: src/main.cc:110
+#: src/main.cc:109
#, c-format
msgid " download - Download the .deb file for a package\n"
msgstr " download - Het .deb-bestand van een pakket ophalen\n"
-#: src/main.cc:112
+#: src/main.cc:111
#, c-format
msgid " Options:\n"
msgstr " Opties:\n"
-#: src/main.cc:113
+#: src/main.cc:112
#, c-format
msgid " -h This help text\n"
msgstr " -h Deze helptekst\n"
-#: src/main.cc:114
+#: src/main.cc:113
#, c-format
msgid " -s Simulate actions, but do not actually perform them.\n"
msgstr " -s Acties simuleren, maar ze niet werkelijk uitvoeren.\n"
-#: src/main.cc:115
+#: src/main.cc:114
#, c-format
msgid ""
" -d Only download packages, do not install or remove anything.\n"
msgstr ""
" -d Enkel pakketten ophalen, niets installeren of verwijderen.\n"
-#: src/main.cc:116
+#: src/main.cc:115
#, c-format
msgid " -P Always prompt for confirmation or actions\n"
msgstr " -P Steeds naar bevestiging of actie vragen\n"
-#: src/main.cc:117
+#: src/main.cc:116
#, c-format
msgid ""
" -y Assume that the answer to simple yes/no questions is 'yes'\n"
@@ -1826,7 +1965,7 @@
" -y Veronderstel dat het antwoord op eenvoudige ja/nee-vragen "
"'ja' is\n"
-#: src/main.cc:118
+#: src/main.cc:117
#, c-format
msgid ""
" -F format Specify a format for displaying search results; see the "
@@ -1835,7 +1974,7 @@
" -F indeling Een indeling aangeven voor de zoekresultaten; zie "
"handleiding\n"
-#: src/main.cc:119
+#: src/main.cc:118
#, c-format
msgid ""
" -O order Specify how search results should be sorted; see the manual\n"
@@ -1843,26 +1982,26 @@
" -O ordening Geef aan hoe zoekresultaten moeten gesorteerd worden; zie "
"handleiding\n"
-#: src/main.cc:120
+#: src/main.cc:119
#, c-format
msgid ""
" -w width Specify the display width for formatting search results\n"
msgstr ""
" -w breedte Geeft de breedte aan voor weergave van zoekresultaten\n"
-#: src/main.cc:121
+#: src/main.cc:120
#, c-format
msgid " -f Aggressively try to fix broken packages.\n"
msgstr ""
" -f Probeert reparaties van gebroken pakketten te forceren\n"
-#: src/main.cc:122
+#: src/main.cc:121
#, c-format
msgid " -V Show which versions of packages are to be installed.\n"
msgstr ""
" -V Toont welke versies van pakketten geïnstalleerd zijn.\n"
-#: src/main.cc:123
+#: src/main.cc:122
#, c-format
msgid ""
" -D Show the dependencies of automatically changed packages.\n"
@@ -1870,12 +2009,12 @@
" -D Toont de afhankelijkheden van automatisch gewijzigde "
"pakketten\n"
-#: src/main.cc:124
+#: src/main.cc:123
#, c-format
msgid " -Z\t\t Show the change in installed size of each package.\n"
msgstr " -Z\t\t Toont de wijziging in installatiegrootte van elk pakket.\n"
-#: src/main.cc:125
+#: src/main.cc:124
#, c-format
msgid ""
" -v Display extra information. (may be supplied multiple times)\n"
@@ -1883,7 +2022,7 @@
" -v Toont extra informatie. (kan meerdere keren worden "
"meegegeven)\n"
-#: src/main.cc:126
+#: src/main.cc:125
#, c-format
msgid ""
" -t [release] Set the release from which packages should be installed\n"
@@ -1891,13 +2030,13 @@
" -t [release] Zet de release waarvan pakketten moeten geïnstalleerd "
"worden\n"
-#: src/main.cc:127
+#: src/main.cc:126
#, c-format
msgid " -o key=val Directly set the configuration option named 'key'\n"
msgstr ""
" -o sleutel=val Zet de configuratie-optie genaamd 'sleutel' rechtstreeks\n"
-#: src/main.cc:128
+#: src/main.cc:127
#, c-format
msgid ""
" --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -1906,59 +2045,67 @@
" --with(out)-recommends\tspecifieert of recommends al dan niet als sterke\n"
" afhankelijkheden worden behandeld\n"
-#: src/main.cc:129
+#: src/main.cc:128
#, c-format
msgid " -S fname: Read the aptitude extended status info from fname.\n"
msgstr " -S fnaam: Lees de uitgebreide statusinfo van aptitude over fnaam.\n"
-#: src/main.cc:130
+#: src/main.cc:129
#, c-format
msgid " -u : Download new package lists on startup.\n"
msgstr " -u : Haal nieuwe pakketlijsten op bij het opstarten.\n"
-#: src/main.cc:131
+#: src/main.cc:130
#, c-format
msgid " -i : Perform an install run on startup.\n"
msgstr " -i : Voer een installatieloop uit bij het opstarten.\n"
-#: src/main.cc:133
+#: src/main.cc:132
#, c-format
msgid " This aptitude does not have Super Cow Powers.\n"
msgstr " Deze aptitude heeft geen Super Koekrachten.\n"
-#: src/main.cc:254
+#: src/main.cc:253
#, c-format
msgid "-o requires an argument of the form key=value, got %s"
msgstr "-o vereist een argument van de vorm sleutel=waarde, heb %s"
-#: src/main.cc:300 src/main.cc:309
+#: src/main.cc:299 src/main.cc:308
msgid "WEIRDNESS: unknown option code received\n"
msgstr "BIZAR: onbekende optiecode meegekregen\n"
-#: src/main.cc:318
+#: src/main.cc:317
msgid "Only one of -u and -i may be specified\n"
msgstr "Er mag slects één van -u of -i meegegeven worden.\n"
-#: src/main.cc:326
+#: src/main.cc:325
msgid ""
"-u and -i may not be specified in command-line mode (eg, with 'install')"
msgstr ""
"-u en -i mogen niet meegegeven worden in commandolijnmodus (vb, met "
"'install')"
-#: src/main.cc:337
+#: src/main.cc:342
msgid "-u and -i may not be specified with a command"
msgstr "-u en -i mogen niet meegegeven worden met een commando"
-#: src/main.cc:392
+#: src/main.cc:399
#, c-format
msgid "Unknown command \"%s\"\n"
msgstr "Onbekend commando \"%s\"\n"
-#: src/main.cc:400
+#: src/main.cc:406 src/main.cc:463
+msgid "Internal error: uncaught 'out of solutions' exception.\n"
+msgstr ""
+
+#: src/main.cc:411 src/main.cc:468
+msgid "Internal error: uncaught 'out of time' exception.\n"
+msgstr ""
+
+#: src/main.cc:418
#, c-format
-msgid "Invalid option for interactive mode: -s\n"
-msgstr "Ongeldige optie voor interactieve modus: -s\n"
+msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
+msgstr ""
#: src/mine/cmine.cc:93
#, c-format
@@ -1986,7 +2133,7 @@
msgid "Lost"
msgstr "Verloren"
-#: src/mine/cmine.cc:119 src/ui.cc:1005
+#: src/mine/cmine.cc:119 src/ui.cc:1089
msgid "Minesweeper"
msgstr "Mijnenveger"
@@ -2164,7 +2311,7 @@
msgid "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
msgstr "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
-#: src/pkg_columnizer.cc:84 src/ui.cc:1488
+#: src/pkg_columnizer.cc:84 src/ui.cc:1638
msgid "Package"
msgstr "Pakket"
@@ -2424,13 +2571,14 @@
" Pakketten in de 'base'-sectie behoren tot het initiële installatiesysteem."
#: src/pkg_grouppolicy.cc:158
+#, fuzzy
msgid ""
"Programs for faxmodems and other communications devices\n"
" Packages in the 'comm' section are used to control modems and other "
"hardware communications devices. This includes software to control faxmodems "
"(for instance, PPP for dial-up internet connections and programs originally "
-"written for that purpose (zmodem/kermit), as well as software to control "
-"cellular phones, interface with FidoNet, and run a BBS."
+"written for that purpose, such as zmodem/kermit), as well as software to "
+"control cellular phones, interface with FidoNet, and run a BBS."
msgstr ""
"Programma's voor faxmodems en andere communicatietoestellen\n"
" Pakketten in de 'comm'-sectie worden gebruikt om modems en andere "
@@ -2884,14 +3032,15 @@
"deze sectie gevonden konden worden, zijn daarom nu in 'main'."
#: src/pkg_grouppolicy.cc:193
+#, fuzzy
msgid ""
"Programs which are not free software\n"
" Packages in the 'non-free' section are not part of Debian.\n"
" .\n"
" These packages fail to meet one or more of the requirements of the Debian "
-"Free Software Guidelines (see below) You should read the license of programs "
-"in this section to be sure that you are allowed to use them in the way you "
-"intend.\n"
+"Free Software Guidelines (see below). You should read the license of "
+"programs in this section to be sure that you are allowed to use them in the "
+"way you intend.\n"
" .\n"
" For more information about what Debian considers to be Free Software, see "
"http://www.debian.org/social_contract#guidelines"
@@ -2955,11 +3104,12 @@
" Er is een nieuwere versie van deze pakketten beschikbaar."
#: src/pkg_grouppolicy.cc:320
+#, fuzzy
msgid ""
"New Packages\n"
" These packages have been added to Debian since the last time you cleared "
-"the list of \"new\" packages. (choose \"Forget new packages\" from the "
-"Actions menu to empty this list)"
+"the list of \"new\" packages (choose \"Forget new packages\" from the "
+"Actions menu to empty this list)."
msgstr ""
"Nieuwe pakketten\n"
" Deze pakketen zijn toegevoegd aan Debian sinds de laatste keer dat u de "
@@ -3215,101 +3365,121 @@
msgid "Versions"
msgstr "Versies"
-#: src/pkg_item.cc:54
+#: src/pkg_item.cc:55
msgid "Yes, I am aware this is a very bad idea"
msgstr "Ja, ik weet dat dit een zeer slecht idee is"
#: src/pkg_item.cc:80
-#, c-format
+#, fuzzy, c-format
msgid ""
-"%s is an essential package!\n"
-"\n"
-"Are you sure you want to remove it?\n"
-"Type '%s' if you are."
+"%s is an essential package!%n%nAre you sure you want to remove it?%nType '%"
+"s' if you are."
msgstr ""
"%s is een essentieel pakket!\n"
"\n"
"Bent u zeker dat u het wil verwijderen?\n"
"Typ '%s' als u zeker bent."
-#: src/pkg_item.cc:219
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:625
#, c-format
msgid "Information about %s"
msgstr "Informatie over %s"
-#: src/pkg_item.cc:304
-msgid "Available versions of "
+#: src/pkg_item.cc:224 src/pkg_ver_item.cc:627
+#, c-format
+msgid "%s info"
+msgstr ""
+
+#: src/pkg_item.cc:310
+#, fuzzy, c-format
+msgid "Available versions of %s"
msgstr "Aanwezige versies van "
-#: src/pkg_item.cc:312 src/pkg_ver_item.cc:648
+#: src/pkg_item.cc:313
+#, fuzzy, c-format
+msgid "%s versions"
+msgstr "Versies"
+
+#: src/pkg_item.cc:325 src/pkg_ver_item.cc:655
#, c-format
msgid "Dependencies of %s"
msgstr "Afhankelijkheden van %s"
-#: src/pkg_item.cc:322 src/pkg_ver_item.cc:657
+#: src/pkg_item.cc:327 src/pkg_ver_item.cc:657
+#, c-format
+msgid "%s deps"
+msgstr ""
+
+#: src/pkg_item.cc:338 src/pkg_ver_item.cc:667
#, c-format
msgid "Packages depending on %s"
msgstr "Pakketten die afhangen van %s"
-#: src/pkg_item.cc:373 src/pkg_ver_item.cc:694
+#: src/pkg_item.cc:340 src/pkg_ver_item.cc:669
+#, c-format
+msgid "%s reverse deps"
+msgstr ""
+
+#: src/pkg_item.cc:392 src/pkg_ver_item.cc:707
#, c-format
msgid "Reporting a bug in %s:\n"
msgstr "Een fout raporteren in %s:\n"
-#: src/pkg_item.cc:395
+#: src/pkg_item.cc:414
+#, fuzzy
msgid ""
-"You are not root and I cannot find any way\n"
-"to become root. To reconfigure this package,\n"
-"install the menu package, the login package,\n"
-"or run aptitude as root."
+"You are not root and I cannot find any way to become root. To reconfigure "
+"this package, install the menu package, the login package, or run aptitude "
+"as root."
msgstr ""
"U bent geen root en er kan geen enkele manier gevonden worden\n"
"om root te worden. Om dit pakket te herconfigureren,\n"
"installeer het menu-pakket, het login-pakket,\n"
"of voer aptitude als root uit."
-#: src/pkg_item.cc:403
+#: src/pkg_item.cc:422
#, c-format
msgid "Reconfiguring %s\n"
msgstr "Herconfigureren van %s\n"
-#: src/pkg_item.cc:428
+#: src/pkg_item.cc:447
msgid "Hierarchy editor"
msgstr "Hiërarchie-editor"
+#: src/pkg_item.cc:447
+#, fuzzy
+msgid "Hierarchy Editor"
+msgstr "Hiërarchie-editor"
+
#: src/pkg_tree.cc:325
msgid "Search for: "
msgstr "Zoek naar: "
-#: src/pkg_tree.cc:585
+#: src/pkg_tree.cc:568
msgid "All Packages"
msgstr "Alle Pakketten"
-#: src/pkg_tree.cc:598 src/pkg_tree.cc:607
+#: src/pkg_tree.cc:581 src/pkg_tree.cc:590
msgid "Building view"
msgstr "Beeld opbouwen"
-#: src/pkg_tree.cc:649
+#: src/pkg_tree.cc:632
#, c-format
msgid "No packages matched the pattern \"%s\"."
msgstr "Er zijn geen pakketten die overeenkomen met het patroon \"%s\"."
-#: src/pkg_tree.cc:671
+#: src/pkg_tree.cc:654
msgid "Enter the new package tree limit: "
msgstr "Geef de nieuwe pakketboomlimiet: "
-#: src/pkg_tree.cc:705
+#: src/pkg_tree.cc:688
msgid "Enter the new package grouping mechanism for this display: "
msgstr "Geef het nieuwe pakketgroepeermechanisme voor deze weergave: "
-#: src/pkg_tree.cc:713
+#: src/pkg_tree.cc:696
msgid "Enter the new package sorting mechanism for this display: "
msgstr "Geef het nieuwe pakketsorteermechanisme voor deze weergave: "
-#: src/pkg_ver_item.cc:623
-msgid "Information about "
-msgstr "Informatie over "
-
#: src/pkg_view.cc:344
msgid "make_package_view: error in arguments -- two main widgets??"
msgstr "make_package_view: fout in argumenten -- twee hoofd-widgets??"
@@ -3324,7 +3494,7 @@
msgid "make_package_view: bad argument!"
msgstr "make_package_view: slect argument!"
-#: src/pkg_view.cc:492
+#: src/pkg_view.cc:495
msgid "make_package_view: no main widget found"
msgstr "make_package_view: geen hoofd-widget gevonden"
@@ -3544,6 +3714,74 @@
"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:74
+msgid "The package cache is not available."
+msgstr ""
+
+#: src/solution_dialog.cc:82
+#, fuzzy
+msgid "No packages are broken."
+msgstr "Enkele pakketten zijn beschadigd. Proberen om ze te repareren?"
+
+#: src/solution_dialog.cc:103
+msgid "No resolution found."
+msgstr ""
+
+#: src/solution_dialog.cc:107
+#, c-format
+msgid ""
+"Time exhausted while searching for a solution (you can select \"Next Solution"
+"\" or press %s to try harder)."
+msgstr ""
+
+#: src/solution_dialog.cc:146
+#, fuzzy
+msgid "Previous"
+msgstr "Voorziet"
+
+#: src/solution_dialog.cc:147
+#, fuzzy
+msgid "Next"
+msgstr "^Volgende"
+
+#: src/solution_dialog.cc:148
+msgid "Apply"
+msgstr ""
+
+#: src/solution_dialog.cc:149
+#, fuzzy
+msgid "Close"
+msgstr "^Sluiten"
+
+#: src/solution_fragment.cc:125
+#, fuzzy
+msgid "%BRemove%b the following packages:%n"
+msgstr "De volgende pakketten zijn BESCHADIGD:"
+
+#: src/solution_fragment.cc:135
+#, fuzzy
+msgid "%BInstall%b the following packages:%n"
+msgstr "De volgende pakketten zijn BESCHADIGD:"
+
+#: src/solution_fragment.cc:148
+msgid "%BKeep%b the following packages at their current version:%n"
+msgstr ""
+
+#: src/solution_fragment.cc:161
+#, fuzzy
+msgid "%BUpgrade%b the following packages:%n"
+msgstr "De volgende pakketten zijn BESCHADIGD:"
+
+#: src/solution_fragment.cc:176
+#, fuzzy
+msgid "%BDowngrade%b the following packages:%n"
+msgstr "Ophalen pakketten"
+
+#: src/solution_fragment.cc:190
+#, c-format
+msgid "Score is %d"
+msgstr ""
+
#: src/trust.cc:17 src/trust.cc:19
msgid "WARNING"
msgstr ""
@@ -3555,54 +3793,54 @@
"system."
msgstr ""
-#: src/ui.cc:143
+#: src/ui.cc:164
msgid "Er, there aren't any errors, this shouldn't have happened.."
msgstr "Euh, er zijn geen fouten, dit zou niet mogen gebeuren..."
-#: src/ui.cc:149
+#: src/ui.cc:170
msgid "E:"
msgstr ""
-#: src/ui.cc:151
+#: src/ui.cc:172
msgid "W:"
msgstr ""
-#: src/ui.cc:172
+#: src/ui.cc:193
msgid "Search for:"
msgstr "Zoek naar:"
-#: src/ui.cc:205
+#: src/ui.cc:261
msgid "You already are root!"
msgstr "U bent reeds root!"
-#: src/ui.cc:303
+#: src/ui.cc:359
msgid ""
"Subprocess exited with an error -- did you type your password correctly?"
msgstr ""
"Subproces is afgesloten met een fout -- heeft u uw wachtwoord correct "
"ingegeven?"
-#: src/ui.cc:331
+#: src/ui.cc:387
msgid "Loading cache"
msgstr "Laden van cache"
-#: src/ui.cc:353
+#: src/ui.cc:409
msgid "Really quit Aptitude?"
msgstr "Aptitude echt afsluiten?"
-#: src/ui.cc:432
+#: src/ui.cc:488
msgid "Really discard your personal settings and reload the defaults?"
msgstr "Echt uw persoonlijke instellingen negeren en de standaarden herladen?"
-#: src/ui.cc:532
+#: src/ui.cc:588 src/ui.cc:590 src/ui.cc:618 src/ui.cc:620
msgid "Packages"
msgstr "Pakketten"
-#: src/ui.cc:533 src/ui.cc:560
+#: src/ui.cc:589 src/ui.cc:619
msgid "View available packages and choose actions to perform"
msgstr "Bekijk beschikbare pakketten en kies uit te voeren acties"
-#: src/ui.cc:599
+#: src/ui.cc:666
#, fuzzy
msgid ""
"%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
@@ -3619,15 +3857,15 @@
"Help-menu. Dit is vrije software, en u bent vrij om het te verspreiden\n"
"onder zekere voorwaarden, zie 'licentie' voor details."
-#: src/ui.cc:620
+#: src/ui.cc:687
msgid "help.txt"
msgstr "help.txt"
-#: src/ui.cc:636
+#: src/ui.cc:703
msgid "README"
msgstr "README"
-#: src/ui.cc:718
+#: src/ui.cc:785
msgid ""
"%C%BWARNING%b: untrusted versions of the following packages will be "
"installed!%n%nUntrusted packages could %Bcompromise your system's security%"
@@ -3635,65 +3873,75 @@
"this is what you want to do.%n%n"
msgstr ""
-#: src/ui.cc:732
+#: src/ui.cc:799
#, fuzzy
msgid "Really Continue"
msgstr "Ga verder"
-#: src/ui.cc:734
+#: src/ui.cc:801
msgid "Abort Installation"
msgstr ""
-#: src/ui.cc:796
+#: src/ui.cc:862
msgid "Preview of package installation"
msgstr "Preview van de pakketinstallatie."
-#: src/ui.cc:797
+#: src/ui.cc:863
msgid "View and/or adjust the actions that will be performed"
msgstr "Bekijk en/of wijzig de acties die zullen worden uitgevoerd"
-#: src/ui.cc:837
-msgid "Some packages were broken and have been fixed"
+#: src/ui.cc:864
+#, fuzzy
+msgid "Preview"
+msgstr "V^orige"
+
+#: src/ui.cc:900
+#, fuzzy
+msgid "Some packages were broken and have been fixed:"
msgstr "Enkele pakketten zijn beschadigd en zijn gerepareerd"
-#: src/ui.cc:839
-msgid "Some broken packages could not be fixed!"
-msgstr "Enkele beschadigde pakketten konden niet gerepareerd worden!"
+#: src/ui.cc:906
+msgid "No solution to these dependency problems exists!"
+msgstr ""
-#: src/ui.cc:847 src/ui.cc:959
-msgid "Some packages are broken. Try to fix them?"
-msgstr "Enkele pakketten zijn beschadigd. Proberen om ze te repareren?"
+#: src/ui.cc:912
+#, c-format
+msgid ""
+"Ran out of time while trying to resolver dependencies (press \"%s\" to try "
+"harder)"
+msgstr ""
-#: src/ui.cc:860
+#: src/ui.cc:958
+#, fuzzy
msgid ""
-"Installing/removing packages requires administrative privileges, which\n"
-"you currently do not have. Would you like to change to the root account?\n"
+"Installing/removing packages requires administrative privileges, which you "
+"currently do not have. Would you like to change to the root account?"
msgstr ""
"Installeren/verwijderen van pakketten vereist administratieve privileges, "
"die\n"
"u momenteel niet heeft. Wenst u te wijzigen naar de root-account?\n"
-#: src/ui.cc:863 src/ui.cc:993
+#: src/ui.cc:961 src/ui.cc:1077
msgid "Become root"
msgstr "Word root"
-#: src/ui.cc:865 src/ui.cc:995
+#: src/ui.cc:963 src/ui.cc:1079
msgid "Don't become root"
msgstr "Word geen root"
-#: src/ui.cc:870 src/ui.cc:1000
+#: src/ui.cc:968 src/ui.cc:1084
msgid "A package-list update or install run is already taking place."
msgstr ""
"Een bijwerking van de pakketlijst of een installatieloop is reeds aan de "
"gang."
-#: src/ui.cc:897
+#: src/ui.cc:995
msgid "No packages are scheduled to be installed, removed, or upgraded."
msgstr ""
"Er zijn geen pakketten gepland voor installatie, opwaardering of "
"verwijdering."
-#: src/ui.cc:903
+#: src/ui.cc:1001
#, fuzzy
msgid ""
"No packages will be installed, removed or upgraded. Some packages could be "
@@ -3706,168 +3954,183 @@
"ze\n"
"op te waarderen. Typ \"U\" om een opwaardering voor te bereiden."
-#: src/ui.cc:990
+#: src/ui.cc:1073
+#, fuzzy
msgid ""
-"Updating the package lists requires administrative privileges, which\n"
-"you currently do not have. Would you like to change to the root account?\n"
+"Updating the package lists requires administrative privileges, which you "
+"currently do not have. Would you like to change to the root account?"
msgstr ""
"Bijwerken van pakketlijsten vereist administratieve privileges, die\n"
"u momenteel niet heeft. Wenst u te wijzigen naar de root-account?\n"
-#: src/ui.cc:1005 src/ui.cc:1198
+#: src/ui.cc:1089 src/ui.cc:1345
msgid "Waste time trying to find mines"
msgstr "Tijd verliezen bij het proberen vinden van mijnen"
-#: src/ui.cc:1012 src/ui.cc:1065
+#: src/ui.cc:1096 src/ui.cc:1149
msgid "Cleaning while a download is in progress is not allowed"
msgstr "Opkuisen terwijl een ophaling aan de gang is, is niet toegelaten."
-#: src/ui.cc:1015
+#: src/ui.cc:1099
msgid "Deleting downloaded files"
msgstr "Opgehaalde bestanden verwijderen"
-#: src/ui.cc:1029
+#: src/ui.cc:1113
msgid "Downloaded package files have been deleted"
msgstr "Opgehaalde pakketbestanden zijn verwijderd"
-#: src/ui.cc:1090
+#: src/ui.cc:1174
#, fuzzy, c-format
msgid ""
"Obsolete downloaded package files have been deleted, freeing %sB of disk "
"space."
msgstr "Verouderde opgehaalde pakketbestanden zijn verwijderd"
-#: src/ui.cc:1174
+#: src/ui.cc:1246
+msgid "All solutions exhausted."
+msgstr ""
+
+#: src/ui.cc:1251 src/ui.cc:1282
+#, fuzzy
+msgid "Ran out of time while trying to find a solution."
+msgstr "Tijd verliezen bij het proberen vinden van mijnen"
+
+#: src/ui.cc:1276
+msgid "Unable to find a solution to apply."
+msgstr ""
+
+#: src/ui.cc:1321
msgid "^Install/remove packages"
msgstr "^Installeer/verwijder pakketten"
-#: src/ui.cc:1175
+#: src/ui.cc:1322
msgid "Perform all pending installs and removals"
msgstr "Doe alle uitstaande installaties en verwijderingen"
-#: src/ui.cc:1177
+#: src/ui.cc:1324
msgid "^Update package list"
msgstr "^Werk pakketlijst bij"
-#: src/ui.cc:1178
+#: src/ui.cc:1325
msgid "Check for new versions of packages"
msgstr "Controleer op nieuwe versies van pakketten"
-#: src/ui.cc:1181
+#: src/ui.cc:1328
msgid "^Forget new packages"
msgstr "^Vergeet nieuwe pakketten"
-#: src/ui.cc:1182
+#: src/ui.cc:1329
msgid "Forget which packages are \"new\""
msgstr "Vergeet welke pakketten \"nieuw\" zijn"
-#: src/ui.cc:1185
+#: src/ui.cc:1332
msgid "^Clean package cache"
msgstr "Kuis de ^pakketcache"
-#: src/ui.cc:1186
+#: src/ui.cc:1333
msgid "Delete package files which were previously downloaded"
msgstr "Verwijder pakketbestanden die vroeger opgehaald zijn"
-#: src/ui.cc:1189
+#: src/ui.cc:1336
msgid "Clean ^obsolete files"
msgstr "^Kuis de veroudere bestanden uit"
-#: src/ui.cc:1190
+#: src/ui.cc:1337
msgid "Delete package files which can no longer be downloaded"
msgstr "Verwijder pakketbestanden die niet langer kunnen opgehaald worden"
-#: src/ui.cc:1193
+#: src/ui.cc:1340
msgid "Mark ^Upgradable"
msgstr "^Markeer opwaardeerbaar"
-#: src/ui.cc:1194
+#: src/ui.cc:1341
msgid "Mark all upgradable packages which are not held for upgrade"
msgstr ""
"Markeer alle opwaardeerbare pakketten die niet behouden zijn voor "
"opwaardering"
-#: src/ui.cc:1197
+#: src/ui.cc:1344
msgid "^Play Minesweeper"
msgstr "^Speel Mijnenveger"
-#: src/ui.cc:1200
+#: src/ui.cc:1347
msgid "^Become root"
msgstr "Word ^root"
-#: src/ui.cc:1201
+#: src/ui.cc:1348
+#, fuzzy
msgid ""
-"Run 'su' to become root; this will restart the program, but your\n"
-"settings will be preserved"
+"Run 'su' to become root; this will restart the program, but your settings "
+"will be preserved"
msgstr ""
"Voer 'su' uit om root te worden; dit zal het programma herstarten, maar uw\n"
"instellingen zullen bewaard blijven."
-#: src/ui.cc:1204
+#: src/ui.cc:1351
msgid "^Reload package cache"
msgstr "^Herlaad pakketcache"
-#: src/ui.cc:1205
+#: src/ui.cc:1352
msgid "Reload the package cache"
msgstr "Herlaad de pakketcache"
-#: src/ui.cc:1211
+#: src/ui.cc:1358
msgid "^Quit"
msgstr "^Afsluiten"
-#: src/ui.cc:1212
+#: src/ui.cc:1359
msgid "Exit the program"
msgstr "Sluit het programma af"
-#: src/ui.cc:1218 src/ui.cc:1487
+#: src/ui.cc:1365 src/ui.cc:1637
msgid "Undo"
msgstr "Ongedaan maken"
-#: src/ui.cc:1219
+#: src/ui.cc:1366
msgid "Undo the last package operation or group of operations"
msgstr "Maak de laatste pakketoperatie of groep van operaties ongedaan."
-#: src/ui.cc:1226
+#: src/ui.cc:1373
msgid "^Install"
msgstr "^Installeren"
-#: src/ui.cc:1227
+#: src/ui.cc:1374
msgid "Flag the currently selected package for installation or upgrade"
msgstr ""
"Duid het momenteel geselecteerde pakket aan voor installatie of opwaardering"
-#: src/ui.cc:1230
+#: src/ui.cc:1377
msgid "^Remove"
msgstr "^Verwijderen"
-#: src/ui.cc:1231
+#: src/ui.cc:1378
msgid "Flag the currently selected package for removal"
msgstr "Duid het momenteel geselecteerde pakket aan voor verwijdering"
-#: src/ui.cc:1234
+#: src/ui.cc:1381
msgid "^Purge"
msgstr "^Wissen (purge)"
-#: src/ui.cc:1235
+#: src/ui.cc:1382
msgid ""
"Flag the currently selected package and its configuration files for removal"
msgstr ""
"Duid het momenteel geselecteerde pakket en zijn configuratiebestanden aan "
"voor verwijdering"
-#: src/ui.cc:1238
+#: src/ui.cc:1385
msgid "^Keep"
msgstr "Be^houden"
-#: src/ui.cc:1239
+#: src/ui.cc:1386
msgid "Cancel any action on the selected package"
msgstr "Annuleer alle acties voor het geselecteerde pakket"
-#: src/ui.cc:1242
+#: src/ui.cc:1389
msgid "^Hold"
msgstr "^Bevriezen"
-#: src/ui.cc:1243
+#: src/ui.cc:1390
msgid ""
"Cancel any action on the selected package, and protect it from future "
"upgrades"
@@ -3875,37 +4138,40 @@
"Annuleer alle acties voor het geselecteerde pakket en bescherm het voor "
"toekomstige opwaarderingen"
-#: src/ui.cc:1246
+#: src/ui.cc:1393
msgid "Mark ^Auto"
msgstr "Markeer ^automatisch"
-#: src/ui.cc:1247
+#: src/ui.cc:1394
+#, fuzzy
msgid ""
-"Mark the selected package as having been automatically installed;\n"
-"it will automatically be removed if no other packages depend on it"
+"Mark the selected package as having been automatically installed; it will "
+"automatically be removed if no other packages depend on it"
msgstr ""
"Markeer het geselecteerde pakket als automatisch geïnstalleerd;\n"
"het zal automatisch worden verwijderd als er geen pakketten meer op steunen"
-#: src/ui.cc:1250
+#: src/ui.cc:1397
msgid "Mark ^Manual"
msgstr "^Markeer handmatig"
-#: src/ui.cc:1251
+#: src/ui.cc:1398
+#, fuzzy
msgid ""
-"Mark the selected package as having been manually installed;\n"
-"it will not be removed unless you manually remove it"
+"Mark the selected package as having been manually installed; it will not be "
+"removed unless you manually remove it"
msgstr ""
"Markeer het geselecteerde pakket als handmatig geïnstalleerd;\n"
"het zal niet worden verwijderd tenzij u het handmatig verwijdert"
-#: src/ui.cc:1254
+#: src/ui.cc:1401
msgid "^Forbid Version"
msgstr "V^erboden versie"
-#: src/ui.cc:1255
+#: src/ui.cc:1402
+#, fuzzy
msgid ""
-"Forbid the candidate version of the selected package from being installed;\n"
+"Forbid the candidate version of the selected package from being installed; "
"newer versions of the package will be installed as usual"
msgstr ""
"Verbied de installatie van de kandidaat versie van het geselecteerde "
@@ -3913,206 +4179,207 @@
"nieuwere versies van het pakket zullen zoals gebruikelijk worden "
"geïnstalleerd"
-#: src/ui.cc:1259
+#: src/ui.cc:1406
msgid "I^nformation"
msgstr "I^nformatie"
-#: src/ui.cc:1260
+#: src/ui.cc:1407
msgid "Display more information about the selected package"
msgstr "Toon meer informatie over het geselecteerde pakket"
-#: src/ui.cc:1263
+#: src/ui.cc:1410
msgid "^Changelog"
msgstr "^Changelog"
-#: src/ui.cc:1264
+#: src/ui.cc:1411
msgid "Display the Debian changelog of the selected package"
msgstr "Toon de Debian-changelog van het geselecteerde pakket"
-#: src/ui.cc:1271
+#: src/ui.cc:1418
msgid "^Find"
msgstr "^Zoek"
-#: src/ui.cc:1272
+#: src/ui.cc:1419
msgid "Search for a package"
msgstr "Zoek naar een pakket"
-#: src/ui.cc:1275
+#: src/ui.cc:1422
msgid "Find ^Again"
msgstr "Zoek ^Opnieuw"
-#: src/ui.cc:1276
+#: src/ui.cc:1423
msgid "Repeat the last search"
msgstr "Herhaal de laatste zoekopdracht"
-#: src/ui.cc:1280
+#: src/ui.cc:1427
msgid "^Limit Display"
msgstr "^Beperk Weergave"
-#: src/ui.cc:1281
+#: src/ui.cc:1428
msgid "Apply a filter to the package list"
msgstr "Pas een filter toe op de pakketlijst"
-#: src/ui.cc:1284
+#: src/ui.cc:1431
msgid "^Un-Limit Display"
msgstr "^Hef Beperking Weergave Op"
-#: src/ui.cc:1285
+#: src/ui.cc:1432
msgid "Remove the filter from the package list"
msgstr "Verwijder de filter van de pakketlijst"
-#: src/ui.cc:1289
+#: src/ui.cc:1436
msgid "Find ^Broken"
msgstr "Zo^ek Beschadigde"
-#: src/ui.cc:1290
+#: src/ui.cc:1437
msgid "Find the next package with unsatisfied dependencies"
msgstr "Zoek het volgende pakket met niet-voldane afhankelijkheden"
-#: src/ui.cc:1297
+#: src/ui.cc:1444
msgid "^UI options"
msgstr "^UI-opties"
-#: src/ui.cc:1298
+#: src/ui.cc:1445
msgid "Change the settings which affect the user interface"
msgstr "Wijzig de instellingen die de gebruikersinterface aangaan"
-#: src/ui.cc:1301
+#: src/ui.cc:1448
msgid "^Dependency handling"
msgstr "^Afhankelijkheidsafhandeling"
-#: src/ui.cc:1302
+#: src/ui.cc:1449
msgid "Change the settings which affect how package dependencies are handled"
msgstr ""
"Wijzig de instellingen die bepalen hoe pakketafhankelijkheden worden "
"behandeld"
-#: src/ui.cc:1305
+#: src/ui.cc:1452
msgid "^Miscellaneous"
msgstr "A^llerlei"
-#: src/ui.cc:1306
+#: src/ui.cc:1453
msgid "Change miscellaneous program settings"
msgstr "Wijzig allerlei programma-instellingen"
-#: src/ui.cc:1311
+#: src/ui.cc:1458
msgid "^Revert options"
msgstr "^Inverteer opties"
-#: src/ui.cc:1312
+#: src/ui.cc:1459
msgid "Reset all settings to the system defaults"
msgstr "Zet alle instellingen op de systeemstandaard"
-#: src/ui.cc:1323
+#: src/ui.cc:1470
msgid "^Next"
msgstr "^Volgende"
-#: src/ui.cc:1324
+#: src/ui.cc:1471
msgid "View next display"
msgstr "Bekijk volgende weergave"
-#: src/ui.cc:1327
+#: src/ui.cc:1474
msgid "^Prev"
msgstr "V^orige"
-#: src/ui.cc:1328
+#: src/ui.cc:1475
msgid "View previous display"
msgstr "Bekijk vorige weergave"
-#: src/ui.cc:1331
+#: src/ui.cc:1478
msgid "^Close"
msgstr "^Sluiten"
-#: src/ui.cc:1332
+#: src/ui.cc:1479
msgid "Close this display"
msgstr "Sluit deze weergave"
-#: src/ui.cc:1337
+#: src/ui.cc:1484
msgid "New Package ^View"
msgstr "Nieuwe ^Pakket-View"
-#: src/ui.cc:1338
+#: src/ui.cc:1485
msgid "Create a new default package view"
msgstr "Maak een nieuwe standaard pakketview"
-#: src/ui.cc:1341
+#: src/ui.cc:1488
msgid "New Categorical ^Browser"
msgstr "Nieuwe ^Categorische Bladeraar"
-#: src/ui.cc:1343
+#: src/ui.cc:1490
msgid "Browse packages by category"
msgstr "Doorblader pakketten per categorie"
-#: src/ui.cc:1351
+#: src/ui.cc:1498
msgid "^About"
msgstr "^Over"
-#: src/ui.cc:1352
+#: src/ui.cc:1499
msgid "View information about this program"
msgstr "Bekijk informatie over dit programma"
-#: src/ui.cc:1355
+#: src/ui.cc:1502
msgid "^Help"
msgstr "^Help"
-#: src/ui.cc:1356
+#: src/ui.cc:1503
msgid "View the on-line help"
msgstr "Bekijk de online help"
-#: src/ui.cc:1358
+#: src/ui.cc:1505
msgid "User's ^Manual"
msgstr "^Gebruikershandleiding"
-#: src/ui.cc:1359
+#: src/ui.cc:1506
msgid "View the detailed program manual"
msgstr "Bekijk de gedetailleerde programmahandleiding"
-#: src/ui.cc:1362
+#: src/ui.cc:1509
msgid "^FAQ"
msgstr "^FAQ"
-#: src/ui.cc:1363
+#: src/ui.cc:1510
msgid "View a list of frequently asked questions"
msgstr "Bekijk een lijst van veel gestelde vragen"
-#: src/ui.cc:1366
-msgid "^ChangeLog"
-msgstr "^ChangeLog"
+#: src/ui.cc:1513
+msgid "^NEWS"
+msgstr ""
-#: src/ui.cc:1367
-msgid "View the important changes made in each version of the program"
+#: src/ui.cc:1514
+#, fuzzy
+msgid "View the important changes made in each version of "
msgstr ""
"Bekijk de belangrijke gemaakte wijzigingen in elke versie van het programma"
-#: src/ui.cc:1370
+#: src/ui.cc:1517
msgid "^License"
msgstr "^Licentie"
-#: src/ui.cc:1371
+#: src/ui.cc:1518
msgid "View the terms under which you may copy the program"
msgstr "Bekijk de voorwaarden waaronder u het programma mag kopiëren"
-#: src/ui.cc:1486
+#: src/ui.cc:1636
msgid "Actions"
msgstr "Acties"
-#: src/ui.cc:1489
+#: src/ui.cc:1639
msgid "Search"
msgstr "Zoek"
-#: src/ui.cc:1490
+#: src/ui.cc:1640
msgid "Options"
msgstr "Opties"
-#: src/ui.cc:1491
+#: src/ui.cc:1641
msgid "Views"
msgstr "Views"
-#: src/ui.cc:1492
+#: src/ui.cc:1642
msgid "Help"
msgstr "Help"
-#: src/ui.cc:1537
+#: src/ui.cc:1699
#, c-format
msgid ""
"%s: Menu %s: Help %s: Quit %s: Update %s: Download/Install/Remove Pkgs"
@@ -4120,11 +4387,11 @@
"%s: Menu %s: Help %s: Afsluiten %s: Bijwerken %s: Ophalen/Inst./Verw. "
"Pakketten"
-#: src/ui.cc:1799 src/vscreen/vscreen.cc:281
+#: src/ui.cc:1968 src/vscreen/vscreen.cc:281
msgid "yes_key"
msgstr "ja-toets"
-#: src/ui.cc:1800 src/vscreen/vscreen.cc:282
+#: src/ui.cc:1969 src/vscreen/vscreen.cc:282
msgid "no_key"
msgstr "nee-toets"
@@ -4136,6 +4403,16 @@
msgid "Downloading Changelog"
msgstr "Changelog ophalen"
+#: src/view_changelog.cc:54
+#, fuzzy
+msgid "Download Changelog"
+msgstr "Changelog ophalen"
+
+#: src/view_changelog.cc:63
+#, c-format
+msgid "%s changes"
+msgstr ""
+
#: src/vscreen/vscreen.cc:119
#, c-format
msgid "Ouch! Got SIGTERM, dying..\n"
@@ -4164,6 +4441,40 @@
msgid "No"
msgstr "Nee"
+#~ msgid ""
+#~ "Some packages had unmet dependencies. This may mean that you have\n"
+#~ "requested an impossible situation or if you are using the unstable\n"
+#~ "distribution that some required packages have not yet been created\n"
+#~ "or been moved out of Incoming.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Enkele pakketten hebben niet-voldane afhankelijkheden. Dit kan betekenen "
+#~ "dat u\n"
+#~ "een onmogelijke situatie vroeg of, indien u de onstabiele distributie "
+#~ "gebruikt\n"
+#~ "dat enkele vereiste pakketten nog niet zijn aangemaakt\n"
+#~ "of uit Incoming zijn verplaatst.\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Please insert the following disc into the drive \"%s\":\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Steek de volgende schijf in het station \"%s\":\n"
+#~ "%s"
+
+#~ msgid "Invalid option for interactive mode: -s\n"
+#~ msgstr "Ongeldige optie voor interactieve modus: -s\n"
+
+#~ msgid "Information about "
+#~ msgstr "Informatie over "
+
+#~ msgid "Some broken packages could not be fixed!"
+#~ msgstr "Enkele beschadigde pakketten konden niet gerepareerd worden!"
+
+#~ msgid "^ChangeLog"
+#~ msgstr "^ChangeLog"
+
#~ msgid "Go away, I'm trying to think.\n"
#~ msgstr "Deixeu-me tranquil, estic intentant pensar.\n"
Modified: branches/aptitude-0.3/aptitude/po/nn.po
==============================================================================
--- branches/aptitude-0.3/aptitude/po/nn.po (original)
+++ branches/aptitude-0.3/aptitude/po/nn.po Sat Apr 30 13:41:32 2005
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: aptitude\n"
"Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-01-10 16:26-0800\n"
+"POT-Creation-Date: 2005-04-29 18:11-0400\n"
"PO-Revision-Date: 2004-09-04 18:55+0200\n"
"Last-Translator: HÃ¥vard Korsvoll <korsvoll at skulelinux.no>\n"
"Language-Team: Norwegian nynorsk <i18n-nn at lister.ping.uio.no>\n"
@@ -156,16 +156,103 @@
msgstr "Fjern ubrukte pakkar som passar med dette filteret automatisk"
#: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:184 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
-#: src/vscreen/vs_util.cc:329
+#: src/ui.cc:218 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
+#: src/vscreen/vs_util.cc:328
msgid "Ok"
msgstr "Ok"
#: src/apt_options.cc:242 src/download_list.cc:71 src/mine/cmine.cc:257
-#: src/mine/cmine.cc:330 src/vscreen/vs_util.cc:329
+#: src/mine/cmine.cc:330 src/vscreen/vs_util.cc:328
msgid "Cancel"
msgstr "Avbryt"
+#: src/broken_indicator.cc:106 src/solution_dialog.cc:97
+msgid "Internal error: unexpected null solution."
+msgstr ""
+
+#: src/broken_indicator.cc:158
+#, fuzzy
+msgid "Suggest "
+msgstr "Forslag"
+
+#: src/broken_indicator.cc:164
+#, fuzzy, c-format
+msgid "%d installs"
+msgstr "installer"
+
+#: src/broken_indicator.cc:169
+#, fuzzy
+msgid "1 install"
+msgstr "installer"
+
+#: src/broken_indicator.cc:173
+#, c-format
+msgid "%d removals"
+msgstr ""
+
+#: src/broken_indicator.cc:178
+msgid "1 removal"
+msgstr ""
+
+#: src/broken_indicator.cc:182
+#, c-format
+msgid "%d keeps"
+msgstr ""
+
+#: src/broken_indicator.cc:187
+msgid "1 keep"
+msgstr ""
+
+#: src/broken_indicator.cc:191
+#, fuzzy, c-format
+msgid "%d upgrades"
+msgstr "oppgrader"
+
+#: src/broken_indicator.cc:196
+#, fuzzy
+msgid "1 upgrade"
+msgstr "oppgrader"
+
+#: src/broken_indicator.cc:200
+#, fuzzy, c-format
+msgid "%d downgrades"
+msgstr "nedgradert"
+
+#: src/broken_indicator.cc:205
+#, fuzzy
+msgid "1 downgrade"
+msgstr "nedgradert"
+
+#: src/broken_indicator.cc:214
+#, c-format
+msgid "%s: Examine"
+msgstr ""
+
+#: src/broken_indicator.cc:216
+#, c-format
+msgid "%s: Apply"
+msgstr ""
+
+#: src/broken_indicator.cc:218
+#, fuzzy, c-format
+msgid "%s: Next"
+msgstr "^Neste"
+
+#: src/broken_indicator.cc:220
+#, c-format
+msgid "%s: Previous"
+msgstr ""
+
+#: src/broken_indicator.cc:233
+#, c-format
+msgid "%CSolution search failed. %s: try harder"
+msgstr ""
+
+#: src/broken_indicator.cc:239
+#, c-format
+msgid "%CUnable to resolve dependencies."
+msgstr ""
+
#: src/cmdline/cmdline_action.cc:36
#, c-format
msgid ""
@@ -237,22 +324,22 @@
msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
msgstr "Pakke %s kan ikkje oppgraderast, kan ikkje forby oppgradering\n"
-#: src/cmdline/cmdline_action.cc:213
+#: src/cmdline/cmdline_action.cc:198
#, c-format
msgid "Note: selecting the task \"%s: %s\" for installation\n"
msgstr "Merk: vel oppgåva «%s: %s» for installasjon\n"
-#: src/cmdline/cmdline_action.cc:240
+#: src/cmdline/cmdline_action.cc:225
#, c-format
msgid "You can only specify a package version with an 'install' command.\n"
msgstr "Du kan berre oppgje ein pakkeversjon med «install»-kommandoen\n"
-#: src/cmdline/cmdline_action.cc:246
+#: src/cmdline/cmdline_action.cc:231
#, c-format
msgid "You can only specify a package archive with an 'install' command.\n"
msgstr "Du kan berre oppgje eit arkiv med «install»-kommandoen\n"
-#: src/cmdline/cmdline_action.cc:280
+#: src/cmdline/cmdline_action.cc:265
#, c-format
msgid ""
"Couldn't find package \"%s\", and more than 40\n"
@@ -261,7 +348,7 @@
"Klarte ikkje finna pakken «%s», og meir enn 40\n"
"pakkar har «%s» i namnet sitt.\n"
-#: src/cmdline/cmdline_action.cc:283
+#: src/cmdline/cmdline_action.cc:268
#, c-format
msgid ""
"Couldn't find package \"%s\". However, the following\n"
@@ -270,14 +357,14 @@
"Klarte ikkje finna pakken «%s». Men desse pakkane\n"
"har «%s» i namnet sitt:\n"
-#: src/cmdline/cmdline_action.cc:307
+#: src/cmdline/cmdline_action.cc:292
#, c-format
msgid "Couldn't find any package whose name or description matched \"%s\"\n"
msgstr ""
"Klarte ikkje finna nokon pakke som har eit namn eller ei skildring\n"
"som passar med «%s»\n"
-#: src/cmdline/cmdline_action.cc:309
+#: src/cmdline/cmdline_action.cc:294
#, c-format
msgid ""
"Couldn't find any package matching \"%s\", and more than 40\n"
@@ -286,7 +373,7 @@
"Klarte ikkje finna nokon pakke som passar med «%s», og meir enn 40\n"
"pakkar har «%s» i skildringa si.\n"
-#: src/cmdline/cmdline_action.cc:312
+#: src/cmdline/cmdline_action.cc:297
#, c-format
msgid ""
"Couldn't find any package matching \"%s\". However, the following\n"
@@ -330,13 +417,13 @@
msgid "Freed %sB of disk space\n"
msgstr "Vil frigjeva %sB med diskplass"
-#: src/cmdline/cmdline_do_action.cc:67
+#: src/cmdline/cmdline_do_action.cc:71
#, c-format
msgid "Invalid operation %s"
msgstr "Ugyldig operasjon %s"
-#: src/cmdline/cmdline_do_action.cc:206 src/cmdline/cmdline_simulate.cc:30
-#: src/cmdline/cmdline_upgrade.cc:89
+#: src/cmdline/cmdline_do_action.cc:201 src/cmdline/cmdline_simulate.cc:31
+#: src/cmdline/cmdline_upgrade.cc:91
#, c-format
msgid "Abort.\n"
msgstr "Avbryt.\n"
@@ -346,7 +433,7 @@
msgid "download: you must specify at least one package to download\n"
msgstr "nedlasting: du må oppgje minste ein pakke for å lasta ned\n"
-#: src/cmdline/cmdline_download.cc:43 src/download.cc:342
+#: src/cmdline/cmdline_download.cc:43 src/download.cc:344
msgid "Couldn't read source list"
msgstr "Klarte ikkje lesa kjeldelista"
@@ -413,95 +500,95 @@
msgstr ""
"Kva det er? Det er ein elefant som vert eten av ein slange sjølvsagt.\n"
-#: src/cmdline/cmdline_prompt.cc:44
+#: src/cmdline/cmdline_prompt.cc:45
msgid "Couldn't read list of sources"
msgstr "Klarte ikkje lesa kjeldelista"
-#: src/cmdline/cmdline_prompt.cc:219 src/cmdline/cmdline_show_broken.cc:73
+#: src/cmdline/cmdline_prompt.cc:220 src/cmdline/cmdline_show_broken.cc:73
#, c-format
msgid "but %s is to be installed."
msgstr "men %s blir installert."
-#: src/cmdline/cmdline_prompt.cc:222 src/cmdline/cmdline_show_broken.cc:76
+#: src/cmdline/cmdline_prompt.cc:223 src/cmdline/cmdline_show_broken.cc:76
#, c-format
msgid "but %s is installed and it is kept back."
msgstr "men %s er installert og vert halden tilbake."
-#: src/cmdline/cmdline_prompt.cc:225 src/cmdline/cmdline_show_broken.cc:79
+#: src/cmdline/cmdline_prompt.cc:226 src/cmdline/cmdline_show_broken.cc:79
#, c-format
msgid "but %s is installed."
msgstr "men %s er installert."
-#: src/cmdline/cmdline_prompt.cc:229 src/cmdline/cmdline_show_broken.cc:83
+#: src/cmdline/cmdline_prompt.cc:230 src/cmdline/cmdline_show_broken.cc:83
#, c-format
msgid "but it is not installable"
msgstr "men lèt seg ikkje installera"
-#: src/cmdline/cmdline_prompt.cc:233 src/cmdline/cmdline_show_broken.cc:87
+#: src/cmdline/cmdline_prompt.cc:234 src/cmdline/cmdline_show_broken.cc:87
#, c-format
msgid " which is a virtual package."
msgstr " som er ein virtuell pakke."
-#: src/cmdline/cmdline_prompt.cc:236 src/cmdline/cmdline_show_broken.cc:90
+#: src/cmdline/cmdline_prompt.cc:237 src/cmdline/cmdline_show_broken.cc:90
#, c-format
msgid " or"
msgstr " eller"
-#: src/cmdline/cmdline_prompt.cc:248
+#: src/cmdline/cmdline_prompt.cc:249
msgid "The following packages are BROKEN:"
msgstr "Desse pakkane er ØYDELAGDE:"
-#: src/cmdline/cmdline_prompt.cc:249
+#: src/cmdline/cmdline_prompt.cc:250
msgid "The following packages are unused and will be REMOVED:"
msgstr "Desse pakkane er ikkje i bruk og vil bli FJERNA:"
-#: src/cmdline/cmdline_prompt.cc:250
+#: src/cmdline/cmdline_prompt.cc:251
msgid "The following packages have been automatically kept back:"
msgstr "Desse pakkana er haldt tilbake automatisk."
-#: src/cmdline/cmdline_prompt.cc:251
+#: src/cmdline/cmdline_prompt.cc:252
msgid "The following NEW packages will be automatically installed:"
msgstr "Desse NYE pakkane vil bli installert automatisk:"
-#: src/cmdline/cmdline_prompt.cc:252
+#: src/cmdline/cmdline_prompt.cc:253
msgid "The following packages will be automatically REMOVED:"
msgstr "Desse pakkane vil bli fjerna automatisk:"
-#: src/cmdline/cmdline_prompt.cc:253
+#: src/cmdline/cmdline_prompt.cc:254
msgid "The following packages will be DOWNGRADED:"
msgstr "Desse pakkane vil bli NEDGRADERT:"
-#: src/cmdline/cmdline_prompt.cc:254
+#: src/cmdline/cmdline_prompt.cc:255
msgid "The following packages have been kept back:"
msgstr "Desse pakkane blir haldt tilbake:"
-#: src/cmdline/cmdline_prompt.cc:255
+#: src/cmdline/cmdline_prompt.cc:256
msgid "The following packages will be REINSTALLED:"
msgstr "Desse pakkane vil bli INSTALLERT PÃ… NY:"
-#: src/cmdline/cmdline_prompt.cc:256
+#: src/cmdline/cmdline_prompt.cc:257
msgid "The following NEW packages will be installed:"
msgstr "Desse NYE pakkane vil bli installert:"
-#: src/cmdline/cmdline_prompt.cc:257
+#: src/cmdline/cmdline_prompt.cc:258
msgid "The following packages will be REMOVED:"
msgstr "Desse pakkane vil bli FJERNA:"
-#: src/cmdline/cmdline_prompt.cc:258
+#: src/cmdline/cmdline_prompt.cc:259
msgid "The following packages will be upgraded:"
msgstr "Desse pakkane vil bli oppgradert:"
-#: src/cmdline/cmdline_prompt.cc:307
+#: src/cmdline/cmdline_prompt.cc:311
#, c-format
msgid "The following ESSENTIAL packages will be REMOVED!\n"
msgstr "Desse VIKTIGE pakkane vil bli FJERNA!\n"
-#: src/cmdline/cmdline_prompt.cc:316
+#: src/cmdline/cmdline_prompt.cc:320
#, c-format
msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
msgstr "Desse VIKTIGE pakkane vil bli ØYDELAGT med denne handlinga:\n"
-#: src/cmdline/cmdline_prompt.cc:326
+#: src/cmdline/cmdline_prompt.cc:330
#, c-format
msgid ""
"WARNING: Performing this action will probably cause your system to break!\n"
@@ -511,96 +598,99 @@
"øydelagt!\n"
" IKKJE hald fram dersom du ikkje veit NØYAKTIG kva du gjer!\n"
-#: src/cmdline/cmdline_prompt.cc:328
+#: src/cmdline/cmdline_prompt.cc:332
msgid "I am aware that this is a very bad idea"
msgstr "Eg er klar over at dette er ein svært dårleg ide"
-#: src/cmdline/cmdline_prompt.cc:331
+#: src/cmdline/cmdline_prompt.cc:335
#, c-format
msgid "To continue, type the phrase \"%s\":\n"
msgstr "For å halda fram, skriv inn teksten «%s»:\n"
-#: src/cmdline/cmdline_prompt.cc:434
+#: src/cmdline/cmdline_prompt.cc:438
#, c-format
msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
msgstr "Desse pakkane er FØRESLÅTT men vil IKKJE bli installert:\n"
-#: src/cmdline/cmdline_prompt.cc:440
+#: src/cmdline/cmdline_prompt.cc:444
#, c-format
msgid "The following packages are SUGGESTED but will NOT be installed:\n"
msgstr "Desse pakkane er FØRESLÅTT men blir IKKJE installert:\n"
-#: src/cmdline/cmdline_prompt.cc:445
+#: src/cmdline/cmdline_prompt.cc:449
#, c-format
msgid "No packages will be installed, upgraded, or removed.\n"
msgstr "Ingen pakkar vil bli installert, oppgradert eller fjerna.\n"
-#: src/cmdline/cmdline_prompt.cc:447
+#: src/cmdline/cmdline_prompt.cc:451
#, c-format
msgid "%lu packages upgraded, %lu newly installed, "
msgstr "%lu pakkar oppgradert, %lu nyleg installert, "
-#: src/cmdline/cmdline_prompt.cc:451
+#: src/cmdline/cmdline_prompt.cc:455
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu installert på ny, "
-#: src/cmdline/cmdline_prompt.cc:453
+#: src/cmdline/cmdline_prompt.cc:457
#, c-format
msgid "%lu downgraded, "
msgstr "%lu nedgraderte, "
-#: src/cmdline/cmdline_prompt.cc:455
+#: src/cmdline/cmdline_prompt.cc:459
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu skal fjernast og %lu skal ikkje oppgraderast.\n"
-#: src/cmdline/cmdline_prompt.cc:462
+#: src/cmdline/cmdline_prompt.cc:466
#, c-format
msgid "Need to get %sB/%sB of archives. "
msgstr "Treng å henta %sB/%sB med installasjonspakkar. "
-#: src/cmdline/cmdline_prompt.cc:465
+#: src/cmdline/cmdline_prompt.cc:469
#, c-format
msgid "Need to get %sB of archives. "
msgstr "Treng å henta %sB med installasjonspakkar. "
-#: src/cmdline/cmdline_prompt.cc:472
+#: src/cmdline/cmdline_prompt.cc:476
#, c-format
msgid "After unpacking %sB will be used.\n"
msgstr "Etter utpakking vil %sB vli brukt.\n"
-#: src/cmdline/cmdline_prompt.cc:475
+#: src/cmdline/cmdline_prompt.cc:479
#, c-format
msgid "After unpacking %sB will be freed.\n"
msgstr "Etter utpakking vil %sB bli frigjort.\n"
-#: src/cmdline/cmdline_prompt.cc:521
+#: src/cmdline/cmdline_prompt.cc:524
#, c-format
msgid "Bad action character '%c'\n"
msgstr "Feil handlingsteikn «%c»\n"
-#: src/cmdline/cmdline_prompt.cc:596
+#: src/cmdline/cmdline_prompt.cc:595
#, c-format
msgid "No packages to show -- enter the package names on the line after 'i'.\n"
msgstr "Ingen pakkar å vise -- oppgje pakkenamna på linja etter «i».\n"
-#: src/cmdline/cmdline_prompt.cc:598 src/cmdline/cmdline_prompt.cc:629
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:597
msgid "Press Return to continue."
msgstr "Trykk Enter for å halda fram."
-#: src/cmdline/cmdline_prompt.cc:625
+#: src/cmdline/cmdline_prompt.cc:623
#, c-format
msgid "No packages found -- enter the package names on the line after 'c'.\n"
msgstr "Fann ingen pakkar -- oppgje pakkenamna på linja etter «c».\n"
-#: src/cmdline/cmdline_prompt.cc:665
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:627
+#, fuzzy
+msgid "Press Return to continue"
+msgstr "Trykk Enter for å halda fram."
+
+#: src/cmdline/cmdline_prompt.cc:675
msgid "Do you want to continue? [Y/n/?] "
msgstr "Vil du halda fram? [J/n/?] "
-#: src/cmdline/cmdline_prompt.cc:690
+#: src/cmdline/cmdline_prompt.cc:700
#, c-format
msgid ""
"\n"
@@ -611,7 +701,7 @@
"Informasjon om pakkekrav vil bli vist.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:692
+#: src/cmdline/cmdline_prompt.cc:702
#, c-format
msgid ""
"\n"
@@ -622,7 +712,7 @@
"Informasjon om pakkekrav vil ikkje bli vist.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:698
+#: src/cmdline/cmdline_prompt.cc:708
#, c-format
msgid ""
"\n"
@@ -633,7 +723,7 @@
"Versjonar vil bli vist.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:700
+#: src/cmdline/cmdline_prompt.cc:710
#, c-format
msgid ""
"\n"
@@ -644,7 +734,7 @@
"Versjonar vil ikkje bli vist.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:705
+#: src/cmdline/cmdline_prompt.cc:715
#, c-format
msgid ""
"\n"
@@ -655,7 +745,7 @@
"Storleiksendringar vil bli vist.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:717
#, c-format
msgid ""
"\n"
@@ -666,7 +756,7 @@
"Storleiksendringar vil ikkje bli vist.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:737
#, c-format
msgid ""
"Commands:\n"
@@ -716,33 +806,83 @@
" _ : Reinsk\n"
" = : Hald\n"
-#: src/cmdline/cmdline_prompt.cc:751
+#: src/cmdline/cmdline_prompt.cc:761
#, c-format
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:84
+#, c-format
+msgid "y: %F%nn: %F%nq: %F%n,: %F%n.: %F%n"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:90
+msgid "accept the proposed changes"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:92
+msgid "reject the proposed changes and search for another solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:94
+#, fuzzy
+msgid "give up and quit the program"
+msgstr "Avsluttar programmet"
+
+#: src/cmdline/cmdline_resolver.cc:96
+msgid "move to the next solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:98
+msgid "move to the previous solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:131
+#, fuzzy
+msgid "The following actions will resolve these dependencies:"
+msgstr "Desse pakkane hadde utilfredsstilte pakkekrav:\n"
+
+#: src/cmdline/cmdline_resolver.cc:146
+msgid "Accept this solution? [Y/n/q/?]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:174
+msgid "Abandoning all efforts to resolve these dependencies."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:184
+#, fuzzy
+msgid "The following commands are available:"
+msgstr "Desse pakkane er ØYDELAGDE:"
+
+#: src/cmdline/cmdline_resolver.cc:188
+#, fuzzy
+msgid "Invalid response; please enter one of the following commands:"
+msgstr "Ugyldig respons. Skriv inn ein gyldig kommando eller «?» for hjelp.\n"
+
+#: src/cmdline/cmdline_resolver.cc:198
+msgid "No solution found within the allotted time. Try harder? [Y/n]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:226
+#, fuzzy
+msgid "Invalid response; please enter 'y' or 'n'."
+msgstr "Ugyldig respons. Skriv inn ein gyldig kommando eller «?» for hjelp.\n"
+
+#: src/cmdline/cmdline_resolver.cc:235
+msgid "Unable to resolve dependencies! Giving up..."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:240
+msgid "No more solutions."
+msgstr ""
+
#: src/cmdline/cmdline_search.cc:78
#, c-format
msgid "search: You must provide at least one search term\n"
msgstr "søk: Du må oppgje iallefall eitt søkje ord\n"
-#: src/cmdline/cmdline_show_broken.cc:114
-#, c-format
-msgid ""
-"Some packages had unmet dependencies. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming.\n"
-"\n"
-msgstr ""
-"Somme pakkar hadde utilfredsstilte pakkekrav. Dette kan bety at du har bede\n"
-"om ein umogeleg situasjon eller du brukar den ustabile utgåva og det er\n"
-"nokre av pakkane som er kravde som ikkje er laga enno eller er flytta ut "
-"frå \n"
-"incoming.\n"
-"\n"
-
-#: src/cmdline/cmdline_show_broken.cc:115
+#: src/cmdline/cmdline_show_broken.cc:113
#, c-format
msgid "The following packages have unmet dependencies:\n"
msgstr "Desse pakkane hadde utilfredsstilte pakkekrav:\n"
@@ -940,12 +1080,12 @@
msgid "Description: "
msgstr "Skildring: "
-#: src/cmdline/cmdline_simulate.cc:36
+#: src/cmdline/cmdline_simulate.cc:37
#, c-format
msgid "Would download/install/remove packages.\n"
msgstr "Vil lasta ned, installera og/eller fjerna pakkar.\n"
-#: src/cmdline/cmdline_simulate.cc:47
+#: src/cmdline/cmdline_simulate.cc:48
msgid "Internal Error, Ordering didn't finish"
msgstr "Intern feil, tinging blei ikkje ferdig"
@@ -987,28 +1127,24 @@
msgid "UNAVAILABLE"
msgstr "IKKJE TILGJENGELEG"
-#: src/download_bar.cc:57 src/download_list.cc:265
+#: src/download_bar.cc:56 src/download_list.cc:263 src/download_screen.cc:57
#, c-format
-msgid ""
-"Please insert the following disc into the drive \"%s\":\n"
-"%s"
-msgstr ""
-"Set inn denne disken i CD-drevet «%s»:\n"
-"%s"
+msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
+msgstr "Set inn disken merka med «%s» i stasjonen «%s»"
-#: src/download_bar.cc:76 src/generic/acqprogress.cc:63
+#: src/download_bar.cc:77 src/generic/acqprogress.cc:63
msgid "Hit "
msgstr "Treff "
-#: src/download_bar.cc:89
+#: src/download_bar.cc:90
msgid "Downloading "
msgstr "Lastar ned "
-#: src/download_bar.cc:102
+#: src/download_bar.cc:103
msgid "Got "
msgstr "Fekk "
-#: src/download_bar.cc:156
+#: src/download_bar.cc:157
msgid "Downloading..."
msgstr "Lastar ned ..."
@@ -1016,7 +1152,7 @@
msgid "Couldn't read list of package sources"
msgstr "Klarte ikkje lesa lista over pakkekjelder"
-#: src/download.cc:104 src/download.cc:321
+#: src/download.cc:104 src/download.cc:322
msgid "Couldn't lock list directory..are you root?"
msgstr "Klarte ikkje låsa listekatalogen.. er du root?"
@@ -1028,29 +1164,33 @@
msgid "View the progress of the package list update"
msgstr "Vis framgangen for oppdateringa av pakkelista"
-#: src/download.cc:159
+#: src/download.cc:113
+msgid "List Update"
+msgstr ""
+
+#: src/download.cc:160
msgid "Couldn't clean out list directories"
msgstr "Klarte ikkje reinska ut listekatalogane"
-#: src/download.cc:176 src/ui.cc:1068
+#: src/download.cc:177 src/ui.cc:1152
msgid "Deleting obsolete downloaded files"
msgstr "Slettar nedlasta filer som er forelda"
-#: src/download.cc:181
+#: src/download.cc:182
#, c-format
msgid "Deleting obsolete downloaded files\n"
msgstr "Slettar nedlasta filer som er forelda\n"
-#: src/download.cc:223
+#: src/download.cc:224
#, c-format
msgid "Unable to open %s to log actions"
msgstr "Ikkje i stand til å opna %s for å logga handlingar"
-#: src/download.cc:229
+#: src/download.cc:230
msgid "log report"
msgstr "loggrapport"
-#: src/download.cc:230
+#: src/download.cc:231
#, c-format
msgid ""
"IMPORTANT: this log only lists intended actions; actions which fail due to\n"
@@ -1062,77 +1202,77 @@
"på grunn av dpkg-problem kan vera ufullstendige.\n"
"\n"
-#: src/download.cc:231
+#: src/download.cc:232
#, c-format
msgid "Will install %li packages, and remove %li packages.\n"
msgstr "Vil installera %li pakkar, og fjerna %li pakkar.\n"
-#: src/download.cc:233
+#: src/download.cc:234
#, c-format
msgid "%sB of disk space will be used\n"
msgstr "%sB med diskplass vil bli brukt\n"
-#: src/download.cc:236
+#: src/download.cc:237
#, c-format
msgid "%sB bytes of disk space will be freed\n"
msgstr "%sB med diskplass vil bli frigjort\n"
-#: src/download.cc:244
+#: src/download.cc:245
#, c-format
msgid "[UPGRADE] %s %s -> %s\n"
msgstr "[UPGRADER] %s %s -> %s\n"
-#: src/download.cc:248
+#: src/download.cc:249
#, c-format
msgid "[DOWNGRADE] %s %s -> %s\n"
msgstr "[NEDGRADER] %s %s -> %s\n"
-#: src/download.cc:258
+#: src/download.cc:259
msgid "REMOVE"
msgstr "FJERN"
-#: src/download.cc:264
+#: src/download.cc:265
msgid "INSTALL"
msgstr "INSTALLER"
-#: src/download.cc:267
+#: src/download.cc:268
msgid "REINSTALL"
msgstr "INSTALLER PÃ… NY"
-#: src/download.cc:270
+#: src/download.cc:271
msgid "HOLD"
msgstr "HALD TILBAKE"
-#: src/download.cc:273
+#: src/download.cc:274
msgid "BROKEN"
msgstr "ØYDELAGT"
-#: src/download.cc:276
+#: src/download.cc:277
msgid "REMOVE, NOT USED"
msgstr "FJERN, UBRUKTE"
-#: src/download.cc:279
+#: src/download.cc:280
msgid "REMOVE, DEPENDENCIES"
msgstr "FJERN, PAKKEKRAV"
-#: src/download.cc:282
+#: src/download.cc:283
msgid "INSTALL, DEPENDENCIES"
msgstr "INSTALLER, PAKKEKRAV"
-#: src/download.cc:285
+#: src/download.cc:286
msgid "HOLD, DEPENDENCIES"
msgstr "HALD, PAKKEKRAV"
-#: src/download.cc:287
+#: src/download.cc:288
msgid "????????"
msgstr "????????"
-#: src/download.cc:291
+#: src/download.cc:292
#, c-format
msgid "[%s] %s\n"
msgstr "[%s] %s\n"
-#: src/download.cc:294
+#: src/download.cc:295
#, c-format
msgid ""
"===============================================================================\n"
@@ -1143,34 +1283,39 @@
"\n"
"Logg ferdig.\n"
-#: src/download.cc:329
+#: src/download.cc:330
msgid "Downloading packages"
msgstr "Lastar ned pakkar"
-#: src/download.cc:330
+#: src/download.cc:331
msgid "View the progress of the package download"
msgstr "Vis framgangen for nedlastinga av pakkar"
-#: src/download.cc:352
+#: src/download.cc:332
+#, fuzzy
+msgid "Package Download"
+msgstr "Pakke: "
+
+#: src/download.cc:354
msgid "Internal error: couldn't generate list of packages to download"
msgstr ""
"Intern feil: klarte ikkje generera liste over pakkar som skal lastast ned"
-#: src/download.cc:413
+#: src/download.cc:415
msgid "Unable to correct for unavailable packages"
msgstr "Ikkje i stand til å retta opp for utilgjengelege pakkar"
-#: src/download.cc:465
+#: src/download.cc:467
msgid ""
"Ack! Something bad happened while installing packages. Trying to recover:"
msgstr ""
"Uff! Noko gjekk gale under installasjonen av pakkar. Prøver å gjenskape."
-#: src/download.cc:475 src/pkg_item.cc:413
+#: src/download.cc:477 src/pkg_item.cc:432
msgid "Press return to continue.\n"
msgstr "Trykk enter for å halda fram.\n"
-#: src/download.cc:506
+#: src/download.cc:508
msgid ""
"Could not regain the system lock! (Perhaps another apt or dpkg is running?)"
msgstr ""
@@ -1232,11 +1377,6 @@
msgid "[ERROR]"
msgstr "[FEIL]"
-#: src/download_screen.cc:57
-#, c-format
-msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
-msgstr "Set inn disken merka med «%s» i stasjonen «%s»"
-
#: src/download_screen.cc:181
#, c-format
msgid "Downloaded %sB in %ss (%sB/s)."
@@ -1275,110 +1415,110 @@
msgstr ""
"CD-skift: Set inn disken som er merka «%s» i stasjonen «%s» og trykk enter\n"
-#: src/generic/aptcache.cc:245
+#: src/generic/aptcache.cc:253
msgid "Can't open Aptitude extended state file"
msgstr "Klarer ikkje opna Aptitude utvida tilstandsfil"
-#: src/generic/aptcache.cc:252 src/generic/aptcache.cc:305
-#: src/generic/aptcache.cc:307
+#: src/generic/aptcache.cc:260 src/generic/aptcache.cc:313
+#: src/generic/aptcache.cc:315
msgid "Reading extended state information"
msgstr "Les utvida tilstandsinformasjon"
-#: src/generic/aptcache.cc:313 src/generic/aptcache.cc:387
-#: src/generic/aptcache.cc:390
+#: src/generic/aptcache.cc:321 src/generic/aptcache.cc:395
+#: src/generic/aptcache.cc:398
msgid "Initializing package states"
msgstr "Oppdaterer pakkestatus"
-#: src/generic/aptcache.cc:501
+#: src/generic/aptcache.cc:509
msgid "Cannot open Aptitude state file"
msgstr "Klarer ikkje opna Aptitude tilstandsfil"
-#: src/generic/aptcache.cc:505 src/generic/aptcache.cc:560
-#: src/generic/aptcache.cc:563
+#: src/generic/aptcache.cc:513 src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:571
msgid "Writing extended state information"
msgstr "Skriv utvida tilstandsinformasjon"
-#: src/generic/aptcache.cc:542
+#: src/generic/aptcache.cc:550
#, 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/aptcache.cc:551
+#: src/generic/aptcache.cc:559
msgid "Couldn't write state file"
msgstr "Klarte ikkje skriva tilstandsfil"
-#: src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:576
msgid "Error writing state file"
msgstr "Feil under skriving av tilstandsfil"
-#: src/generic/aptcache.cc:584
+#: src/generic/aptcache.cc:592
msgid "couldn't replace old state file"
msgstr "klarte ikkje byta ut gamal tilstandsfil"
-#: src/generic/aptcache.cc:960
+#: src/generic/aptcache.cc:1000
msgid "Unable to correct dependencies, some packages cannot be installed"
msgstr "Klarte ikkje rette opp pakkekrav, nokre pakkar kan ikkje installerast"
-#: src/generic/aptcache.cc:1325
+#: src/generic/aptcache.cc:1546
msgid "The list of sources could not be read."
msgstr "Kjeldelista kan ikkje lesast."
-#: src/generic/aptcache.cc:1332
+#: src/generic/aptcache.cc:1553
msgid "The package lists or status file could not be parsed or opened."
msgstr "Klarte ikkje tolka eller opna pakkelista eller tilstandsfila."
-#: src/generic/aptcache.cc:1335
+#: src/generic/aptcache.cc:1556
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"
-#: src/generic/apt.cc:141
+#: src/generic/apt.cc:142
#, c-format
msgid "Unable to open %s for writing"
msgstr "Klarer ikkje opna %s for å skriva til ho"
-#: src/generic/apt.cc:151
+#: src/generic/apt.cc:152
#, c-format
msgid "Unable to replace %s with new configuration file"
msgstr "Klarer ikkje byta ut %s med ny oppsettsfil"
-#: src/generic/apt.cc:226
+#: src/generic/apt.cc:227
msgid "Warning: could not lock the cache file. Opening in read-only mode"
msgstr "Åtvaring: klarer ikkje låsa mellomlagerfila. Opnar i skriveverna modus"
-#: src/generic/matchers.cc:780
+#: src/generic/matchers.cc:797
msgid "Unmatched '('"
msgstr "Passa ikkje «(»"
-#: src/generic/matchers.cc:870 src/generic/matchers.cc:949
+#: src/generic/matchers.cc:887 src/generic/matchers.cc:968
#, c-format
msgid "Unknown dependency type: %s"
msgstr "Ukjend kravtype: %s"
-#: src/generic/matchers.cc:931
+#: src/generic/matchers.cc:950
#, c-format
msgid "Unknown action type: %s"
msgstr "Ukjent handlingstype: %s"
-#: src/generic/matchers.cc:998
+#: src/generic/matchers.cc:1017
#, c-format
msgid "Unknown priority %s"
msgstr "Ukjent prioritet %s"
-#: src/generic/matchers.cc:1020
+#: src/generic/matchers.cc:1039
#, c-format
msgid "Unknown pattern type: %c"
msgstr "Ukjent mønstertype: %c"
-#: src/generic/matchers.cc:1065
+#: src/generic/matchers.cc:1084
msgid "Unexpected empty expression"
msgstr "Uventa tomt uttrykk"
-#: src/generic/matchers.cc:1100
+#: src/generic/matchers.cc:1119
msgid "Badly formed expression"
msgstr "DÃ¥rleg utforma uttrykk"
-#: src/generic/matchers.cc:1129
+#: src/generic/matchers.cc:1148
msgid "Unexpected ')'"
msgstr "Uventa «)»"
@@ -1402,7 +1542,7 @@
msgid "Can't get value of $HOME, using TMPDIR (insecure)"
msgstr "Finn ingen verdi for $HOME, brukar TMPDIR (utrygt)"
-#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:60
+#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:61
#, c-format
msgid "ChangeLog of %s"
msgstr "Endringslogg for %s"
@@ -1609,17 +1749,17 @@
msgid "Invalid sorting policy type '%s'"
msgstr "Ugyldig type «%s» på sorteringsmetode"
-#: src/main.cc:68
+#: src/main.cc:67
#, c-format
msgid "%s %s compiled at %s %s\n"
msgstr "%s %s kompilert på %s %s\n"
-#: src/main.cc:71
+#: src/main.cc:70
#, c-format
msgid "Compiler: g++ %s\n"
msgstr "Kompilator: g++ %s\n"
-#: src/main.cc:74
+#: src/main.cc:73
#, c-format
msgid ""
"\n"
@@ -1628,7 +1768,7 @@
"\n"
"NCurses-versjon: %s\n"
-#: src/main.cc:76
+#: src/main.cc:75
#, c-format
msgid ""
"\n"
@@ -1637,22 +1777,22 @@
"\n"
"Curses-versjon: %s\n"
-#: src/main.cc:78
+#: src/main.cc:77
#, c-format
msgid "libsigc++ version: %s\n"
msgstr "«libsigc++»-versjon: %s\n"
-#: src/main.cc:84
+#: src/main.cc:83
#, c-format
msgid "Usage: aptitude [-S fname] [-u|-i]"
msgstr "Bruk: aptitude [-S fnamn] [-u|-i]"
-#: src/main.cc:86
+#: src/main.cc:85
#, c-format
msgid " aptitude [options] <action> ..."
msgstr " aptitude [val] <handling> ..."
-#: src/main.cc:88
+#: src/main.cc:87
#, c-format
msgid ""
" Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -1662,43 +1802,43 @@
"modus):\n"
"\n"
-#: src/main.cc:89
+#: src/main.cc:88
#, c-format
msgid " install - Install/upgrade packages\n"
msgstr " install - Installer/oppgrader pakkar\n"
-#: src/main.cc:90
+#: src/main.cc:89
#, c-format
msgid " remove - Remove packages\n"
msgstr " remove - Fjernar pakkar\n"
-#: src/main.cc:91
+#: src/main.cc:90
#, c-format
msgid " purge - Remove packages and their configuration files\n"
msgstr " purge - Fjernar pakkar og oppsettsfilene deira\n"
-#: src/main.cc:92
+#: src/main.cc:91
#, c-format
msgid " hold - Place packages on hold\n"
msgstr " hold - Legg pakkar på hald\n"
-#: src/main.cc:93
+#: src/main.cc:92
#, c-format
msgid " unhold - Cancel a hold command for a package\n"
msgstr " unhold - Fjern ein hald-kommando for ein pakke\n"
-#: src/main.cc:94
+#: src/main.cc:93
#, c-format
msgid " markauto - Mark packages as having been automatically installed\n"
msgstr ""
" markauto - Merk pakkar som at dei er blitt installert automatisk\n"
-#: src/main.cc:95
+#: src/main.cc:94
#, c-format
msgid " unmarkauto - Mark packages as having been manually installed\n"
msgstr " unmarkauto - Merk pakkar som at dei er installert manuelt\n"
-#: src/main.cc:100
+#: src/main.cc:99
#, c-format
msgid ""
" forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -1706,17 +1846,17 @@
msgstr ""
" forby versjon - Forby aptitude å oppgradere til ein særskild pakkeversjon.\n"
-#: src/main.cc:101
+#: src/main.cc:100
#, c-format
msgid " update - Download lists of new/upgradable packages\n"
msgstr " update - Last ned liste over nye/oppgraderbare pakkar\n"
-#: src/main.cc:102
+#: src/main.cc:101
#, c-format
msgid " upgrade - Perform a safe upgrade\n"
msgstr " upgrade - Utfør ei trygg oppgradering\n"
-#: src/main.cc:103
+#: src/main.cc:102
#, c-format
msgid ""
" dist-upgrade - Perform an upgrade, possibly installing and removing "
@@ -1725,75 +1865,75 @@
" dist-upgrade - Utfør ei oppgradering, det kan vera pakkar blir installert "
"og fjerna\n"
-#: src/main.cc:104
+#: src/main.cc:103
#, c-format
msgid " forget-new - Forget what packages are \"new\"\n"
msgstr " forget-new - Gløym kva for pakkar som er «nye»\n"
-#: src/main.cc:105
+#: src/main.cc:104
#, c-format
msgid " search - Search for a package by name and/or expression\n"
msgstr " search - Søk etter ein pakke etter namn og/eller uttrykk\n"
-#: src/main.cc:106
+#: src/main.cc:105
#, c-format
msgid " show - Display detailed information about a package\n"
msgstr " show - Vis detaljert informasjon om ei pakke\n"
-#: src/main.cc:107
+#: src/main.cc:106
#, c-format
msgid " clean - Erase downloaded package files\n"
msgstr " clean - Slett nedlasta pakkefiler\n"
-#: src/main.cc:108
+#: src/main.cc:107
#, c-format
msgid " autoclean - Erase old downloaded package files\n"
msgstr " autoclean - Slett gamle nedlasta pakkefiler\n"
-#: src/main.cc:109
+#: src/main.cc:108
#, c-format
msgid " changelog - View a package's changelog\n"
msgstr " changelog - Vis endringsloggen til ein pakke\n"
-#: src/main.cc:110
+#: src/main.cc:109
#, c-format
msgid " download - Download the .deb file for a package\n"
msgstr " download - Last ned .deb-fila for ein pakke\n"
-#: src/main.cc:112
+#: src/main.cc:111
#, c-format
msgid " Options:\n"
msgstr " Val:\n"
-#: src/main.cc:113
+#: src/main.cc:112
#, c-format
msgid " -h This help text\n"
msgstr " -h Denne hjelpeteksten\n"
-#: src/main.cc:114
+#: src/main.cc:113
#, c-format
msgid " -s Simulate actions, but do not actually perform them.\n"
msgstr " -s Simuler handlingar, men ikkje utfør dei.\n"
-#: src/main.cc:115
+#: src/main.cc:114
#, c-format
msgid ""
" -d Only download packages, do not install or remove anything.\n"
msgstr ""
" -d Berre lasta ned pakkar, ikkje installer eller fjern noko.\n"
-#: src/main.cc:116
+#: src/main.cc:115
#, c-format
msgid " -P Always prompt for confirmation or actions\n"
msgstr " -P Spør alltid om stadfesting eller handlingar\n"
-#: src/main.cc:117
+#: src/main.cc:116
#, c-format
msgid ""
" -y Assume that the answer to simple yes/no questions is 'yes'\n"
msgstr " -y Forutset at svaret på enkle ja/nei-spørsmål er «Ja»\n"
-#: src/main.cc:118
+#: src/main.cc:117
#, c-format
msgid ""
" -F format Specify a format for displaying search results; see the "
@@ -1801,7 +1941,7 @@
msgstr ""
" -F format Oppgje eit format for vising av søkjeresultat; sjå manualen\n"
-#: src/main.cc:119
+#: src/main.cc:118
#, c-format
msgid ""
" -O order Specify how search results should be sorted; see the manual\n"
@@ -1809,55 +1949,55 @@
" -O rekkjefølgje Oppgjev korleis eit søkjeresultat skal sorterast; sjå "
"manualen\n"
-#: src/main.cc:120
+#: src/main.cc:119
#, c-format
msgid ""
" -w width Specify the display width for formatting search results\n"
msgstr ""
" -w breidde Oppgje visingsbreidde for formatering av søkjeresultat\n"
-#: src/main.cc:121
+#: src/main.cc:120
#, c-format
msgid " -f Aggressively try to fix broken packages.\n"
msgstr " -f Prøv hardt å reparere øydelagde pakkar.\n"
-#: src/main.cc:122
+#: src/main.cc:121
#, c-format
msgid " -V Show which versions of packages are to be installed.\n"
msgstr ""
" -V Vis kva for versjonar av pakkar som skal installerast.\n"
-#: src/main.cc:123
+#: src/main.cc:122
#, c-format
msgid ""
" -D Show the dependencies of automatically changed packages.\n"
msgstr " -D Vis pakkekrava til automatisk endra pakkar.\n"
-#: src/main.cc:124
+#: src/main.cc:123
#, c-format
msgid " -Z\t\t Show the change in installed size of each package.\n"
msgstr " -Z\t\t Vis endringane på installert storleik på kvar pakke.\n"
-#: src/main.cc:125
+#: src/main.cc:124
#, c-format
msgid ""
" -v Display extra information. (may be supplied multiple times)\n"
msgstr ""
" -v Vis ekstra informasjon. (kan tilføyast fleire gongar)\n"
-#: src/main.cc:126
+#: src/main.cc:125
#, c-format
msgid ""
" -t [release] Set the release from which packages should be installed\n"
msgstr ""
" -t [sleppversjon] Set sleppversjonen som pakkar skal installerast frå\n"
-#: src/main.cc:127
+#: src/main.cc:126
#, c-format
msgid " -o key=val Directly set the configuration option named 'key'\n"
msgstr " -o nøkkel=verdi Set direkte oppsettsvalet som heiter «nøkkel»\n"
-#: src/main.cc:128
+#: src/main.cc:127
#, c-format
msgid ""
" --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -1866,58 +2006,66 @@
" --with(out)-recommends\tOppgje om tilrådde og/eller føreslåtte pakkar skal\n"
" handterast som strenge pakkekrav\n"
-#: src/main.cc:129
+#: src/main.cc:128
#, c-format
msgid " -S fname: Read the aptitude extended status info from fname.\n"
msgstr " -S fnamn: Les den utvida statusinfo-fila for aptitude frå fnamn.\n"
-#: src/main.cc:130
+#: src/main.cc:129
#, c-format
msgid " -u : Download new package lists on startup.\n"
msgstr " -u : Last ned ny pakkeliste ved oppstart.\n"
-#: src/main.cc:131
+#: src/main.cc:130
#, c-format
msgid " -i : Perform an install run on startup.\n"
msgstr " -i : Utfør ei installasjonskøyring ved oppstart.\n"
-#: src/main.cc:133
+#: src/main.cc:132
#, c-format
msgid " This aptitude does not have Super Cow Powers.\n"
msgstr " Denne aptituden har ikkje Super Cow Powers.\n"
-#: src/main.cc:254
+#: src/main.cc:253
#, c-format
msgid "-o requires an argument of the form key=value, got %s"
msgstr "-o krev eit argument på forma nøkkel=verdi, fekk %s"
-#: src/main.cc:300 src/main.cc:309
+#: src/main.cc:299 src/main.cc:308
msgid "WEIRDNESS: unknown option code received\n"
msgstr "MERKJELEG: mottok ein ukjent valkode\n"
-#: src/main.cc:318
+#: src/main.cc:317
msgid "Only one of -u and -i may be specified\n"
msgstr "Berre ein av -u og -i kan oppgjevast\n"
-#: src/main.cc:326
+#: src/main.cc:325
msgid ""
"-u and -i may not be specified in command-line mode (eg, with 'install')"
msgstr ""
"-u og -i kan ikkje oppgjevast i kommandolinjemodus (dvs, med «install»)"
-#: src/main.cc:337
+#: src/main.cc:342
msgid "-u and -i may not be specified with a command"
msgstr "-u og -i kan ikkje oppgjevast med ein kommando"
-#: src/main.cc:392
+#: src/main.cc:399
#, c-format
msgid "Unknown command \"%s\"\n"
msgstr "Ukjent kommando «%s»\n"
-#: src/main.cc:400
+#: src/main.cc:406 src/main.cc:463
+msgid "Internal error: uncaught 'out of solutions' exception.\n"
+msgstr ""
+
+#: src/main.cc:411 src/main.cc:468
+msgid "Internal error: uncaught 'out of time' exception.\n"
+msgstr ""
+
+#: src/main.cc:418
#, c-format
-msgid "Invalid option for interactive mode: -s\n"
-msgstr "Ugyldig val for interaktiv modus: -s\n"
+msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
+msgstr ""
#: src/mine/cmine.cc:93
#, c-format
@@ -1945,7 +2093,7 @@
msgid "Lost"
msgstr "Tapt"
-#: src/mine/cmine.cc:119 src/ui.cc:1005
+#: src/mine/cmine.cc:119 src/ui.cc:1089
msgid "Minesweeper"
msgstr "Minesveiper"
@@ -2122,7 +2270,7 @@
msgid "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
msgstr "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
-#: src/pkg_columnizer.cc:84 src/ui.cc:1488
+#: src/pkg_columnizer.cc:84 src/ui.cc:1638
msgid "Package"
msgstr "Pakke"
@@ -2382,13 +2530,14 @@
" Pakkar i «grunn»-seksjonen er del av den opphavelege systeminstallasjonen."
#: src/pkg_grouppolicy.cc:158
+#, fuzzy
msgid ""
"Programs for faxmodems and other communications devices\n"
" Packages in the 'comm' section are used to control modems and other "
"hardware communications devices. This includes software to control faxmodems "
"(for instance, PPP for dial-up internet connections and programs originally "
-"written for that purpose (zmodem/kermit), as well as software to control "
-"cellular phones, interface with FidoNet, and run a BBS."
+"written for that purpose, such as zmodem/kermit), as well as software to "
+"control cellular phones, interface with FidoNet, and run a BBS."
msgstr ""
"Program for faxmodem og andre kommunikasjonseiningar\n"
" Pakkar i «komm»-seksjonen blir brukt til å kontrollera modem og anna "
@@ -2838,14 +2987,15 @@
"tidlegare var i denne seksjonen er derfor no i «hovud»."
#: src/pkg_grouppolicy.cc:193
+#, fuzzy
msgid ""
"Programs which are not free software\n"
" Packages in the 'non-free' section are not part of Debian.\n"
" .\n"
" These packages fail to meet one or more of the requirements of the Debian "
-"Free Software Guidelines (see below) You should read the license of programs "
-"in this section to be sure that you are allowed to use them in the way you "
-"intend.\n"
+"Free Software Guidelines (see below). You should read the license of "
+"programs in this section to be sure that you are allowed to use them in the "
+"way you intend.\n"
" .\n"
" For more information about what Debian considers to be Free Software, see "
"http://www.debian.org/social_contract#guidelines"
@@ -2909,11 +3059,12 @@
" Ein ny versjon av desse pakkane er tilgjengeleg."
#: src/pkg_grouppolicy.cc:320
+#, fuzzy
msgid ""
"New Packages\n"
" These packages have been added to Debian since the last time you cleared "
-"the list of \"new\" packages. (choose \"Forget new packages\" from the "
-"Actions menu to empty this list)"
+"the list of \"new\" packages (choose \"Forget new packages\" from the "
+"Actions menu to empty this list)."
msgstr ""
"Nye pakkar\n"
" Desse pakkane er blitt lagt til Debian sidan førre gong du reinska lista "
@@ -3167,101 +3318,121 @@
msgid "Versions"
msgstr "Versjonar"
-#: src/pkg_item.cc:54
+#: src/pkg_item.cc:55
msgid "Yes, I am aware this is a very bad idea"
msgstr "Ja, eg er klar over at dette er ein dårleg ide"
#: src/pkg_item.cc:80
-#, c-format
+#, fuzzy, c-format
msgid ""
-"%s is an essential package!\n"
-"\n"
-"Are you sure you want to remove it?\n"
-"Type '%s' if you are."
+"%s is an essential package!%n%nAre you sure you want to remove it?%nType '%"
+"s' if you are."
msgstr ""
"%s er ein vesentleg pakke!\n"
"\n"
"Er du sikker på at du vil gjerna han?\n"
"Skriv «%s» viss du er det."
-#: src/pkg_item.cc:219
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:625
#, c-format
msgid "Information about %s"
msgstr "Informasjon om %s"
-#: src/pkg_item.cc:304
-msgid "Available versions of "
+#: src/pkg_item.cc:224 src/pkg_ver_item.cc:627
+#, c-format
+msgid "%s info"
+msgstr ""
+
+#: src/pkg_item.cc:310
+#, fuzzy, c-format
+msgid "Available versions of %s"
msgstr "Tilgjengelege versjonar av "
-#: src/pkg_item.cc:312 src/pkg_ver_item.cc:648
+#: src/pkg_item.cc:313
+#, fuzzy, c-format
+msgid "%s versions"
+msgstr "Versjonar"
+
+#: src/pkg_item.cc:325 src/pkg_ver_item.cc:655
#, c-format
msgid "Dependencies of %s"
msgstr "Pakkekrav for %s"
-#: src/pkg_item.cc:322 src/pkg_ver_item.cc:657
+#: src/pkg_item.cc:327 src/pkg_ver_item.cc:657
+#, c-format
+msgid "%s deps"
+msgstr ""
+
+#: src/pkg_item.cc:338 src/pkg_ver_item.cc:667
#, c-format
msgid "Packages depending on %s"
msgstr "Pakkar som krev %s"
-#: src/pkg_item.cc:373 src/pkg_ver_item.cc:694
+#: src/pkg_item.cc:340 src/pkg_ver_item.cc:669
+#, c-format
+msgid "%s reverse deps"
+msgstr ""
+
+#: src/pkg_item.cc:392 src/pkg_ver_item.cc:707
#, c-format
msgid "Reporting a bug in %s:\n"
msgstr "Rapporterer ein feil i %s:\n"
-#: src/pkg_item.cc:395
+#: src/pkg_item.cc:414
+#, fuzzy
msgid ""
-"You are not root and I cannot find any way\n"
-"to become root. To reconfigure this package,\n"
-"install the menu package, the login package,\n"
-"or run aptitude as root."
+"You are not root and I cannot find any way to become root. To reconfigure "
+"this package, install the menu package, the login package, or run aptitude "
+"as root."
msgstr ""
"Du er ikkje root og eg finn ingen måte å bli\n"
"root på. Installer menu-pakken, login-pakken\n"
"eller køyr aptitude som root for å setja opp\n"
"denne pakken på ny."
-#: src/pkg_item.cc:403
+#: src/pkg_item.cc:422
#, c-format
msgid "Reconfiguring %s\n"
msgstr "Set opp %s på ny\n"
-#: src/pkg_item.cc:428
+#: src/pkg_item.cc:447
msgid "Hierarchy editor"
msgstr "Hierarkisk redigering"
+#: src/pkg_item.cc:447
+#, fuzzy
+msgid "Hierarchy Editor"
+msgstr "Hierarkisk redigering"
+
#: src/pkg_tree.cc:325
msgid "Search for: "
msgstr "Søk etter: "
-#: src/pkg_tree.cc:585
+#: src/pkg_tree.cc:568
msgid "All Packages"
msgstr "Alle pakkar"
-#: src/pkg_tree.cc:598 src/pkg_tree.cc:607
+#: src/pkg_tree.cc:581 src/pkg_tree.cc:590
msgid "Building view"
msgstr "Byggjer vising"
-#: src/pkg_tree.cc:649
+#: src/pkg_tree.cc:632
#, c-format
msgid "No packages matched the pattern \"%s\"."
msgstr "Ingen pakkar passa med mønsteret «%s»."
-#: src/pkg_tree.cc:671
+#: src/pkg_tree.cc:654
msgid "Enter the new package tree limit: "
msgstr "Oppgje den nye grensa for pakketre: "
-#: src/pkg_tree.cc:705
+#: src/pkg_tree.cc:688
msgid "Enter the new package grouping mechanism for this display: "
msgstr "Oppgje den nye mekanismen for pakkegruppering for denne visinga: "
-#: src/pkg_tree.cc:713
+#: src/pkg_tree.cc:696
msgid "Enter the new package sorting mechanism for this display: "
msgstr "Oppgje den nye mekansimen for pakkesortering for denne visinga: "
-#: src/pkg_ver_item.cc:623
-msgid "Information about "
-msgstr "Informasjon om "
-
#: src/pkg_view.cc:344
msgid "make_package_view: error in arguments -- two main widgets??"
msgstr "make_package_view: feil i argument -- to hovudelement?"
@@ -3276,7 +3447,7 @@
msgid "make_package_view: bad argument!"
msgstr "make_package_view: dårleg argument!"
-#: src/pkg_view.cc:492
+#: src/pkg_view.cc:495
msgid "make_package_view: no main widget found"
msgstr "make_package_view: fann ingen hovudelement"
@@ -3489,6 +3660,74 @@
"Desse pakkane krev versjon %B%s%b av %B%s%b, og dei vil bli øydelagde viss "
"han blir %s."
+#: src/solution_dialog.cc:74
+msgid "The package cache is not available."
+msgstr ""
+
+#: src/solution_dialog.cc:82
+#, fuzzy
+msgid "No packages are broken."
+msgstr "Nokre pakkar er øydelagde. Prøve å fiksa dei?"
+
+#: src/solution_dialog.cc:103
+msgid "No resolution found."
+msgstr ""
+
+#: src/solution_dialog.cc:107
+#, c-format
+msgid ""
+"Time exhausted while searching for a solution (you can select \"Next Solution"
+"\" or press %s to try harder)."
+msgstr ""
+
+#: src/solution_dialog.cc:146
+#, fuzzy
+msgid "Previous"
+msgstr "Skaffar"
+
+#: src/solution_dialog.cc:147
+#, fuzzy
+msgid "Next"
+msgstr "^Neste"
+
+#: src/solution_dialog.cc:148
+msgid "Apply"
+msgstr ""
+
+#: src/solution_dialog.cc:149
+#, fuzzy
+msgid "Close"
+msgstr "^Lukk"
+
+#: src/solution_fragment.cc:125
+#, fuzzy
+msgid "%BRemove%b the following packages:%n"
+msgstr "Desse pakkane er ØYDELAGDE:"
+
+#: src/solution_fragment.cc:135
+#, fuzzy
+msgid "%BInstall%b the following packages:%n"
+msgstr "Desse pakkane er ØYDELAGDE:"
+
+#: src/solution_fragment.cc:148
+msgid "%BKeep%b the following packages at their current version:%n"
+msgstr ""
+
+#: src/solution_fragment.cc:161
+#, fuzzy
+msgid "%BUpgrade%b the following packages:%n"
+msgstr "Desse pakkane er ØYDELAGDE:"
+
+#: src/solution_fragment.cc:176
+#, fuzzy
+msgid "%BDowngrade%b the following packages:%n"
+msgstr "Lastar ned pakkar"
+
+#: src/solution_fragment.cc:190
+#, c-format
+msgid "Score is %d"
+msgstr ""
+
#: src/trust.cc:17 src/trust.cc:19
msgid "WARNING"
msgstr ""
@@ -3500,54 +3739,54 @@
"system."
msgstr ""
-#: src/ui.cc:143
+#: src/ui.cc:164
msgid "Er, there aren't any errors, this shouldn't have happened.."
msgstr "Hmm, det er ingen feil her, dette skulle ikkje ha hendt.."
-#: src/ui.cc:149
+#: src/ui.cc:170
msgid "E:"
msgstr ""
-#: src/ui.cc:151
+#: src/ui.cc:172
msgid "W:"
msgstr ""
-#: src/ui.cc:172
+#: src/ui.cc:193
msgid "Search for:"
msgstr "Søk etter:"
-#: src/ui.cc:205
+#: src/ui.cc:261
msgid "You already are root!"
msgstr "Du er allereie root!"
-#: src/ui.cc:303
+#: src/ui.cc:359
msgid ""
"Subprocess exited with an error -- did you type your password correctly?"
msgstr "Underprosessen avslutta med ein feil -- skreiv du passordet ditt rett?"
-#: src/ui.cc:331
+#: src/ui.cc:387
msgid "Loading cache"
msgstr "Lastar mellomlager"
-#: src/ui.cc:353
+#: src/ui.cc:409
msgid "Really quit Aptitude?"
msgstr "Vil du verkeleg avslutta Aptitude?"
-#: src/ui.cc:432
+#: src/ui.cc:488
msgid "Really discard your personal settings and reload the defaults?"
msgstr ""
"Vil du verkeleg forkasta dine eigne instillingar og lasta inn "
"standardinnstillingane?"
-#: src/ui.cc:532
+#: src/ui.cc:588 src/ui.cc:590 src/ui.cc:618 src/ui.cc:620
msgid "Packages"
msgstr "Pakkar"
-#: src/ui.cc:533 src/ui.cc:560
+#: src/ui.cc:589 src/ui.cc:619
msgid "View available packages and choose actions to perform"
msgstr "Vis tilgjengelege pakkar og vel kva handlingar som skal utførast"
-#: src/ui.cc:599
+#: src/ui.cc:666
#, fuzzy
msgid ""
"%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
@@ -3564,15 +3803,15 @@
"Dette er fri programvare og du er velkomen til å dela vidare programmet\n"
"under visse vilkår; sjå «lisens» for detaljar."
-#: src/ui.cc:620
+#: src/ui.cc:687
msgid "help.txt"
msgstr "hjelp.txt"
-#: src/ui.cc:636
+#: src/ui.cc:703
msgid "README"
msgstr "LESMEG"
-#: src/ui.cc:718
+#: src/ui.cc:785
msgid ""
"%C%BWARNING%b: untrusted versions of the following packages will be "
"installed!%n%nUntrusted packages could %Bcompromise your system's security%"
@@ -3580,60 +3819,70 @@
"this is what you want to do.%n%n"
msgstr ""
-#: src/ui.cc:732
+#: src/ui.cc:799
#, fuzzy
msgid "Really Continue"
msgstr "Hald fram"
-#: src/ui.cc:734
+#: src/ui.cc:801
msgid "Abort Installation"
msgstr ""
-#: src/ui.cc:796
+#: src/ui.cc:862
msgid "Preview of package installation"
msgstr "Førehandsvising av pakkeinstallasjon"
-#: src/ui.cc:797
+#: src/ui.cc:863
msgid "View and/or adjust the actions that will be performed"
msgstr "Vis og/eller endra på handlingane som skal utførast"
-#: src/ui.cc:837
-msgid "Some packages were broken and have been fixed"
+#: src/ui.cc:864
+#, fuzzy
+msgid "Preview"
+msgstr "^Førre"
+
+#: src/ui.cc:900
+#, fuzzy
+msgid "Some packages were broken and have been fixed:"
msgstr "Nokre pakkar var øydelagde og har blitt fiksa"
-#: src/ui.cc:839
-msgid "Some broken packages could not be fixed!"
-msgstr "Somme av dei øydelagde pakkane kunne ikkje bli fiksa!"
+#: src/ui.cc:906
+msgid "No solution to these dependency problems exists!"
+msgstr ""
-#: src/ui.cc:847 src/ui.cc:959
-msgid "Some packages are broken. Try to fix them?"
-msgstr "Nokre pakkar er øydelagde. Prøve å fiksa dei?"
+#: src/ui.cc:912
+#, c-format
+msgid ""
+"Ran out of time while trying to resolver dependencies (press \"%s\" to try "
+"harder)"
+msgstr ""
-#: src/ui.cc:860
+#: src/ui.cc:958
+#, fuzzy
msgid ""
-"Installing/removing packages requires administrative privileges, which\n"
-"you currently do not have. Would you like to change to the root account?\n"
+"Installing/removing packages requires administrative privileges, which you "
+"currently do not have. Would you like to change to the root account?"
msgstr ""
"Ã… installera/fjerna pakkar krev at du har administrative rettar, som\n"
"du ikkje har no. Vil du endra til root-kontoen?\n"
-#: src/ui.cc:863 src/ui.cc:993
+#: src/ui.cc:961 src/ui.cc:1077
msgid "Become root"
msgstr "Bli root"
-#: src/ui.cc:865 src/ui.cc:995
+#: src/ui.cc:963 src/ui.cc:1079
msgid "Don't become root"
msgstr "Ikkje bli root"
-#: src/ui.cc:870 src/ui.cc:1000
+#: src/ui.cc:968 src/ui.cc:1084
msgid "A package-list update or install run is already taking place."
msgstr "Ei oppdatering av pakkelista eller ei installering er allereie igang."
-#: src/ui.cc:897
+#: src/ui.cc:995
msgid "No packages are scheduled to be installed, removed, or upgraded."
msgstr "Ingen pakkar vil bli installert, oppgradert eller fjerna."
-#: src/ui.cc:903
+#: src/ui.cc:1001
#, fuzzy
msgid ""
"No packages will be installed, removed or upgraded. Some packages could be "
@@ -3646,163 +3895,178 @@
"oppgraderast.\n"
"Tast «U» for å førebu oppgradering."
-#: src/ui.cc:990
+#: src/ui.cc:1073
+#, fuzzy
msgid ""
-"Updating the package lists requires administrative privileges, which\n"
-"you currently do not have. Would you like to change to the root account?\n"
+"Updating the package lists requires administrative privileges, which you "
+"currently do not have. Would you like to change to the root account?"
msgstr ""
"Oppdatering av pakkelister krev administrative rettar, som\n"
"du ikkje har no. Vil du endra til root-kontoen?\n"
-#: src/ui.cc:1005 src/ui.cc:1198
+#: src/ui.cc:1089 src/ui.cc:1345
msgid "Waste time trying to find mines"
msgstr "Bruke tida på å finna miner"
-#: src/ui.cc:1012 src/ui.cc:1065
+#: src/ui.cc:1096 src/ui.cc:1149
msgid "Cleaning while a download is in progress is not allowed"
msgstr "Å vaske medan ei nedlasting held på er ikkje tillatt!"
-#: src/ui.cc:1015
+#: src/ui.cc:1099
msgid "Deleting downloaded files"
msgstr "Slettar nedlasta filer"
-#: src/ui.cc:1029
+#: src/ui.cc:1113
msgid "Downloaded package files have been deleted"
msgstr "Nedlasta pakkefiler er blitt sletta"
-#: src/ui.cc:1090
+#: src/ui.cc:1174
#, fuzzy, c-format
msgid ""
"Obsolete downloaded package files have been deleted, freeing %sB of disk "
"space."
msgstr "Forelda nedlasta pakkefiler er blitt sletta"
-#: src/ui.cc:1174
+#: src/ui.cc:1246
+msgid "All solutions exhausted."
+msgstr ""
+
+#: src/ui.cc:1251 src/ui.cc:1282
+#, fuzzy
+msgid "Ran out of time while trying to find a solution."
+msgstr "Bruke tida på å finna miner"
+
+#: src/ui.cc:1276
+msgid "Unable to find a solution to apply."
+msgstr ""
+
+#: src/ui.cc:1321
msgid "^Install/remove packages"
msgstr "^Installer/fjern pakkar"
-#: src/ui.cc:1175
+#: src/ui.cc:1322
msgid "Perform all pending installs and removals"
msgstr "Utfør installering og fjerning av pakkar"
-#: src/ui.cc:1177
+#: src/ui.cc:1324
msgid "^Update package list"
msgstr "^Oppdater pakkeliste"
-#: src/ui.cc:1178
+#: src/ui.cc:1325
msgid "Check for new versions of packages"
msgstr "Sjå etter nye versjonar av pakkar"
-#: src/ui.cc:1181
+#: src/ui.cc:1328
msgid "^Forget new packages"
msgstr "^Gløym nye pakkar"
-#: src/ui.cc:1182
+#: src/ui.cc:1329
msgid "Forget which packages are \"new\""
msgstr "Gløym kva for pakkar som er «nye»"
-#: src/ui.cc:1185
+#: src/ui.cc:1332
msgid "^Clean package cache"
msgstr "^Reinsk pakkemellomlageret"
-#: src/ui.cc:1186
+#: src/ui.cc:1333
msgid "Delete package files which were previously downloaded"
msgstr "Slett tidlegare nedlasta pakkefiler"
-#: src/ui.cc:1189
+#: src/ui.cc:1336
msgid "Clean ^obsolete files"
msgstr "Slett ^forelda filer"
-#: src/ui.cc:1190
+#: src/ui.cc:1337
msgid "Delete package files which can no longer be downloaded"
msgstr "Slett pakkefiler som ikkje kan hentast lenger"
-#: src/ui.cc:1193
+#: src/ui.cc:1340
msgid "Mark ^Upgradable"
msgstr "Marker ^Oppgraderbare"
-#: src/ui.cc:1194
+#: src/ui.cc:1341
msgid "Mark all upgradable packages which are not held for upgrade"
msgstr "Marker alle pakkar som ikkje er haldt tilbake til oppgradering"
-#: src/ui.cc:1197
+#: src/ui.cc:1344
msgid "^Play Minesweeper"
msgstr "^Spel minesveipar"
-#: src/ui.cc:1200
+#: src/ui.cc:1347
msgid "^Become root"
msgstr "Bli ^root"
-#: src/ui.cc:1201
+#: src/ui.cc:1348
+#, fuzzy
msgid ""
-"Run 'su' to become root; this will restart the program, but your\n"
-"settings will be preserved"
+"Run 'su' to become root; this will restart the program, but your settings "
+"will be preserved"
msgstr ""
"Køyrer «su» for å bli root. Dette vil starta programmet på ny, men\n"
"instillingane vil bli tatt vare på."
-#: src/ui.cc:1204
+#: src/ui.cc:1351
msgid "^Reload package cache"
msgstr "^Last inn igjen pakkemellomlageret"
-#: src/ui.cc:1205
+#: src/ui.cc:1352
msgid "Reload the package cache"
msgstr "Lastar pakkelagert inn på ny"
-#: src/ui.cc:1211
+#: src/ui.cc:1358
msgid "^Quit"
msgstr "^Avslutt"
-#: src/ui.cc:1212
+#: src/ui.cc:1359
msgid "Exit the program"
msgstr "Avsluttar programmet"
-#: src/ui.cc:1218 src/ui.cc:1487
+#: src/ui.cc:1365 src/ui.cc:1637
msgid "Undo"
msgstr "Angra"
-#: src/ui.cc:1219
+#: src/ui.cc:1366
msgid "Undo the last package operation or group of operations"
msgstr "Angrar den siste pakkehandlinga eller gruppe av handlingar"
-#: src/ui.cc:1226
+#: src/ui.cc:1373
msgid "^Install"
msgstr "^Installer"
-#: src/ui.cc:1227
+#: src/ui.cc:1374
msgid "Flag the currently selected package for installation or upgrade"
msgstr "Merkjer den valde pakke for installasjon eller oppgradering"
-#: src/ui.cc:1230
+#: src/ui.cc:1377
msgid "^Remove"
msgstr "^Fjern"
-#: src/ui.cc:1231
+#: src/ui.cc:1378
msgid "Flag the currently selected package for removal"
msgstr "Merkjer den valde pakke for fjerning"
-#: src/ui.cc:1234
+#: src/ui.cc:1381
msgid "^Purge"
msgstr "^Reinsk ut"
-#: src/ui.cc:1235
+#: src/ui.cc:1382
msgid ""
"Flag the currently selected package and its configuration files for removal"
msgstr "Merkjer den valde pakken for fjerning av programfiler og oppsettsfiler"
-#: src/ui.cc:1238
+#: src/ui.cc:1385
msgid "^Keep"
msgstr "^Ta vare på"
-#: src/ui.cc:1239
+#: src/ui.cc:1386
msgid "Cancel any action on the selected package"
msgstr "Avbryt handlingane på den valde pakken"
-#: src/ui.cc:1242
+#: src/ui.cc:1389
msgid "^Hold"
msgstr "^Hald tilbake"
-#: src/ui.cc:1243
+#: src/ui.cc:1390
msgid ""
"Cancel any action on the selected package, and protect it from future "
"upgrades"
@@ -3810,239 +4074,243 @@
"Avbryt handlinar på den valde pakken og vernar han mot framtidige "
"oppgraderingar."
-#: src/ui.cc:1246
+#: src/ui.cc:1393
msgid "Mark ^Auto"
msgstr "Merk ^Auto"
-#: src/ui.cc:1247
+#: src/ui.cc:1394
+#, fuzzy
msgid ""
-"Mark the selected package as having been automatically installed;\n"
-"it will automatically be removed if no other packages depend on it"
+"Mark the selected package as having been automatically installed; it will "
+"automatically be removed if no other packages depend on it"
msgstr ""
"Merk den valde pakken som om han er automatisk installert.\n"
"Pakken vil automatisk bli fjerna viss ingen andre pakkar treng han."
-#: src/ui.cc:1250
+#: src/ui.cc:1397
msgid "Mark ^Manual"
msgstr "Merk ^Manuell"
-#: src/ui.cc:1251
+#: src/ui.cc:1398
+#, fuzzy
msgid ""
-"Mark the selected package as having been manually installed;\n"
-"it will not be removed unless you manually remove it"
+"Mark the selected package as having been manually installed; it will not be "
+"removed unless you manually remove it"
msgstr ""
"Merk den valde pakken som om han var manuelt installert.\n"
"Pakken vil ikkje bli fjerna viss du ikkje fjernar han manuelt."
-#: src/ui.cc:1254
+#: src/ui.cc:1401
msgid "^Forbid Version"
msgstr "^Forby versjon"
-#: src/ui.cc:1255
+#: src/ui.cc:1402
+#, fuzzy
msgid ""
-"Forbid the candidate version of the selected package from being installed;\n"
+"Forbid the candidate version of the selected package from being installed; "
"newer versions of the package will be installed as usual"
msgstr ""
"Forby versjonskandidaten til den valde pakken frå å bli installert.\n"
"Nyare versjonar av pakken vil bli installert som vanleg"
-#: src/ui.cc:1259
+#: src/ui.cc:1406
msgid "I^nformation"
msgstr "I^nformasjon"
-#: src/ui.cc:1260
+#: src/ui.cc:1407
msgid "Display more information about the selected package"
msgstr "Vis meir informasjon om den valde pakken"
-#: src/ui.cc:1263
+#: src/ui.cc:1410
msgid "^Changelog"
msgstr "^Endringslogg"
-#: src/ui.cc:1264
+#: src/ui.cc:1411
msgid "Display the Debian changelog of the selected package"
msgstr "Vis debianendringsloggen til den valde pakken"
-#: src/ui.cc:1271
+#: src/ui.cc:1418
msgid "^Find"
msgstr "^Finn"
-#: src/ui.cc:1272
+#: src/ui.cc:1419
msgid "Search for a package"
msgstr "Søk etter ein pakke"
-#: src/ui.cc:1275
+#: src/ui.cc:1422
msgid "Find ^Again"
msgstr "Finn i^gjen"
-#: src/ui.cc:1276
+#: src/ui.cc:1423
msgid "Repeat the last search"
msgstr "Gjer opp igjen det siste søket"
-#: src/ui.cc:1280
+#: src/ui.cc:1427
msgid "^Limit Display"
msgstr "^Filtrer vising"
-#: src/ui.cc:1281
+#: src/ui.cc:1428
msgid "Apply a filter to the package list"
msgstr "Bruk eit filter på pakkelista"
-#: src/ui.cc:1284
+#: src/ui.cc:1431
msgid "^Un-Limit Display"
msgstr "^Avfiltrer vising"
-#: src/ui.cc:1285
+#: src/ui.cc:1432
msgid "Remove the filter from the package list"
msgstr "Fjernar filteret frå pakkelista"
-#: src/ui.cc:1289
+#: src/ui.cc:1436
msgid "Find ^Broken"
msgstr "Finn ^Øydelagd"
-#: src/ui.cc:1290
+#: src/ui.cc:1437
msgid "Find the next package with unsatisfied dependencies"
msgstr "Finn den neste pakken med pakkekrav som ikkje er tilfredsstilt"
-#: src/ui.cc:1297
+#: src/ui.cc:1444
msgid "^UI options"
msgstr "^Brukargrensesnitt"
-#: src/ui.cc:1298
+#: src/ui.cc:1445
msgid "Change the settings which affect the user interface"
msgstr "Endrar innstillingane for brukargrenseflata"
-#: src/ui.cc:1301
+#: src/ui.cc:1448
msgid "^Dependency handling"
msgstr "^Handsaming av pakkekrav"
-#: src/ui.cc:1302
+#: src/ui.cc:1449
msgid "Change the settings which affect how package dependencies are handled"
msgstr "Endra innstillingar som påverkar handtering av pakkekrav"
-#: src/ui.cc:1305
+#: src/ui.cc:1452
msgid "^Miscellaneous"
msgstr "^Ymse"
-#: src/ui.cc:1306
+#: src/ui.cc:1453
msgid "Change miscellaneous program settings"
msgstr "Endra ymse programinnstillingar"
-#: src/ui.cc:1311
+#: src/ui.cc:1458
msgid "^Revert options"
msgstr "^Tilbakestill innstillingar"
-#: src/ui.cc:1312
+#: src/ui.cc:1459
msgid "Reset all settings to the system defaults"
msgstr "Stiller tilbake alle innstillingar til standardverdiar"
-#: src/ui.cc:1323
+#: src/ui.cc:1470
msgid "^Next"
msgstr "^Neste"
-#: src/ui.cc:1324
+#: src/ui.cc:1471
msgid "View next display"
msgstr "Vis neste skjermbilete"
-#: src/ui.cc:1327
+#: src/ui.cc:1474
msgid "^Prev"
msgstr "^Førre"
-#: src/ui.cc:1328
+#: src/ui.cc:1475
msgid "View previous display"
msgstr "Vis førre skjermbilete"
-#: src/ui.cc:1331
+#: src/ui.cc:1478
msgid "^Close"
msgstr "^Lukk"
-#: src/ui.cc:1332
+#: src/ui.cc:1479
msgid "Close this display"
msgstr "Lukk dette skjermbilete"
-#: src/ui.cc:1337
+#: src/ui.cc:1484
msgid "New Package ^View"
msgstr "Ny pakke^vising"
-#: src/ui.cc:1338
+#: src/ui.cc:1485
msgid "Create a new default package view"
msgstr "Lag ei ny standard for pakkevising"
-#: src/ui.cc:1341
+#: src/ui.cc:1488
msgid "New Categorical ^Browser"
msgstr "Ny ^katagorivising"
-#: src/ui.cc:1343
+#: src/ui.cc:1490
msgid "Browse packages by category"
msgstr "Bla i pakkar etter kategori"
-#: src/ui.cc:1351
+#: src/ui.cc:1498
msgid "^About"
msgstr "^Om"
-#: src/ui.cc:1352
+#: src/ui.cc:1499
msgid "View information about this program"
msgstr "Vis informasjon om dette programmet"
-#: src/ui.cc:1355
+#: src/ui.cc:1502
msgid "^Help"
msgstr "^Hjelp"
-#: src/ui.cc:1356
+#: src/ui.cc:1503
msgid "View the on-line help"
msgstr "Vis hjelp"
-#: src/ui.cc:1358
+#: src/ui.cc:1505
msgid "User's ^Manual"
msgstr "^Brukarvegleiing"
-#: src/ui.cc:1359
+#: src/ui.cc:1506
msgid "View the detailed program manual"
msgstr "Vis den detaljerte programmanualen"
-#: src/ui.cc:1362
+#: src/ui.cc:1509
msgid "^FAQ"
msgstr "^SOS"
-#: src/ui.cc:1363
+#: src/ui.cc:1510
msgid "View a list of frequently asked questions"
msgstr "Vis ei liste over spørsmål og svar"
-#: src/ui.cc:1366
-msgid "^ChangeLog"
-msgstr "^Endringslogg"
+#: src/ui.cc:1513
+msgid "^NEWS"
+msgstr ""
-#: src/ui.cc:1367
-msgid "View the important changes made in each version of the program"
+#: src/ui.cc:1514
+#, fuzzy
+msgid "View the important changes made in each version of "
msgstr "Vis viktige endringar som er gjort i kvar versjon av programmet"
-#: src/ui.cc:1370
+#: src/ui.cc:1517
msgid "^License"
msgstr "^Lisens"
-#: src/ui.cc:1371
+#: src/ui.cc:1518
msgid "View the terms under which you may copy the program"
msgstr "Vis vilkåra for å kopiera programmet"
-#: src/ui.cc:1486
+#: src/ui.cc:1636
msgid "Actions"
msgstr "Handlingar"
-#: src/ui.cc:1489
+#: src/ui.cc:1639
msgid "Search"
msgstr "Søk"
-#: src/ui.cc:1490
+#: src/ui.cc:1640
msgid "Options"
msgstr "Val"
-#: src/ui.cc:1491
+#: src/ui.cc:1641
msgid "Views"
msgstr "Visingar"
-#: src/ui.cc:1492
+#: src/ui.cc:1642
msgid "Help"
msgstr "Hjelp"
-#: src/ui.cc:1537
+#: src/ui.cc:1699
#, c-format
msgid ""
"%s: Menu %s: Help %s: Quit %s: Update %s: Download/Install/Remove Pkgs"
@@ -4050,11 +4318,11 @@
"%s: Meny %s: Hjelp %s: Avslutt %s:Oppdater %s: Lasta ned/Installer/"
"Fjerna pakkar"
-#: src/ui.cc:1799 src/vscreen/vscreen.cc:281
+#: src/ui.cc:1968 src/vscreen/vscreen.cc:281
msgid "yes_key"
msgstr "j"
-#: src/ui.cc:1800 src/vscreen/vscreen.cc:282
+#: src/ui.cc:1969 src/vscreen/vscreen.cc:282
msgid "no_key"
msgstr "n"
@@ -4066,6 +4334,16 @@
msgid "Downloading Changelog"
msgstr "Lastar ned endringslogg"
+#: src/view_changelog.cc:54
+#, fuzzy
+msgid "Download Changelog"
+msgstr "Lastar ned endringslogg"
+
+#: src/view_changelog.cc:63
+#, c-format
+msgid "%s changes"
+msgstr ""
+
#: src/vscreen/vscreen.cc:119
#, c-format
msgid "Ouch! Got SIGTERM, dying..\n"
@@ -4094,6 +4372,40 @@
msgid "No"
msgstr "Nei"
+#~ msgid ""
+#~ "Some packages had unmet dependencies. This may mean that you have\n"
+#~ "requested an impossible situation or if you are using the unstable\n"
+#~ "distribution that some required packages have not yet been created\n"
+#~ "or been moved out of Incoming.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Somme pakkar hadde utilfredsstilte pakkekrav. Dette kan bety at du har "
+#~ "bede\n"
+#~ "om ein umogeleg situasjon eller du brukar den ustabile utgåva og det er\n"
+#~ "nokre av pakkane som er kravde som ikkje er laga enno eller er flytta ut "
+#~ "frå \n"
+#~ "incoming.\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Please insert the following disc into the drive \"%s\":\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Set inn denne disken i CD-drevet «%s»:\n"
+#~ "%s"
+
+#~ msgid "Invalid option for interactive mode: -s\n"
+#~ msgstr "Ugyldig val for interaktiv modus: -s\n"
+
+#~ msgid "Information about "
+#~ msgstr "Informasjon om "
+
+#~ msgid "Some broken packages could not be fixed!"
+#~ msgstr "Somme av dei øydelagde pakkane kunne ikkje bli fiksa!"
+
+#~ msgid "^ChangeLog"
+#~ msgstr "^Endringslogg"
+
#~ msgid "Go away, I'm trying to think.\n"
#~ msgstr "Forsvinn, eg prøver å tenkja.\n"
Modified: branches/aptitude-0.3/aptitude/po/pl.po
==============================================================================
--- branches/aptitude-0.3/aptitude/po/pl.po (original)
+++ branches/aptitude-0.3/aptitude/po/pl.po Sat Apr 30 13:41:32 2005
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: aptitude 0.2.15.6\n"
"Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-01-10 16:26-0800\n"
+"POT-Creation-Date: 2005-04-29 18:11-0400\n"
"PO-Revision-Date: 2004-08-13 12:48+0200\n"
"Last-Translator: Micha³ Politowski <l10n at mp.pl.eu.org>\n"
"Language-Team: Polish\n"
@@ -149,16 +149,103 @@
msgstr "Usuwanie tylko nieu¿ywanych pakietów pasuj±cych do wzorca"
#: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:184 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
-#: src/vscreen/vs_util.cc:329
+#: src/ui.cc:218 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
+#: src/vscreen/vs_util.cc:328
msgid "Ok"
msgstr "Ok"
#: src/apt_options.cc:242 src/download_list.cc:71 src/mine/cmine.cc:257
-#: src/mine/cmine.cc:330 src/vscreen/vs_util.cc:329
+#: src/mine/cmine.cc:330 src/vscreen/vs_util.cc:328
msgid "Cancel"
msgstr "Anuluj"
+#: src/broken_indicator.cc:106 src/solution_dialog.cc:97
+msgid "Internal error: unexpected null solution."
+msgstr ""
+
+#: src/broken_indicator.cc:158
+#, fuzzy
+msgid "Suggest "
+msgstr "Sugeruje"
+
+#: src/broken_indicator.cc:164
+#, fuzzy, c-format
+msgid "%d installs"
+msgstr "instaluj"
+
+#: src/broken_indicator.cc:169
+#, fuzzy
+msgid "1 install"
+msgstr "instaluj"
+
+#: src/broken_indicator.cc:173
+#, c-format
+msgid "%d removals"
+msgstr ""
+
+#: src/broken_indicator.cc:178
+msgid "1 removal"
+msgstr ""
+
+#: src/broken_indicator.cc:182
+#, c-format
+msgid "%d keeps"
+msgstr ""
+
+#: src/broken_indicator.cc:187
+msgid "1 keep"
+msgstr ""
+
+#: src/broken_indicator.cc:191
+#, fuzzy, c-format
+msgid "%d upgrades"
+msgstr "uaktualnij"
+
+#: src/broken_indicator.cc:196
+#, fuzzy
+msgid "1 upgrade"
+msgstr "uaktualnij"
+
+#: src/broken_indicator.cc:200
+#, fuzzy, c-format
+msgid "%d downgrades"
+msgstr "cofniêty"
+
+#: src/broken_indicator.cc:205
+#, fuzzy
+msgid "1 downgrade"
+msgstr "cofniêty"
+
+#: src/broken_indicator.cc:214
+#, c-format
+msgid "%s: Examine"
+msgstr ""
+
+#: src/broken_indicator.cc:216
+#, c-format
+msgid "%s: Apply"
+msgstr ""
+
+#: src/broken_indicator.cc:218
+#, fuzzy, c-format
+msgid "%s: Next"
+msgstr "^Nastêpny"
+
+#: src/broken_indicator.cc:220
+#, c-format
+msgid "%s: Previous"
+msgstr ""
+
+#: src/broken_indicator.cc:233
+#, c-format
+msgid "%CSolution search failed. %s: try harder"
+msgstr ""
+
+#: src/broken_indicator.cc:239
+#, c-format
+msgid "%CUnable to resolve dependencies."
+msgstr ""
+
#: src/cmdline/cmdline_action.cc:36
#, c-format
msgid ""
@@ -230,22 +317,22 @@
msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
msgstr "Pakiet %s nie ma uaktualnienia, nie mo¿na zakazaæ uaktualniania\n"
-#: src/cmdline/cmdline_action.cc:213
+#: src/cmdline/cmdline_action.cc:198
#, c-format
msgid "Note: selecting the task \"%s: %s\" for installation\n"
msgstr "Uwaga: wybranie zadania \"%s: %s\" do instalacji\n"
-#: src/cmdline/cmdline_action.cc:240
+#: src/cmdline/cmdline_action.cc:225
#, c-format
msgid "You can only specify a package version with an 'install' command.\n"
msgstr "Wersjê pakietu mo¿na podaæ tylko przy poleceniu \"install\".\n"
-#: src/cmdline/cmdline_action.cc:246
+#: src/cmdline/cmdline_action.cc:231
#, c-format
msgid "You can only specify a package archive with an 'install' command.\n"
msgstr "Archiwum pakietu mo¿na podaæ tylko przy poleceniu \"install\"\n"
-#: src/cmdline/cmdline_action.cc:280
+#: src/cmdline/cmdline_action.cc:265
#, c-format
msgid ""
"Couldn't find package \"%s\", and more than 40\n"
@@ -254,7 +341,7 @@
"Nie znaleziono pakietu \"%s\".\n"
"Nazwy ponad 40 pakietów zawieraj± \"%s\".\n"
-#: src/cmdline/cmdline_action.cc:283
+#: src/cmdline/cmdline_action.cc:268
#, c-format
msgid ""
"Couldn't find package \"%s\". However, the following\n"
@@ -263,12 +350,12 @@
"Nie znaleziono pakietu \"%s\".\n"
"Nastêpuj±ce pakiety maj± \"%s\" w nazwie:\n"
-#: src/cmdline/cmdline_action.cc:307
+#: src/cmdline/cmdline_action.cc:292
#, c-format
msgid "Couldn't find any package whose name or description matched \"%s\"\n"
msgstr "Nie znaleziono pakietu, którego nazwa lub opis zawiera³yby \"%s\"\n"
-#: src/cmdline/cmdline_action.cc:309
+#: src/cmdline/cmdline_action.cc:294
#, c-format
msgid ""
"Couldn't find any package matching \"%s\", and more than 40\n"
@@ -277,7 +364,7 @@
"Nie znaleziono pakietu z \"%s\" w nazwie.\n"
"Opisy ponad czterdziestu pakietów zawieraj± \"%s\".\n"
-#: src/cmdline/cmdline_action.cc:312
+#: src/cmdline/cmdline_action.cc:297
#, c-format
msgid ""
"Couldn't find any package matching \"%s\". However, the following\n"
@@ -322,13 +409,13 @@
msgid "Freed %sB of disk space\n"
msgstr "Zwolni siê %sB na dysku"
-#: src/cmdline/cmdline_do_action.cc:67
+#: src/cmdline/cmdline_do_action.cc:71
#, c-format
msgid "Invalid operation %s"
msgstr "B³êdna operacja '%s'"
-#: src/cmdline/cmdline_do_action.cc:206 src/cmdline/cmdline_simulate.cc:30
-#: src/cmdline/cmdline_upgrade.cc:89
+#: src/cmdline/cmdline_do_action.cc:201 src/cmdline/cmdline_simulate.cc:31
+#: src/cmdline/cmdline_upgrade.cc:91
#, c-format
msgid "Abort.\n"
msgstr "Przerwane.\n"
@@ -338,7 +425,7 @@
msgid "download: you must specify at least one package to download\n"
msgstr "download: nale¿y podaæ przynajmniej jeden pakiet do pobrania\n"
-#: src/cmdline/cmdline_download.cc:43 src/download.cc:342
+#: src/cmdline/cmdline_download.cc:43 src/download.cc:344
msgid "Couldn't read source list"
msgstr "Nie mo¿na odczytaæ listy ¼róde³"
@@ -401,95 +488,95 @@
msgid "What is it? It's an elephant being eaten by a snake, of course.\n"
msgstr "Co to jest? Oczywi¶cie s³oñ zjadany przez wê¿a.\n"
-#: src/cmdline/cmdline_prompt.cc:44
+#: src/cmdline/cmdline_prompt.cc:45
msgid "Couldn't read list of sources"
msgstr "Nie mo¿na odczytaæ listy ¼róde³ pakietów"
-#: src/cmdline/cmdline_prompt.cc:219 src/cmdline/cmdline_show_broken.cc:73
+#: src/cmdline/cmdline_prompt.cc:220 src/cmdline/cmdline_show_broken.cc:73
#, c-format
msgid "but %s is to be installed."
msgstr "ale zaplanowana jest instalacja wersji %s."
-#: src/cmdline/cmdline_prompt.cc:222 src/cmdline/cmdline_show_broken.cc:76
+#: src/cmdline/cmdline_prompt.cc:223 src/cmdline/cmdline_show_broken.cc:76
#, c-format
msgid "but %s is installed and it is kept back."
msgstr "ale wersja %s jest zainstalowana i zatrzymana."
-#: src/cmdline/cmdline_prompt.cc:225 src/cmdline/cmdline_show_broken.cc:79
+#: src/cmdline/cmdline_prompt.cc:226 src/cmdline/cmdline_show_broken.cc:79
#, c-format
msgid "but %s is installed."
msgstr "ale zainstalowana jest wersja %s."
-#: src/cmdline/cmdline_prompt.cc:229 src/cmdline/cmdline_show_broken.cc:83
+#: src/cmdline/cmdline_prompt.cc:230 src/cmdline/cmdline_show_broken.cc:83
#, c-format
msgid "but it is not installable"
msgstr "którego nie mo¿na zainstalowaæ"
-#: src/cmdline/cmdline_prompt.cc:233 src/cmdline/cmdline_show_broken.cc:87
+#: src/cmdline/cmdline_prompt.cc:234 src/cmdline/cmdline_show_broken.cc:87
#, c-format
msgid " which is a virtual package."
msgstr " który jest pakietem wirtualnym."
-#: src/cmdline/cmdline_prompt.cc:236 src/cmdline/cmdline_show_broken.cc:90
+#: src/cmdline/cmdline_prompt.cc:237 src/cmdline/cmdline_show_broken.cc:90
#, c-format
msgid " or"
msgstr " lub"
-#: src/cmdline/cmdline_prompt.cc:248
+#: src/cmdline/cmdline_prompt.cc:249
msgid "The following packages are BROKEN:"
msgstr "Nastêpuj±ce pakiety maj± NIESPE£NIONE zale¿no¶ci:"
-#: src/cmdline/cmdline_prompt.cc:249
+#: src/cmdline/cmdline_prompt.cc:250
msgid "The following packages are unused and will be REMOVED:"
msgstr "Nastêpuj±ce pakiety nie s± u¿ywane i zostan± USUNIÊTE:"
-#: src/cmdline/cmdline_prompt.cc:250
+#: src/cmdline/cmdline_prompt.cc:251
msgid "The following packages have been automatically kept back:"
msgstr "Nastêpuj±ce pakiety zosta³y automatycznie zatrzymane:"
-#: src/cmdline/cmdline_prompt.cc:251
+#: src/cmdline/cmdline_prompt.cc:252
msgid "The following NEW packages will be automatically installed:"
msgstr "Nastêpuj±ce NOWE pakiety zostan± automatycznie zainstalowane:"
-#: src/cmdline/cmdline_prompt.cc:252
+#: src/cmdline/cmdline_prompt.cc:253
msgid "The following packages will be automatically REMOVED:"
msgstr "Nastêpuj±ce pakiety zostan± automatycznie USUNIÊTE:"
-#: src/cmdline/cmdline_prompt.cc:253
+#: src/cmdline/cmdline_prompt.cc:254
msgid "The following packages will be DOWNGRADED:"
msgstr "Nastêpuj±ce pakiety zostan± COFNIÊTE:"
-#: src/cmdline/cmdline_prompt.cc:254
+#: src/cmdline/cmdline_prompt.cc:255
msgid "The following packages have been kept back:"
msgstr "Nastêpuj±ce pakiety zosta³y zatrzymane:"
-#: src/cmdline/cmdline_prompt.cc:255
+#: src/cmdline/cmdline_prompt.cc:256
msgid "The following packages will be REINSTALLED:"
msgstr "Nastêpuj±ce pakiety zostan± PONOWNIE zainstalowane:"
-#: src/cmdline/cmdline_prompt.cc:256
+#: src/cmdline/cmdline_prompt.cc:257
msgid "The following NEW packages will be installed:"
msgstr "Nastêpuj±ce NOWE pakiety zostan± zainstalowane:"
-#: src/cmdline/cmdline_prompt.cc:257
+#: src/cmdline/cmdline_prompt.cc:258
msgid "The following packages will be REMOVED:"
msgstr "Nastêpuj±ce pakiety zostan± USUNIÊTE:"
-#: src/cmdline/cmdline_prompt.cc:258
+#: src/cmdline/cmdline_prompt.cc:259
msgid "The following packages will be upgraded:"
msgstr "Nastêpuj±ce pakiety zostan± uaktualnione:"
-#: src/cmdline/cmdline_prompt.cc:307
+#: src/cmdline/cmdline_prompt.cc:311
#, c-format
msgid "The following ESSENTIAL packages will be REMOVED!\n"
msgstr "Nastêpuj±ce ISTOTNE pakiety zostan± USUNIÊTE!\n"
-#: src/cmdline/cmdline_prompt.cc:316
+#: src/cmdline/cmdline_prompt.cc:320
#, c-format
msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
msgstr "Nastêpuj±ce ISTOTNE pakiet bêd± mia³y NIESPE£NIONE zale¿no¶ci:\n"
-#: src/cmdline/cmdline_prompt.cc:326
+#: src/cmdline/cmdline_prompt.cc:330
#, c-format
msgid ""
"WARNING: Performing this action will probably cause your system to break!\n"
@@ -498,98 +585,101 @@
"UWAGA: Wykonanie tej akcji prawdopodobnie spowoduje powa¿ne problemy!\n"
" NIE kontynuuj, o ile nie wiesz DOK£ADNIE, co chcesz zrobiæ!\n"
-#: src/cmdline/cmdline_prompt.cc:328
+#: src/cmdline/cmdline_prompt.cc:332
msgid "I am aware that this is a very bad idea"
msgstr "Zdajê sobie sprawê, ¿e to bardzo z³y pomys³"
-#: src/cmdline/cmdline_prompt.cc:331
+#: src/cmdline/cmdline_prompt.cc:335
#, c-format
msgid "To continue, type the phrase \"%s\":\n"
msgstr "Aby kontynuowaæ napisz \"%s\":\n"
-#: src/cmdline/cmdline_prompt.cc:434
+#: src/cmdline/cmdline_prompt.cc:438
#, c-format
msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
msgstr "Nastêpuj±ce pakiety POLECANE przez inne NIE zostan± zainstalowane:\n"
-#: src/cmdline/cmdline_prompt.cc:440
+#: src/cmdline/cmdline_prompt.cc:444
#, c-format
msgid "The following packages are SUGGESTED but will NOT be installed:\n"
msgstr "Nastêpuj±ce pakiety SUGEROWANE przez inne NIE zostan± zainstalowane:\n"
-#: src/cmdline/cmdline_prompt.cc:445
+#: src/cmdline/cmdline_prompt.cc:449
#, c-format
msgid "No packages will be installed, upgraded, or removed.\n"
msgstr "Nie zostan± zainstalowane, uaktualnione ani usuniête ¿adne pakiety.\n"
-#: src/cmdline/cmdline_prompt.cc:447
+#: src/cmdline/cmdline_prompt.cc:451
#, c-format
msgid "%lu packages upgraded, %lu newly installed, "
msgstr "%lu pakietów uaktualnianych, %lu instalowanych, "
-#: src/cmdline/cmdline_prompt.cc:451
+#: src/cmdline/cmdline_prompt.cc:455
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu ponownie instalowanych, "
-#: src/cmdline/cmdline_prompt.cc:453
+#: src/cmdline/cmdline_prompt.cc:457
#, c-format
msgid "%lu downgraded, "
msgstr "%lu cofanych, "
-#: src/cmdline/cmdline_prompt.cc:455
+#: src/cmdline/cmdline_prompt.cc:459
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu do usuniêcia i %lu nie uaktualnianych.\n"
-#: src/cmdline/cmdline_prompt.cc:462
+#: src/cmdline/cmdline_prompt.cc:466
#, c-format
msgid "Need to get %sB/%sB of archives. "
msgstr "Do pobrania %sB/%sB archiwów. "
-#: src/cmdline/cmdline_prompt.cc:465
+#: src/cmdline/cmdline_prompt.cc:469
#, c-format
msgid "Need to get %sB of archives. "
msgstr "Do pobrania %sB archiwów. "
-#: src/cmdline/cmdline_prompt.cc:472
+#: src/cmdline/cmdline_prompt.cc:476
#, c-format
msgid "After unpacking %sB will be used.\n"
msgstr "Zajête po rozpakowaniu: %sB.\n"
-#: src/cmdline/cmdline_prompt.cc:475
+#: src/cmdline/cmdline_prompt.cc:479
#, c-format
msgid "After unpacking %sB will be freed.\n"
msgstr "Zwolnione po rozpakowaniu: %sB.\n"
-#: src/cmdline/cmdline_prompt.cc:521
+#: src/cmdline/cmdline_prompt.cc:524
#, c-format
msgid "Bad action character '%c'\n"
msgstr "Nieznana akcja \"%c\"\n"
-#: src/cmdline/cmdline_prompt.cc:596
+#: src/cmdline/cmdline_prompt.cc:595
#, c-format
msgid "No packages to show -- enter the package names on the line after 'i'.\n"
msgstr ""
"Brak pakietów do wy¶wietlenia -- po poleceniu \"i\" nale¿y podaæ nazwy "
"pakietów.\n"
-#: src/cmdline/cmdline_prompt.cc:598 src/cmdline/cmdline_prompt.cc:629
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:597
msgid "Press Return to continue."
msgstr "Wci¶nij return."
-#: src/cmdline/cmdline_prompt.cc:625
+#: src/cmdline/cmdline_prompt.cc:623
#, c-format
msgid "No packages found -- enter the package names on the line after 'c'.\n"
msgstr "Brak pakietów -- po poleceniu \"c\" nale¿y podaæ nazwy pakietów.\n"
-#: src/cmdline/cmdline_prompt.cc:665
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:627
+#, fuzzy
+msgid "Press Return to continue"
+msgstr "Wci¶nij return."
+
+#: src/cmdline/cmdline_prompt.cc:675
msgid "Do you want to continue? [Y/n/?] "
msgstr "Kontynuowaæ? [Y/n/?] "
-#: src/cmdline/cmdline_prompt.cc:690
+#: src/cmdline/cmdline_prompt.cc:700
#, c-format
msgid ""
"\n"
@@ -600,7 +690,7 @@
"Zale¿no¶ci bêd± pokazywane.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:692
+#: src/cmdline/cmdline_prompt.cc:702
#, c-format
msgid ""
"\n"
@@ -611,7 +701,7 @@
"Zale¿no¶ci nie bêd± pokazywane.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:698
+#: src/cmdline/cmdline_prompt.cc:708
#, c-format
msgid ""
"\n"
@@ -622,7 +712,7 @@
"Wersje bêd± pokazywane.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:700
+#: src/cmdline/cmdline_prompt.cc:710
#, c-format
msgid ""
"\n"
@@ -633,7 +723,7 @@
"Wersje nie bêd± pokazywane.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:705
+#: src/cmdline/cmdline_prompt.cc:715
#, c-format
msgid ""
"\n"
@@ -644,7 +734,7 @@
"Zmiany rozmiaru bêd± pokazywane.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:717
#, c-format
msgid ""
"\n"
@@ -655,7 +745,7 @@
"Zmiany rozmiaru nie bêd± pokazywane.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:737
#, c-format
msgid ""
"Commands:\n"
@@ -704,34 +794,89 @@
" _ : wyczyszczenie\n"
" = : zatrzymanie\n"
-#: src/cmdline/cmdline_prompt.cc:751
+#: src/cmdline/cmdline_prompt.cc:761
#, c-format
msgid "Invalid response. Please enter a valid command or '?' for help.\n"
msgstr ""
"Nieprawid³owe polecenie. Proszê podaæ polecenie, lub \"?\" dla uzyskania "
"pomocy.\n"
+#: src/cmdline/cmdline_resolver.cc:84
+#, c-format
+msgid "y: %F%nn: %F%nq: %F%n,: %F%n.: %F%n"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:90
+msgid "accept the proposed changes"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:92
+msgid "reject the proposed changes and search for another solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:94
+#, fuzzy
+msgid "give up and quit the program"
+msgstr "Koñczy program"
+
+#: src/cmdline/cmdline_resolver.cc:96
+msgid "move to the next solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:98
+msgid "move to the previous solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:131
+#, fuzzy
+msgid "The following actions will resolve these dependencies:"
+msgstr "Nastêpuj±ce pakiety maj± niespe³nione zale¿no¶ci:\n"
+
+#: src/cmdline/cmdline_resolver.cc:146
+msgid "Accept this solution? [Y/n/q/?]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:174
+msgid "Abandoning all efforts to resolve these dependencies."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:184
+#, fuzzy
+msgid "The following commands are available:"
+msgstr "Nastêpuj±ce pakiety maj± NIESPE£NIONE zale¿no¶ci:"
+
+#: src/cmdline/cmdline_resolver.cc:188
+#, fuzzy
+msgid "Invalid response; please enter one of the following commands:"
+msgstr ""
+"Nieprawid³owe polecenie. Proszê podaæ polecenie, lub \"?\" dla uzyskania "
+"pomocy.\n"
+
+#: src/cmdline/cmdline_resolver.cc:198
+msgid "No solution found within the allotted time. Try harder? [Y/n]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:226
+#, fuzzy
+msgid "Invalid response; please enter 'y' or 'n'."
+msgstr ""
+"Nieprawid³owe polecenie. Proszê podaæ polecenie, lub \"?\" dla uzyskania "
+"pomocy.\n"
+
+#: src/cmdline/cmdline_resolver.cc:235
+msgid "Unable to resolve dependencies! Giving up..."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:240
+msgid "No more solutions."
+msgstr ""
+
#: src/cmdline/cmdline_search.cc:78
#, c-format
msgid "search: You must provide at least one search term\n"
msgstr "search: Nale¿y podaæ przynajmniej jedno wyra¿enie do wyszukania\n"
-#: src/cmdline/cmdline_show_broken.cc:114
-#, c-format
-msgid ""
-"Some packages had unmet dependencies. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming.\n"
-"\n"
-msgstr ""
-"Niektóre pakiety maj± niespe³nione zale¿no¶ci. Mo¿e to znaczyæ, ¿e\n"
-"za¿±dano niemo¿liwej sytuacji albo, je¶li u¿ywana jest dystrybucja\n"
-"niestabilna, pewne wymagane pakiety nie zosta³y jeszcze stworzone,\n"
-"lub przeniesione z kolejki nowych pakietów (Incoming).\n"
-"\n"
-
-#: src/cmdline/cmdline_show_broken.cc:115
+#: src/cmdline/cmdline_show_broken.cc:113
#, c-format
msgid "The following packages have unmet dependencies:\n"
msgstr "Nastêpuj±ce pakiety maj± niespe³nione zale¿no¶ci:\n"
@@ -929,12 +1074,12 @@
msgid "Description: "
msgstr "Opis: "
-#: src/cmdline/cmdline_simulate.cc:36
+#: src/cmdline/cmdline_simulate.cc:37
#, c-format
msgid "Would download/install/remove packages.\n"
msgstr "Pakiety zosta³yby pobrane/zainstalowane/usuniête.\n"
-#: src/cmdline/cmdline_simulate.cc:47
+#: src/cmdline/cmdline_simulate.cc:48
msgid "Internal Error, Ordering didn't finish"
msgstr "B³±d wewnêtrzny. Sortowanie nie zakoñczone."
@@ -977,28 +1122,24 @@
msgid "UNAVAILABLE"
msgstr "NIEDOSTÊPNY"
-#: src/download_bar.cc:57 src/download_list.cc:265
+#: src/download_bar.cc:56 src/download_list.cc:263 src/download_screen.cc:57
#, c-format
-msgid ""
-"Please insert the following disc into the drive \"%s\":\n"
-"%s"
-msgstr ""
-"Proszê w³o¿yæ nastêpuj±cy dysk do napêdu \"%s\":\n"
-"%s"
+msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
+msgstr "Proszê w³o¿yæ dysk oznaczony \"%s\" do napêdu \"%s\""
-#: src/download_bar.cc:76 src/generic/acqprogress.cc:63
+#: src/download_bar.cc:77 src/generic/acqprogress.cc:63
msgid "Hit "
msgstr "Stary "
-#: src/download_bar.cc:89
+#: src/download_bar.cc:90
msgid "Downloading "
msgstr "Pobieranie "
-#: src/download_bar.cc:102
+#: src/download_bar.cc:103
msgid "Got "
msgstr "Nowy "
-#: src/download_bar.cc:156
+#: src/download_bar.cc:157
msgid "Downloading..."
msgstr "Pobieranie..."
@@ -1006,7 +1147,7 @@
msgid "Couldn't read list of package sources"
msgstr "Nie mo¿na odczytaæ listy ¼róde³ pakietów"
-#: src/download.cc:104 src/download.cc:321
+#: src/download.cc:104 src/download.cc:322
msgid "Couldn't lock list directory..are you root?"
msgstr "Nie mo¿na zablokowaæ katalogu z listami..czy jeste¶ rootem?"
@@ -1018,29 +1159,33 @@
msgid "View the progress of the package list update"
msgstr "Widok postêpów uaktualniania list pakietów"
-#: src/download.cc:159
+#: src/download.cc:113
+msgid "List Update"
+msgstr ""
+
+#: src/download.cc:160
msgid "Couldn't clean out list directories"
msgstr "Nie mo¿na wyczy¶ciæ katalogów z listami"
-#: src/download.cc:176 src/ui.cc:1068
+#: src/download.cc:177 src/ui.cc:1152
msgid "Deleting obsolete downloaded files"
msgstr "Usuwanie nieaktualnych plików pakietów"
-#: src/download.cc:181
+#: src/download.cc:182
#, c-format
msgid "Deleting obsolete downloaded files\n"
msgstr "Usuwanie nieaktualnych plików pakietów\n"
-#: src/download.cc:223
+#: src/download.cc:224
#, c-format
msgid "Unable to open %s to log actions"
msgstr "Nie mo¿na otworzyæ pliku dziennika: %s"
-#: src/download.cc:229
+#: src/download.cc:230
msgid "log report"
msgstr "dziennik operacji"
-#: src/download.cc:230
+#: src/download.cc:231
#, c-format
msgid ""
"IMPORTANT: this log only lists intended actions; actions which fail due to\n"
@@ -1051,77 +1196,77 @@
"wyst±pi³y b³êdy dpkg mog± nie byæ zakoñczone pomy¶lnie.\n"
"\n"
-#: src/download.cc:231
+#: src/download.cc:232
#, c-format
msgid "Will install %li packages, and remove %li packages.\n"
msgstr "Zostanie zainstalowanych %li pakietów, usuniêtych %li pakietów.\n"
-#: src/download.cc:233
+#: src/download.cc:234
#, c-format
msgid "%sB of disk space will be used\n"
msgstr "Zostanie zajête na dysku: %sB\n"
-#: src/download.cc:236
+#: src/download.cc:237
#, c-format
msgid "%sB bytes of disk space will be freed\n"
msgstr "Zwolni siê na dysku: %sB\n"
-#: src/download.cc:244
+#: src/download.cc:245
#, c-format
msgid "[UPGRADE] %s %s -> %s\n"
msgstr "[UAKTUALNIONY] %s %s -> %s\n"
-#: src/download.cc:248
+#: src/download.cc:249
#, c-format
msgid "[DOWNGRADE] %s %s -> %s\n"
msgstr "[COFNIÊTY] %s %s -> %s\n"
-#: src/download.cc:258
+#: src/download.cc:259
msgid "REMOVE"
msgstr "USUNIÊTY"
-#: src/download.cc:264
+#: src/download.cc:265
msgid "INSTALL"
msgstr "INSTALOWANY"
-#: src/download.cc:267
+#: src/download.cc:268
msgid "REINSTALL"
msgstr "REINSTALOWANY"
-#: src/download.cc:270
+#: src/download.cc:271
msgid "HOLD"
msgstr "ZATRZYMANY"
-#: src/download.cc:273
+#: src/download.cc:274
msgid "BROKEN"
msgstr "ZALE¯NO¦CI"
-#: src/download.cc:276
+#: src/download.cc:277
msgid "REMOVE, NOT USED"
msgstr "USUNIÊTY, NIE U¯YWANY"
-#: src/download.cc:279
+#: src/download.cc:280
msgid "REMOVE, DEPENDENCIES"
msgstr "USUNIÊTY, ZALE¯NO¦CI"
-#: src/download.cc:282
+#: src/download.cc:283
msgid "INSTALL, DEPENDENCIES"
msgstr "INSTALOWANY, ZALE¯NO¦CI"
-#: src/download.cc:285
+#: src/download.cc:286
msgid "HOLD, DEPENDENCIES"
msgstr "ZATRZYMANY, ZALE¯NO¦CI"
-#: src/download.cc:287
+#: src/download.cc:288
msgid "????????"
msgstr "????????"
-#: src/download.cc:291
+#: src/download.cc:292
#, c-format
msgid "[%s] %s\n"
msgstr "[%s] %s\n"
-#: src/download.cc:294
+#: src/download.cc:295
#, c-format
msgid ""
"===============================================================================\n"
@@ -1132,32 +1277,37 @@
"\n"
"Dziennik zakoñczony.\n"
-#: src/download.cc:329
+#: src/download.cc:330
msgid "Downloading packages"
msgstr "Pobieranie pakietów"
-#: src/download.cc:330
+#: src/download.cc:331
msgid "View the progress of the package download"
msgstr "Widok postêpów pobierania pakietów"
-#: src/download.cc:352
+#: src/download.cc:332
+#, fuzzy
+msgid "Package Download"
+msgstr "Pakiet: "
+
+#: src/download.cc:354
msgid "Internal error: couldn't generate list of packages to download"
msgstr "B³±d wewnêtrzny: nie mo¿na utworzyæ listy pakietów do pobrania"
-#: src/download.cc:413
+#: src/download.cc:415
msgid "Unable to correct for unavailable packages"
msgstr "Nie mo¿na naprawiæ braku pakietów"
-#: src/download.cc:465
+#: src/download.cc:467
msgid ""
"Ack! Something bad happened while installing packages. Trying to recover:"
msgstr "W czasie instalacji wyst±pi³y problemy. Próba naprawy: "
-#: src/download.cc:475 src/pkg_item.cc:413
+#: src/download.cc:477 src/pkg_item.cc:432
msgid "Press return to continue.\n"
msgstr "Wci¶nij return.\n"
-#: src/download.cc:506
+#: src/download.cc:508
msgid ""
"Could not regain the system lock! (Perhaps another apt or dpkg is running?)"
msgstr ""
@@ -1219,11 +1369,6 @@
msgid "[ERROR]"
msgstr "[B£¡D]"
-#: src/download_screen.cc:57
-#, c-format
-msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
-msgstr "Proszê w³o¿yæ dysk oznaczony \"%s\" do napêdu \"%s\""
-
#: src/download_screen.cc:181
#, c-format
msgid "Downloaded %sB in %ss (%sB/s)."
@@ -1263,111 +1408,111 @@
"Wymiana no¶nika: Proszê w³o¿yæ dysk oznaczony \"%s\" do napêdu \"%s\" i "
"nacisn±æ enter\n"
-#: src/generic/aptcache.cc:245
+#: src/generic/aptcache.cc:253
msgid "Can't open Aptitude extended state file"
msgstr "Nie mo¿na otworzyæ dodatkowych informacji o stanie"
-#: src/generic/aptcache.cc:252 src/generic/aptcache.cc:305
-#: src/generic/aptcache.cc:307
+#: src/generic/aptcache.cc:260 src/generic/aptcache.cc:313
+#: src/generic/aptcache.cc:315
msgid "Reading extended state information"
msgstr "Odczyt dodatkowych informacji o stanie"
-#: src/generic/aptcache.cc:313 src/generic/aptcache.cc:387
-#: src/generic/aptcache.cc:390
+#: src/generic/aptcache.cc:321 src/generic/aptcache.cc:395
+#: src/generic/aptcache.cc:398
msgid "Initializing package states"
msgstr "Inicjalizacja stanów pakietów"
-#: src/generic/aptcache.cc:501
+#: src/generic/aptcache.cc:509
msgid "Cannot open Aptitude state file"
msgstr "Nie mo¿na otworzyæ informacji o stanie"
-#: src/generic/aptcache.cc:505 src/generic/aptcache.cc:560
-#: src/generic/aptcache.cc:563
+#: src/generic/aptcache.cc:513 src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:571
msgid "Writing extended state information"
msgstr "Zapisywanie dodatkowych informacji o stanie"
-#: src/generic/aptcache.cc:542
+#: src/generic/aptcache.cc:550
#, c-format
msgid "Internal buffer overflow on package \"%s\" while writing state file"
msgstr "Przepe³nienie bufora przy zapisie informacji o stanie pakietu \"%s\""
-#: src/generic/aptcache.cc:551
+#: src/generic/aptcache.cc:559
msgid "Couldn't write state file"
msgstr "Nie mo¿na zapisaæ informacji o stanie"
-#: src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:576
msgid "Error writing state file"
msgstr "B³±d w czasie zapisu informacji o stanie"
-#: src/generic/aptcache.cc:584
+#: src/generic/aptcache.cc:592
msgid "couldn't replace old state file"
msgstr "nie mo¿na zast±piæ starego pliku stanu"
-#: src/generic/aptcache.cc:960
+#: src/generic/aptcache.cc:1000
msgid "Unable to correct dependencies, some packages cannot be installed"
msgstr ""
"Nie mo¿na poprawiæ zale¿no¶ci, czê¶æ pakietów nie mo¿e byæ zainstalowana"
-#: src/generic/aptcache.cc:1325
+#: src/generic/aptcache.cc:1546
msgid "The list of sources could not be read."
msgstr "Nie mo¿na odczytaæ listy ¼róde³."
-#: src/generic/aptcache.cc:1332
+#: src/generic/aptcache.cc:1553
msgid "The package lists or status file could not be parsed or opened."
msgstr "Nie uda³o siê odczytaæ lub przetworzyæ list pakietów lub pliku stanu."
-#: src/generic/aptcache.cc:1335
+#: src/generic/aptcache.cc:1556
msgid "You may want to update the package lists to correct these missing files"
msgstr "Mo¿na uaktualniæ listy pakietów aby uzupe³niæ brakuj±ce pliki"
-#: src/generic/apt.cc:141
+#: src/generic/apt.cc:142
#, c-format
msgid "Unable to open %s for writing"
msgstr "Nie mo¿na otworzyæ %s do zapisu"
-#: src/generic/apt.cc:151
+#: src/generic/apt.cc:152
#, c-format
msgid "Unable to replace %s with new configuration file"
msgstr "Nie mo¿na zast±piæ %s nowym plikiem konfiguracyjnym"
-#: src/generic/apt.cc:226
+#: src/generic/apt.cc:227
msgid "Warning: could not lock the cache file. Opening in read-only mode"
msgstr ""
"Uwaga: nie uda³o siê zablokowaæ pliku bufora. Otwarty tylko do odczytu."
-#: src/generic/matchers.cc:780
+#: src/generic/matchers.cc:797
msgid "Unmatched '('"
msgstr "Niesparowany nawias '('"
-#: src/generic/matchers.cc:870 src/generic/matchers.cc:949
+#: src/generic/matchers.cc:887 src/generic/matchers.cc:968
#, c-format
msgid "Unknown dependency type: %s"
msgstr "Nieznany typ zale¿no¶ci: %s"
-#: src/generic/matchers.cc:931
+#: src/generic/matchers.cc:950
#, c-format
msgid "Unknown action type: %s"
msgstr "Nieznana akcja: %s"
-#: src/generic/matchers.cc:998
+#: src/generic/matchers.cc:1017
#, c-format
msgid "Unknown priority %s"
msgstr "Nieznany priorytet: %s"
-#: src/generic/matchers.cc:1020
+#: src/generic/matchers.cc:1039
#, c-format
msgid "Unknown pattern type: %c"
msgstr "Nieznany typ wzorca: %c"
-#: src/generic/matchers.cc:1065
+#: src/generic/matchers.cc:1084
msgid "Unexpected empty expression"
msgstr "Niespodziewane puste wyra¿enie"
-#: src/generic/matchers.cc:1100
+#: src/generic/matchers.cc:1119
msgid "Badly formed expression"
msgstr "Niepoprawne wyra¿enie"
-#: src/generic/matchers.cc:1129
+#: src/generic/matchers.cc:1148
msgid "Unexpected ')'"
msgstr "Niespodziewany nawias ')'"
@@ -1392,7 +1537,7 @@
msgstr ""
"Nie mo¿na pobraæ warto¶ci $HOME, zostanie u¿yty $TMPDIR (niebezpieczne)"
-#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:60
+#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:61
#, c-format
msgid "ChangeLog of %s"
msgstr "Dziennik zmian dla %s"
@@ -1600,17 +1745,17 @@
msgid "Invalid sorting policy type '%s'"
msgstr "Nieznany sposób sortowania '%s'"
-#: src/main.cc:68
+#: src/main.cc:67
#, c-format
msgid "%s %s compiled at %s %s\n"
msgstr "%s %s skompilowany %s %s\n"
-#: src/main.cc:71
+#: src/main.cc:70
#, c-format
msgid "Compiler: g++ %s\n"
msgstr "Kompilator: g++ %s\n"
-#: src/main.cc:74
+#: src/main.cc:73
#, c-format
msgid ""
"\n"
@@ -1619,7 +1764,7 @@
"\n"
"Wersja NCurses: %s\n"
-#: src/main.cc:76
+#: src/main.cc:75
#, c-format
msgid ""
"\n"
@@ -1628,22 +1773,22 @@
"\n"
"Wersja Curses: %s\n"
-#: src/main.cc:78
+#: src/main.cc:77
#, c-format
msgid "libsigc++ version: %s\n"
msgstr "Wersja libsigc++: %s\n"
-#: src/main.cc:84
+#: src/main.cc:83
#, c-format
msgid "Usage: aptitude [-S fname] [-u|-i]"
msgstr "U¿ycie: aptitude [-S fname] [-u|-i]"
-#: src/main.cc:86
+#: src/main.cc:85
#, c-format
msgid " aptitude [options] <action> ..."
msgstr " aptitude [opcje] <akcja> ..."
-#: src/main.cc:88
+#: src/main.cc:87
#, c-format
msgid ""
" Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -1652,43 +1797,43 @@
" Akcje (je¶li nie podane aptitude uruchamia siê w trybie interaktywnym):\n"
"\n"
-#: src/main.cc:89
+#: src/main.cc:88
#, c-format
msgid " install - Install/upgrade packages\n"
msgstr " install - Instalacja/uaktualnienie pakietów\n"
-#: src/main.cc:90
+#: src/main.cc:89
#, c-format
msgid " remove - Remove packages\n"
msgstr " remove - Usuniêcie pakietów\n"
-#: src/main.cc:91
+#: src/main.cc:90
#, c-format
msgid " purge - Remove packages and their configuration files\n"
msgstr " purge - Usuniêcie pakietów i ich plików konfiguracyjnych\n"
-#: src/main.cc:92
+#: src/main.cc:91
#, c-format
msgid " hold - Place packages on hold\n"
msgstr " hold - Zatrzymanie pakietów\n"
-#: src/main.cc:93
+#: src/main.cc:92
#, c-format
msgid " unhold - Cancel a hold command for a package\n"
msgstr " unhold - Anylowanie zatrzymania pakietów\n"
-#: src/main.cc:94
+#: src/main.cc:93
#, c-format
msgid " markauto - Mark packages as having been automatically installed\n"
msgstr ""
" markauto - Zaznaczenie pakietów jako automatycznie zainstalowanych\n"
-#: src/main.cc:95
+#: src/main.cc:94
#, c-format
msgid " unmarkauto - Mark packages as having been manually installed\n"
msgstr " unmarkauto - Zaznaczenie pakietów jako rêcznie zainstalowanych\n"
-#: src/main.cc:100
+#: src/main.cc:99
#, c-format
msgid ""
" forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -1696,17 +1841,17 @@
msgstr ""
" forbid-version - Zablokowanie uaktualniania do okre¶lonej wersji pakietu.\n"
-#: src/main.cc:101
+#: src/main.cc:100
#, c-format
msgid " update - Download lists of new/upgradable packages\n"
msgstr " update - Pobranie list nowych/uaktualnionych pakietów\n"
-#: src/main.cc:102
+#: src/main.cc:101
#, c-format
msgid " upgrade - Perform a safe upgrade\n"
msgstr " upgrade - Bezpieczne uaktualnienie systemu\n"
-#: src/main.cc:103
+#: src/main.cc:102
#, c-format
msgid ""
" dist-upgrade - Perform an upgrade, possibly installing and removing "
@@ -1715,75 +1860,75 @@
" dist-upgrade - Uaktualnienie systemu; mo¿liwa instalacja/usuniêcie "
"pakietów\n"
-#: src/main.cc:104
+#: src/main.cc:103
#, c-format
msgid " forget-new - Forget what packages are \"new\"\n"
msgstr " forget-new - Usuniêcie informacji, które pakiety s± nowe\n"
-#: src/main.cc:105
+#: src/main.cc:104
#, c-format
msgid " search - Search for a package by name and/or expression\n"
msgstr " search - Wyszukiwanie pakietów wed³ug nazwy/wyra¿enia\n"
-#: src/main.cc:106
+#: src/main.cc:105
#, c-format
msgid " show - Display detailed information about a package\n"
msgstr " show - Wy¶wietlanie szczegó³owych informacji o pakiecie\n"
-#: src/main.cc:107
+#: src/main.cc:106
#, c-format
msgid " clean - Erase downloaded package files\n"
msgstr " clean - Usuniêcie pobranych plików pakietów\n"
-#: src/main.cc:108
+#: src/main.cc:107
#, c-format
msgid " autoclean - Erase old downloaded package files\n"
msgstr " autoclean - Usuniêcie starych plików pakietów\n"
-#: src/main.cc:109
+#: src/main.cc:108
#, c-format
msgid " changelog - View a package's changelog\n"
msgstr " changelog - Wy¶wietlanie dziennika zmian pakietu\n"
-#: src/main.cc:110
+#: src/main.cc:109
#, c-format
msgid " download - Download the .deb file for a package\n"
msgstr " download - Pobranie pliku .deb pakietu\n"
-#: src/main.cc:112
+#: src/main.cc:111
#, c-format
msgid " Options:\n"
msgstr " Opcje:\n"
-#: src/main.cc:113
+#: src/main.cc:112
#, c-format
msgid " -h This help text\n"
msgstr " -h Ten tekst pomocy\n"
-#: src/main.cc:114
+#: src/main.cc:113
#, c-format
msgid " -s Simulate actions, but do not actually perform them.\n"
msgstr " -s Symualcja akcji bez ich wykonania\n"
-#: src/main.cc:115
+#: src/main.cc:114
#, c-format
msgid ""
" -d Only download packages, do not install or remove anything.\n"
msgstr ""
" -d Pobranie pakietów bez instalacji lub usuwania czegokolwiek\n"
-#: src/main.cc:116
+#: src/main.cc:115
#, c-format
msgid " -P Always prompt for confirmation or actions\n"
msgstr " -P Pytanie o potwierdzenie wykonywanych akcji\n"
-#: src/main.cc:117
+#: src/main.cc:116
#, c-format
msgid ""
" -y Assume that the answer to simple yes/no questions is 'yes'\n"
msgstr " -y Przyjêcie odpowiedzi \"tak\" na pytania typu tak/nie\n"
-#: src/main.cc:118
+#: src/main.cc:117
#, c-format
msgid ""
" -F format Specify a format for displaying search results; see the "
@@ -1791,43 +1936,43 @@
msgstr ""
" -F format Format wy¶wietlania wyników wyszukiwania; patrz podrêcznik\n"
-#: src/main.cc:119
+#: src/main.cc:118
#, c-format
msgid ""
" -O order Specify how search results should be sorted; see the manual\n"
msgstr ""
" -O order Sposób sortowania wyników wyszukiwania; patrz podrêcznik\n"
-#: src/main.cc:120
+#: src/main.cc:119
#, c-format
msgid ""
" -w width Specify the display width for formatting search results\n"
msgstr " -w width Szeroko¶æ wy¶wietlania wyników wyszukiwania\n"
-#: src/main.cc:121
+#: src/main.cc:120
#, c-format
msgid " -f Aggressively try to fix broken packages.\n"
msgstr ""
" -f Agresywne próby naprawnienia niespe³nionych zale¿no¶ci\n"
-#: src/main.cc:122
+#: src/main.cc:121
#, c-format
msgid " -V Show which versions of packages are to be installed.\n"
msgstr " -V Wy¶wietlanie wersji pakietów do instalacji\n"
-#: src/main.cc:123
+#: src/main.cc:122
#, c-format
msgid ""
" -D Show the dependencies of automatically changed packages.\n"
msgstr ""
" -D Wy¶wietlanie zale¿no¶ci automatycznie zmienianych pakietów\n"
-#: src/main.cc:124
+#: src/main.cc:123
#, c-format
msgid " -Z\t\t Show the change in installed size of each package.\n"
msgstr " -Z\t\t Wy¶wietlanie zmian rozmiarów pakietów.\n"
-#: src/main.cc:125
+#: src/main.cc:124
#, c-format
msgid ""
" -v Display extra information. (may be supplied multiple times)\n"
@@ -1835,7 +1980,7 @@
" -v Wy¶wietlanie dodatkowych informacji (mo¿na podaæ "
"wielokrotnie)\n"
-#: src/main.cc:126
+#: src/main.cc:125
#, c-format
msgid ""
" -t [release] Set the release from which packages should be installed\n"
@@ -1843,12 +1988,12 @@
" -t [wydanie] Ustalenie wydania z którego powinny pochodziæ instalowane "
"pakiety\n"
-#: src/main.cc:127
+#: src/main.cc:126
#, c-format
msgid " -o key=val Directly set the configuration option named 'key'\n"
msgstr " -o nazwa=warto¶æ Bezpo¶rednie ustawienie warto¶ci podanej opcji\n"
-#: src/main.cc:128
+#: src/main.cc:127
#, c-format
msgid ""
" --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -1857,58 +2002,66 @@
" --with(out)-recommends\tCzy traktowaæ rekomendacje (sugestie) jak\n"
" silne zale¿no¶ci\n"
-#: src/main.cc:129
+#: src/main.cc:128
#, c-format
msgid " -S fname: Read the aptitude extended status info from fname.\n"
msgstr " -S fname: Odczyt rozszerzonych informacji o stanie z pliku fname.\n"
-#: src/main.cc:130
+#: src/main.cc:129
#, c-format
msgid " -u : Download new package lists on startup.\n"
msgstr " -u: : Uaktualnienie listy pakietów przy starcie.\n"
-#: src/main.cc:131
+#: src/main.cc:130
#, c-format
msgid " -i : Perform an install run on startup.\n"
msgstr " -i : Przeprowadzenie instalacji przy starcie.\n"
-#: src/main.cc:133
+#: src/main.cc:132
#, c-format
msgid " This aptitude does not have Super Cow Powers.\n"
msgstr " Ten aptitude nie posiada Mocy Super Krowy.\n"
-#: src/main.cc:254
+#: src/main.cc:253
#, c-format
msgid "-o requires an argument of the form key=value, got %s"
msgstr "-o wymaga podania argumentu postaci nazwa=warto¶æ, otrzymano %s"
-#: src/main.cc:300 src/main.cc:309
+#: src/main.cc:299 src/main.cc:308
msgid "WEIRDNESS: unknown option code received\n"
msgstr "DZIWNE: otrzymano nieznany kod opcji\n"
-#: src/main.cc:318
+#: src/main.cc:317
msgid "Only one of -u and -i may be specified\n"
msgstr "Mo¿na podaæ tylko jedn± z opcji -u i -f\n"
-#: src/main.cc:326
+#: src/main.cc:325
msgid ""
"-u and -i may not be specified in command-line mode (eg, with 'install')"
msgstr ""
"-u ani -i nie mo¿na podaæ dla trybu wiersza poleceñ (np. z \"install\")"
-#: src/main.cc:337
+#: src/main.cc:342
msgid "-u and -i may not be specified with a command"
msgstr "-u ani -i nie mo¿na podaæ razem z poleceniem"
-#: src/main.cc:392
+#: src/main.cc:399
#, c-format
msgid "Unknown command \"%s\"\n"
msgstr "Nieznane polecenie:\"%s\"\n"
-#: src/main.cc:400
+#: src/main.cc:406 src/main.cc:463
+msgid "Internal error: uncaught 'out of solutions' exception.\n"
+msgstr ""
+
+#: src/main.cc:411 src/main.cc:468
+msgid "Internal error: uncaught 'out of time' exception.\n"
+msgstr ""
+
+#: src/main.cc:418
#, c-format
-msgid "Invalid option for interactive mode: -s\n"
-msgstr "Nieprawid³owa opcja dla trybu interaktywnego: -s\n"
+msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
+msgstr ""
#: src/mine/cmine.cc:93
#, c-format
@@ -1936,7 +2089,7 @@
msgid "Lost"
msgstr "Przegrana"
-#: src/mine/cmine.cc:119 src/ui.cc:1005
+#: src/mine/cmine.cc:119 src/ui.cc:1089
msgid "Minesweeper"
msgstr "Saper"
@@ -2111,7 +2264,7 @@
msgid "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
msgstr "30 6 6 1 1 40 10 10 18 10 35 9 10 2 1 1 12 14 32 19 15"
-#: src/pkg_columnizer.cc:84 src/ui.cc:1488
+#: src/pkg_columnizer.cc:84 src/ui.cc:1638
msgid "Package"
msgstr "Pakiet"
@@ -2369,13 +2522,14 @@
" Pakiety w sekcji \"base\" s± czê¶ci± podstawowej instalacji systemu."
#: src/pkg_grouppolicy.cc:158
+#, fuzzy
msgid ""
"Programs for faxmodems and other communications devices\n"
" Packages in the 'comm' section are used to control modems and other "
"hardware communications devices. This includes software to control faxmodems "
"(for instance, PPP for dial-up internet connections and programs originally "
-"written for that purpose (zmodem/kermit), as well as software to control "
-"cellular phones, interface with FidoNet, and run a BBS."
+"written for that purpose, such as zmodem/kermit), as well as software to "
+"control cellular phones, interface with FidoNet, and run a BBS."
msgstr ""
"Programy do obs³ugi faxmodemów i innych urz±dzeñ komunikacyjnych\n"
" Pakiety w sekcji \"comm\" s± u¿ywane do obs³ugi modemów i innych urz±dzeñ "
@@ -2823,14 +2977,15 @@
"jest wiêc teraz dostêpnych w sekcji \"main\"."
#: src/pkg_grouppolicy.cc:193
+#, fuzzy
msgid ""
"Programs which are not free software\n"
" Packages in the 'non-free' section are not part of Debian.\n"
" .\n"
" These packages fail to meet one or more of the requirements of the Debian "
-"Free Software Guidelines (see below) You should read the license of programs "
-"in this section to be sure that you are allowed to use them in the way you "
-"intend.\n"
+"Free Software Guidelines (see below). You should read the license of "
+"programs in this section to be sure that you are allowed to use them in the "
+"way you intend.\n"
" .\n"
" For more information about what Debian considers to be Free Software, see "
"http://www.debian.org/social_contract#guidelines"
@@ -2894,11 +3049,12 @@
" Dostêpne s± nowsze wersje tych pakietów."
#: src/pkg_grouppolicy.cc:320
+#, fuzzy
msgid ""
"New Packages\n"
" These packages have been added to Debian since the last time you cleared "
-"the list of \"new\" packages. (choose \"Forget new packages\" from the "
-"Actions menu to empty this list)"
+"the list of \"new\" packages (choose \"Forget new packages\" from the "
+"Actions menu to empty this list)."
msgstr ""
"Nowe pakiety\n"
" Te pakiety zosta³y dodane do Debiana od czasu ostatniego usuniêcia "
@@ -3151,101 +3307,121 @@
msgid "Versions"
msgstr "Wersje"
-#: src/pkg_item.cc:54
+#: src/pkg_item.cc:55
msgid "Yes, I am aware this is a very bad idea"
msgstr "Tak, zdajê sobie sprawê, ¿e to z³y pomys³"
#: src/pkg_item.cc:80
-#, c-format
+#, fuzzy, c-format
msgid ""
-"%s is an essential package!\n"
-"\n"
-"Are you sure you want to remove it?\n"
-"Type '%s' if you are."
+"%s is an essential package!%n%nAre you sure you want to remove it?%nType '%"
+"s' if you are."
msgstr ""
"%s jest istotnym pakietem!\n"
"\n"
"Czy na pewno chcesz go usun±æ?\n"
"Je¶li tak, wpisz '%s'."
-#: src/pkg_item.cc:219
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:625
#, c-format
msgid "Information about %s"
msgstr "Informacje o %s"
-#: src/pkg_item.cc:304
-msgid "Available versions of "
+#: src/pkg_item.cc:224 src/pkg_ver_item.cc:627
+#, c-format
+msgid "%s info"
+msgstr ""
+
+#: src/pkg_item.cc:310
+#, fuzzy, c-format
+msgid "Available versions of %s"
msgstr "Dostêpne wersje "
-#: src/pkg_item.cc:312 src/pkg_ver_item.cc:648
+#: src/pkg_item.cc:313
+#, fuzzy, c-format
+msgid "%s versions"
+msgstr "Wersje"
+
+#: src/pkg_item.cc:325 src/pkg_ver_item.cc:655
#, c-format
msgid "Dependencies of %s"
msgstr "Zale¿no¶ci %s"
-#: src/pkg_item.cc:322 src/pkg_ver_item.cc:657
+#: src/pkg_item.cc:327 src/pkg_ver_item.cc:657
+#, c-format
+msgid "%s deps"
+msgstr ""
+
+#: src/pkg_item.cc:338 src/pkg_ver_item.cc:667
#, c-format
msgid "Packages depending on %s"
msgstr "Pakiety zale¿ne od %s"
-#: src/pkg_item.cc:373 src/pkg_ver_item.cc:694
+#: src/pkg_item.cc:340 src/pkg_ver_item.cc:669
+#, c-format
+msgid "%s reverse deps"
+msgstr ""
+
+#: src/pkg_item.cc:392 src/pkg_ver_item.cc:707
#, c-format
msgid "Reporting a bug in %s:\n"
msgstr "Zg³aszanie b³êdu w %s:\n"
-#: src/pkg_item.cc:395
+#: src/pkg_item.cc:414
+#, fuzzy
msgid ""
-"You are not root and I cannot find any way\n"
-"to become root. To reconfigure this package,\n"
-"install the menu package, the login package,\n"
-"or run aptitude as root."
+"You are not root and I cannot find any way to become root. To reconfigure "
+"this package, install the menu package, the login package, or run aptitude "
+"as root."
msgstr ""
"Nie masz uprawnieñ administratora\n"
"i nie znaleziono sposobu na ich uzyskanie.\n"
"By móc rekonfigurowaæ pakiety, zainstaluj pakiet menu,\n"
"login lub uruchamiaj aptitude jako administrator."
-#: src/pkg_item.cc:403
+#: src/pkg_item.cc:422
#, c-format
msgid "Reconfiguring %s\n"
msgstr "Rekonfigurowanie pakietu \"%s\"\n"
-#: src/pkg_item.cc:428
+#: src/pkg_item.cc:447
msgid "Hierarchy editor"
msgstr "Edytor hierarchii"
+#: src/pkg_item.cc:447
+#, fuzzy
+msgid "Hierarchy Editor"
+msgstr "Edytor hierarchii"
+
#: src/pkg_tree.cc:325
msgid "Search for: "
msgstr "Znajd¼: "
-#: src/pkg_tree.cc:585
+#: src/pkg_tree.cc:568
msgid "All Packages"
msgstr "Wszystkie pakiety"
-#: src/pkg_tree.cc:598 src/pkg_tree.cc:607
+#: src/pkg_tree.cc:581 src/pkg_tree.cc:590
msgid "Building view"
msgstr "Tworzenie widoku"
-#: src/pkg_tree.cc:649
+#: src/pkg_tree.cc:632
#, c-format
msgid "No packages matched the pattern \"%s\"."
msgstr "Brak pakietów pasuj±cych do wzorca \"%s\"."
-#: src/pkg_tree.cc:671
+#: src/pkg_tree.cc:654
msgid "Enter the new package tree limit: "
msgstr "Nowy filtr wy¶wietlania pakietów: "
-#: src/pkg_tree.cc:705
+#: src/pkg_tree.cc:688
msgid "Enter the new package grouping mechanism for this display: "
msgstr "Nowy sposób grupowania pakietów w tym widoku: "
-#: src/pkg_tree.cc:713
+#: src/pkg_tree.cc:696
msgid "Enter the new package sorting mechanism for this display: "
msgstr "Nowy sposób sortowania pakietów w tym widoku: "
-#: src/pkg_ver_item.cc:623
-msgid "Information about "
-msgstr "Informacje o "
-
#: src/pkg_view.cc:344
msgid "make_package_view: error in arguments -- two main widgets??"
msgstr "make_package_view: b³êdne argumenty -- dwa g³ówne elementy??"
@@ -3261,7 +3437,7 @@
msgid "make_package_view: bad argument!"
msgstr "make_package_view: b³êdny argument!"
-#: src/pkg_view.cc:492
+#: src/pkg_view.cc:495
msgid "make_package_view: no main widget found"
msgstr "make_package_view: brak g³ównego elementu"
@@ -3482,6 +3658,74 @@
"Nastêpuj±ce pakiety wymagaj± wersji %B%s%b pakietu %B%s%b i bêd± mai³y "
"niespe³nione zale¿no¶ci je¶li zostanie %s."
+#: src/solution_dialog.cc:74
+msgid "The package cache is not available."
+msgstr ""
+
+#: src/solution_dialog.cc:82
+#, fuzzy
+msgid "No packages are broken."
+msgstr "Niektóre pakiety maj± niespe³nione zale¿no¶ci. Naprawiæ je? "
+
+#: src/solution_dialog.cc:103
+msgid "No resolution found."
+msgstr ""
+
+#: src/solution_dialog.cc:107
+#, c-format
+msgid ""
+"Time exhausted while searching for a solution (you can select \"Next Solution"
+"\" or press %s to try harder)."
+msgstr ""
+
+#: src/solution_dialog.cc:146
+#, fuzzy
+msgid "Previous"
+msgstr "Udostêpnia"
+
+#: src/solution_dialog.cc:147
+#, fuzzy
+msgid "Next"
+msgstr "^Nastêpny"
+
+#: src/solution_dialog.cc:148
+msgid "Apply"
+msgstr ""
+
+#: src/solution_dialog.cc:149
+#, fuzzy
+msgid "Close"
+msgstr "^Zamknij"
+
+#: src/solution_fragment.cc:125
+#, fuzzy
+msgid "%BRemove%b the following packages:%n"
+msgstr "Nastêpuj±ce pakiety maj± NIESPE£NIONE zale¿no¶ci:"
+
+#: src/solution_fragment.cc:135
+#, fuzzy
+msgid "%BInstall%b the following packages:%n"
+msgstr "Nastêpuj±ce pakiety maj± NIESPE£NIONE zale¿no¶ci:"
+
+#: src/solution_fragment.cc:148
+msgid "%BKeep%b the following packages at their current version:%n"
+msgstr ""
+
+#: src/solution_fragment.cc:161
+#, fuzzy
+msgid "%BUpgrade%b the following packages:%n"
+msgstr "Nastêpuj±ce pakiety maj± NIESPE£NIONE zale¿no¶ci:"
+
+#: src/solution_fragment.cc:176
+#, fuzzy
+msgid "%BDowngrade%b the following packages:%n"
+msgstr "Pobieranie pakietów"
+
+#: src/solution_fragment.cc:190
+#, c-format
+msgid "Score is %d"
+msgstr ""
+
#: src/trust.cc:17 src/trust.cc:19
msgid "WARNING"
msgstr ""
@@ -3493,52 +3737,52 @@
"system."
msgstr ""
-#: src/ui.cc:143
+#: src/ui.cc:164
msgid "Er, there aren't any errors, this shouldn't have happened.."
msgstr "Hm, nie wyst±pi³ ¿aden b³±d. Nie mo¿esz tego widzieæ.."
-#: src/ui.cc:149
+#: src/ui.cc:170
msgid "E:"
msgstr ""
-#: src/ui.cc:151
+#: src/ui.cc:172
msgid "W:"
msgstr ""
-#: src/ui.cc:172
+#: src/ui.cc:193
msgid "Search for:"
msgstr "Znajd¼:"
-#: src/ui.cc:205
+#: src/ui.cc:261
msgid "You already are root!"
msgstr "Ju¿ jeste¶ administratorem."
-#: src/ui.cc:303
+#: src/ui.cc:359
msgid ""
"Subprocess exited with an error -- did you type your password correctly?"
msgstr "Podproces zakoñczy³ siê b³êdem -- czy podano poprawne has³o?"
-#: src/ui.cc:331
+#: src/ui.cc:387
msgid "Loading cache"
msgstr "Odczyt stanu"
-#: src/ui.cc:353
+#: src/ui.cc:409
msgid "Really quit Aptitude?"
msgstr "Zakoñczyæ Aptitude?"
-#: src/ui.cc:432
+#: src/ui.cc:488
msgid "Really discard your personal settings and reload the defaults?"
msgstr "Przywróciæ ustawienia domy¶lne rezygnuj±c z wprowadzonych zmian?"
-#: src/ui.cc:532
+#: src/ui.cc:588 src/ui.cc:590 src/ui.cc:618 src/ui.cc:620
msgid "Packages"
msgstr "Pakiety"
-#: src/ui.cc:533 src/ui.cc:560
+#: src/ui.cc:589 src/ui.cc:619
msgid "View available packages and choose actions to perform"
msgstr "Przegl±danie dostêpnych pakietów, wybór dzia³añ na nich"
-#: src/ui.cc:599
+#: src/ui.cc:666
#, fuzzy
msgid ""
"%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
@@ -3556,15 +3800,15 @@
"na okre¶lonych warunkach; szczegó³owe informacje mo¿na znale¼æ\n"
"wybieraj±c pozycjê Licencja z menu Pomoc."
-#: src/ui.cc:620
+#: src/ui.cc:687
msgid "help.txt"
msgstr "help-pl.txt"
-#: src/ui.cc:636
+#: src/ui.cc:703
msgid "README"
msgstr "README"
-#: src/ui.cc:718
+#: src/ui.cc:785
msgid ""
"%C%BWARNING%b: untrusted versions of the following packages will be "
"installed!%n%nUntrusted packages could %Bcompromise your system's security%"
@@ -3572,62 +3816,72 @@
"this is what you want to do.%n%n"
msgstr ""
-#: src/ui.cc:732
+#: src/ui.cc:799
#, fuzzy
msgid "Really Continue"
msgstr "Dalej"
-#: src/ui.cc:734
+#: src/ui.cc:801
msgid "Abort Installation"
msgstr ""
-#: src/ui.cc:796
+#: src/ui.cc:862
msgid "Preview of package installation"
msgstr "Przegl±d planowanych dzia³añ"
-#: src/ui.cc:797
+#: src/ui.cc:863
msgid "View and/or adjust the actions that will be performed"
msgstr "Przegl±danie i modyfikowanie akcji do wykonania"
-#: src/ui.cc:837
-msgid "Some packages were broken and have been fixed"
+#: src/ui.cc:864
+#, fuzzy
+msgid "Preview"
+msgstr "^Poprzedni"
+
+#: src/ui.cc:900
+#, fuzzy
+msgid "Some packages were broken and have been fixed:"
msgstr "Niektóre pakiety mia³y niespe³nione zale¿no¶ci"
-#: src/ui.cc:839
-msgid "Some broken packages could not be fixed!"
-msgstr "Nie uda³o siê naprawiæ zale¿no¶ci niektórych pakietów."
+#: src/ui.cc:906
+msgid "No solution to these dependency problems exists!"
+msgstr ""
-#: src/ui.cc:847 src/ui.cc:959
-msgid "Some packages are broken. Try to fix them?"
-msgstr "Niektóre pakiety maj± niespe³nione zale¿no¶ci. Naprawiæ je? "
+#: src/ui.cc:912
+#, c-format
+msgid ""
+"Ran out of time while trying to resolver dependencies (press \"%s\" to try "
+"harder)"
+msgstr ""
-#: src/ui.cc:860
+#: src/ui.cc:958
+#, fuzzy
msgid ""
-"Installing/removing packages requires administrative privileges, which\n"
-"you currently do not have. Would you like to change to the root account?\n"
+"Installing/removing packages requires administrative privileges, which you "
+"currently do not have. Would you like to change to the root account?"
msgstr ""
"Instalowanie/usuwanie pakietów wymaga uprawnieñ administratora,\n"
"których nie posiadasz. Czy chcesz siê prze³±czyæ na konto administratora?\n"
-#: src/ui.cc:863 src/ui.cc:993
+#: src/ui.cc:961 src/ui.cc:1077
msgid "Become root"
msgstr "Prze³±cz"
-#: src/ui.cc:865 src/ui.cc:995
+#: src/ui.cc:963 src/ui.cc:1079
msgid "Don't become root"
msgstr "Nie prze³±czaj"
-#: src/ui.cc:870 src/ui.cc:1000
+#: src/ui.cc:968 src/ui.cc:1084
msgid "A package-list update or install run is already taking place."
msgstr "Trwa uaktualnianie listy pakietów lub instalacja."
-#: src/ui.cc:897
+#: src/ui.cc:995
msgid "No packages are scheduled to be installed, removed, or upgraded."
msgstr ""
"Nie jest zaplanowana instalacja, uaktualnienie ani usuniêcie ¿adnych "
"pakietów."
-#: src/ui.cc:903
+#: src/ui.cc:1001
#, fuzzy
msgid ""
"No packages will be installed, removed or upgraded. Some packages could be "
@@ -3640,163 +3894,178 @@
"w bie¿±cych wersjach.\n"
"Wci¶nij \"U\" aby przygotowaæ uaktualnienie."
-#: src/ui.cc:990
+#: src/ui.cc:1073
+#, fuzzy
msgid ""
-"Updating the package lists requires administrative privileges, which\n"
-"you currently do not have. Would you like to change to the root account?\n"
+"Updating the package lists requires administrative privileges, which you "
+"currently do not have. Would you like to change to the root account?"
msgstr ""
"Uaktualnianie listy pakietów wymaga uprawnieñ administratora,\n"
"których nie posiadasz. Czy chcesz siê prze³±czyæ na konto administratora?\n"
-#: src/ui.cc:1005 src/ui.cc:1198
+#: src/ui.cc:1089 src/ui.cc:1345
msgid "Waste time trying to find mines"
msgstr "Strata czasu na poszukiwanie min"
-#: src/ui.cc:1012 src/ui.cc:1065
+#: src/ui.cc:1096 src/ui.cc:1149
msgid "Cleaning while a download is in progress is not allowed"
msgstr "Nie mo¿na czy¶ciæ archiwum w czasie pobierania pakietów"
-#: src/ui.cc:1015
+#: src/ui.cc:1099
msgid "Deleting downloaded files"
msgstr "Usuwanie pobranych plików"
-#: src/ui.cc:1029
+#: src/ui.cc:1113
msgid "Downloaded package files have been deleted"
msgstr "Usuniêto pobrane pliki pakietów"
-#: src/ui.cc:1090
+#: src/ui.cc:1174
#, fuzzy, c-format
msgid ""
"Obsolete downloaded package files have been deleted, freeing %sB of disk "
"space."
msgstr "Usuniêto nieaktualne pliki pakietów"
-#: src/ui.cc:1174
+#: src/ui.cc:1246
+msgid "All solutions exhausted."
+msgstr ""
+
+#: src/ui.cc:1251 src/ui.cc:1282
+#, fuzzy
+msgid "Ran out of time while trying to find a solution."
+msgstr "Strata czasu na poszukiwanie min"
+
+#: src/ui.cc:1276
+msgid "Unable to find a solution to apply."
+msgstr ""
+
+#: src/ui.cc:1321
msgid "^Install/remove packages"
msgstr "Za^instaluj/usuñ pakiety"
-#: src/ui.cc:1175
+#: src/ui.cc:1322
msgid "Perform all pending installs and removals"
msgstr "Przeprowadza zaplanowane instalacje/usuniêcia"
-#: src/ui.cc:1177
+#: src/ui.cc:1324
msgid "^Update package list"
msgstr "^Uaktualnij listê pakietów"
-#: src/ui.cc:1178
+#: src/ui.cc:1325
msgid "Check for new versions of packages"
msgstr "Sprawdza dostêpno¶æ nowszych wersji pakietów"
-#: src/ui.cc:1181
+#: src/ui.cc:1328
msgid "^Forget new packages"
msgstr "^Zapomnij o nowo¶ciach"
-#: src/ui.cc:1182
+#: src/ui.cc:1329
msgid "Forget which packages are \"new\""
msgstr "Usuwa informacje, które pakiety s± nowe"
-#: src/ui.cc:1185
+#: src/ui.cc:1332
msgid "^Clean package cache"
msgstr "Wyczy¶æ ^archiwum pakietów"
-#: src/ui.cc:1186
+#: src/ui.cc:1333
msgid "Delete package files which were previously downloaded"
msgstr "Usuwa wszystkie pobrane wcze¶niej pliki"
-#: src/ui.cc:1189
+#: src/ui.cc:1336
msgid "Clean ^obsolete files"
msgstr "^Usuñ nieaktualne pliki"
-#: src/ui.cc:1190
+#: src/ui.cc:1337
msgid "Delete package files which can no longer be downloaded"
msgstr "Usuwa pliki pakietów, które nie s± dostêpne do pobrania"
-#: src/ui.cc:1193
+#: src/ui.cc:1340
msgid "Mark ^Upgradable"
msgstr "Zaznacz ^do uaktualnienia"
-#: src/ui.cc:1194
+#: src/ui.cc:1341
msgid "Mark all upgradable packages which are not held for upgrade"
msgstr "Zaznacza do uaktualnienia wszystkie mo¿liwe nie zatrzymane pakiety"
-#: src/ui.cc:1197
+#: src/ui.cc:1344
msgid "^Play Minesweeper"
msgstr "^Saper"
-#: src/ui.cc:1200
+#: src/ui.cc:1347
msgid "^Become root"
msgstr "^Administrator"
-#: src/ui.cc:1201
+#: src/ui.cc:1348
+#, fuzzy
msgid ""
-"Run 'su' to become root; this will restart the program, but your\n"
-"settings will be preserved"
+"Run 'su' to become root; this will restart the program, but your settings "
+"will be preserved"
msgstr ""
"U¿ywa \"su\" do uzyskania uprawnieñ administratora.\n"
"Program zostanie zrestartowany, ale ustawienia zostan± zachowane"
-#: src/ui.cc:1204
+#: src/ui.cc:1351
msgid "^Reload package cache"
msgstr "^Od¶wie¿ archiwum pakietów"
-#: src/ui.cc:1205
+#: src/ui.cc:1352
msgid "Reload the package cache"
msgstr "Ponownie odczytuje archiwum pakietów"
-#: src/ui.cc:1211
+#: src/ui.cc:1358
msgid "^Quit"
msgstr "^Zakoñcz"
-#: src/ui.cc:1212
+#: src/ui.cc:1359
msgid "Exit the program"
msgstr "Koñczy program"
-#: src/ui.cc:1218 src/ui.cc:1487
+#: src/ui.cc:1365 src/ui.cc:1637
msgid "Undo"
msgstr "Cofnij"
-#: src/ui.cc:1219
+#: src/ui.cc:1366
msgid "Undo the last package operation or group of operations"
msgstr "Cofa ostatni± operacjê lub grupê operacji"
-#: src/ui.cc:1226
+#: src/ui.cc:1373
msgid "^Install"
msgstr "^Instaluj"
-#: src/ui.cc:1227
+#: src/ui.cc:1374
msgid "Flag the currently selected package for installation or upgrade"
msgstr "Dodaje wybrany pakiet do instalowanych/uaktualnianych"
-#: src/ui.cc:1230
+#: src/ui.cc:1377
msgid "^Remove"
msgstr "^Usuñ"
-#: src/ui.cc:1231
+#: src/ui.cc:1378
msgid "Flag the currently selected package for removal"
msgstr "Dodaje wybrany pakiet do usuwanych"
-#: src/ui.cc:1234
+#: src/ui.cc:1381
msgid "^Purge"
msgstr "^Wyczy¶æ"
-#: src/ui.cc:1235
+#: src/ui.cc:1382
msgid ""
"Flag the currently selected package and its configuration files for removal"
msgstr "Dodaje wybrany pakiet do usuwanych wraz z plikami konfiguracyjnymi"
-#: src/ui.cc:1238
+#: src/ui.cc:1385
msgid "^Keep"
msgstr "^Pozostaw"
-#: src/ui.cc:1239
+#: src/ui.cc:1386
msgid "Cancel any action on the selected package"
msgstr "Odwo³uje planowane dzia³ania na wybranym pakiecie"
-#: src/ui.cc:1242
+#: src/ui.cc:1389
msgid "^Hold"
msgstr "^Zatrzymaj"
-#: src/ui.cc:1243
+#: src/ui.cc:1390
msgid ""
"Cancel any action on the selected package, and protect it from future "
"upgrades"
@@ -3804,250 +4073,254 @@
"Odwo³uje planowane dzia³ania na wybranym pakiecie i zapobiega jego "
"uaktualnieniom w przysz³o¶ci"
-#: src/ui.cc:1246
+#: src/ui.cc:1393
msgid "Mark ^Auto"
msgstr "^Automatyczny"
-#: src/ui.cc:1247
+#: src/ui.cc:1394
+#, fuzzy
msgid ""
-"Mark the selected package as having been automatically installed;\n"
-"it will automatically be removed if no other packages depend on it"
+"Mark the selected package as having been automatically installed; it will "
+"automatically be removed if no other packages depend on it"
msgstr ""
"Oznacza wybrany pakiet jako zainstalowany automatycznie,\n"
"czyli przeznaczony do usuniêcia, gdy nie bêdzie przez nic wymagany"
-#: src/ui.cc:1250
+#: src/ui.cc:1397
msgid "Mark ^Manual"
msgstr "¯±^dany"
-#: src/ui.cc:1251
+#: src/ui.cc:1398
+#, fuzzy
msgid ""
-"Mark the selected package as having been manually installed;\n"
-"it will not be removed unless you manually remove it"
+"Mark the selected package as having been manually installed; it will not be "
+"removed unless you manually remove it"
msgstr ""
"Oznacza wybrany pakiet jako zainstalowany na ¿±danie\n"
"i nie podlegaj±cy automatycznemu usuwaniu"
-#: src/ui.cc:1254
+#: src/ui.cc:1401
msgid "^Forbid Version"
msgstr "Za^blokuj wersjê"
-#: src/ui.cc:1255
+#: src/ui.cc:1402
+#, fuzzy
msgid ""
-"Forbid the candidate version of the selected package from being installed;\n"
+"Forbid the candidate version of the selected package from being installed; "
"newer versions of the package will be installed as usual"
msgstr ""
"Nie zezwala na instalacjê kandyduj±cej wersji wybranego pakietu;\n"
"nowsze wersje bed± instalowane normalnie"
-#: src/ui.cc:1259
+#: src/ui.cc:1406
msgid "I^nformation"
msgstr "I^nformacje"
-#: src/ui.cc:1260
+#: src/ui.cc:1407
msgid "Display more information about the selected package"
msgstr "Wy¶wietla szczegó³owe informacje o wybranym pakiecie"
-#: src/ui.cc:1263
+#: src/ui.cc:1410
msgid "^Changelog"
msgstr "^Dziennik zmian"
-#: src/ui.cc:1264
+#: src/ui.cc:1411
msgid "Display the Debian changelog of the selected package"
msgstr "Wy¶wietla dziennik zmian wybranego pakietu"
-#: src/ui.cc:1271
+#: src/ui.cc:1418
msgid "^Find"
msgstr "^Znajd¼"
-#: src/ui.cc:1272
+#: src/ui.cc:1419
msgid "Search for a package"
msgstr "Szuka pakietu"
-#: src/ui.cc:1275
+#: src/ui.cc:1422
msgid "Find ^Again"
msgstr "Znajd¼ ^nastêpny"
-#: src/ui.cc:1276
+#: src/ui.cc:1423
msgid "Repeat the last search"
msgstr "Powtarza wyszukiwanie"
-#: src/ui.cc:1280
+#: src/ui.cc:1427
msgid "^Limit Display"
msgstr "^Filtruj"
-#: src/ui.cc:1281
+#: src/ui.cc:1428
msgid "Apply a filter to the package list"
msgstr "Ogranicza wy¶wietlan± listê pakietów"
-#: src/ui.cc:1284
+#: src/ui.cc:1431
msgid "^Un-Limit Display"
msgstr "^Usuñ filtr"
-#: src/ui.cc:1285
+#: src/ui.cc:1432
msgid "Remove the filter from the package list"
msgstr "Usuwa ograniczenie wy¶wietlanej listy pakietów"
-#: src/ui.cc:1289
+#: src/ui.cc:1436
msgid "Find ^Broken"
msgstr "Znajd¼ ^problem"
-#: src/ui.cc:1290
+#: src/ui.cc:1437
msgid "Find the next package with unsatisfied dependencies"
msgstr "Szuka kolejnego pakietu z niespe³nionymi zale¿no¶ciami"
-#: src/ui.cc:1297
+#: src/ui.cc:1444
msgid "^UI options"
msgstr "Opcje ^interfejsu"
-#: src/ui.cc:1298
+#: src/ui.cc:1445
msgid "Change the settings which affect the user interface"
msgstr "Zmienia opcje dotycz±ce interfejsu u¿ytkownika"
-#: src/ui.cc:1301
+#: src/ui.cc:1448
msgid "^Dependency handling"
msgstr "^Zale¿no¶ci"
-#: src/ui.cc:1302
+#: src/ui.cc:1449
msgid "Change the settings which affect how package dependencies are handled"
msgstr "Zmienia opcje dotycz±ce zale¿no¶ci miêdzy pakietami"
-#: src/ui.cc:1305
+#: src/ui.cc:1452
msgid "^Miscellaneous"
msgstr "^Ró¿ne"
-#: src/ui.cc:1306
+#: src/ui.cc:1453
msgid "Change miscellaneous program settings"
msgstr "Zmienia ró¿ne inne opcje programu"
-#: src/ui.cc:1311
+#: src/ui.cc:1458
msgid "^Revert options"
msgstr "^Przywróæ domy¶lne"
-#: src/ui.cc:1312
+#: src/ui.cc:1459
msgid "Reset all settings to the system defaults"
msgstr "Przywraca wszystkim opcjom warto¶ci domy¶lne"
-#: src/ui.cc:1323
+#: src/ui.cc:1470
msgid "^Next"
msgstr "^Nastêpny"
-#: src/ui.cc:1324
+#: src/ui.cc:1471
msgid "View next display"
msgstr "Wy¶wietla nastêpny widok"
-#: src/ui.cc:1327
+#: src/ui.cc:1474
msgid "^Prev"
msgstr "^Poprzedni"
-#: src/ui.cc:1328
+#: src/ui.cc:1475
msgid "View previous display"
msgstr "Wy¶wietla poprzedni widok"
-#: src/ui.cc:1331
+#: src/ui.cc:1478
msgid "^Close"
msgstr "^Zamknij"
-#: src/ui.cc:1332
+#: src/ui.cc:1479
msgid "Close this display"
msgstr "Zamyka bie¿±cy widok"
-#: src/ui.cc:1337
+#: src/ui.cc:1484
msgid "New Package ^View"
msgstr "Nowy ^widok pakietów"
-#: src/ui.cc:1338
+#: src/ui.cc:1485
msgid "Create a new default package view"
msgstr "Tworzy nowy, standardowy widok listy pakietów"
-#: src/ui.cc:1341
+#: src/ui.cc:1488
msgid "New Categorical ^Browser"
msgstr "Nowa przegl±darka ^kategorii"
-#: src/ui.cc:1343
+#: src/ui.cc:1490
msgid "Browse packages by category"
msgstr "Pozwala na przegl±danie pakietów wed³ug kategorii"
-#: src/ui.cc:1351
+#: src/ui.cc:1498
msgid "^About"
msgstr "^O Aptitude"
-#: src/ui.cc:1352
+#: src/ui.cc:1499
msgid "View information about this program"
msgstr "Wy¶wietla informacje o programie"
-#: src/ui.cc:1355
+#: src/ui.cc:1502
msgid "^Help"
msgstr "^Pomoc"
-#: src/ui.cc:1356
+#: src/ui.cc:1503
msgid "View the on-line help"
msgstr "Wy¶wietla pomoc Aptitude"
-#: src/ui.cc:1358
+#: src/ui.cc:1505
msgid "User's ^Manual"
msgstr "Podrêcznik ^u¿ytkownika"
-#: src/ui.cc:1359
+#: src/ui.cc:1506
msgid "View the detailed program manual"
msgstr "Wy¶wietla podrêcznik u¿ytkownika programu"
-#: src/ui.cc:1362
+#: src/ui.cc:1509
msgid "^FAQ"
msgstr "^FAQ"
-#: src/ui.cc:1363
+#: src/ui.cc:1510
msgid "View a list of frequently asked questions"
msgstr "Wy¶wietla najczê¶ciej zadawane pytania na temat Aptitude"
-#: src/ui.cc:1366
-msgid "^ChangeLog"
-msgstr "^Dziennik zmian"
+#: src/ui.cc:1513
+msgid "^NEWS"
+msgstr ""
-#: src/ui.cc:1367
-msgid "View the important changes made in each version of the program"
+#: src/ui.cc:1514
+#, fuzzy
+msgid "View the important changes made in each version of "
msgstr "Wy¶wietla najwa¿niejsze zmiany w kolejnych wersjach programu"
-#: src/ui.cc:1370
+#: src/ui.cc:1517
msgid "^License"
msgstr "^Licencja"
-#: src/ui.cc:1371
+#: src/ui.cc:1518
msgid "View the terms under which you may copy the program"
msgstr "Wy¶wietla warunki rozpowszechniania programu"
-#: src/ui.cc:1486
+#: src/ui.cc:1636
msgid "Actions"
msgstr "Akcje"
-#: src/ui.cc:1489
+#: src/ui.cc:1639
msgid "Search"
msgstr "Znajd¼"
-#: src/ui.cc:1490
+#: src/ui.cc:1640
msgid "Options"
msgstr "Opcje"
-#: src/ui.cc:1491
+#: src/ui.cc:1641
msgid "Views"
msgstr "Widoki"
-#: src/ui.cc:1492
+#: src/ui.cc:1642
msgid "Help"
msgstr "Pomoc"
-#: src/ui.cc:1537
+#: src/ui.cc:1699
#, c-format
msgid ""
"%s: Menu %s: Help %s: Quit %s: Update %s: Download/Install/Remove Pkgs"
msgstr ""
"%s: Menu %s: Pomoc %s: Zakoñcz %s: Uaktualnij %s: Instaluj/usuñ pakiety"
-#: src/ui.cc:1799 src/vscreen/vscreen.cc:281
+#: src/ui.cc:1968 src/vscreen/vscreen.cc:281
msgid "yes_key"
msgstr "t"
-#: src/ui.cc:1800 src/vscreen/vscreen.cc:282
+#: src/ui.cc:1969 src/vscreen/vscreen.cc:282
msgid "no_key"
msgstr "n"
@@ -4060,6 +4333,16 @@
msgid "Downloading Changelog"
msgstr "Pobieranie dziennika zmian"
+#: src/view_changelog.cc:54
+#, fuzzy
+msgid "Download Changelog"
+msgstr "Pobieranie dziennika zmian"
+
+#: src/view_changelog.cc:63
+#, c-format
+msgid "%s changes"
+msgstr ""
+
#: src/vscreen/vscreen.cc:119
#, c-format
msgid "Ouch! Got SIGTERM, dying..\n"
@@ -4087,3 +4370,35 @@
#: src/vscreen/vs_util.cc:175 src/vscreen/vs_util.cc:212
msgid "No"
msgstr "Nie"
+
+#~ msgid ""
+#~ "Some packages had unmet dependencies. This may mean that you have\n"
+#~ "requested an impossible situation or if you are using the unstable\n"
+#~ "distribution that some required packages have not yet been created\n"
+#~ "or been moved out of Incoming.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Niektóre pakiety maj± niespe³nione zale¿no¶ci. Mo¿e to znaczyæ, ¿e\n"
+#~ "za¿±dano niemo¿liwej sytuacji albo, je¶li u¿ywana jest dystrybucja\n"
+#~ "niestabilna, pewne wymagane pakiety nie zosta³y jeszcze stworzone,\n"
+#~ "lub przeniesione z kolejki nowych pakietów (Incoming).\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Please insert the following disc into the drive \"%s\":\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Proszê w³o¿yæ nastêpuj±cy dysk do napêdu \"%s\":\n"
+#~ "%s"
+
+#~ msgid "Invalid option for interactive mode: -s\n"
+#~ msgstr "Nieprawid³owa opcja dla trybu interaktywnego: -s\n"
+
+#~ msgid "Information about "
+#~ msgstr "Informacje o "
+
+#~ msgid "Some broken packages could not be fixed!"
+#~ msgstr "Nie uda³o siê naprawiæ zale¿no¶ci niektórych pakietów."
+
+#~ msgid "^ChangeLog"
+#~ msgstr "^Dziennik zmian"
Modified: branches/aptitude-0.3/aptitude/po/pt.po
==============================================================================
--- branches/aptitude-0.3/aptitude/po/pt.po (original)
+++ branches/aptitude-0.3/aptitude/po/pt.po Sat Apr 30 13:41:32 2005
@@ -4,7 +4,7 @@
msgstr ""
"Project-Id-Version: aptitude 0.2.14-3\n"
"Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-01-10 16:26-0800\n"
+"POT-Creation-Date: 2005-04-29 18:11-0400\n"
"PO-Revision-Date: 2004-08-26 18:00+0000\n"
"Last-Translator: Miguel Figueiredo <elmig at debianPT.org>\n"
"Language-Team: Portuguese <traduz at debianpt.org>\n"
@@ -157,16 +157,103 @@
"Reomver automaticamente pacotes não usados que coincidam com este filtro"
#: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:184 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
-#: src/vscreen/vs_util.cc:329
+#: src/ui.cc:218 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
+#: src/vscreen/vs_util.cc:328
msgid "Ok"
msgstr "Ok"
#: src/apt_options.cc:242 src/download_list.cc:71 src/mine/cmine.cc:257
-#: src/mine/cmine.cc:330 src/vscreen/vs_util.cc:329
+#: src/mine/cmine.cc:330 src/vscreen/vs_util.cc:328
msgid "Cancel"
msgstr "Cancelar"
+#: src/broken_indicator.cc:106 src/solution_dialog.cc:97
+msgid "Internal error: unexpected null solution."
+msgstr ""
+
+#: src/broken_indicator.cc:158
+#, fuzzy
+msgid "Suggest "
+msgstr "Sugere"
+
+#: src/broken_indicator.cc:164
+#, fuzzy, c-format
+msgid "%d installs"
+msgstr "instalar"
+
+#: src/broken_indicator.cc:169
+#, fuzzy
+msgid "1 install"
+msgstr "instalar"
+
+#: src/broken_indicator.cc:173
+#, c-format
+msgid "%d removals"
+msgstr ""
+
+#: src/broken_indicator.cc:178
+msgid "1 removal"
+msgstr ""
+
+#: src/broken_indicator.cc:182
+#, c-format
+msgid "%d keeps"
+msgstr ""
+
+#: src/broken_indicator.cc:187
+msgid "1 keep"
+msgstr ""
+
+#: src/broken_indicator.cc:191
+#, fuzzy, c-format
+msgid "%d upgrades"
+msgstr "actualizar"
+
+#: src/broken_indicator.cc:196
+#, fuzzy
+msgid "1 upgrade"
+msgstr "actualizar"
+
+#: src/broken_indicator.cc:200
+#, fuzzy, c-format
+msgid "%d downgrades"
+msgstr "downgraded"
+
+#: src/broken_indicator.cc:205
+#, fuzzy
+msgid "1 downgrade"
+msgstr "downgraded"
+
+#: src/broken_indicator.cc:214
+#, c-format
+msgid "%s: Examine"
+msgstr ""
+
+#: src/broken_indicator.cc:216
+#, c-format
+msgid "%s: Apply"
+msgstr ""
+
+#: src/broken_indicator.cc:218
+#, fuzzy, c-format
+msgid "%s: Next"
+msgstr "^N Próximo"
+
+#: src/broken_indicator.cc:220
+#, c-format
+msgid "%s: Previous"
+msgstr ""
+
+#: src/broken_indicator.cc:233
+#, c-format
+msgid "%CSolution search failed. %s: try harder"
+msgstr ""
+
+#: src/broken_indicator.cc:239
+#, c-format
+msgid "%CUnable to resolve dependencies."
+msgstr ""
+
#: src/cmdline/cmdline_action.cc:36
#, c-format
msgid ""
@@ -240,22 +327,22 @@
msgstr ""
"O pacote %s não é actualizável, não é possÃvel proibir uma actualização\n"
-#: src/cmdline/cmdline_action.cc:213
+#: src/cmdline/cmdline_action.cc:198
#, c-format
msgid "Note: selecting the task \"%s: %s\" for installation\n"
msgstr "Nota: a seleccionar a tarefa \"%s: %s\" para instalação\n"
-#: src/cmdline/cmdline_action.cc:240
+#: src/cmdline/cmdline_action.cc:225
#, c-format
msgid "You can only specify a package version with an 'install' command.\n"
msgstr "Só pode especificar uma versão de um pacote com o comando 'install'.\n"
-#: src/cmdline/cmdline_action.cc:246
+#: src/cmdline/cmdline_action.cc:231
#, c-format
msgid "You can only specify a package archive with an 'install' command.\n"
msgstr "Só pode especificar um repositório com o comando 'install'.\n"
-#: src/cmdline/cmdline_action.cc:280
+#: src/cmdline/cmdline_action.cc:265
#, c-format
msgid ""
"Couldn't find package \"%s\", and more than 40\n"
@@ -264,7 +351,7 @@
"Não foi possÃvel encontrar o pacote \"%s\", e mais de 40\n"
"pacotes contém \"%s\" no seu nome.\n"
-#: src/cmdline/cmdline_action.cc:283
+#: src/cmdline/cmdline_action.cc:268
#, c-format
msgid ""
"Couldn't find package \"%s\". However, the following\n"
@@ -273,14 +360,14 @@
"Não foi possÃvel encontrar o pacote \"%s\". No entanto,\n"
"estes pacote possuem \"%s\" no seu nome:\n"
-#: src/cmdline/cmdline_action.cc:307
+#: src/cmdline/cmdline_action.cc:292
#, c-format
msgid "Couldn't find any package whose name or description matched \"%s\"\n"
msgstr ""
"Não foi possÃvel encontrar nenhum pacote em que o nome ou a descrição "
"coincida com \"%s\"\n"
-#: src/cmdline/cmdline_action.cc:309
+#: src/cmdline/cmdline_action.cc:294
#, c-format
msgid ""
"Couldn't find any package matching \"%s\", and more than 40\n"
@@ -289,7 +376,7 @@
"Não foi possÃvel encontrar nenhum pacote que coincida com \"%s\", e\n"
"mais de 40 pacotes contém \"%s\" na sua descrição.\n"
-#: src/cmdline/cmdline_action.cc:312
+#: src/cmdline/cmdline_action.cc:297
#, c-format
msgid ""
"Couldn't find any package matching \"%s\". However, the following\n"
@@ -334,13 +421,13 @@
msgid "Freed %sB of disk space\n"
msgstr "Serão libertados %sB de espaço em disco"
-#: src/cmdline/cmdline_do_action.cc:67
+#: src/cmdline/cmdline_do_action.cc:71
#, c-format
msgid "Invalid operation %s"
msgstr "Operação inválida %s"
-#: src/cmdline/cmdline_do_action.cc:206 src/cmdline/cmdline_simulate.cc:30
-#: src/cmdline/cmdline_upgrade.cc:89
+#: src/cmdline/cmdline_do_action.cc:201 src/cmdline/cmdline_simulate.cc:31
+#: src/cmdline/cmdline_upgrade.cc:91
#, c-format
msgid "Abort.\n"
msgstr "Abortar.\n"
@@ -350,7 +437,7 @@
msgid "download: you must specify at least one package to download\n"
msgstr "download: deve especificar pelo menos um pacote para download\n"
-#: src/cmdline/cmdline_download.cc:43 src/download.cc:342
+#: src/cmdline/cmdline_download.cc:43 src/download.cc:344
msgid "Couldn't read source list"
msgstr "Não foi possÃvel ler a lista de fontes"
@@ -415,95 +502,95 @@
msgstr ""
"O que é isso? Isso é um elefante a ser comido por uma cobra, é claro.\n"
-#: src/cmdline/cmdline_prompt.cc:44
+#: src/cmdline/cmdline_prompt.cc:45
msgid "Couldn't read list of sources"
msgstr "Não foi possÃvel ler a lista das fontes"
-#: src/cmdline/cmdline_prompt.cc:219 src/cmdline/cmdline_show_broken.cc:73
+#: src/cmdline/cmdline_prompt.cc:220 src/cmdline/cmdline_show_broken.cc:73
#, c-format
msgid "but %s is to be installed."
msgstr "mas %s irá ser instalado."
-#: src/cmdline/cmdline_prompt.cc:222 src/cmdline/cmdline_show_broken.cc:76
+#: src/cmdline/cmdline_prompt.cc:223 src/cmdline/cmdline_show_broken.cc:76
#, c-format
msgid "but %s is installed and it is kept back."
msgstr "mas %s está instalado e é mantido."
-#: src/cmdline/cmdline_prompt.cc:225 src/cmdline/cmdline_show_broken.cc:79
+#: src/cmdline/cmdline_prompt.cc:226 src/cmdline/cmdline_show_broken.cc:79
#, c-format
msgid "but %s is installed."
msgstr "mas %s está instalado."
-#: src/cmdline/cmdline_prompt.cc:229 src/cmdline/cmdline_show_broken.cc:83
+#: src/cmdline/cmdline_prompt.cc:230 src/cmdline/cmdline_show_broken.cc:83
#, c-format
msgid "but it is not installable"
msgstr "mas não é instalável."
-#: src/cmdline/cmdline_prompt.cc:233 src/cmdline/cmdline_show_broken.cc:87
+#: src/cmdline/cmdline_prompt.cc:234 src/cmdline/cmdline_show_broken.cc:87
#, c-format
msgid " which is a virtual package."
msgstr " o qual é um pacote virtual."
-#: src/cmdline/cmdline_prompt.cc:236 src/cmdline/cmdline_show_broken.cc:90
+#: src/cmdline/cmdline_prompt.cc:237 src/cmdline/cmdline_show_broken.cc:90
#, c-format
msgid " or"
msgstr " ou"
-#: src/cmdline/cmdline_prompt.cc:248
+#: src/cmdline/cmdline_prompt.cc:249
msgid "The following packages are BROKEN:"
msgstr "Os seguintes pacotes estão DANIFICADOS:"
-#: src/cmdline/cmdline_prompt.cc:249
+#: src/cmdline/cmdline_prompt.cc:250
msgid "The following packages are unused and will be REMOVED:"
msgstr "Os seguintes pacotes não são usados e serão REMOVIDOS:"
-#: src/cmdline/cmdline_prompt.cc:250
+#: src/cmdline/cmdline_prompt.cc:251
msgid "The following packages have been automatically kept back:"
msgstr "Os seguintes pacotes foram automaticamente mantidos:"
-#: src/cmdline/cmdline_prompt.cc:251
+#: src/cmdline/cmdline_prompt.cc:252
msgid "The following NEW packages will be automatically installed:"
msgstr "Os seguintes NOVOS pacotes serão automaticamente instalados:"
-#: src/cmdline/cmdline_prompt.cc:252
+#: src/cmdline/cmdline_prompt.cc:253
msgid "The following packages will be automatically REMOVED:"
msgstr "Os seguintes pacotes serão automaticamente REMOVIDOS:"
-#: src/cmdline/cmdline_prompt.cc:253
+#: src/cmdline/cmdline_prompt.cc:254
msgid "The following packages will be DOWNGRADED:"
msgstr "Os seguintes pacotes serão alterados para uma versão ANTERIOR:"
-#: src/cmdline/cmdline_prompt.cc:254
+#: src/cmdline/cmdline_prompt.cc:255
msgid "The following packages have been kept back:"
msgstr "Os seguintes pacotes foram mantidos:"
-#: src/cmdline/cmdline_prompt.cc:255
+#: src/cmdline/cmdline_prompt.cc:256
msgid "The following packages will be REINSTALLED:"
msgstr "Os seguintes pacotes serão REINSTALADOS:"
-#: src/cmdline/cmdline_prompt.cc:256
+#: src/cmdline/cmdline_prompt.cc:257
msgid "The following NEW packages will be installed:"
msgstr "Os seguintes NOVOS pacotes serão instalados:"
-#: src/cmdline/cmdline_prompt.cc:257
+#: src/cmdline/cmdline_prompt.cc:258
msgid "The following packages will be REMOVED:"
msgstr "Os seguintes pacotes serão REMOVIDOS:"
-#: src/cmdline/cmdline_prompt.cc:258
+#: src/cmdline/cmdline_prompt.cc:259
msgid "The following packages will be upgraded:"
msgstr "Os seguintes pacotes serão actualizados:"
-#: src/cmdline/cmdline_prompt.cc:307
+#: src/cmdline/cmdline_prompt.cc:311
#, c-format
msgid "The following ESSENTIAL packages will be REMOVED!\n"
msgstr "Os seguintes pacotes ESSENCIAIS serão REMOVIDOS !\n"
-#: src/cmdline/cmdline_prompt.cc:316
+#: src/cmdline/cmdline_prompt.cc:320
#, c-format
msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
msgstr "Os seguintes pacotes ESSENCIAIS ficarão DANIFICADOS por esta acção:\n"
-#: src/cmdline/cmdline_prompt.cc:326
+#: src/cmdline/cmdline_prompt.cc:330
#, c-format
msgid ""
"WARNING: Performing this action will probably cause your system to break!\n"
@@ -513,100 +600,103 @@
"pare!\n"
" NÃO continue a menos que saiba EXACTAMENTE o que está a fazer!\n"
-#: src/cmdline/cmdline_prompt.cc:328
+#: src/cmdline/cmdline_prompt.cc:332
msgid "I am aware that this is a very bad idea"
msgstr "Estou ciente de que esta é um ideia muito má."
-#: src/cmdline/cmdline_prompt.cc:331
+#: src/cmdline/cmdline_prompt.cc:335
#, c-format
msgid "To continue, type the phrase \"%s\":\n"
msgstr "Para continuar, introduza a frase \"%s\":\n"
-#: src/cmdline/cmdline_prompt.cc:434
+#: src/cmdline/cmdline_prompt.cc:438
#, c-format
msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
msgstr "Os seguintes pacotes estão RECOMENDADOS mas NÃO serão instalados:\n"
-#: src/cmdline/cmdline_prompt.cc:440
+#: src/cmdline/cmdline_prompt.cc:444
#, c-format
msgid "The following packages are SUGGESTED but will NOT be installed:\n"
msgstr "Os seguintes pacotes estão SUGERIDOS mas NÃO serão instalados:\n"
-#: src/cmdline/cmdline_prompt.cc:445
+#: src/cmdline/cmdline_prompt.cc:449
#, c-format
msgid "No packages will be installed, upgraded, or removed.\n"
msgstr "Nenhum pacote será instalado, actualizado ou removido.\n"
-#: src/cmdline/cmdline_prompt.cc:447
+#: src/cmdline/cmdline_prompt.cc:451
#, c-format
msgid "%lu packages upgraded, %lu newly installed, "
msgstr "%lu pacotes actualizados, %lu novos instalados, "
-#: src/cmdline/cmdline_prompt.cc:451
+#: src/cmdline/cmdline_prompt.cc:455
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstalados, "
-#: src/cmdline/cmdline_prompt.cc:453
+#: src/cmdline/cmdline_prompt.cc:457
#, c-format
msgid "%lu downgraded, "
msgstr "%lu alterados para uma versão anterior, "
-#: src/cmdline/cmdline_prompt.cc:455
+#: src/cmdline/cmdline_prompt.cc:459
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu para serem removidos e %lu não actualizados.\n"
-#: src/cmdline/cmdline_prompt.cc:462
+#: src/cmdline/cmdline_prompt.cc:466
#, c-format
msgid "Need to get %sB/%sB of archives. "
msgstr "É preciso obter %sB/%sB de ficheiros. "
-#: src/cmdline/cmdline_prompt.cc:465
+#: src/cmdline/cmdline_prompt.cc:469
#, c-format
msgid "Need to get %sB of archives. "
msgstr "É preciso obter %sB de ficheiros. "
-#: src/cmdline/cmdline_prompt.cc:472
+#: src/cmdline/cmdline_prompt.cc:476
#, c-format
msgid "After unpacking %sB will be used.\n"
msgstr "Depois de desempacotar serão utilizados %sB.\n"
-#: src/cmdline/cmdline_prompt.cc:475
+#: src/cmdline/cmdline_prompt.cc:479
#, c-format
msgid "After unpacking %sB will be freed.\n"
msgstr "Depois de desempacotar, serão libertados.%sB\n"
-#: src/cmdline/cmdline_prompt.cc:521
+#: src/cmdline/cmdline_prompt.cc:524
#, c-format
msgid "Bad action character '%c'\n"
msgstr "Caracter de acção '%c' não disponÃvel\n"
-#: src/cmdline/cmdline_prompt.cc:596
+#: src/cmdline/cmdline_prompt.cc:595
#, c-format
msgid "No packages to show -- enter the package names on the line after 'i'.\n"
msgstr ""
"Não existem pacotes para mostrar -- introduza os nomes dos pacotes na linha "
"a seguir a 'i'.\n"
-#: src/cmdline/cmdline_prompt.cc:598 src/cmdline/cmdline_prompt.cc:629
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:597
msgid "Press Return to continue."
msgstr "Pressione Return para continuar."
-#: src/cmdline/cmdline_prompt.cc:625
+#: src/cmdline/cmdline_prompt.cc:623
#, c-format
msgid "No packages found -- enter the package names on the line after 'c'.\n"
msgstr ""
"Não foram encontrados -- introduza os nomes dos pacotes na linha a seguir a "
"'c'.\n"
-#: src/cmdline/cmdline_prompt.cc:665
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:627
+#, fuzzy
+msgid "Press Return to continue"
+msgstr "Pressione Return para continuar."
+
+#: src/cmdline/cmdline_prompt.cc:675
msgid "Do you want to continue? [Y/n/?] "
msgstr "Deseja continuar ? [Y/n/?] "
-#: src/cmdline/cmdline_prompt.cc:690
+#: src/cmdline/cmdline_prompt.cc:700
#, c-format
msgid ""
"\n"
@@ -617,7 +707,7 @@
"Informação de dependências será exibida.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:692
+#: src/cmdline/cmdline_prompt.cc:702
#, c-format
msgid ""
"\n"
@@ -628,7 +718,7 @@
"Informação de dependências não será exibida.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:698
+#: src/cmdline/cmdline_prompt.cc:708
#, c-format
msgid ""
"\n"
@@ -639,7 +729,7 @@
"Versões serão exibidas.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:700
+#: src/cmdline/cmdline_prompt.cc:710
#, c-format
msgid ""
"\n"
@@ -650,7 +740,7 @@
"Versões não serão exibidas.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:705
+#: src/cmdline/cmdline_prompt.cc:715
#, c-format
msgid ""
"\n"
@@ -661,7 +751,7 @@
"Alterações de tamanho serão exibidas.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:717
#, c-format
msgid ""
"\n"
@@ -672,7 +762,7 @@
"Alterações de tamanho não serão exibidas.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:737
#, c-format
msgid ""
"Commands:\n"
@@ -722,34 +812,89 @@
" _ : Apagar\n"
" = : Manter\n"
-#: src/cmdline/cmdline_prompt.cc:751
+#: src/cmdline/cmdline_prompt.cc:761
#, c-format
msgid "Invalid response. Please enter a valid command or '?' for help.\n"
msgstr ""
"Resposta inválida. Por favor, introduza um comando válido ou '?' para "
"ajuda.\n"
+#: src/cmdline/cmdline_resolver.cc:84
+#, c-format
+msgid "y: %F%nn: %F%nq: %F%n,: %F%n.: %F%n"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:90
+msgid "accept the proposed changes"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:92
+msgid "reject the proposed changes and search for another solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:94
+#, fuzzy
+msgid "give up and quit the program"
+msgstr "Sair do programa"
+
+#: src/cmdline/cmdline_resolver.cc:96
+msgid "move to the next solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:98
+msgid "move to the previous solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:131
+#, fuzzy
+msgid "The following actions will resolve these dependencies:"
+msgstr "Os seguintes pacotes possuem dependências não satisfeitas:\n"
+
+#: src/cmdline/cmdline_resolver.cc:146
+msgid "Accept this solution? [Y/n/q/?]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:174
+msgid "Abandoning all efforts to resolve these dependencies."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:184
+#, fuzzy
+msgid "The following commands are available:"
+msgstr "Os seguintes pacotes estão DANIFICADOS:"
+
+#: src/cmdline/cmdline_resolver.cc:188
+#, fuzzy
+msgid "Invalid response; please enter one of the following commands:"
+msgstr ""
+"Resposta inválida. Por favor, introduza um comando válido ou '?' para "
+"ajuda.\n"
+
+#: src/cmdline/cmdline_resolver.cc:198
+msgid "No solution found within the allotted time. Try harder? [Y/n]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:226
+#, fuzzy
+msgid "Invalid response; please enter 'y' or 'n'."
+msgstr ""
+"Resposta inválida. Por favor, introduza um comando válido ou '?' para "
+"ajuda.\n"
+
+#: src/cmdline/cmdline_resolver.cc:235
+msgid "Unable to resolve dependencies! Giving up..."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:240
+msgid "No more solutions."
+msgstr ""
+
#: src/cmdline/cmdline_search.cc:78
#, c-format
msgid "search: You must provide at least one search term\n"
msgstr "pesquisa: Deve fornecer pelo menos um termo para pesquisar\n"
-#: src/cmdline/cmdline_show_broken.cc:114
-#, c-format
-msgid ""
-"Some packages had unmet dependencies. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming.\n"
-"\n"
-msgstr ""
-"Alguns pacotes possuem dependências não satisfeitas. Isto significa\n"
-" que você pediu uma situação impossÃvel ou, caso você esteja \n"
-" a usar a distribuição instável, que alguns pacotes pedidos ainda\n"
-" não foram criados ou foram movidos da Incoming.\n"
-"\n"
-
-#: src/cmdline/cmdline_show_broken.cc:115
+#: src/cmdline/cmdline_show_broken.cc:113
#, c-format
msgid "The following packages have unmet dependencies:\n"
msgstr "Os seguintes pacotes possuem dependências não satisfeitas:\n"
@@ -947,12 +1092,12 @@
msgid "Description: "
msgstr "Descrição: "
-#: src/cmdline/cmdline_simulate.cc:36
+#: src/cmdline/cmdline_simulate.cc:37
#, c-format
msgid "Would download/install/remove packages.\n"
msgstr "Iria fazer o download/instalar/remover pacotes.\n"
-#: src/cmdline/cmdline_simulate.cc:47
+#: src/cmdline/cmdline_simulate.cc:48
msgid "Internal Error, Ordering didn't finish"
msgstr "Erro interno, a Ordenação não terminou"
@@ -996,28 +1141,24 @@
msgid "UNAVAILABLE"
msgstr "INDISPONÃVEL"
-#: src/download_bar.cc:57 src/download_list.cc:265
+#: src/download_bar.cc:56 src/download_list.cc:263 src/download_screen.cc:57
#, c-format
-msgid ""
-"Please insert the following disc into the drive \"%s\":\n"
-"%s"
-msgstr ""
-"Por favor, introduza o seguinte disco na drive \"%s\":\n"
-"%s"
+msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
+msgstr "Por favor insira o disco com o nome \"%s\" na drive \"%s\""
-#: src/download_bar.cc:76 src/generic/acqprogress.cc:63
+#: src/download_bar.cc:77 src/generic/acqprogress.cc:63
msgid "Hit "
msgstr "Acertou "
-#: src/download_bar.cc:89
+#: src/download_bar.cc:90
msgid "Downloading "
msgstr "A fazer download de "
-#: src/download_bar.cc:102
+#: src/download_bar.cc:103
msgid "Got "
msgstr "Obtido "
-#: src/download_bar.cc:156
+#: src/download_bar.cc:157
msgid "Downloading..."
msgstr "A fazer download ..."
@@ -1025,7 +1166,7 @@
msgid "Couldn't read list of package sources"
msgstr "Não foi possÃvel ler a lista de fontes de pacotes"
-#: src/download.cc:104 src/download.cc:321
+#: src/download.cc:104 src/download.cc:322
msgid "Couldn't lock list directory..are you root?"
msgstr ""
"Não foi possÃvel obter acesso exclusiva da lista de diretorias..é root?"
@@ -1038,29 +1179,33 @@
msgid "View the progress of the package list update"
msgstr "Ver o progresso da actualização da lista de pacotes"
-#: src/download.cc:159
+#: src/download.cc:113
+msgid "List Update"
+msgstr ""
+
+#: src/download.cc:160
msgid "Couldn't clean out list directories"
msgstr "Não foi possÃvel limpar a lista de diretorias"
-#: src/download.cc:176 src/ui.cc:1068
+#: src/download.cc:177 src/ui.cc:1152
msgid "Deleting obsolete downloaded files"
msgstr "A apagar os ficheiros obsoletos a que foi feito o download"
-#: src/download.cc:181
+#: src/download.cc:182
#, c-format
msgid "Deleting obsolete downloaded files\n"
msgstr "A apagar os ficheiros obsoletos a que foi feito o download\n"
-#: src/download.cc:223
+#: src/download.cc:224
#, c-format
msgid "Unable to open %s to log actions"
msgstr "Não é possÃvel abrir %s para gravar o log das acções"
-#: src/download.cc:229
+#: src/download.cc:230
msgid "log report"
msgstr "relatório de log"
-#: src/download.cc:230
+#: src/download.cc:231
#, c-format
msgid ""
"IMPORTANT: this log only lists intended actions; actions which fail due to\n"
@@ -1071,77 +1216,77 @@
"falham devido a problemas do dpkg podem não estar completas.\n"
"\n"
-#: src/download.cc:231
+#: src/download.cc:232
#, c-format
msgid "Will install %li packages, and remove %li packages.\n"
msgstr "Serão instalados %li pacotes e removidos %li pacotes.\n"
-#: src/download.cc:233
+#: src/download.cc:234
#, c-format
msgid "%sB of disk space will be used\n"
msgstr "%sB de espaço em disco será usado\n"
-#: src/download.cc:236
+#: src/download.cc:237
#, c-format
msgid "%sB bytes of disk space will be freed\n"
msgstr "%sB de espaço em disco serão libertados\n"
-#: src/download.cc:244
+#: src/download.cc:245
#, c-format
msgid "[UPGRADE] %s %s -> %s\n"
msgstr "[ACTUALIZAÇÃO] %s %s -> %s\n"
-#: src/download.cc:248
+#: src/download.cc:249
#, c-format
msgid "[DOWNGRADE] %s %s -> %s\n"
msgstr "[ACTUALIZAÇÃO] %s %s -> %s\n"
-#: src/download.cc:258
+#: src/download.cc:259
msgid "REMOVE"
msgstr "REMOVER"
-#: src/download.cc:264
+#: src/download.cc:265
msgid "INSTALL"
msgstr "INSTALAR"
-#: src/download.cc:267
+#: src/download.cc:268
msgid "REINSTALL"
msgstr "REINSTALAR"
-#: src/download.cc:270
+#: src/download.cc:271
msgid "HOLD"
msgstr "MANTER"
-#: src/download.cc:273
+#: src/download.cc:274
msgid "BROKEN"
msgstr "DANIFICADO"
-#: src/download.cc:276
+#: src/download.cc:277
msgid "REMOVE, NOT USED"
msgstr "REMOVER, NÃO USADOS"
-#: src/download.cc:279
+#: src/download.cc:280
msgid "REMOVE, DEPENDENCIES"
msgstr "REMOVER, DEPENDÊNCIAS"
-#: src/download.cc:282
+#: src/download.cc:283
msgid "INSTALL, DEPENDENCIES"
msgstr "INSTALAR, DEPENDÊNCIAS"
-#: src/download.cc:285
+#: src/download.cc:286
msgid "HOLD, DEPENDENCIES"
msgstr "MANTER, DEPENDÊNCIAS"
-#: src/download.cc:287
+#: src/download.cc:288
msgid "????????"
msgstr "????????"
-#: src/download.cc:291
+#: src/download.cc:292
#, c-format
msgid "[%s] %s\n"
msgstr "[%s] %s\n"
-#: src/download.cc:294
+#: src/download.cc:295
#, c-format
msgid ""
"===============================================================================\n"
@@ -1152,34 +1297,39 @@
"\n"
"Log completo.\n"
-#: src/download.cc:329
+#: src/download.cc:330
msgid "Downloading packages"
msgstr "A efectuar o download dos pacotes"
-#: src/download.cc:330
+#: src/download.cc:331
msgid "View the progress of the package download"
msgstr "Ver o progresso do download do pacote"
-#: src/download.cc:352
+#: src/download.cc:332
+#, fuzzy
+msgid "Package Download"
+msgstr "Pacote: "
+
+#: src/download.cc:354
msgid "Internal error: couldn't generate list of packages to download"
msgstr "Erro interno: não foi possÃvel gerar a lista de pacotes para download"
-#: src/download.cc:413
+#: src/download.cc:415
msgid "Unable to correct for unavailable packages"
msgstr "Não é possÃvel corrigir para pacotes não disponÃveis"
-#: src/download.cc:465
+#: src/download.cc:467
msgid ""
"Ack! Something bad happened while installing packages. Trying to recover:"
msgstr ""
"Ack! Algo de mau aconteceu durante a instalação dos pacotes. A tentar "
"recuperar:"
-#: src/download.cc:475 src/pkg_item.cc:413
+#: src/download.cc:477 src/pkg_item.cc:432
msgid "Press return to continue.\n"
msgstr "Pressione Enter para continuar.\n"
-#: src/download.cc:506
+#: src/download.cc:508
msgid ""
"Could not regain the system lock! (Perhaps another apt or dpkg is running?)"
msgstr ""
@@ -1241,11 +1391,6 @@
msgid "[ERROR]"
msgstr "[ERRO]"
-#: src/download_screen.cc:57
-#, c-format
-msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
-msgstr "Por favor insira o disco com o nome \"%s\" na drive \"%s\""
-
#: src/download_screen.cc:181
#, c-format
msgid "Downloaded %sB in %ss (%sB/s)."
@@ -1285,118 +1430,118 @@
"Mudança de Media: Por favor, insira o disco chamado '%s' na drive '%s' e "
"pressione Enter\n"
-#: src/generic/aptcache.cc:245
+#: src/generic/aptcache.cc:253
msgid "Can't open Aptitude extended state file"
msgstr "Não foi possÃvel abrir o ficheiro de estados extendido do Aptitude"
-#: src/generic/aptcache.cc:252 src/generic/aptcache.cc:305
-#: src/generic/aptcache.cc:307
+#: src/generic/aptcache.cc:260 src/generic/aptcache.cc:313
+#: src/generic/aptcache.cc:315
msgid "Reading extended state information"
msgstr "A ler informações extendidas de estado"
-#: src/generic/aptcache.cc:313 src/generic/aptcache.cc:387
-#: src/generic/aptcache.cc:390
+#: src/generic/aptcache.cc:321 src/generic/aptcache.cc:395
+#: src/generic/aptcache.cc:398
msgid "Initializing package states"
msgstr "A inicializar os estados dos pacotes"
-#: src/generic/aptcache.cc:501
+#: src/generic/aptcache.cc:509
msgid "Cannot open Aptitude state file"
msgstr "Não foi possÃvel abrir o ficheiro de estados do Aptitude"
-#: src/generic/aptcache.cc:505 src/generic/aptcache.cc:560
-#: src/generic/aptcache.cc:563
+#: src/generic/aptcache.cc:513 src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:571
msgid "Writing extended state information"
msgstr "A gravar informações extendidas de estado"
-#: src/generic/aptcache.cc:542
+#: src/generic/aptcache.cc:550
#, 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/aptcache.cc:551
+#: src/generic/aptcache.cc:559
msgid "Couldn't write state file"
msgstr "Não foi possÃvel escrever o ficheiro de estado"
-#: src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:576
msgid "Error writing state file"
msgstr "Erro ao escrever o ficheiro do estado"
-#: src/generic/aptcache.cc:584
+#: src/generic/aptcache.cc:592
msgid "couldn't replace old state file"
msgstr "não foi possÃvel substituir o antigo ficheiro de estado"
-#: src/generic/aptcache.cc:960
+#: src/generic/aptcache.cc:1000
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/aptcache.cc:1325
+#: src/generic/aptcache.cc:1546
msgid "The list of sources could not be read."
msgstr "A lista de fontes não pode ser lida."
-#: src/generic/aptcache.cc:1332
+#: src/generic/aptcache.cc:1553
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/aptcache.cc:1335
+#: src/generic/aptcache.cc:1556
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 "
"falta"
-#: src/generic/apt.cc:141
+#: src/generic/apt.cc:142
#, c-format
msgid "Unable to open %s for writing"
msgstr "Não foi possÃvel abrir %s para gravação"
-#: src/generic/apt.cc:151
+#: src/generic/apt.cc:152
#, c-format
msgid "Unable to replace %s with new configuration file"
msgstr "Não foi possÃvel substituir %s pelo novo ficheiro de configuração"
-#: src/generic/apt.cc:226
+#: src/generic/apt.cc:227
msgid "Warning: could not lock the cache file. Opening in read-only mode"
msgstr ""
"Aviso: não foi possÃvel obter acesso exclusivo ao ficheiro de cache. A abrir "
"apenas para leitura"
-#: src/generic/matchers.cc:780
+#: src/generic/matchers.cc:797
msgid "Unmatched '('"
msgstr "Parentese '(' sem par"
-#: src/generic/matchers.cc:870 src/generic/matchers.cc:949
+#: src/generic/matchers.cc:887 src/generic/matchers.cc:968
#, c-format
msgid "Unknown dependency type: %s"
msgstr "Tipo de dependência desconhecida: %s"
-#: src/generic/matchers.cc:931
+#: src/generic/matchers.cc:950
#, c-format
msgid "Unknown action type: %s"
msgstr "Tipo de acção desconhecida: %s"
-#: src/generic/matchers.cc:998
+#: src/generic/matchers.cc:1017
#, c-format
msgid "Unknown priority %s"
msgstr "Prioridade desconhecida %s"
-#: src/generic/matchers.cc:1020
+#: src/generic/matchers.cc:1039
#, c-format
msgid "Unknown pattern type: %c"
msgstr "Tipo de padrão desconhecido: %c"
-#: src/generic/matchers.cc:1065
+#: src/generic/matchers.cc:1084
msgid "Unexpected empty expression"
msgstr "Expressão vazia não esperada"
-#: src/generic/matchers.cc:1100
+#: src/generic/matchers.cc:1119
msgid "Badly formed expression"
msgstr "Expressão mal formada"
-#: src/generic/matchers.cc:1129
+#: src/generic/matchers.cc:1148
msgid "Unexpected ')'"
msgstr "')' inesperado"
@@ -1422,7 +1567,7 @@
msgid "Can't get value of $HOME, using TMPDIR (insecure)"
msgstr "Não foi possÃvel obter o valor de $HOME, a usar TMPDIR (não é seguro)"
-#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:60
+#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:61
#, c-format
msgid "ChangeLog of %s"
msgstr "Log de alterações de %s"
@@ -1638,17 +1783,17 @@
msgid "Invalid sorting policy type '%s'"
msgstr "Tipo de polÃtica de ordenação '%s' inválido"
-#: src/main.cc:68
+#: src/main.cc:67
#, c-format
msgid "%s %s compiled at %s %s\n"
msgstr "%s %s compilado em %s %s\n"
-#: src/main.cc:71
+#: src/main.cc:70
#, c-format
msgid "Compiler: g++ %s\n"
msgstr "Compilador: g++ %s\n"
-#: src/main.cc:74
+#: src/main.cc:73
#, c-format
msgid ""
"\n"
@@ -1657,7 +1802,7 @@
"\n"
"Versão do NCurses: %s\n"
-#: src/main.cc:76
+#: src/main.cc:75
#, c-format
msgid ""
"\n"
@@ -1666,22 +1811,22 @@
"\n"
"Versão do Curses: %s\n"
-#: src/main.cc:78
+#: src/main.cc:77
#, c-format
msgid "libsigc++ version: %s\n"
msgstr "versão de libsigc++: %s\n"
-#: src/main.cc:84
+#: src/main.cc:83
#, c-format
msgid "Usage: aptitude [-S fname] [-u|-i]"
msgstr "Utilização: aptitude [-S fname] [-u|-i]"
-#: src/main.cc:86
+#: src/main.cc:85
#, c-format
msgid " aptitude [options] <action> ..."
msgstr " aptitude [opções] <acção> ..."
-#: src/main.cc:88
+#: src/main.cc:87
#, c-format
msgid ""
" Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -1691,44 +1836,44 @@
"interactivo):\n"
"\n"
-#: src/main.cc:89
+#: src/main.cc:88
#, c-format
msgid " install - Install/upgrade packages\n"
msgstr " install - Instalar/actualizar pacotes\n"
-#: src/main.cc:90
+#: src/main.cc:89
#, c-format
msgid " remove - Remove packages\n"
msgstr " remove - Remover pacotes\n"
-#: src/main.cc:91
+#: src/main.cc:90
#, c-format
msgid " purge - Remove packages and their configuration files\n"
msgstr " purge - Remover pacotes e os seus ficheiros de configuração\n"
-#: src/main.cc:92
+#: src/main.cc:91
#, c-format
msgid " hold - Place packages on hold\n"
msgstr " hold - Manter pacotes na versão actual\n"
-#: src/main.cc:93
+#: src/main.cc:92
#, c-format
msgid " unhold - Cancel a hold command for a package\n"
msgstr " unhold - Cancelar o comando hold para um pacote\n"
-#: src/main.cc:94
+#: src/main.cc:93
#, c-format
msgid " markauto - Mark packages as having been automatically installed\n"
msgstr ""
" markauto - Marcar pacotes como tendo sido automaticamente instalados\n"
-#: src/main.cc:95
+#: src/main.cc:94
#, c-format
msgid " unmarkauto - Mark packages as having been manually installed\n"
msgstr ""
" unmarkauto - Marcar pacotes como tendo sido manualmente instalados\n"
-#: src/main.cc:100
+#: src/main.cc:99
#, c-format
msgid ""
" forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -1737,18 +1882,18 @@
" forbid-version - ProÃbir o aptitude de actualizar para uma versão "
"especÃfica de um pacote.\n"
-#: src/main.cc:101
+#: src/main.cc:100
#, c-format
msgid " update - Download lists of new/upgradable packages\n"
msgstr ""
" update - Fazer o download das listas de pacotes novos/actualizados\n"
-#: src/main.cc:102
+#: src/main.cc:101
#, c-format
msgid " upgrade - Perform a safe upgrade\n"
msgstr " upgrade - Executar uma actualização segura\n"
-#: src/main.cc:103
+#: src/main.cc:102
#, c-format
msgid ""
" dist-upgrade - Perform an upgrade, possibly installing and removing "
@@ -1757,57 +1902,57 @@
" dist-upgrade - Executar uma actualização, possivelmente instalando e "
"removendo pacotes\n"
-#: src/main.cc:104
+#: src/main.cc:103
#, c-format
msgid " forget-new - Forget what packages are \"new\"\n"
msgstr " forget-new - Esquecer quais os pacotes que são \"novos\"\n"
-#: src/main.cc:105
+#: src/main.cc:104
#, c-format
msgid " search - Search for a package by name and/or expression\n"
msgstr " search - Procurar por um pacote por nome e/ou expressão\n"
-#: src/main.cc:106
+#: src/main.cc:105
#, c-format
msgid " show - Display detailed information about a package\n"
msgstr " show - Mostrar informação detalhada acerca de um pacote\n"
-#: src/main.cc:107
+#: src/main.cc:106
#, c-format
msgid " clean - Erase downloaded package files\n"
msgstr " clean - Apagar pacotes já transferidos\n"
-#: src/main.cc:108
+#: src/main.cc:107
#, c-format
msgid " autoclean - Erase old downloaded package files\n"
msgstr " autoclean - Apagar pacotes antigos já transferidos\n"
-#: src/main.cc:109
+#: src/main.cc:108
#, c-format
msgid " changelog - View a package's changelog\n"
msgstr " changelog - Ver o registo de alterações de um pacote\n"
-#: src/main.cc:110
+#: src/main.cc:109
#, c-format
msgid " download - Download the .deb file for a package\n"
msgstr " download - Fazer o download do ficheiro .deb para um pacote\n"
-#: src/main.cc:112
+#: src/main.cc:111
#, c-format
msgid " Options:\n"
msgstr " Opções:\n"
-#: src/main.cc:113
+#: src/main.cc:112
#, c-format
msgid " -h This help text\n"
msgstr " -h Este texto de ajuda\n"
-#: src/main.cc:114
+#: src/main.cc:113
#, c-format
msgid " -s Simulate actions, but do not actually perform them.\n"
msgstr " -s Simular acções, mas sem as executar.\n"
-#: src/main.cc:115
+#: src/main.cc:114
#, c-format
msgid ""
" -d Only download packages, do not install or remove anything.\n"
@@ -1815,12 +1960,12 @@
" -d Fazer apenas o download de pacotes, não instalar ou remover "
"nada.\n"
-#: src/main.cc:116
+#: src/main.cc:115
#, c-format
msgid " -P Always prompt for confirmation or actions\n"
msgstr " -P Pedir sempre por confirmação ou acções\n"
-#: src/main.cc:117
+#: src/main.cc:116
#, c-format
msgid ""
" -y Assume that the answer to simple yes/no questions is 'yes'\n"
@@ -1828,7 +1973,7 @@
" -y Assumir que a resposta para simples perguntas de sim/não "
"seja 'sim'\n"
-#: src/main.cc:118
+#: src/main.cc:117
#, c-format
msgid ""
" -F format Specify a format for displaying search results; see the "
@@ -1837,7 +1982,7 @@
" -F formato Especifica um formato para exibição dos resultados da "
"pesquisa; ver o manual\n"
-#: src/main.cc:119
+#: src/main.cc:118
#, c-format
msgid ""
" -O order Specify how search results should be sorted; see the manual\n"
@@ -1845,7 +1990,7 @@
" -O ordem Especifica como os resultados das pesquisas devem ser "
"ordenados; ver o manual\n"
-#: src/main.cc:120
+#: src/main.cc:119
#, c-format
msgid ""
" -w width Specify the display width for formatting search results\n"
@@ -1853,18 +1998,18 @@
" -w largura Especifica a largura de exibição para formatar os "
"resultados de pesquisa\n"
-#: src/main.cc:121
+#: src/main.cc:120
#, c-format
msgid " -f Aggressively try to fix broken packages.\n"
msgstr " -f Tentar agressivamente corrigir pacotes danificados.\n"
-#: src/main.cc:122
+#: src/main.cc:121
#, c-format
msgid " -V Show which versions of packages are to be installed.\n"
msgstr ""
" -V Exibir as versões de pacotes que irão ser instalados.\n"
-#: src/main.cc:123
+#: src/main.cc:122
#, c-format
msgid ""
" -D Show the dependencies of automatically changed packages.\n"
@@ -1872,33 +2017,33 @@
" -D Exibir as dependências dos pacotes automaticamente "
"modificados.\n"
-#: src/main.cc:124
+#: src/main.cc:123
#, c-format
msgid " -Z\t\t Show the change in installed size of each package.\n"
msgstr " -Z\t\t Exibir a alteração no tamanho instalado de cada pacote.\n"
-#: src/main.cc:125
+#: src/main.cc:124
#, c-format
msgid ""
" -v Display extra information. (may be supplied multiple times)\n"
msgstr ""
" -v Exibir informação extra. (pode ser fornecido várias vezes)\n"
-#: src/main.cc:126
+#: src/main.cc:125
#, c-format
msgid ""
" -t [release] Set the release from which packages should be installed\n"
msgstr ""
" -t [release] Define de qual distribuição os pacotes devem ser instalados\n"
-#: src/main.cc:127
+#: src/main.cc:126
#, c-format
msgid " -o key=val Directly set the configuration option named 'key'\n"
msgstr ""
" -o chave=val Define directamente a configração da opção chamada "
"'chave'\n"
-#: src/main.cc:128
+#: src/main.cc:127
#, c-format
msgid ""
" --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -1907,60 +2052,68 @@
" --with(out)-recommends\tEspecifica se as recomendações devem ser \n"
" tratadas como dependências fortes\n"
-#: src/main.cc:129
+#: src/main.cc:128
#, c-format
msgid " -S fname: Read the aptitude extended status info from fname.\n"
msgstr " -S fname: Lê a informação de estado extendido do aptitude do fname.\n"
-#: src/main.cc:130
+#: src/main.cc:129
#, c-format
msgid " -u : Download new package lists on startup.\n"
msgstr ""
" -u : Faz o download de novas lista de pacotes na inicialização.\n"
-#: src/main.cc:131
+#: src/main.cc:130
#, c-format
msgid " -i : Perform an install run on startup.\n"
msgstr " -i : Executa uma execução de instalação na inicialização.\n"
-#: src/main.cc:133
+#: src/main.cc:132
#, c-format
msgid " This aptitude does not have Super Cow Powers.\n"
msgstr " Este aptitude não contém Poderes de Super Vaca.\n"
-#: src/main.cc:254
+#: src/main.cc:253
#, c-format
msgid "-o requires an argument of the form key=value, got %s"
msgstr "-o necessita de um argumento na forma chave=valor, tem %s"
-#: src/main.cc:300 src/main.cc:309
+#: src/main.cc:299 src/main.cc:308
msgid "WEIRDNESS: unknown option code received\n"
msgstr "ESTRANHO: recebida uma opção de código desconhecida\n"
-#: src/main.cc:318
+#: src/main.cc:317
msgid "Only one of -u and -i may be specified\n"
msgstr "Apenas uma das opções -u e -i pode ser especificada\n"
-#: src/main.cc:326
+#: src/main.cc:325
msgid ""
"-u and -i may not be specified in command-line mode (eg, with 'install')"
msgstr ""
"-u e -i não podem ser especificadas em modo de linha de comando (ex. com "
"'install')"
-#: src/main.cc:337
+#: src/main.cc:342
msgid "-u and -i may not be specified with a command"
msgstr "-u e -i não podem ser especificadas com um comando"
-#: src/main.cc:392
+#: src/main.cc:399
#, c-format
msgid "Unknown command \"%s\"\n"
msgstr "Comando desconhecido \"%s\"\n"
-#: src/main.cc:400
+#: src/main.cc:406 src/main.cc:463
+msgid "Internal error: uncaught 'out of solutions' exception.\n"
+msgstr ""
+
+#: src/main.cc:411 src/main.cc:468
+msgid "Internal error: uncaught 'out of time' exception.\n"
+msgstr ""
+
+#: src/main.cc:418
#, c-format
-msgid "Invalid option for interactive mode: -s\n"
-msgstr "Opção inválida para modo interativo: -s\n"
+msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
+msgstr ""
#: src/mine/cmine.cc:93
#, c-format
@@ -1988,7 +2141,7 @@
msgid "Lost"
msgstr "Perdeu"
-#: src/mine/cmine.cc:119 src/ui.cc:1005
+#: src/mine/cmine.cc:119 src/ui.cc:1089
msgid "Minesweeper"
msgstr "Campo Minado"
@@ -2166,7 +2319,7 @@
msgid "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
msgstr "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
-#: src/pkg_columnizer.cc:84 src/ui.cc:1488
+#: src/pkg_columnizer.cc:84 src/ui.cc:1638
msgid "Package"
msgstr "Pacote"
@@ -2425,13 +2578,14 @@
" Pacotes na secção 'base' fazem parte da instalação inicial do sistema."
#: src/pkg_grouppolicy.cc:158
+#, fuzzy
msgid ""
"Programs for faxmodems and other communications devices\n"
" Packages in the 'comm' section are used to control modems and other "
"hardware communications devices. This includes software to control faxmodems "
"(for instance, PPP for dial-up internet connections and programs originally "
-"written for that purpose (zmodem/kermit), as well as software to control "
-"cellular phones, interface with FidoNet, and run a BBS."
+"written for that purpose, such as zmodem/kermit), as well as software to "
+"control cellular phones, interface with FidoNet, and run a BBS."
msgstr ""
"Programas para fax-modems e outros dispositivos de comunicação\n"
" Pacotes na secção 'comm' são usados para controlar modems e outros "
@@ -2887,14 +3041,15 @@
"pacotes que se encontravam nesta secção estão agora na secção 'main'."
#: src/pkg_grouppolicy.cc:193
+#, fuzzy
msgid ""
"Programs which are not free software\n"
" Packages in the 'non-free' section are not part of Debian.\n"
" .\n"
" These packages fail to meet one or more of the requirements of the Debian "
-"Free Software Guidelines (see below) You should read the license of programs "
-"in this section to be sure that you are allowed to use them in the way you "
-"intend.\n"
+"Free Software Guidelines (see below). You should read the license of "
+"programs in this section to be sure that you are allowed to use them in the "
+"way you intend.\n"
" .\n"
" For more information about what Debian considers to be Free Software, see "
"http://www.debian.org/social_contract#guidelines"
@@ -2958,11 +3113,12 @@
" Uma versão mais recente destes pacotes está disponÃvel."
#: src/pkg_grouppolicy.cc:320
+#, fuzzy
msgid ""
"New Packages\n"
" These packages have been added to Debian since the last time you cleared "
-"the list of \"new\" packages. (choose \"Forget new packages\" from the "
-"Actions menu to empty this list)"
+"the list of \"new\" packages (choose \"Forget new packages\" from the "
+"Actions menu to empty this list)."
msgstr ""
"Novos Pacotes\n"
" Estes pacotes foram adicionados ao Debian desde a última vez que você "
@@ -3217,101 +3373,121 @@
msgid "Versions"
msgstr "Versões"
-#: src/pkg_item.cc:54
+#: src/pkg_item.cc:55
msgid "Yes, I am aware this is a very bad idea"
msgstr "Sim, estou ciente de que não é uma boa idéia."
#: src/pkg_item.cc:80
-#, c-format
+#, fuzzy, c-format
msgid ""
-"%s is an essential package!\n"
-"\n"
-"Are you sure you want to remove it?\n"
-"Type '%s' if you are."
+"%s is an essential package!%n%nAre you sure you want to remove it?%nType '%"
+"s' if you are."
msgstr ""
"%s é um pacote essencial!\n"
"\n"
"Tem certeza de que deseja removê-lo?\n"
"Digite '%s' se tiver a certeza."
-#: src/pkg_item.cc:219
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:625
#, c-format
msgid "Information about %s"
msgstr "Informação sobre %s"
-#: src/pkg_item.cc:304
-msgid "Available versions of "
+#: src/pkg_item.cc:224 src/pkg_ver_item.cc:627
+#, c-format
+msgid "%s info"
+msgstr ""
+
+#: src/pkg_item.cc:310
+#, fuzzy, c-format
+msgid "Available versions of %s"
msgstr "Versões disponÃveis de "
-#: src/pkg_item.cc:312 src/pkg_ver_item.cc:648
+#: src/pkg_item.cc:313
+#, fuzzy, c-format
+msgid "%s versions"
+msgstr "Versões"
+
+#: src/pkg_item.cc:325 src/pkg_ver_item.cc:655
#, c-format
msgid "Dependencies of %s"
msgstr "Dependências de %s"
-#: src/pkg_item.cc:322 src/pkg_ver_item.cc:657
+#: src/pkg_item.cc:327 src/pkg_ver_item.cc:657
+#, c-format
+msgid "%s deps"
+msgstr ""
+
+#: src/pkg_item.cc:338 src/pkg_ver_item.cc:667
#, c-format
msgid "Packages depending on %s"
msgstr "Pacotes que dependem de %s"
-#: src/pkg_item.cc:373 src/pkg_ver_item.cc:694
+#: src/pkg_item.cc:340 src/pkg_ver_item.cc:669
+#, c-format
+msgid "%s reverse deps"
+msgstr ""
+
+#: src/pkg_item.cc:392 src/pkg_ver_item.cc:707
#, c-format
msgid "Reporting a bug in %s:\n"
msgstr "A reportar um erro em %s:\n"
-#: src/pkg_item.cc:395
+#: src/pkg_item.cc:414
+#, fuzzy
msgid ""
-"You are not root and I cannot find any way\n"
-"to become root. To reconfigure this package,\n"
-"install the menu package, the login package,\n"
-"or run aptitude as root."
+"You are not root and I cannot find any way to become root. To reconfigure "
+"this package, install the menu package, the login package, or run aptitude "
+"as root."
msgstr ""
"Você não é root e não foi possÃvel encontrar nenhuma maneira\n"
"de se tornar root. Para reconfigurar este pacote,\n"
"instale o pacote menu, o pacote login ou execute o \n"
"aptitude como root."
-#: src/pkg_item.cc:403
+#: src/pkg_item.cc:422
#, c-format
msgid "Reconfiguring %s\n"
msgstr "A reconfigurar %s\n"
-#: src/pkg_item.cc:428
+#: src/pkg_item.cc:447
msgid "Hierarchy editor"
msgstr "Editor de hierarquia"
+#: src/pkg_item.cc:447
+#, fuzzy
+msgid "Hierarchy Editor"
+msgstr "Editor de hierarquia"
+
#: src/pkg_tree.cc:325
msgid "Search for: "
msgstr "Procurar por: "
-#: src/pkg_tree.cc:585
+#: src/pkg_tree.cc:568
msgid "All Packages"
msgstr "Todos os Pacotes"
-#: src/pkg_tree.cc:598 src/pkg_tree.cc:607
+#: src/pkg_tree.cc:581 src/pkg_tree.cc:590
msgid "Building view"
msgstr "Vista de criação"
-#: src/pkg_tree.cc:649
+#: src/pkg_tree.cc:632
#, c-format
msgid "No packages matched the pattern \"%s\"."
msgstr "Nenhum pacote coincidiu com o padrão \"%s\"."
-#: src/pkg_tree.cc:671
+#: src/pkg_tree.cc:654
msgid "Enter the new package tree limit: "
msgstr "Introduza o novo limite da árvore de pacote: "
-#: src/pkg_tree.cc:705
+#: src/pkg_tree.cc:688
msgid "Enter the new package grouping mechanism for this display: "
msgstr "Introduza o novo mecanismo de agrupamento de pacotes para esta vista: "
-#: src/pkg_tree.cc:713
+#: src/pkg_tree.cc:696
msgid "Enter the new package sorting mechanism for this display: "
msgstr "Introduza o novo mecanismo de ordenação de pacotes para esta vista: "
-#: src/pkg_ver_item.cc:623
-msgid "Information about "
-msgstr "Informação sobre "
-
#: src/pkg_view.cc:344
msgid "make_package_view: error in arguments -- two main widgets??"
msgstr "make_package_view: erro nos argumentos -- dois widgets principais??"
@@ -3327,7 +3503,7 @@
msgid "make_package_view: bad argument!"
msgstr "make_package_view: argumento inválido!"
-#: src/pkg_view.cc:492
+#: src/pkg_view.cc:495
msgid "make_package_view: no main widget found"
msgstr "make_package_view: nenhum widget principal encontrado"
@@ -3546,6 +3722,74 @@
"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:74
+msgid "The package cache is not available."
+msgstr ""
+
+#: src/solution_dialog.cc:82
+#, fuzzy
+msgid "No packages are broken."
+msgstr "Alguns pacotes têm dependências quebradas. Deseja tentar corrigi-las?"
+
+#: src/solution_dialog.cc:103
+msgid "No resolution found."
+msgstr ""
+
+#: src/solution_dialog.cc:107
+#, c-format
+msgid ""
+"Time exhausted while searching for a solution (you can select \"Next Solution"
+"\" or press %s to try harder)."
+msgstr ""
+
+#: src/solution_dialog.cc:146
+#, fuzzy
+msgid "Previous"
+msgstr "Fornece"
+
+#: src/solution_dialog.cc:147
+#, fuzzy
+msgid "Next"
+msgstr "^N Próximo"
+
+#: src/solution_dialog.cc:148
+msgid "Apply"
+msgstr ""
+
+#: src/solution_dialog.cc:149
+#, fuzzy
+msgid "Close"
+msgstr "^C Fechar"
+
+#: src/solution_fragment.cc:125
+#, fuzzy
+msgid "%BRemove%b the following packages:%n"
+msgstr "Os seguintes pacotes estão DANIFICADOS:"
+
+#: src/solution_fragment.cc:135
+#, fuzzy
+msgid "%BInstall%b the following packages:%n"
+msgstr "Os seguintes pacotes estão DANIFICADOS:"
+
+#: src/solution_fragment.cc:148
+msgid "%BKeep%b the following packages at their current version:%n"
+msgstr ""
+
+#: src/solution_fragment.cc:161
+#, fuzzy
+msgid "%BUpgrade%b the following packages:%n"
+msgstr "Os seguintes pacotes estão DANIFICADOS:"
+
+#: src/solution_fragment.cc:176
+#, fuzzy
+msgid "%BDowngrade%b the following packages:%n"
+msgstr "A efectuar o download dos pacotes"
+
+#: src/solution_fragment.cc:190
+#, c-format
+msgid "Score is %d"
+msgstr ""
+
#: src/trust.cc:17 src/trust.cc:19
msgid "WARNING"
msgstr ""
@@ -3557,54 +3801,54 @@
"system."
msgstr ""
-#: src/ui.cc:143
+#: src/ui.cc:164
msgid "Er, there aren't any errors, this shouldn't have happened.."
msgstr "Er, não ocorreu nenhum erro, isto não deveria ter acontecido.."
-#: src/ui.cc:149
+#: src/ui.cc:170
msgid "E:"
msgstr ""
-#: src/ui.cc:151
+#: src/ui.cc:172
msgid "W:"
msgstr ""
-#: src/ui.cc:172
+#: src/ui.cc:193
msgid "Search for:"
msgstr "Procurar por: "
-#: src/ui.cc:205
+#: src/ui.cc:261
msgid "You already are root!"
msgstr "Você já é root!"
-#: src/ui.cc:303
+#: src/ui.cc:359
msgid ""
"Subprocess exited with an error -- did you type your password correctly?"
msgstr ""
"Subprocesso saiu com um erro -- introduziu a sua password corretamente?"
-#: src/ui.cc:331
+#: src/ui.cc:387
msgid "Loading cache"
msgstr "A carregar a cache"
-#: src/ui.cc:353
+#: src/ui.cc:409
msgid "Really quit Aptitude?"
msgstr "Deseja realmente sair do Aptitude?"
-#: src/ui.cc:432
+#: src/ui.cc:488
msgid "Really discard your personal settings and reload the defaults?"
msgstr ""
"Deseja realmente anular as suas configurações pessoais e utilizar as padrões?"
-#: src/ui.cc:532
+#: src/ui.cc:588 src/ui.cc:590 src/ui.cc:618 src/ui.cc:620
msgid "Packages"
msgstr "Pacotes"
-#: src/ui.cc:533 src/ui.cc:560
+#: src/ui.cc:589 src/ui.cc:619
msgid "View available packages and choose actions to perform"
msgstr "Visualizar os pacotes disponÃveis e escolher as acções a executar"
-#: src/ui.cc:599
+#: src/ui.cc:666
#, fuzzy
msgid ""
"%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
@@ -3620,15 +3864,15 @@
"veja 'licença' no menu Ajuda. Este é um software livre e é encorajado \n"
"a distribuÃ-lo sob certas condições; veja a 'licença' para detalhes."
-#: src/ui.cc:620
+#: src/ui.cc:687
msgid "help.txt"
msgstr "help.txt"
-#: src/ui.cc:636
+#: src/ui.cc:703
msgid "README"
msgstr "README"
-#: src/ui.cc:718
+#: src/ui.cc:785
msgid ""
"%C%BWARNING%b: untrusted versions of the following packages will be "
"installed!%n%nUntrusted packages could %Bcompromise your system's security%"
@@ -3636,64 +3880,73 @@
"this is what you want to do.%n%n"
msgstr ""
-#: src/ui.cc:732
+#: src/ui.cc:799
#, fuzzy
msgid "Really Continue"
msgstr "Continuar"
-#: src/ui.cc:734
+#: src/ui.cc:801
msgid "Abort Installation"
msgstr ""
-#: src/ui.cc:796
+#: src/ui.cc:862
msgid "Preview of package installation"
msgstr "Previsão da instalação de pacotes"
-#: src/ui.cc:797
+#: src/ui.cc:863
msgid "View and/or adjust the actions that will be performed"
msgstr "Ver e/ou ajustar as acções a serem executadas"
-#: src/ui.cc:837
-msgid "Some packages were broken and have been fixed"
+#: src/ui.cc:864
+#, fuzzy
+msgid "Preview"
+msgstr "^P Anterior"
+
+#: src/ui.cc:900
+#, fuzzy
+msgid "Some packages were broken and have been fixed:"
msgstr "Alguns pacotes tinham dependências quebradas e foram corrigidos"
-#: src/ui.cc:839
-msgid "Some broken packages could not be fixed!"
+#: src/ui.cc:906
+msgid "No solution to these dependency problems exists!"
msgstr ""
-"Alguns pacotes tinham dependências quebradas e não puderam ser corrigidos!"
-#: src/ui.cc:847 src/ui.cc:959
-msgid "Some packages are broken. Try to fix them?"
-msgstr "Alguns pacotes têm dependências quebradas. Deseja tentar corrigi-las?"
+#: src/ui.cc:912
+#, c-format
+msgid ""
+"Ran out of time while trying to resolver dependencies (press \"%s\" to try "
+"harder)"
+msgstr ""
-#: src/ui.cc:860
+#: src/ui.cc:958
+#, fuzzy
msgid ""
-"Installing/removing packages requires administrative privileges, which\n"
-"you currently do not have. Would you like to change to the root account?\n"
+"Installing/removing packages requires administrative privileges, which you "
+"currently do not have. Would you like to change to the root account?"
msgstr ""
"Instalar/remover pacotes requer privilégios de administrador, que\n"
"actualmente não possui. Deseja mudar para a conta de root?\n"
-#: src/ui.cc:863 src/ui.cc:993
+#: src/ui.cc:961 src/ui.cc:1077
msgid "Become root"
msgstr "Tornar-se root"
-#: src/ui.cc:865 src/ui.cc:995
+#: src/ui.cc:963 src/ui.cc:1079
msgid "Don't become root"
msgstr "Não tornar-se root"
-#: src/ui.cc:870 src/ui.cc:1000
+#: src/ui.cc:968 src/ui.cc:1084
msgid "A package-list update or install run is already taking place."
msgstr ""
"Uma actualização da lista de pacotes ou uma instalação já está em execução."
-#: src/ui.cc:897
+#: src/ui.cc:995
msgid "No packages are scheduled to be installed, removed, or upgraded."
msgstr ""
"Nenhuns pacotes estão agendados para serem instalados, removidos ou "
"actualizados."
-#: src/ui.cc:903
+#: src/ui.cc:1001
#, fuzzy
msgid ""
"No packages will be installed, removed or upgraded. Some packages could be "
@@ -3705,168 +3958,183 @@
"Alguns pacotes podiam ser actualizados, mas escolheu não os actualizar.\n"
"Carregue em \"U\" para preparar uma actualização."
-#: src/ui.cc:990
+#: src/ui.cc:1073
+#, fuzzy
msgid ""
-"Updating the package lists requires administrative privileges, which\n"
-"you currently do not have. Would you like to change to the root account?\n"
+"Updating the package lists requires administrative privileges, which you "
+"currently do not have. Would you like to change to the root account?"
msgstr ""
"Actualizar a lista de pacotes requer privilégios de administrador, que\n"
"actualmente não possui. Deseja mudar para a conta de root ?\n"
-#: src/ui.cc:1005 src/ui.cc:1198
+#: src/ui.cc:1089 src/ui.cc:1345
msgid "Waste time trying to find mines"
msgstr "Perca tempo tentando encontrar minas"
-#: src/ui.cc:1012 src/ui.cc:1065
+#: src/ui.cc:1096 src/ui.cc:1149
msgid "Cleaning while a download is in progress is not allowed"
msgstr "Limpar enquanto um download está em curso não é permitido"
-#: src/ui.cc:1015
+#: src/ui.cc:1099
msgid "Deleting downloaded files"
msgstr "A apagar ficheiros transferidos"
-#: src/ui.cc:1029
+#: src/ui.cc:1113
msgid "Downloaded package files have been deleted"
msgstr "Ficheiros de pacotes transferidos foram apagados"
-#: src/ui.cc:1090
+#: src/ui.cc:1174
#, fuzzy, c-format
msgid ""
"Obsolete downloaded package files have been deleted, freeing %sB of disk "
"space."
msgstr "Ficheiros de pacotes obsoletos transferidos foram apagados"
-#: src/ui.cc:1174
+#: src/ui.cc:1246
+msgid "All solutions exhausted."
+msgstr ""
+
+#: src/ui.cc:1251 src/ui.cc:1282
+#, fuzzy
+msgid "Ran out of time while trying to find a solution."
+msgstr "Perca tempo tentando encontrar minas"
+
+#: src/ui.cc:1276
+msgid "Unable to find a solution to apply."
+msgstr ""
+
+#: src/ui.cc:1321
msgid "^Install/remove packages"
msgstr "^Instalar/remover pacotes"
-#: src/ui.cc:1175
+#: src/ui.cc:1322
msgid "Perform all pending installs and removals"
msgstr "Executar todas as instalações e remoções pendentes"
-#: src/ui.cc:1177
+#: src/ui.cc:1324
msgid "^Update package list"
msgstr "^U Actualizar a lista de pacotes"
-#: src/ui.cc:1178
+#: src/ui.cc:1325
msgid "Check for new versions of packages"
msgstr "Checar por novas versões de pacotes"
-#: src/ui.cc:1181
+#: src/ui.cc:1328
msgid "^Forget new packages"
msgstr "^F Esquecer novos pacotes"
-#: src/ui.cc:1182
+#: src/ui.cc:1329
msgid "Forget which packages are \"new\""
msgstr "Esquecer que pacotes são \"novos\""
-#: src/ui.cc:1185
+#: src/ui.cc:1332
msgid "^Clean package cache"
msgstr "^C Limpar cache de pacotes"
-#: src/ui.cc:1186
+#: src/ui.cc:1333
msgid "Delete package files which were previously downloaded"
msgstr "Apagar ficheiros de pacotes que foram previamente transferidos"
-#: src/ui.cc:1189
+#: src/ui.cc:1336
msgid "Clean ^obsolete files"
msgstr "Limpar ficheiros ^obsoletos"
-#: src/ui.cc:1190
+#: src/ui.cc:1337
msgid "Delete package files which can no longer be downloaded"
msgstr "Apagar ficheiros de pacotes que não podem mais ser transferidos"
-#: src/ui.cc:1193
+#: src/ui.cc:1340
msgid "Mark ^Upgradable"
msgstr "^U Marcar Actualizáveis"
-#: src/ui.cc:1194
+#: src/ui.cc:1341
msgid "Mark all upgradable packages which are not held for upgrade"
msgstr ""
"Marcar para actualização todos os pacotes actualizáveis que não sejam para "
"manter"
-#: src/ui.cc:1197
+#: src/ui.cc:1344
msgid "^Play Minesweeper"
msgstr "^P Jogar Campo Minado"
-#: src/ui.cc:1200
+#: src/ui.cc:1347
msgid "^Become root"
msgstr "^B Tornar-se root"
-#: src/ui.cc:1201
+#: src/ui.cc:1348
+#, fuzzy
msgid ""
-"Run 'su' to become root; this will restart the program, but your\n"
-"settings will be preserved"
+"Run 'su' to become root; this will restart the program, but your settings "
+"will be preserved"
msgstr ""
"Executar 'su' para tornar-se root. Esta operação irá reiniciar o\n"
"programa, mas as suas configurações serão guardadas."
-#: src/ui.cc:1204
+#: src/ui.cc:1351
msgid "^Reload package cache"
msgstr "^Reler cache de pacotes"
-#: src/ui.cc:1205
+#: src/ui.cc:1352
msgid "Reload the package cache"
msgstr "Reler a cache de pacotes"
-#: src/ui.cc:1211
+#: src/ui.cc:1358
msgid "^Quit"
msgstr "^Q Terminar"
-#: src/ui.cc:1212
+#: src/ui.cc:1359
msgid "Exit the program"
msgstr "Sair do programa"
-#: src/ui.cc:1218 src/ui.cc:1487
+#: src/ui.cc:1365 src/ui.cc:1637
msgid "Undo"
msgstr "Desfazer"
-#: src/ui.cc:1219
+#: src/ui.cc:1366
msgid "Undo the last package operation or group of operations"
msgstr "Desfaz a última operação ou grupo de operações"
-#: src/ui.cc:1226
+#: src/ui.cc:1373
msgid "^Install"
msgstr "^Instalar"
-#: src/ui.cc:1227
+#: src/ui.cc:1374
msgid "Flag the currently selected package for installation or upgrade"
msgstr ""
"Marcar o pacote actualmente seleccionado para instalação ou actualização"
-#: src/ui.cc:1230
+#: src/ui.cc:1377
msgid "^Remove"
msgstr "^Remover"
-#: src/ui.cc:1231
+#: src/ui.cc:1378
msgid "Flag the currently selected package for removal"
msgstr "Marcar o pacote actualmente seleccionado para remoção"
-#: src/ui.cc:1234
+#: src/ui.cc:1381
msgid "^Purge"
msgstr "^Purgar"
-#: src/ui.cc:1235
+#: src/ui.cc:1382
msgid ""
"Flag the currently selected package and its configuration files for removal"
msgstr ""
"Marcar o pacote actualmente seleccionado e seus ficheiros de configuração "
"para serem removidos"
-#: src/ui.cc:1238
+#: src/ui.cc:1385
msgid "^Keep"
msgstr "^Ficar com"
-#: src/ui.cc:1239
+#: src/ui.cc:1386
msgid "Cancel any action on the selected package"
msgstr "Cancelar qualquer acção no pacote seleccionado"
-#: src/ui.cc:1242
+#: src/ui.cc:1389
msgid "^Hold"
msgstr "^Manter"
-#: src/ui.cc:1243
+#: src/ui.cc:1390
msgid ""
"Cancel any action on the selected package, and protect it from future "
"upgrades"
@@ -3874,252 +4142,256 @@
"Cancelar qualquer acção no pacote seleccionado e protegê-lo de futuras "
"actualizações"
-#: src/ui.cc:1246
+#: src/ui.cc:1393
msgid "Mark ^Auto"
msgstr "Marcar ^Auto"
-#: src/ui.cc:1247
+#: src/ui.cc:1394
+#, fuzzy
msgid ""
-"Mark the selected package as having been automatically installed;\n"
-"it will automatically be removed if no other packages depend on it"
+"Mark the selected package as having been automatically installed; it will "
+"automatically be removed if no other packages depend on it"
msgstr ""
"Marcar o pacote seleccionado como tendo sido automaticamente instalado;\n"
"será automaticamente removido se nenhum outro pacote depender dele"
-#: src/ui.cc:1250
+#: src/ui.cc:1397
msgid "Mark ^Manual"
msgstr "Marcar ^Manual"
-#: src/ui.cc:1251
+#: src/ui.cc:1398
+#, fuzzy
msgid ""
-"Mark the selected package as having been manually installed;\n"
-"it will not be removed unless you manually remove it"
+"Mark the selected package as having been manually installed; it will not be "
+"removed unless you manually remove it"
msgstr ""
"Marcar o pacote seleccionado como tendo sido manualmente instalado;\n"
"não irá ser removido a menos que você o remova manualmente"
-#: src/ui.cc:1254
+#: src/ui.cc:1401
msgid "^Forbid Version"
msgstr "^F ProÃbir Versão"
-#: src/ui.cc:1255
+#: src/ui.cc:1402
+#, fuzzy
msgid ""
-"Forbid the candidate version of the selected package from being installed;\n"
+"Forbid the candidate version of the selected package from being installed; "
"newer versions of the package will be installed as usual"
msgstr ""
"ProÃbir a versão candidata do pacote seleccionado de ser instalada;\n"
"versões mais recentes deste pacote serão instaladas como de costume"
-#: src/ui.cc:1259
+#: src/ui.cc:1406
msgid "I^nformation"
msgstr "I^nformação"
-#: src/ui.cc:1260
+#: src/ui.cc:1407
msgid "Display more information about the selected package"
msgstr "Mostrar mais informações acerca do pacote seleccionado"
-#: src/ui.cc:1263
+#: src/ui.cc:1410
msgid "^Changelog"
msgstr "^C Registo de alterações"
-#: src/ui.cc:1264
+#: src/ui.cc:1411
msgid "Display the Debian changelog of the selected package"
msgstr "Mostrar o registo de alterações Debian do pacote seleccionado"
-#: src/ui.cc:1271
+#: src/ui.cc:1418
msgid "^Find"
msgstr "^F Procurar"
-#: src/ui.cc:1272
+#: src/ui.cc:1419
msgid "Search for a package"
msgstr "Procurar por um pacote"
-#: src/ui.cc:1275
+#: src/ui.cc:1422
msgid "Find ^Again"
msgstr "^A Procurar de novo"
-#: src/ui.cc:1276
+#: src/ui.cc:1423
msgid "Repeat the last search"
msgstr "Repetir a última procura"
-#: src/ui.cc:1280
+#: src/ui.cc:1427
msgid "^Limit Display"
msgstr "^Limitar a vista"
-#: src/ui.cc:1281
+#: src/ui.cc:1428
msgid "Apply a filter to the package list"
msgstr "Aplicar um filtro à lista de pacotes"
-#: src/ui.cc:1284
+#: src/ui.cc:1431
msgid "^Un-Limit Display"
msgstr "^U Retirar limite à vista"
-#: src/ui.cc:1285
+#: src/ui.cc:1432
msgid "Remove the filter from the package list"
msgstr "Remover o filtro da lista de pacotes"
-#: src/ui.cc:1289
+#: src/ui.cc:1436
msgid "Find ^Broken"
msgstr "^B Procurar Quebrado"
-#: src/ui.cc:1290
+#: src/ui.cc:1437
msgid "Find the next package with unsatisfied dependencies"
msgstr "Procurar o próximo pacote com depedências não satisfeitas:"
-#: src/ui.cc:1297
+#: src/ui.cc:1444
msgid "^UI options"
msgstr "^UI Opções da interface"
-#: src/ui.cc:1298
+#: src/ui.cc:1445
msgid "Change the settings which affect the user interface"
msgstr "Altera as configurações que afectam a interface do utilizador"
-#: src/ui.cc:1301
+#: src/ui.cc:1448
msgid "^Dependency handling"
msgstr "Gestão de ^Dependências"
-#: src/ui.cc:1302
+#: src/ui.cc:1449
msgid "Change the settings which affect how package dependencies are handled"
msgstr ""
"Altera as configurações que afectam a forma como as dependências de pacotes "
"são geridas"
-#: src/ui.cc:1305
+#: src/ui.cc:1452
msgid "^Miscellaneous"
msgstr "^Miscelânea"
-#: src/ui.cc:1306
+#: src/ui.cc:1453
msgid "Change miscellaneous program settings"
msgstr "Altera as configurações diversas do programa"
-#: src/ui.cc:1311
+#: src/ui.cc:1458
msgid "^Revert options"
msgstr "^Reverter as opções"
-#: src/ui.cc:1312
+#: src/ui.cc:1459
msgid "Reset all settings to the system defaults"
msgstr "Reset a todas as configurações para os padrões do sistema"
-#: src/ui.cc:1323
+#: src/ui.cc:1470
msgid "^Next"
msgstr "^N Próximo"
-#: src/ui.cc:1324
+#: src/ui.cc:1471
msgid "View next display"
msgstr "Visualizar a próxima página"
-#: src/ui.cc:1327
+#: src/ui.cc:1474
msgid "^Prev"
msgstr "^P Anterior"
-#: src/ui.cc:1328
+#: src/ui.cc:1475
msgid "View previous display"
msgstr "Visualizar a página anterior"
-#: src/ui.cc:1331
+#: src/ui.cc:1478
msgid "^Close"
msgstr "^C Fechar"
-#: src/ui.cc:1332
+#: src/ui.cc:1479
msgid "Close this display"
msgstr "Fechar esta página"
-#: src/ui.cc:1337
+#: src/ui.cc:1484
msgid "New Package ^View"
msgstr "Nova ^Visão de Pacote"
-#: src/ui.cc:1338
+#: src/ui.cc:1485
msgid "Create a new default package view"
msgstr "Criar uma nova visão de pacote padrão"
-#: src/ui.cc:1341
+#: src/ui.cc:1488
msgid "New Categorical ^Browser"
msgstr "^B Novo Navegador de Categorias"
-#: src/ui.cc:1343
+#: src/ui.cc:1490
msgid "Browse packages by category"
msgstr "Navega pelos pacotes por categoria"
-#: src/ui.cc:1351
+#: src/ui.cc:1498
msgid "^About"
msgstr "^A Sobre"
-#: src/ui.cc:1352
+#: src/ui.cc:1499
msgid "View information about this program"
msgstr "Ver informações sobre este programa."
-#: src/ui.cc:1355
+#: src/ui.cc:1502
msgid "^Help"
msgstr "^H Ajuda"
-#: src/ui.cc:1356
+#: src/ui.cc:1503
msgid "View the on-line help"
msgstr "Visualiza a ajuda on-line"
-#: src/ui.cc:1358
+#: src/ui.cc:1505
msgid "User's ^Manual"
msgstr "^Manual do Utilizador"
-#: src/ui.cc:1359
+#: src/ui.cc:1506
msgid "View the detailed program manual"
msgstr "Ver o manual do programa detalhado"
-#: src/ui.cc:1362
+#: src/ui.cc:1509
msgid "^FAQ"
msgstr "^FAQ"
-#: src/ui.cc:1363
+#: src/ui.cc:1510
msgid "View a list of frequently asked questions"
msgstr "Ver a lista de perguntas frequentes"
-#: src/ui.cc:1366
-msgid "^ChangeLog"
-msgstr "^C Log de alterações"
+#: src/ui.cc:1513
+msgid "^NEWS"
+msgstr ""
-#: src/ui.cc:1367
-msgid "View the important changes made in each version of the program"
+#: src/ui.cc:1514
+#, fuzzy
+msgid "View the important changes made in each version of "
msgstr "Ver as alterações importantes feitas em cada versão do programa"
-#: src/ui.cc:1370
+#: src/ui.cc:1517
msgid "^License"
msgstr "^Licença"
-#: src/ui.cc:1371
+#: src/ui.cc:1518
msgid "View the terms under which you may copy the program"
msgstr "Ver os termos sob os quais pode copiar o programa"
-#: src/ui.cc:1486
+#: src/ui.cc:1636
msgid "Actions"
msgstr "Acções"
-#: src/ui.cc:1489
+#: src/ui.cc:1639
msgid "Search"
msgstr "Procurar"
-#: src/ui.cc:1490
+#: src/ui.cc:1640
msgid "Options"
msgstr "Opções"
-#: src/ui.cc:1491
+#: src/ui.cc:1641
msgid "Views"
msgstr "Vistas"
-#: src/ui.cc:1492
+#: src/ui.cc:1642
msgid "Help"
msgstr "Ajuda"
-#: src/ui.cc:1537
+#: src/ui.cc:1699
#, c-format
msgid ""
"%s: Menu %s: Help %s: Quit %s: Update %s: Download/Install/Remove Pkgs"
msgstr ""
"%s: Menu %s: Ajuda %s: Terminar %s: Actualizar %s: Instalar/Remover Pcts."
-#: src/ui.cc:1799 src/vscreen/vscreen.cc:281
+#: src/ui.cc:1968 src/vscreen/vscreen.cc:281
msgid "yes_key"
msgstr "chave_sim"
-#: src/ui.cc:1800 src/vscreen/vscreen.cc:282
+#: src/ui.cc:1969 src/vscreen/vscreen.cc:282
msgid "no_key"
msgstr "chave_não"
@@ -4131,6 +4403,16 @@
msgid "Downloading Changelog"
msgstr "A efectuar o download do registo de alterações"
+#: src/view_changelog.cc:54
+#, fuzzy
+msgid "Download Changelog"
+msgstr "A efectuar o download do registo de alterações"
+
+#: src/view_changelog.cc:63
+#, c-format
+msgid "%s changes"
+msgstr ""
+
#: src/vscreen/vscreen.cc:119
#, c-format
msgid "Ouch! Got SIGTERM, dying..\n"
@@ -4159,6 +4441,39 @@
msgid "No"
msgstr "Não"
+#~ msgid ""
+#~ "Some packages had unmet dependencies. This may mean that you have\n"
+#~ "requested an impossible situation or if you are using the unstable\n"
+#~ "distribution that some required packages have not yet been created\n"
+#~ "or been moved out of Incoming.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Alguns pacotes possuem dependências não satisfeitas. Isto significa\n"
+#~ " que você pediu uma situação impossÃvel ou, caso você esteja \n"
+#~ " a usar a distribuição instável, que alguns pacotes pedidos ainda\n"
+#~ " não foram criados ou foram movidos da Incoming.\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Please insert the following disc into the drive \"%s\":\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Por favor, introduza o seguinte disco na drive \"%s\":\n"
+#~ "%s"
+
+#~ msgid "Invalid option for interactive mode: -s\n"
+#~ msgstr "Opção inválida para modo interativo: -s\n"
+
+#~ msgid "Information about "
+#~ msgstr "Informação sobre "
+
+#~ msgid "Some broken packages could not be fixed!"
+#~ msgstr ""
+#~ "Alguns pacotes tinham dependências quebradas e não puderam ser corrigidos!"
+
+#~ msgid "^ChangeLog"
+#~ msgstr "^C Log de alterações"
+
#~ msgid "Go away, I'm trying to think.\n"
#~ msgstr "Vá-se embora, eu estou a tentar pensar.\n"
Modified: branches/aptitude-0.3/aptitude/po/pt_BR.po
==============================================================================
--- branches/aptitude-0.3/aptitude/po/pt_BR.po (original)
+++ branches/aptitude-0.3/aptitude/po/pt_BR.po Sat Apr 30 13:41:32 2005
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: aptitude\n"
"Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-01-10 16:26-0800\n"
+"POT-Creation-Date: 2005-04-29 18:11-0400\n"
"PO-Revision-Date: 2004-10-06 15:35-0300\n"
"Last-Translator: Goedson Teixeira Paixão <goedson at debian.org>\n"
"Language-Team: Debian-BR Project <debian-l10n-portuguese at lists.debian.org>\n"
@@ -158,16 +158,103 @@
msgstr "Reomver automaticamente pacotes não usados que casem com este filtro"
#: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:184 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
-#: src/vscreen/vs_util.cc:329
+#: src/ui.cc:218 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
+#: src/vscreen/vs_util.cc:328
msgid "Ok"
msgstr "Ok"
#: src/apt_options.cc:242 src/download_list.cc:71 src/mine/cmine.cc:257
-#: src/mine/cmine.cc:330 src/vscreen/vs_util.cc:329
+#: src/mine/cmine.cc:330 src/vscreen/vs_util.cc:328
msgid "Cancel"
msgstr "Cancelar"
+#: src/broken_indicator.cc:106 src/solution_dialog.cc:97
+msgid "Internal error: unexpected null solution."
+msgstr ""
+
+#: src/broken_indicator.cc:158
+#, fuzzy
+msgid "Suggest "
+msgstr "Sugere"
+
+#: src/broken_indicator.cc:164
+#, fuzzy, c-format
+msgid "%d installs"
+msgstr "instalar"
+
+#: src/broken_indicator.cc:169
+#, fuzzy
+msgid "1 install"
+msgstr "instalar"
+
+#: src/broken_indicator.cc:173
+#, c-format
+msgid "%d removals"
+msgstr ""
+
+#: src/broken_indicator.cc:178
+msgid "1 removal"
+msgstr ""
+
+#: src/broken_indicator.cc:182
+#, c-format
+msgid "%d keeps"
+msgstr ""
+
+#: src/broken_indicator.cc:187
+msgid "1 keep"
+msgstr ""
+
+#: src/broken_indicator.cc:191
+#, fuzzy, c-format
+msgid "%d upgrades"
+msgstr "atualizar"
+
+#: src/broken_indicator.cc:196
+#, fuzzy
+msgid "1 upgrade"
+msgstr "atualizar"
+
+#: src/broken_indicator.cc:200
+#, fuzzy, c-format
+msgid "%d downgrades"
+msgstr "rebaixado"
+
+#: src/broken_indicator.cc:205
+#, fuzzy
+msgid "1 downgrade"
+msgstr "rebaixado"
+
+#: src/broken_indicator.cc:214
+#, c-format
+msgid "%s: Examine"
+msgstr ""
+
+#: src/broken_indicator.cc:216
+#, c-format
+msgid "%s: Apply"
+msgstr ""
+
+#: src/broken_indicator.cc:218
+#, fuzzy, c-format
+msgid "%s: Next"
+msgstr "^N Próximo"
+
+#: src/broken_indicator.cc:220
+#, c-format
+msgid "%s: Previous"
+msgstr ""
+
+#: src/broken_indicator.cc:233
+#, c-format
+msgid "%CSolution search failed. %s: try harder"
+msgstr ""
+
+#: src/broken_indicator.cc:239
+#, c-format
+msgid "%CUnable to resolve dependencies."
+msgstr ""
+
#: src/cmdline/cmdline_action.cc:36
#, c-format
msgid ""
@@ -239,25 +326,25 @@
msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
msgstr "Pacote %s não é atualizável, não é possÃvel proibir uma atualização\n"
-#: src/cmdline/cmdline_action.cc:213
+#: src/cmdline/cmdline_action.cc:198
#, c-format
msgid "Note: selecting the task \"%s: %s\" for installation\n"
msgstr "Nota : selecionando a tarefa \"%s: %s\" para instalação\n"
-#: src/cmdline/cmdline_action.cc:240
+#: src/cmdline/cmdline_action.cc:225
#, c-format
msgid "You can only specify a package version with an 'install' command.\n"
msgstr ""
"Você pode especificar uma versão de pacote somente com um comando 'install'\n"
-#: src/cmdline/cmdline_action.cc:246
+#: src/cmdline/cmdline_action.cc:231
#, c-format
msgid "You can only specify a package archive with an 'install' command.\n"
msgstr ""
"Você pode especificar um repositório de pacotes somente com um comando "
"'install'\n"
-#: src/cmdline/cmdline_action.cc:280
+#: src/cmdline/cmdline_action.cc:265
#, c-format
msgid ""
"Couldn't find package \"%s\", and more than 40\n"
@@ -266,7 +353,7 @@
"Não foi possÃvel encontrar o pacote \"%s\", e mais de 40\n"
"pacotes contém \"%s\" em seu nome.\n"
-#: src/cmdline/cmdline_action.cc:283
+#: src/cmdline/cmdline_action.cc:268
#, c-format
msgid ""
"Couldn't find package \"%s\". However, the following\n"
@@ -275,14 +362,14 @@
"Não foi possÃvel encontrar o pacote \"%s\". Porém, os pacotes\n"
"a seguir possuem \"%s\" em seu nome :\n"
-#: src/cmdline/cmdline_action.cc:307
+#: src/cmdline/cmdline_action.cc:292
#, c-format
msgid "Couldn't find any package whose name or description matched \"%s\"\n"
msgstr ""
"Não foi possÃvel encontrar nenhum pacote cujo nome ou descrição casasse com "
"\"%s\"\n"
-#: src/cmdline/cmdline_action.cc:309
+#: src/cmdline/cmdline_action.cc:294
#, c-format
msgid ""
"Couldn't find any package matching \"%s\", and more than 40\n"
@@ -291,7 +378,7 @@
"Não foi possÃvel encontrar nenhum pacote que casasse com \"%s\", e\n"
"mais de 40 pacotes contém \"%s\" em sua descrição.\n"
-#: src/cmdline/cmdline_action.cc:312
+#: src/cmdline/cmdline_action.cc:297
#, c-format
msgid ""
"Couldn't find any package matching \"%s\". However, the following\n"
@@ -338,13 +425,13 @@
msgid "Freed %sB of disk space\n"
msgstr "Serão liberados %sB de espaço em disco"
-#: src/cmdline/cmdline_do_action.cc:67
+#: src/cmdline/cmdline_do_action.cc:71
#, c-format
msgid "Invalid operation %s"
msgstr "Operação %s inválida"
-#: src/cmdline/cmdline_do_action.cc:206 src/cmdline/cmdline_simulate.cc:30
-#: src/cmdline/cmdline_upgrade.cc:89
+#: src/cmdline/cmdline_do_action.cc:201 src/cmdline/cmdline_simulate.cc:31
+#: src/cmdline/cmdline_upgrade.cc:91
#, c-format
msgid "Abort.\n"
msgstr "Abortar.\n"
@@ -354,7 +441,7 @@
msgid "download: you must specify at least one package to download\n"
msgstr "download : você deve especificar pelo menos um pacote para download\n"
-#: src/cmdline/cmdline_download.cc:43 src/download.cc:342
+#: src/cmdline/cmdline_download.cc:43 src/download.cc:344
msgid "Couldn't read source list"
msgstr "Não foi possÃvel ler a lista de fontes"
@@ -419,95 +506,95 @@
msgstr ""
"O que é isso? Isso é um elefante sendo comido por uma cobra, é claro.\n"
-#: src/cmdline/cmdline_prompt.cc:44
+#: src/cmdline/cmdline_prompt.cc:45
msgid "Couldn't read list of sources"
msgstr "Não foi possÃvel ler a lista fontes"
-#: src/cmdline/cmdline_prompt.cc:219 src/cmdline/cmdline_show_broken.cc:73
+#: src/cmdline/cmdline_prompt.cc:220 src/cmdline/cmdline_show_broken.cc:73
#, c-format
msgid "but %s is to be installed."
msgstr "mas %s será instalado."
-#: src/cmdline/cmdline_prompt.cc:222 src/cmdline/cmdline_show_broken.cc:76
+#: src/cmdline/cmdline_prompt.cc:223 src/cmdline/cmdline_show_broken.cc:76
#, c-format
msgid "but %s is installed and it is kept back."
msgstr "mas %s está instalado e é mantido."
-#: src/cmdline/cmdline_prompt.cc:225 src/cmdline/cmdline_show_broken.cc:79
+#: src/cmdline/cmdline_prompt.cc:226 src/cmdline/cmdline_show_broken.cc:79
#, c-format
msgid "but %s is installed."
msgstr "mas %s está instalado."
-#: src/cmdline/cmdline_prompt.cc:229 src/cmdline/cmdline_show_broken.cc:83
+#: src/cmdline/cmdline_prompt.cc:230 src/cmdline/cmdline_show_broken.cc:83
#, c-format
msgid "but it is not installable"
msgstr "mas não é instalável."
-#: src/cmdline/cmdline_prompt.cc:233 src/cmdline/cmdline_show_broken.cc:87
+#: src/cmdline/cmdline_prompt.cc:234 src/cmdline/cmdline_show_broken.cc:87
#, c-format
msgid " which is a virtual package."
msgstr " o qual é um pacote virtual."
-#: src/cmdline/cmdline_prompt.cc:236 src/cmdline/cmdline_show_broken.cc:90
+#: src/cmdline/cmdline_prompt.cc:237 src/cmdline/cmdline_show_broken.cc:90
#, c-format
msgid " or"
msgstr " ou"
-#: src/cmdline/cmdline_prompt.cc:248
+#: src/cmdline/cmdline_prompt.cc:249
msgid "The following packages are BROKEN:"
msgstr "Os pacotes a seguir estão QUEBRADOS :"
-#: src/cmdline/cmdline_prompt.cc:249
+#: src/cmdline/cmdline_prompt.cc:250
msgid "The following packages are unused and will be REMOVED:"
msgstr "Os pacotes a seguir não estão sendo utilizados e serão REMOVIDOS:"
-#: src/cmdline/cmdline_prompt.cc:250
+#: src/cmdline/cmdline_prompt.cc:251
msgid "The following packages have been automatically kept back:"
msgstr "Os pacotes a seguir foram automaticamente mantidos:"
-#: src/cmdline/cmdline_prompt.cc:251
+#: src/cmdline/cmdline_prompt.cc:252
msgid "The following NEW packages will be automatically installed:"
msgstr "Os NOVOS pacotes a seguir serão automaticamente instalados:"
-#: src/cmdline/cmdline_prompt.cc:252
+#: src/cmdline/cmdline_prompt.cc:253
msgid "The following packages will be automatically REMOVED:"
msgstr "Os pacotes a seguir serão automaticamente REMOVIDOS:"
-#: src/cmdline/cmdline_prompt.cc:253
+#: src/cmdline/cmdline_prompt.cc:254
msgid "The following packages will be DOWNGRADED:"
msgstr "Os pacotes a seguir serão REBAIXADOS (de versão):"
-#: src/cmdline/cmdline_prompt.cc:254
+#: src/cmdline/cmdline_prompt.cc:255
msgid "The following packages have been kept back:"
msgstr "Os pacotes a seguir foram mantidos:"
-#: src/cmdline/cmdline_prompt.cc:255
+#: src/cmdline/cmdline_prompt.cc:256
msgid "The following packages will be REINSTALLED:"
msgstr "Os pacotes a seguir serão REINSTALADOS:"
-#: src/cmdline/cmdline_prompt.cc:256
+#: src/cmdline/cmdline_prompt.cc:257
msgid "The following NEW packages will be installed:"
msgstr "Os NOVOS pacotes a seguir serão instalados:"
-#: src/cmdline/cmdline_prompt.cc:257
+#: src/cmdline/cmdline_prompt.cc:258
msgid "The following packages will be REMOVED:"
msgstr "Os pacotes a seguir serão REMOVIDOS:"
-#: src/cmdline/cmdline_prompt.cc:258
+#: src/cmdline/cmdline_prompt.cc:259
msgid "The following packages will be upgraded:"
msgstr "Os pacotes a seguir serão atualizados:"
-#: src/cmdline/cmdline_prompt.cc:307
+#: src/cmdline/cmdline_prompt.cc:311
#, c-format
msgid "The following ESSENTIAL packages will be REMOVED!\n"
msgstr "Os pacotes ESSENCIAIS a seguir serão REMOVIDOS!\n"
-#: src/cmdline/cmdline_prompt.cc:316
+#: src/cmdline/cmdline_prompt.cc:320
#, c-format
msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
msgstr "Os pacotes ESSENCIAIS a seguir ficarão QUEBRADOS por esta ação:\n"
-#: src/cmdline/cmdline_prompt.cc:326
+#: src/cmdline/cmdline_prompt.cc:330
#, c-format
msgid ""
"WARNING: Performing this action will probably cause your system to break!\n"
@@ -517,99 +604,102 @@
"quebre\n"
" NÃO continue a menos que você saiba EXATAMENTE o que está fazendo!\n"
-#: src/cmdline/cmdline_prompt.cc:328
+#: src/cmdline/cmdline_prompt.cc:332
msgid "I am aware that this is a very bad idea"
msgstr "Estou ciente de que essa é um idéia muito ruim."
-#: src/cmdline/cmdline_prompt.cc:331
+#: src/cmdline/cmdline_prompt.cc:335
#, c-format
msgid "To continue, type the phrase \"%s\":\n"
msgstr "Para continuar, digite a frase \"%s\":\n"
-#: src/cmdline/cmdline_prompt.cc:434
+#: src/cmdline/cmdline_prompt.cc:438
#, c-format
msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
msgstr "Os pacotes a seguir foram RECOMENDADOS mas NÃO serão instalados:\n"
-#: src/cmdline/cmdline_prompt.cc:440
+#: src/cmdline/cmdline_prompt.cc:444
#, c-format
msgid "The following packages are SUGGESTED but will NOT be installed:\n"
msgstr "Os pacotes a seguir foram SUGERIDOS mas NÃO serão instalados:\n"
-#: src/cmdline/cmdline_prompt.cc:445
+#: src/cmdline/cmdline_prompt.cc:449
#, c-format
msgid "No packages will be installed, upgraded, or removed.\n"
msgstr "Nenhum pacote será instalado, atualizado ou removido.\n"
-#: src/cmdline/cmdline_prompt.cc:447
+#: src/cmdline/cmdline_prompt.cc:451
#, c-format
msgid "%lu packages upgraded, %lu newly installed, "
msgstr "%lu pacotes atualizados, %lu novos instalados, "
-#: src/cmdline/cmdline_prompt.cc:451
+#: src/cmdline/cmdline_prompt.cc:455
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstalados, "
-#: src/cmdline/cmdline_prompt.cc:453
+#: src/cmdline/cmdline_prompt.cc:457
#, c-format
msgid "%lu downgraded, "
msgstr "%lu rebaixados, "
-#: src/cmdline/cmdline_prompt.cc:455
+#: src/cmdline/cmdline_prompt.cc:459
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu a serem removidos e %lu não atualizados.\n"
-#: src/cmdline/cmdline_prompt.cc:462
+#: src/cmdline/cmdline_prompt.cc:466
#, c-format
msgid "Need to get %sB/%sB of archives. "
msgstr "É preciso obter %sB/%sB de arquivos. "
-#: src/cmdline/cmdline_prompt.cc:465
+#: src/cmdline/cmdline_prompt.cc:469
#, c-format
msgid "Need to get %sB of archives. "
msgstr "É preciso obter %sB de arquivos. "
-#: src/cmdline/cmdline_prompt.cc:472
+#: src/cmdline/cmdline_prompt.cc:476
#, c-format
msgid "After unpacking %sB will be used.\n"
msgstr "Depois do desempacotamento, %sB serão usados.\n"
-#: src/cmdline/cmdline_prompt.cc:475
+#: src/cmdline/cmdline_prompt.cc:479
#, c-format
msgid "After unpacking %sB will be freed.\n"
msgstr "Depois do desempacotamento, %sB serão liberados.\n"
-#: src/cmdline/cmdline_prompt.cc:521
+#: src/cmdline/cmdline_prompt.cc:524
#, c-format
msgid "Bad action character '%c'\n"
msgstr "Caracter de ação ruim '%c'\n"
-#: src/cmdline/cmdline_prompt.cc:596
+#: src/cmdline/cmdline_prompt.cc:595
#, c-format
msgid "No packages to show -- enter the package names on the line after 'i'.\n"
msgstr ""
"Nenhum pacote a ser exibido -- informe os nomes dos pacotes na linha após "
"'i'.\n"
-#: src/cmdline/cmdline_prompt.cc:598 src/cmdline/cmdline_prompt.cc:629
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:597
msgid "Press Return to continue."
msgstr "Pressione Enter para continuar."
-#: src/cmdline/cmdline_prompt.cc:625
+#: src/cmdline/cmdline_prompt.cc:623
#, c-format
msgid "No packages found -- enter the package names on the line after 'c'.\n"
msgstr ""
"Nenhum pacote encontrado -- informe os nomes dos pacotes na linha após 'c'.\n"
-#: src/cmdline/cmdline_prompt.cc:665
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:627
+#, fuzzy
+msgid "Press Return to continue"
+msgstr "Pressione Enter para continuar."
+
+#: src/cmdline/cmdline_prompt.cc:675
msgid "Do you want to continue? [Y/n/?] "
msgstr "Você deseja continuar? [Y/n/?] "
-#: src/cmdline/cmdline_prompt.cc:690
+#: src/cmdline/cmdline_prompt.cc:700
#, c-format
msgid ""
"\n"
@@ -620,7 +710,7 @@
"Informação de dependência será exibida.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:692
+#: src/cmdline/cmdline_prompt.cc:702
#, c-format
msgid ""
"\n"
@@ -631,7 +721,7 @@
"Informação de dependência não será exibida.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:698
+#: src/cmdline/cmdline_prompt.cc:708
#, c-format
msgid ""
"\n"
@@ -642,7 +732,7 @@
"Versões serão exibidas.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:700
+#: src/cmdline/cmdline_prompt.cc:710
#, c-format
msgid ""
"\n"
@@ -653,7 +743,7 @@
"Versões não serão exibidas.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:705
+#: src/cmdline/cmdline_prompt.cc:715
#, c-format
msgid ""
"\n"
@@ -664,7 +754,7 @@
"Mudanças de tamanho serão exibidas.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:717
#, c-format
msgid ""
"\n"
@@ -675,7 +765,7 @@
"Mudanças de tamanho não serão exibidas.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:737
#, c-format
msgid ""
"Commands:\n"
@@ -725,33 +815,86 @@
" _ : Expurgar\n"
" = : Manter\n"
-#: src/cmdline/cmdline_prompt.cc:751
+#: src/cmdline/cmdline_prompt.cc:761
#, c-format
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:84
+#, c-format
+msgid "y: %F%nn: %F%nq: %F%n,: %F%n.: %F%n"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:90
+msgid "accept the proposed changes"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:92
+msgid "reject the proposed changes and search for another solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:94
+#, fuzzy
+msgid "give up and quit the program"
+msgstr "Sair do programa"
+
+#: src/cmdline/cmdline_resolver.cc:96
+msgid "move to the next solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:98
+msgid "move to the previous solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:131
+#, 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:146
+msgid "Accept this solution? [Y/n/q/?]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:174
+msgid "Abandoning all efforts to resolve these dependencies."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:184
+#, fuzzy
+msgid "The following commands are available:"
+msgstr "Os pacotes a seguir estão QUEBRADOS :"
+
+#: src/cmdline/cmdline_resolver.cc:188
+#, 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:198
+msgid "No solution found within the allotted time. Try harder? [Y/n]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:226
+#, 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:235
+msgid "Unable to resolve dependencies! Giving up..."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:240
+msgid "No more solutions."
+msgstr ""
+
#: src/cmdline/cmdline_search.cc:78
#, c-format
msgid "search: You must provide at least one search term\n"
msgstr "busca : Você deve fornecer pelo menos um termo para busca\n"
-#: src/cmdline/cmdline_show_broken.cc:114
-#, c-format
-msgid ""
-"Some packages had unmet dependencies. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming.\n"
-"\n"
-msgstr ""
-"Alguns pacotes possuem dependências não satisfeitas. Isto siginifica\n"
-" que você requisitou uma situação impossÃvel ou, caso você esteja \n"
-" usando a distribuição instável, que alguns pacotes requeridos ainda\n"
-" não foram criados ou não foram movidos da Incoming.\n"
-"\n"
-
-#: src/cmdline/cmdline_show_broken.cc:115
+#: src/cmdline/cmdline_show_broken.cc:113
#, c-format
msgid "The following packages have unmet dependencies:\n"
msgstr "Os pacotes a seguir possuem dependências não satisfeitas :\n"
@@ -949,12 +1092,12 @@
msgid "Description: "
msgstr "Descrição: "
-#: src/cmdline/cmdline_simulate.cc:36
+#: src/cmdline/cmdline_simulate.cc:37
#, c-format
msgid "Would download/install/remove packages.\n"
msgstr "Faria o download/instalaria/removeria pacotes.\n"
-#: src/cmdline/cmdline_simulate.cc:47
+#: src/cmdline/cmdline_simulate.cc:48
msgid "Internal Error, Ordering didn't finish"
msgstr "Erro interno, Ordenação não finalizou"
@@ -998,28 +1141,24 @@
msgid "UNAVAILABLE"
msgstr "NÂO DISPONÃVEIS"
-#: src/download_bar.cc:57 src/download_list.cc:265
+#: src/download_bar.cc:56 src/download_list.cc:263 src/download_screen.cc:57
#, c-format
-msgid ""
-"Please insert the following disc into the drive \"%s\":\n"
-"%s"
-msgstr ""
-"Por favor, insira o seguinte disco no leitor \"%s\":\n"
-"%s"
+msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
+msgstr "Por favor insira o disco nomeado \"%s\" no drive \"%s\""
-#: src/download_bar.cc:76 src/generic/acqprogress.cc:63
+#: src/download_bar.cc:77 src/generic/acqprogress.cc:63
msgid "Hit "
msgstr "Atingido "
-#: src/download_bar.cc:89
+#: src/download_bar.cc:90
msgid "Downloading "
msgstr "Fazendo download de "
-#: src/download_bar.cc:102
+#: src/download_bar.cc:103
msgid "Got "
msgstr "Obtido "
-#: src/download_bar.cc:156
+#: src/download_bar.cc:157
msgid "Downloading..."
msgstr "Fazendo download..."
@@ -1027,7 +1166,7 @@
msgid "Couldn't read list of package sources"
msgstr "Não foi possÃvel ler a lista de fontes de pacote"
-#: src/download.cc:104 src/download.cc:321
+#: src/download.cc:104 src/download.cc:322
msgid "Couldn't lock list directory..are you root?"
msgstr "Não foi possÃvel travar o diretório de listas..você é root?"
@@ -1039,29 +1178,33 @@
msgid "View the progress of the package list update"
msgstr "Visualizar o progresso da atualização da lista de pacotes"
-#: src/download.cc:159
+#: src/download.cc:113
+msgid "List Update"
+msgstr ""
+
+#: src/download.cc:160
msgid "Couldn't clean out list directories"
msgstr "Não foi possÃvel limpar os diretórios de listas"
-#: src/download.cc:176 src/ui.cc:1068
+#: src/download.cc:177 src/ui.cc:1152
msgid "Deleting obsolete downloaded files"
msgstr "Apagando arquivos baixados obsoletos"
-#: src/download.cc:181
+#: src/download.cc:182
#, c-format
msgid "Deleting obsolete downloaded files\n"
msgstr "Apagando arquivos obsoletos baixados\n"
-#: src/download.cc:223
+#: src/download.cc:224
#, c-format
msgid "Unable to open %s to log actions"
msgstr "Não é possÃvel abrir %s para gravar ações"
-#: src/download.cc:229
+#: src/download.cc:230
msgid "log report"
msgstr "relatório de log"
-#: src/download.cc:230
+#: src/download.cc:231
#, c-format
msgid ""
"IMPORTANT: this log only lists intended actions; actions which fail due to\n"
@@ -1072,77 +1215,77 @@
"devido\n"
" a problemas do dpkg podem não estar completas.\n"
-#: src/download.cc:231
+#: src/download.cc:232
#, c-format
msgid "Will install %li packages, and remove %li packages.\n"
msgstr "Serão instalados %li pacotes e removidos %li pacotes.\n"
-#: src/download.cc:233
+#: src/download.cc:234
#, c-format
msgid "%sB of disk space will be used\n"
msgstr "%sB de espaço em disco serão usados\n"
-#: src/download.cc:236
+#: src/download.cc:237
#, c-format
msgid "%sB bytes of disk space will be freed\n"
msgstr "%sB de espaço em disco serão liberados\n"
-#: src/download.cc:244
+#: src/download.cc:245
#, c-format
msgid "[UPGRADE] %s %s -> %s\n"
msgstr "[ATUALIZAÇÂO] %s %s -> %s\n"
-#: src/download.cc:248
+#: src/download.cc:249
#, c-format
msgid "[DOWNGRADE] %s %s -> %s\n"
msgstr "[REBAIXAMENTO] %s %s -> %s\n"
-#: src/download.cc:258
+#: src/download.cc:259
msgid "REMOVE"
msgstr "REMOVER"
-#: src/download.cc:264
+#: src/download.cc:265
msgid "INSTALL"
msgstr "INSTALAR"
-#: src/download.cc:267
+#: src/download.cc:268
msgid "REINSTALL"
msgstr "REINSTALAR"
-#: src/download.cc:270
+#: src/download.cc:271
msgid "HOLD"
msgstr "MANTER"
-#: src/download.cc:273
+#: src/download.cc:274
msgid "BROKEN"
msgstr "QUEBRADO"
-#: src/download.cc:276
+#: src/download.cc:277
msgid "REMOVE, NOT USED"
msgstr "REMOVER, NÃO USADOS"
-#: src/download.cc:279
+#: src/download.cc:280
msgid "REMOVE, DEPENDENCIES"
msgstr "REMOVER, DEPENDÊNCIAS"
-#: src/download.cc:282
+#: src/download.cc:283
msgid "INSTALL, DEPENDENCIES"
msgstr "INSTALAR, DEPENDÊNCIAS"
-#: src/download.cc:285
+#: src/download.cc:286
msgid "HOLD, DEPENDENCIES"
msgstr "MANTER, DEPENDÊNCIAS"
-#: src/download.cc:287
+#: src/download.cc:288
msgid "????????"
msgstr "????????"
-#: src/download.cc:291
+#: src/download.cc:292
#, c-format
msgid "[%s] %s\n"
msgstr "[%s] %s\n"
-#: src/download.cc:294
+#: src/download.cc:295
#, c-format
msgid ""
"===============================================================================\n"
@@ -1153,34 +1296,39 @@
"\n"
"Log completo.\n"
-#: src/download.cc:329
+#: src/download.cc:330
msgid "Downloading packages"
msgstr "Fazendo download de pacotes"
-#: src/download.cc:330
+#: src/download.cc:331
msgid "View the progress of the package download"
msgstr "Visualizar o progresso do download dos pacotes"
-#: src/download.cc:352
+#: src/download.cc:332
+#, fuzzy
+msgid "Package Download"
+msgstr "Pacote: "
+
+#: src/download.cc:354
msgid "Internal error: couldn't generate list of packages to download"
msgstr ""
"Erro interno: não foi possÃvel gerar a lista de pacotes a serem baixados"
-#: src/download.cc:413
+#: src/download.cc:415
msgid "Unable to correct for unavailable packages"
msgstr "Não é possÃvel corrigir para pacotes não disponÃveis"
-#: src/download.cc:465
+#: src/download.cc:467
msgid ""
"Ack! Something bad happened while installing packages. Trying to recover:"
msgstr ""
"Ack! Algo ruim aconteceu durante a instalação de pacotes. Tentando recuperar:"
-#: src/download.cc:475 src/pkg_item.cc:413
+#: src/download.cc:477 src/pkg_item.cc:432
msgid "Press return to continue.\n"
msgstr "Pressione Enter para continuar.\n"
-#: src/download.cc:506
+#: src/download.cc:508
msgid ""
"Could not regain the system lock! (Perhaps another apt or dpkg is running?)"
msgstr ""
@@ -1242,11 +1390,6 @@
msgid "[ERROR]"
msgstr "[ERRO]"
-#: src/download_screen.cc:57
-#, c-format
-msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
-msgstr "Por favor insira o disco nomeado \"%s\" no drive \"%s\""
-
#: src/download_screen.cc:181
#, c-format
msgid "Downloaded %sB in %ss (%sB/s)."
@@ -1286,118 +1429,118 @@
"Mudança de mÃdia: Por favor, insira o disco nomeado '%s' no drive '%s' e "
"pressione Enter\n"
-#: src/generic/aptcache.cc:245
+#: src/generic/aptcache.cc:253
msgid "Can't open Aptitude extended state file"
msgstr "Não foi possÃvel abrir o arquivo de estado extendido do Aptitude"
-#: src/generic/aptcache.cc:252 src/generic/aptcache.cc:305
-#: src/generic/aptcache.cc:307
+#: src/generic/aptcache.cc:260 src/generic/aptcache.cc:313
+#: src/generic/aptcache.cc:315
msgid "Reading extended state information"
msgstr "Lendo informações extendidas de estado"
-#: src/generic/aptcache.cc:313 src/generic/aptcache.cc:387
-#: src/generic/aptcache.cc:390
+#: src/generic/aptcache.cc:321 src/generic/aptcache.cc:395
+#: src/generic/aptcache.cc:398
msgid "Initializing package states"
msgstr "Inicializando estados de pacotes"
-#: src/generic/aptcache.cc:501
+#: src/generic/aptcache.cc:509
msgid "Cannot open Aptitude state file"
msgstr "Não foi possÃvel abrir o arquivo de estado do Aptitude"
-#: src/generic/aptcache.cc:505 src/generic/aptcache.cc:560
-#: src/generic/aptcache.cc:563
+#: src/generic/aptcache.cc:513 src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:571
msgid "Writing extended state information"
msgstr "Gravando informações extendidas de estado"
-#: src/generic/aptcache.cc:542
+#: src/generic/aptcache.cc:550
#, 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/aptcache.cc:551
+#: src/generic/aptcache.cc:559
msgid "Couldn't write state file"
msgstr "Não foi possÃvel gravar o arquivo de estado"
-#: src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:576
msgid "Error writing state file"
msgstr "Erro ao gravar o arquivo de estado"
-#: src/generic/aptcache.cc:584
+#: src/generic/aptcache.cc:592
msgid "couldn't replace old state file"
msgstr "não foi possÃvel substituir o antigo arquivo de estado"
-#: src/generic/aptcache.cc:960
+#: src/generic/aptcache.cc:1000
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/aptcache.cc:1325
+#: src/generic/aptcache.cc:1546
msgid "The list of sources could not be read."
msgstr "A lista de fontes não pôde ser lida."
-#: src/generic/aptcache.cc:1332
+#: src/generic/aptcache.cc:1553
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/aptcache.cc:1335
+#: src/generic/aptcache.cc:1556
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 "
"faltam"
-#: src/generic/apt.cc:141
+#: src/generic/apt.cc:142
#, c-format
msgid "Unable to open %s for writing"
msgstr "Não foi possÃvel abrir %s para gravação"
-#: src/generic/apt.cc:151
+#: src/generic/apt.cc:152
#, c-format
msgid "Unable to replace %s with new configuration file"
msgstr "Não foi possÃvel substituir %s pelo novo arquivo de configuração"
-#: src/generic/apt.cc:226
+#: src/generic/apt.cc:227
msgid "Warning: could not lock the cache file. Opening in read-only mode"
msgstr ""
"Aviso: não foi possÃvel travar o arquivo de cache. Abrindo em modo somente-"
"leitura"
-#: src/generic/matchers.cc:780
+#: src/generic/matchers.cc:797
msgid "Unmatched '('"
msgstr "Parentese '(' sem par"
-#: src/generic/matchers.cc:870 src/generic/matchers.cc:949
+#: src/generic/matchers.cc:887 src/generic/matchers.cc:968
#, c-format
msgid "Unknown dependency type: %s"
msgstr "Tipo de dependência desconhecida: %s"
-#: src/generic/matchers.cc:931
+#: src/generic/matchers.cc:950
#, c-format
msgid "Unknown action type: %s"
msgstr "Tipo de ação desconhecida: %s"
-#: src/generic/matchers.cc:998
+#: src/generic/matchers.cc:1017
#, c-format
msgid "Unknown priority %s"
msgstr "Prioridade %s desconhecida"
-#: src/generic/matchers.cc:1020
+#: src/generic/matchers.cc:1039
#, c-format
msgid "Unknown pattern type: %c"
msgstr "Tipo de padrão desconhecido: %c"
-#: src/generic/matchers.cc:1065
+#: src/generic/matchers.cc:1084
msgid "Unexpected empty expression"
msgstr "Expressão vazia não esperada"
-#: src/generic/matchers.cc:1100
+#: src/generic/matchers.cc:1119
msgid "Badly formed expression"
msgstr "Expressão mal formada"
-#: src/generic/matchers.cc:1129
+#: src/generic/matchers.cc:1148
msgid "Unexpected ')'"
msgstr "')' inesperado"
@@ -1423,7 +1566,7 @@
msgid "Can't get value of $HOME, using TMPDIR (insecure)"
msgstr "Não foi possÃvel obter o valor de $HOME, usando TMPDIR (inseguro)"
-#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:60
+#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:61
#, c-format
msgid "ChangeLog of %s"
msgstr "Log de mudanças de %s"
@@ -1636,17 +1779,17 @@
msgid "Invalid sorting policy type '%s'"
msgstr "Tipo de polÃtica de ordenação '%s' inválido"
-#: src/main.cc:68
+#: src/main.cc:67
#, c-format
msgid "%s %s compiled at %s %s\n"
msgstr "%s %s compilado em %s %s\n"
-#: src/main.cc:71
+#: src/main.cc:70
#, c-format
msgid "Compiler: g++ %s\n"
msgstr "Compilador: g++ %s\n"
-#: src/main.cc:74
+#: src/main.cc:73
#, c-format
msgid ""
"\n"
@@ -1655,7 +1798,7 @@
"\n"
"Versão NCurses: %s\n"
-#: src/main.cc:76
+#: src/main.cc:75
#, c-format
msgid ""
"\n"
@@ -1664,22 +1807,22 @@
"\n"
"Versão Curses: %s\n"
-#: src/main.cc:78
+#: src/main.cc:77
#, c-format
msgid "libsigc++ version: %s\n"
msgstr "versão libsigc++: %s\n"
-#: src/main.cc:84
+#: src/main.cc:83
#, c-format
msgid "Usage: aptitude [-S fname] [-u|-i]"
msgstr "Uso: aptitude [-S frame] [-u|-i]"
-#: src/main.cc:86
+#: src/main.cc:85
#, c-format
msgid " aptitude [options] <action> ..."
msgstr " aptitude [opções] <ação> ..."
-#: src/main.cc:88
+#: src/main.cc:87
#, c-format
msgid ""
" Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -1689,44 +1832,44 @@
"interativo):\n"
"\n"
-#: src/main.cc:89
+#: src/main.cc:88
#, c-format
msgid " install - Install/upgrade packages\n"
msgstr " install - Instalar/atualizar pacotes\n"
-#: src/main.cc:90
+#: src/main.cc:89
#, c-format
msgid " remove - Remove packages\n"
msgstr " remove - Remover pacotes\n"
-#: src/main.cc:91
+#: src/main.cc:90
#, c-format
msgid " purge - Remove packages and their configuration files\n"
msgstr " purge - Remover pacotes e seus arquivos de configuração\n"
-#: src/main.cc:92
+#: src/main.cc:91
#, c-format
msgid " hold - Place packages on hold\n"
msgstr " hold - Manter pacotes na versão atual\n"
-#: src/main.cc:93
+#: src/main.cc:92
#, c-format
msgid " unhold - Cancel a hold command for a package\n"
msgstr " unhold - Cancelar o comando hold para um pacote\n"
-#: src/main.cc:94
+#: src/main.cc:93
#, c-format
msgid " markauto - Mark packages as having been automatically installed\n"
msgstr ""
" markauto - Marcar pacotes como tendo sido automaticamente instalados\n"
-#: src/main.cc:95
+#: src/main.cc:94
#, c-format
msgid " unmarkauto - Mark packages as having been manually installed\n"
msgstr ""
" unmarkauto - Marcar pacotes como tendo sido manualmente instalados\n"
-#: src/main.cc:100
+#: src/main.cc:99
#, c-format
msgid ""
" forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -1735,18 +1878,18 @@
" forbid-version - Proibir o aptitude de atualizar para uma versão especÃfica "
"do pacote.\n"
-#: src/main.cc:101
+#: src/main.cc:100
#, c-format
msgid " update - Download lists of new/upgradable packages\n"
msgstr ""
" update - Fazer o download das listas de pacotes novos/atualizados\n"
-#: src/main.cc:102
+#: src/main.cc:101
#, c-format
msgid " upgrade - Perform a safe upgrade\n"
msgstr " upgrade - Executar uma atualização segura\n"
-#: src/main.cc:103
+#: src/main.cc:102
#, c-format
msgid ""
" dist-upgrade - Perform an upgrade, possibly installing and removing "
@@ -1755,57 +1898,57 @@
" dist-upgrade - Executar uma atualização, posivelmente instalando e "
"removendo pacotes\n"
-#: src/main.cc:104
+#: src/main.cc:103
#, c-format
msgid " forget-new - Forget what packages are \"new\"\n"
msgstr " forget-new - Esquecer quais pacotes são \"novos\"\n"
-#: src/main.cc:105
+#: src/main.cc:104
#, c-format
msgid " search - Search for a package by name and/or expression\n"
msgstr " search - Procurar por um pacote por nome e/ou expressão\n"
-#: src/main.cc:106
+#: src/main.cc:105
#, c-format
msgid " show - Display detailed information about a package\n"
msgstr " show - Exibe informações detalhadas sobre um pacote\n"
-#: src/main.cc:107
+#: src/main.cc:106
#, c-format
msgid " clean - Erase downloaded package files\n"
msgstr " clean - Apagar arquivos de pacotes baixados\n"
-#: src/main.cc:108
+#: src/main.cc:107
#, c-format
msgid " autoclean - Erase old downloaded package files\n"
msgstr " autoclean - Apagar arquivos de pacotes baixados antigos\n"
-#: src/main.cc:109
+#: src/main.cc:108
#, c-format
msgid " changelog - View a package's changelog\n"
msgstr " changelog - Visualiza o log de mudanças de um pacote\n"
-#: src/main.cc:110
+#: src/main.cc:109
#, c-format
msgid " download - Download the .deb file for a package\n"
msgstr " download - Fazer o download do arquivo .deb de um pacote\n"
-#: src/main.cc:112
+#: src/main.cc:111
#, c-format
msgid " Options:\n"
msgstr " Opções:\n"
-#: src/main.cc:113
+#: src/main.cc:112
#, c-format
msgid " -h This help text\n"
msgstr " -h Este texto de ajuda\n"
-#: src/main.cc:114
+#: src/main.cc:113
#, c-format
msgid " -s Simulate actions, but do not actually perform them.\n"
msgstr " -s Simular ações mas não executá-las de verdade.\n"
-#: src/main.cc:115
+#: src/main.cc:114
#, c-format
msgid ""
" -d Only download packages, do not install or remove anything.\n"
@@ -1813,12 +1956,12 @@
" -d Somente fazer o download de pacotes, não instalar ou remover "
"nada.\n"
-#: src/main.cc:116
+#: src/main.cc:115
#, c-format
msgid " -P Always prompt for confirmation or actions\n"
msgstr " -P Sempre pedir por confirmação ou ações\n"
-#: src/main.cc:117
+#: src/main.cc:116
#, c-format
msgid ""
" -y Assume that the answer to simple yes/no questions is 'yes'\n"
@@ -1826,7 +1969,7 @@
" -y Assumir que a resposta para perguntas sim/não simples seja "
"'sim'\n"
-#: src/main.cc:118
+#: src/main.cc:117
#, c-format
msgid ""
" -F format Specify a format for displaying search results; see the "
@@ -1835,7 +1978,7 @@
" -F formato Especificar um formato para exibição dos resultados da "
"busca; veja o manual\n"
-#: src/main.cc:119
+#: src/main.cc:118
#, c-format
msgid ""
" -O order Specify how search results should be sorted; see the manual\n"
@@ -1843,7 +1986,7 @@
" -O ordem Especificar como resultados de buscas devem ser ordenados; \n"
"consulte o manual\n"
-#: src/main.cc:120
+#: src/main.cc:119
#, c-format
msgid ""
" -w width Specify the display width for formatting search results\n"
@@ -1851,17 +1994,17 @@
" -w largura Especificar a largura de exibição para formatar resultados "
"de busca\n"
-#: src/main.cc:121
+#: src/main.cc:120
#, c-format
msgid " -f Aggressively try to fix broken packages.\n"
msgstr " -f Tentar agressivamente corrigir pacotes quebrados.\n"
-#: src/main.cc:122
+#: src/main.cc:121
#, c-format
msgid " -V Show which versions of packages are to be installed.\n"
msgstr " -V Exibir quais versões de pacotes serão instaladas.\n"
-#: src/main.cc:123
+#: src/main.cc:122
#, c-format
msgid ""
" -D Show the dependencies of automatically changed packages.\n"
@@ -1869,12 +2012,12 @@
" -D Exibir as dependências dos pacotes modificados "
"automaticamente.\n"
-#: src/main.cc:124
+#: src/main.cc:123
#, c-format
msgid " -Z\t\t Show the change in installed size of each package.\n"
msgstr " -Z\t\t Exibir a mudança no tamanho instalado de cada pacote.\n"
-#: src/main.cc:125
+#: src/main.cc:124
#, c-format
msgid ""
" -v Display extra information. (may be supplied multiple times)\n"
@@ -1882,7 +2025,7 @@
" -v Exibir informação extra. (pode ser fonecido múltiplas "
"vezes)\n"
-#: src/main.cc:126
+#: src/main.cc:125
#, c-format
msgid ""
" -t [release] Set the release from which packages should be installed\n"
@@ -1890,14 +2033,14 @@
" -t [release] Definir de qual distribuição os pacotes devem ser "
"instalados\n"
-#: src/main.cc:127
+#: src/main.cc:126
#, c-format
msgid " -o key=val Directly set the configuration option named 'key'\n"
msgstr ""
"-o chave=valor Definir diretamente a opção de configuração chamada "
"'chave'\n"
-#: src/main.cc:128
+#: src/main.cc:127
#, c-format
msgid ""
" --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -1906,60 +2049,68 @@
" --with(out)-recommends\tEspecificar se as recomendaçãoes devem ou não ser\n"
" tratadas como dependências fortes\n"
-#: src/main.cc:129
+#: src/main.cc:128
#, c-format
msgid " -S fname: Read the aptitude extended status info from fname.\n"
msgstr ""
" -S fname: Ler a informação de estado extendido do aptitude de fname.\n"
-#: src/main.cc:130
+#: src/main.cc:129
#, c-format
msgid " -u : Download new package lists on startup.\n"
msgstr " -u : Fazer download de novas lista de pacotes ao iniciar.\n"
-#: src/main.cc:131
+#: src/main.cc:130
#, c-format
msgid " -i : Perform an install run on startup.\n"
msgstr " -i : Executar uma execução de instalação ao iniciar.\n"
-#: src/main.cc:133
+#: src/main.cc:132
#, c-format
msgid " This aptitude does not have Super Cow Powers.\n"
msgstr " Este aptitude não contém Poderes de Super Vaca.\n"
-#: src/main.cc:254
+#: src/main.cc:253
#, c-format
msgid "-o requires an argument of the form key=value, got %s"
msgstr "-o requer um argumento na forma chave=valor, obtido %s"
-#: src/main.cc:300 src/main.cc:309
+#: src/main.cc:299 src/main.cc:308
msgid "WEIRDNESS: unknown option code received\n"
msgstr "ESTRANHEZA: opção de código desconhecida recebida\n"
-#: src/main.cc:318
+#: src/main.cc:317
msgid "Only one of -u and -i may be specified\n"
msgstr "Somente uma das opções -u e -i pode ser especificada\n"
-#: src/main.cc:326
+#: src/main.cc:325
msgid ""
"-u and -i may not be specified in command-line mode (eg, with 'install')"
msgstr ""
"-u e -i não podem ser especificadas em modo de linha de comando(ex. com "
"'install')"
-#: src/main.cc:337
+#: src/main.cc:342
msgid "-u and -i may not be specified with a command"
msgstr "-u e -i não podem ser especificados com um comando"
-#: src/main.cc:392
+#: src/main.cc:399
#, c-format
msgid "Unknown command \"%s\"\n"
msgstr "Comando desconhecido \"%s\"\n"
-#: src/main.cc:400
+#: src/main.cc:406 src/main.cc:463
+msgid "Internal error: uncaught 'out of solutions' exception.\n"
+msgstr ""
+
+#: src/main.cc:411 src/main.cc:468
+msgid "Internal error: uncaught 'out of time' exception.\n"
+msgstr ""
+
+#: src/main.cc:418
#, c-format
-msgid "Invalid option for interactive mode: -s\n"
-msgstr "Opção inválida para modo interativo: -s\n"
+msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
+msgstr ""
#: src/mine/cmine.cc:93
#, c-format
@@ -1987,7 +2138,7 @@
msgid "Lost"
msgstr "Perdeu"
-#: src/mine/cmine.cc:119 src/ui.cc:1005
+#: src/mine/cmine.cc:119 src/ui.cc:1089
msgid "Minesweeper"
msgstr "Campo Minado"
@@ -2165,7 +2316,7 @@
msgid "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
msgstr "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
-#: src/pkg_columnizer.cc:84 src/ui.cc:1488
+#: src/pkg_columnizer.cc:84 src/ui.cc:1638
msgid "Package"
msgstr "Pacote"
@@ -2424,13 +2575,14 @@
" Pacotes na seção 'base' fazem parte da instalação inicial do sistema."
#: src/pkg_grouppolicy.cc:158
+#, fuzzy
msgid ""
"Programs for faxmodems and other communications devices\n"
" Packages in the 'comm' section are used to control modems and other "
"hardware communications devices. This includes software to control faxmodems "
"(for instance, PPP for dial-up internet connections and programs originally "
-"written for that purpose (zmodem/kermit), as well as software to control "
-"cellular phones, interface with FidoNet, and run a BBS."
+"written for that purpose, such as zmodem/kermit), as well as software to "
+"control cellular phones, interface with FidoNet, and run a BBS."
msgstr ""
"Programas para fax-modems e outros dispositivos de comunicação\n"
" Pacotes na seção 'comm' são usados para controlar modems e outros "
@@ -2885,14 +3037,15 @@
"seção 'main'."
#: src/pkg_grouppolicy.cc:193
+#, fuzzy
msgid ""
"Programs which are not free software\n"
" Packages in the 'non-free' section are not part of Debian.\n"
" .\n"
" These packages fail to meet one or more of the requirements of the Debian "
-"Free Software Guidelines (see below) You should read the license of programs "
-"in this section to be sure that you are allowed to use them in the way you "
-"intend.\n"
+"Free Software Guidelines (see below). You should read the license of "
+"programs in this section to be sure that you are allowed to use them in the "
+"way you intend.\n"
" .\n"
" For more information about what Debian considers to be Free Software, see "
"http://www.debian.org/social_contract#guidelines"
@@ -2956,11 +3109,12 @@
" Versões mais nova destes pacotes estão disponÃveis."
#: src/pkg_grouppolicy.cc:320
+#, fuzzy
msgid ""
"New Packages\n"
" These packages have been added to Debian since the last time you cleared "
-"the list of \"new\" packages. (choose \"Forget new packages\" from the "
-"Actions menu to empty this list)"
+"the list of \"new\" packages (choose \"Forget new packages\" from the "
+"Actions menu to empty this list)."
msgstr ""
"Novos Pacotes\n"
" Estes pacotes foram adicionados ao Debian desde a última vez que você "
@@ -3215,102 +3369,122 @@
msgid "Versions"
msgstr "Versões"
-#: src/pkg_item.cc:54
+#: src/pkg_item.cc:55
msgid "Yes, I am aware this is a very bad idea"
msgstr "Sim, estou ciente de que isso é uma idéia muito ruim"
#: src/pkg_item.cc:80
-#, c-format
+#, fuzzy, c-format
msgid ""
-"%s is an essential package!\n"
-"\n"
-"Are you sure you want to remove it?\n"
-"Type '%s' if you are."
+"%s is an essential package!%n%nAre you sure you want to remove it?%nType '%"
+"s' if you are."
msgstr ""
"%s é um pacote essencial!\n"
"\n"
"Você tem certeza de que deseja removê-lo?\n"
"Digite '%s' caso você tenha certeza disso."
-#: src/pkg_item.cc:219
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:625
#, c-format
msgid "Information about %s"
msgstr "Informação sobre %s"
-#: src/pkg_item.cc:304
-msgid "Available versions of "
+#: src/pkg_item.cc:224 src/pkg_ver_item.cc:627
+#, c-format
+msgid "%s info"
+msgstr ""
+
+#: src/pkg_item.cc:310
+#, fuzzy, c-format
+msgid "Available versions of %s"
msgstr "Versões disponÃveis de "
-#: src/pkg_item.cc:312 src/pkg_ver_item.cc:648
+#: src/pkg_item.cc:313
+#, fuzzy, c-format
+msgid "%s versions"
+msgstr "Versões"
+
+#: src/pkg_item.cc:325 src/pkg_ver_item.cc:655
#, c-format
msgid "Dependencies of %s"
msgstr "Dependências de %s"
-#: src/pkg_item.cc:322 src/pkg_ver_item.cc:657
+#: src/pkg_item.cc:327 src/pkg_ver_item.cc:657
+#, c-format
+msgid "%s deps"
+msgstr ""
+
+#: src/pkg_item.cc:338 src/pkg_ver_item.cc:667
#, c-format
msgid "Packages depending on %s"
msgstr "Pacotes que dependem de %s"
-#: src/pkg_item.cc:373 src/pkg_ver_item.cc:694
+#: src/pkg_item.cc:340 src/pkg_ver_item.cc:669
+#, c-format
+msgid "%s reverse deps"
+msgstr ""
+
+#: src/pkg_item.cc:392 src/pkg_ver_item.cc:707
#, c-format
msgid "Reporting a bug in %s:\n"
msgstr "Relatando um bug em %s:\n"
-#: src/pkg_item.cc:395
+#: src/pkg_item.cc:414
+#, fuzzy
msgid ""
-"You are not root and I cannot find any way\n"
-"to become root. To reconfigure this package,\n"
-"install the menu package, the login package,\n"
-"or run aptitude as root."
+"You are not root and I cannot find any way to become root. To reconfigure "
+"this package, install the menu package, the login package, or run aptitude "
+"as root."
msgstr ""
"Você não é root e não foi possÃvel encontrar nenhuma maneira\n"
"de se tornar root. Para reconfigurar este pacote,\n"
"instale o pacote menu, o pacote login ou execute o \n"
"aptitude como root."
-#: src/pkg_item.cc:403
+#: src/pkg_item.cc:422
#, c-format
msgid "Reconfiguring %s\n"
msgstr "Reconfigurando %s\n"
-#: src/pkg_item.cc:428
+#: src/pkg_item.cc:447
msgid "Hierarchy editor"
msgstr "Editor de hierarquia"
+#: src/pkg_item.cc:447
+#, fuzzy
+msgid "Hierarchy Editor"
+msgstr "Editor de hierarquia"
+
#: src/pkg_tree.cc:325
msgid "Search for: "
msgstr "Procurar por: "
-#: src/pkg_tree.cc:585
+#: src/pkg_tree.cc:568
msgid "All Packages"
msgstr "Todos os Pacotes"
-#: src/pkg_tree.cc:598 src/pkg_tree.cc:607
+#: src/pkg_tree.cc:581 src/pkg_tree.cc:590
msgid "Building view"
msgstr "Construindo visão"
-#: src/pkg_tree.cc:649
+#: src/pkg_tree.cc:632
#, c-format
msgid "No packages matched the pattern \"%s\"."
msgstr "Nenhum pacote casa com o padrão \"%s\"."
-#: src/pkg_tree.cc:671
+#: src/pkg_tree.cc:654
msgid "Enter the new package tree limit: "
msgstr "Informe o novo limite da árvore de pacote: "
-#: src/pkg_tree.cc:705
+#: src/pkg_tree.cc:688
msgid "Enter the new package grouping mechanism for this display: "
msgstr ""
"Informe o novo mecanismo de agrupamento de pacotes para esta exibição: "
-#: src/pkg_tree.cc:713
+#: src/pkg_tree.cc:696
msgid "Enter the new package sorting mechanism for this display: "
msgstr "Informe o novo mecanismo de ordenação de pacotes para esta exibição: "
-#: src/pkg_ver_item.cc:623
-msgid "Information about "
-msgstr "Informação sobre "
-
#: src/pkg_view.cc:344
msgid "make_package_view: error in arguments -- two main widgets??"
msgstr "make_package_view: erro nos argumentos -- dois widgets principais??"
@@ -3326,7 +3500,7 @@
msgid "make_package_view: bad argument!"
msgstr "make_package_view: argumento ruim!"
-#: src/pkg_view.cc:492
+#: src/pkg_view.cc:495
msgid "make_package_view: no main widget found"
msgstr "make_package_view: nenhum widget principal encontrado"
@@ -3544,6 +3718,74 @@
"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:74
+msgid "The package cache is not available."
+msgstr ""
+
+#: src/solution_dialog.cc:82
+#, fuzzy
+msgid "No packages are broken."
+msgstr "Alguns pacotes estão quebrados. Deseja tentar consertá-los?"
+
+#: src/solution_dialog.cc:103
+msgid "No resolution found."
+msgstr ""
+
+#: src/solution_dialog.cc:107
+#, c-format
+msgid ""
+"Time exhausted while searching for a solution (you can select \"Next Solution"
+"\" or press %s to try harder)."
+msgstr ""
+
+#: src/solution_dialog.cc:146
+#, fuzzy
+msgid "Previous"
+msgstr "Fornece"
+
+#: src/solution_dialog.cc:147
+#, fuzzy
+msgid "Next"
+msgstr "^N Próximo"
+
+#: src/solution_dialog.cc:148
+msgid "Apply"
+msgstr ""
+
+#: src/solution_dialog.cc:149
+#, fuzzy
+msgid "Close"
+msgstr "^C Fechar"
+
+#: src/solution_fragment.cc:125
+#, fuzzy
+msgid "%BRemove%b the following packages:%n"
+msgstr "Os pacotes a seguir estão QUEBRADOS :"
+
+#: src/solution_fragment.cc:135
+#, fuzzy
+msgid "%BInstall%b the following packages:%n"
+msgstr "Os pacotes a seguir estão QUEBRADOS :"
+
+#: src/solution_fragment.cc:148
+msgid "%BKeep%b the following packages at their current version:%n"
+msgstr ""
+
+#: src/solution_fragment.cc:161
+#, fuzzy
+msgid "%BUpgrade%b the following packages:%n"
+msgstr "Os pacotes a seguir estão QUEBRADOS :"
+
+#: src/solution_fragment.cc:176
+#, fuzzy
+msgid "%BDowngrade%b the following packages:%n"
+msgstr "Fazendo download de pacotes"
+
+#: src/solution_fragment.cc:190
+#, c-format
+msgid "Score is %d"
+msgstr ""
+
#: src/trust.cc:17 src/trust.cc:19
msgid "WARNING"
msgstr ""
@@ -3555,53 +3797,53 @@
"system."
msgstr ""
-#: src/ui.cc:143
+#: src/ui.cc:164
msgid "Er, there aren't any errors, this shouldn't have happened.."
msgstr "Opa, nenhum erro aconteceu, isto não deveria ter acontecido.."
-#: src/ui.cc:149
+#: src/ui.cc:170
msgid "E:"
msgstr ""
-#: src/ui.cc:151
+#: src/ui.cc:172
msgid "W:"
msgstr ""
-#: src/ui.cc:172
+#: src/ui.cc:193
msgid "Search for:"
msgstr "Procurar por: "
-#: src/ui.cc:205
+#: src/ui.cc:261
msgid "You already are root!"
msgstr "Você já é root!"
-#: src/ui.cc:303
+#: src/ui.cc:359
msgid ""
"Subprocess exited with an error -- did you type your password correctly?"
msgstr "Subprocesso saiu com um erro -- você informou sua senha corretamente?"
-#: src/ui.cc:331
+#: src/ui.cc:387
msgid "Loading cache"
msgstr "Carregando cache"
-#: src/ui.cc:353
+#: src/ui.cc:409
msgid "Really quit Aptitude?"
msgstr "Realmente sair do Aptitude?"
-#: src/ui.cc:432
+#: src/ui.cc:488
msgid "Really discard your personal settings and reload the defaults?"
msgstr ""
"Realmente descartar suas configurações pessoais e recarregar as padrões?"
-#: src/ui.cc:532
+#: src/ui.cc:588 src/ui.cc:590 src/ui.cc:618 src/ui.cc:620
msgid "Packages"
msgstr "Pacotes"
-#: src/ui.cc:533 src/ui.cc:560
+#: src/ui.cc:589 src/ui.cc:619
msgid "View available packages and choose actions to perform"
msgstr "Visualizar os pacotes disponÃveis e escolher as ações a executar"
-#: src/ui.cc:599
+#: src/ui.cc:666
#, fuzzy
msgid ""
"%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
@@ -3617,15 +3859,15 @@
"veja 'licença' no menu Ajuda. Este é um software livre e você é encorajado \n"
"a redistribuÃ-lo sob certas condições; veja a 'licença' para detalhes."
-#: src/ui.cc:620
+#: src/ui.cc:687
msgid "help.txt"
msgstr "help.txt"
-#: src/ui.cc:636
+#: src/ui.cc:703
msgid "README"
msgstr "README"
-#: src/ui.cc:718
+#: src/ui.cc:785
msgid ""
"%C%BWARNING%b: untrusted versions of the following packages will be "
"installed!%n%nUntrusted packages could %Bcompromise your system's security%"
@@ -3633,61 +3875,71 @@
"this is what you want to do.%n%n"
msgstr ""
-#: src/ui.cc:732
+#: src/ui.cc:799
#, fuzzy
msgid "Really Continue"
msgstr "Continuar"
-#: src/ui.cc:734
+#: src/ui.cc:801
msgid "Abort Installation"
msgstr ""
-#: src/ui.cc:796
+#: src/ui.cc:862
msgid "Preview of package installation"
msgstr "Previsão da instalação de pacotes"
-#: src/ui.cc:797
+#: src/ui.cc:863
msgid "View and/or adjust the actions that will be performed"
msgstr "Visualizar e/ou ajustar as ações que serão executadas"
-#: src/ui.cc:837
-msgid "Some packages were broken and have been fixed"
+#: src/ui.cc:864
+#, fuzzy
+msgid "Preview"
+msgstr "^P Anterior"
+
+#: src/ui.cc:900
+#, fuzzy
+msgid "Some packages were broken and have been fixed:"
msgstr "Alguns pacotes estavam quebrados e foram consertados"
-#: src/ui.cc:839
-msgid "Some broken packages could not be fixed!"
-msgstr "Alguns pacotes quebrados não puderam ser consertados!"
+#: src/ui.cc:906
+msgid "No solution to these dependency problems exists!"
+msgstr ""
-#: src/ui.cc:847 src/ui.cc:959
-msgid "Some packages are broken. Try to fix them?"
-msgstr "Alguns pacotes estão quebrados. Deseja tentar consertá-los?"
+#: src/ui.cc:912
+#, c-format
+msgid ""
+"Ran out of time while trying to resolver dependencies (press \"%s\" to try "
+"harder)"
+msgstr ""
-#: src/ui.cc:860
+#: src/ui.cc:958
+#, fuzzy
msgid ""
-"Installing/removing packages requires administrative privileges, which\n"
-"you currently do not have. Would you like to change to the root account?\n"
+"Installing/removing packages requires administrative privileges, which you "
+"currently do not have. Would you like to change to the root account?"
msgstr ""
"Instalar/remover pacotes requer privilégios administrativos, os quais você\n"
"atualmente não possui. Você gostaria de mudar para a conta de root?\n"
-#: src/ui.cc:863 src/ui.cc:993
+#: src/ui.cc:961 src/ui.cc:1077
msgid "Become root"
msgstr "Tornar-se root"
-#: src/ui.cc:865 src/ui.cc:995
+#: src/ui.cc:963 src/ui.cc:1079
msgid "Don't become root"
msgstr "Não tornar-se root"
-#: src/ui.cc:870 src/ui.cc:1000
+#: src/ui.cc:968 src/ui.cc:1084
msgid "A package-list update or install run is already taking place."
msgstr "Uma atualização da lista de pacotes ou instalação já está em execução."
-#: src/ui.cc:897
+#: src/ui.cc:995
msgid "No packages are scheduled to be installed, removed, or upgraded."
msgstr ""
"Nenhum pacote está agendado para ser instalado, removido ou atualizado."
-#: src/ui.cc:903
+#: src/ui.cc:1001
#, fuzzy
msgid ""
"No packages will be installed, removed or upgraded. Some packages could be "
@@ -3700,168 +3952,183 @@
"los.\n"
"Digite \"U\" para preparar uma atualização."
-#: src/ui.cc:990
+#: src/ui.cc:1073
+#, fuzzy
msgid ""
-"Updating the package lists requires administrative privileges, which\n"
-"you currently do not have. Would you like to change to the root account?\n"
+"Updating the package lists requires administrative privileges, which you "
+"currently do not have. Would you like to change to the root account?"
msgstr ""
"Atualizar a lista de pacotes requer privilégios administrativos, os quais "
"você\n"
" atualmente não possui. Você gostaria de mudar para a conta de root?\n"
-#: src/ui.cc:1005 src/ui.cc:1198
+#: src/ui.cc:1089 src/ui.cc:1345
msgid "Waste time trying to find mines"
msgstr "Perca tempo tentando encontrar minas"
-#: src/ui.cc:1012 src/ui.cc:1065
+#: src/ui.cc:1096 src/ui.cc:1149
msgid "Cleaning while a download is in progress is not allowed"
msgstr "Limpar enquanto um download está em progresso não é permitido"
-#: src/ui.cc:1015
+#: src/ui.cc:1099
msgid "Deleting downloaded files"
msgstr "Apagando arquivos baixados"
-#: src/ui.cc:1029
+#: src/ui.cc:1113
msgid "Downloaded package files have been deleted"
msgstr "Arquivos de pacotes baixados foram apagados"
-#: src/ui.cc:1090
+#: src/ui.cc:1174
#, fuzzy, c-format
msgid ""
"Obsolete downloaded package files have been deleted, freeing %sB of disk "
"space."
msgstr "Arquivos de pacotes baixados obsoletos foram apagados"
-#: src/ui.cc:1174
+#: src/ui.cc:1246
+msgid "All solutions exhausted."
+msgstr ""
+
+#: src/ui.cc:1251 src/ui.cc:1282
+#, fuzzy
+msgid "Ran out of time while trying to find a solution."
+msgstr "Perca tempo tentando encontrar minas"
+
+#: src/ui.cc:1276
+msgid "Unable to find a solution to apply."
+msgstr ""
+
+#: src/ui.cc:1321
msgid "^Install/remove packages"
msgstr "^Instalar/remover pacotes"
-#: src/ui.cc:1175
+#: src/ui.cc:1322
msgid "Perform all pending installs and removals"
msgstr "Executar todas as instalações e remoções pendentes"
-#: src/ui.cc:1177
+#: src/ui.cc:1324
msgid "^Update package list"
msgstr "^U Atualizar a lista de pacotes"
-#: src/ui.cc:1178
+#: src/ui.cc:1325
msgid "Check for new versions of packages"
msgstr "Checar por novas versões de pacotes"
-#: src/ui.cc:1181
+#: src/ui.cc:1328
msgid "^Forget new packages"
msgstr "^F Esquecer novos pacotes"
-#: src/ui.cc:1182
+#: src/ui.cc:1329
msgid "Forget which packages are \"new\""
msgstr "Esquecer quais pacotes são \"novos\""
-#: src/ui.cc:1185
+#: src/ui.cc:1332
msgid "^Clean package cache"
msgstr "^C Limpar cache de pacotes"
-#: src/ui.cc:1186
+#: src/ui.cc:1333
msgid "Delete package files which were previously downloaded"
msgstr "Apagar arquivos de pacotes que foram previamente baixados"
-#: src/ui.cc:1189
+#: src/ui.cc:1336
msgid "Clean ^obsolete files"
msgstr "Limpar arquivos ^obsoletos"
-#: src/ui.cc:1190
+#: src/ui.cc:1337
msgid "Delete package files which can no longer be downloaded"
msgstr "Apagar arquivos de pacotes que não podem mais ser baixados"
-#: src/ui.cc:1193
+#: src/ui.cc:1340
msgid "Mark ^Upgradable"
msgstr "^U Marcar Atualizáveis"
-#: src/ui.cc:1194
+#: src/ui.cc:1341
msgid "Mark all upgradable packages which are not held for upgrade"
msgstr ""
"Marcar para atualização todos os pacotes atualizáveis que não estejam "
"mantidos"
-#: src/ui.cc:1197
+#: src/ui.cc:1344
msgid "^Play Minesweeper"
msgstr "^P Jogar Campo Minado"
-#: src/ui.cc:1200
+#: src/ui.cc:1347
msgid "^Become root"
msgstr "^B Tornar-se root"
-#: src/ui.cc:1201
+#: src/ui.cc:1348
+#, fuzzy
msgid ""
-"Run 'su' to become root; this will restart the program, but your\n"
-"settings will be preserved"
+"Run 'su' to become root; this will restart the program, but your settings "
+"will be preserved"
msgstr ""
"Executar 'su' para tornar-se root. Isto irá reiniciar o programa, mas\n"
" suas configurações serão preservadas"
-#: src/ui.cc:1204
+#: src/ui.cc:1351
msgid "^Reload package cache"
msgstr "^Recarregar cache de pacotes"
-#: src/ui.cc:1205
+#: src/ui.cc:1352
msgid "Reload the package cache"
msgstr "Recarregar o cache de pacotes"
-#: src/ui.cc:1211
+#: src/ui.cc:1358
msgid "^Quit"
msgstr "^Q Finalizar"
-#: src/ui.cc:1212
+#: src/ui.cc:1359
msgid "Exit the program"
msgstr "Sair do programa"
-#: src/ui.cc:1218 src/ui.cc:1487
+#: src/ui.cc:1365 src/ui.cc:1637
msgid "Undo"
msgstr "Desfazer"
-#: src/ui.cc:1219
+#: src/ui.cc:1366
msgid "Undo the last package operation or group of operations"
msgstr "Desfaz a última operação ou grupo de operações de pacote"
-#: src/ui.cc:1226
+#: src/ui.cc:1373
msgid "^Install"
msgstr "^Instalar"
-#: src/ui.cc:1227
+#: src/ui.cc:1374
msgid "Flag the currently selected package for installation or upgrade"
msgstr "Marcar o pacote atualmente selecionado para instalação ou atualização"
-#: src/ui.cc:1230
+#: src/ui.cc:1377
msgid "^Remove"
msgstr "^Remover"
-#: src/ui.cc:1231
+#: src/ui.cc:1378
msgid "Flag the currently selected package for removal"
msgstr "Marcar o pacote atualmente selecionado para remoção"
-#: src/ui.cc:1234
+#: src/ui.cc:1381
msgid "^Purge"
msgstr "Ex^purgar"
-#: src/ui.cc:1235
+#: src/ui.cc:1382
msgid ""
"Flag the currently selected package and its configuration files for removal"
msgstr ""
"Marcar o pacote atualmente selecionado e seus arquivos de configuração para "
"remoção"
-#: src/ui.cc:1238
+#: src/ui.cc:1385
msgid "^Keep"
msgstr "^K Manter"
-#: src/ui.cc:1239
+#: src/ui.cc:1386
msgid "Cancel any action on the selected package"
msgstr "Cancelar quaisquer ações nos pacotes selecionados"
-#: src/ui.cc:1242
+#: src/ui.cc:1389
msgid "^Hold"
msgstr "^H Mantido"
-#: src/ui.cc:1243
+#: src/ui.cc:1390
msgid ""
"Cancel any action on the selected package, and protect it from future "
"upgrades"
@@ -3869,240 +4136,244 @@
"Cancelar quaisquer ações nos pacotes selecionados e protegê-los de "
"atualizações futuras"
-#: src/ui.cc:1246
+#: src/ui.cc:1393
msgid "Mark ^Auto"
msgstr "Marcar ^Auto"
-#: src/ui.cc:1247
+#: src/ui.cc:1394
+#, fuzzy
msgid ""
-"Mark the selected package as having been automatically installed;\n"
-"it will automatically be removed if no other packages depend on it"
+"Mark the selected package as having been automatically installed; it will "
+"automatically be removed if no other packages depend on it"
msgstr ""
"Marcar o pacote selecionado como tendo sido automaticamente instalado;\n"
"ele será automaticamente removido caso nenhum outro pacote dependa dele"
-#: src/ui.cc:1250
+#: src/ui.cc:1397
msgid "Mark ^Manual"
msgstr "Marcar ^Manual"
-#: src/ui.cc:1251
+#: src/ui.cc:1398
+#, fuzzy
msgid ""
-"Mark the selected package as having been manually installed;\n"
-"it will not be removed unless you manually remove it"
+"Mark the selected package as having been manually installed; it will not be "
+"removed unless you manually remove it"
msgstr ""
"Marcar o pacote selecionado como tendo sido manualmente instalado;\n"
"ele não será removido a menos que você o remova manualmente"
-#: src/ui.cc:1254
+#: src/ui.cc:1401
msgid "^Forbid Version"
msgstr "^F Proibir Versão"
-#: src/ui.cc:1255
+#: src/ui.cc:1402
+#, fuzzy
msgid ""
-"Forbid the candidate version of the selected package from being installed;\n"
+"Forbid the candidate version of the selected package from being installed; "
"newer versions of the package will be installed as usual"
msgstr ""
"Proibir a versão candidata do pacote selecionado de ser instalada;\n"
"novas versões do pacotes serão instaladas normalmente"
-#: src/ui.cc:1259
+#: src/ui.cc:1406
msgid "I^nformation"
msgstr "I^nformação"
-#: src/ui.cc:1260
+#: src/ui.cc:1407
msgid "Display more information about the selected package"
msgstr "Exibir maiores informações sobre o pacote selecionado"
-#: src/ui.cc:1263
+#: src/ui.cc:1410
msgid "^Changelog"
msgstr "^C Log de mudanças"
-#: src/ui.cc:1264
+#: src/ui.cc:1411
msgid "Display the Debian changelog of the selected package"
msgstr "Exibir o log de mudanças Debian do pacote selecionado"
-#: src/ui.cc:1271
+#: src/ui.cc:1418
msgid "^Find"
msgstr "^F Encontrar"
-#: src/ui.cc:1272
+#: src/ui.cc:1419
msgid "Search for a package"
msgstr "Procurar por um pacote"
-#: src/ui.cc:1275
+#: src/ui.cc:1422
msgid "Find ^Again"
msgstr "^A Procurar Novamente"
-#: src/ui.cc:1276
+#: src/ui.cc:1423
msgid "Repeat the last search"
msgstr "Repetir a última procura"
-#: src/ui.cc:1280
+#: src/ui.cc:1427
msgid "^Limit Display"
msgstr "^Limitar Exibição"
-#: src/ui.cc:1281
+#: src/ui.cc:1428
msgid "Apply a filter to the package list"
msgstr "^Aplicar um filtro à lista de pacotes"
-#: src/ui.cc:1284
+#: src/ui.cc:1431
msgid "^Un-Limit Display"
msgstr "^U Deslimitar Exibição"
-#: src/ui.cc:1285
+#: src/ui.cc:1432
msgid "Remove the filter from the package list"
msgstr "Remover o filtro da lista de pacotes"
-#: src/ui.cc:1289
+#: src/ui.cc:1436
msgid "Find ^Broken"
msgstr "^B Encontrar Quebrado"
-#: src/ui.cc:1290
+#: src/ui.cc:1437
msgid "Find the next package with unsatisfied dependencies"
msgstr "Encontra o próximo pacote com dependências não satisfeitas"
-#: src/ui.cc:1297
+#: src/ui.cc:1444
msgid "^UI options"
msgstr "^U Opções da interface"
-#: src/ui.cc:1298
+#: src/ui.cc:1445
msgid "Change the settings which affect the user interface"
msgstr "Muda as configurações que afetam a interface do usuário"
-#: src/ui.cc:1301
+#: src/ui.cc:1448
msgid "^Dependency handling"
msgstr "Gerencimento de ^Dependências"
-#: src/ui.cc:1302
+#: src/ui.cc:1449
msgid "Change the settings which affect how package dependencies are handled"
msgstr ""
"Muda as configurações que afetam como as dependências de pacotes são tratadas"
-#: src/ui.cc:1305
+#: src/ui.cc:1452
msgid "^Miscellaneous"
msgstr "^Miscelânea"
-#: src/ui.cc:1306
+#: src/ui.cc:1453
msgid "Change miscellaneous program settings"
msgstr "Muda as configurações miscelânicas do programa"
-#: src/ui.cc:1311
+#: src/ui.cc:1458
msgid "^Revert options"
msgstr "^Reverter as opções"
-#: src/ui.cc:1312
+#: src/ui.cc:1459
msgid "Reset all settings to the system defaults"
msgstr "Reverte todas as configurações para os padrões do sistema"
-#: src/ui.cc:1323
+#: src/ui.cc:1470
msgid "^Next"
msgstr "^N Próximo"
-#: src/ui.cc:1324
+#: src/ui.cc:1471
msgid "View next display"
msgstr "Visualizar próxima tela"
-#: src/ui.cc:1327
+#: src/ui.cc:1474
msgid "^Prev"
msgstr "^P Anterior"
-#: src/ui.cc:1328
+#: src/ui.cc:1475
msgid "View previous display"
msgstr "Visualizar tela anterior"
-#: src/ui.cc:1331
+#: src/ui.cc:1478
msgid "^Close"
msgstr "^C Fechar"
-#: src/ui.cc:1332
+#: src/ui.cc:1479
msgid "Close this display"
msgstr "Fechar esta tela"
-#: src/ui.cc:1337
+#: src/ui.cc:1484
msgid "New Package ^View"
msgstr "Nova ^Visão de Pacote"
-#: src/ui.cc:1338
+#: src/ui.cc:1485
msgid "Create a new default package view"
msgstr "Criar uma nova visão de pacote padrão"
-#: src/ui.cc:1341
+#: src/ui.cc:1488
msgid "New Categorical ^Browser"
msgstr "^B Novo Navegador de Categorias"
-#: src/ui.cc:1343
+#: src/ui.cc:1490
msgid "Browse packages by category"
msgstr "Navega pelos pacotes por categoria"
-#: src/ui.cc:1351
+#: src/ui.cc:1498
msgid "^About"
msgstr "^A Sobre"
-#: src/ui.cc:1352
+#: src/ui.cc:1499
msgid "View information about this program"
msgstr "Visualiza informações sobre este programa"
-#: src/ui.cc:1355
+#: src/ui.cc:1502
msgid "^Help"
msgstr "^H Ajuda"
-#: src/ui.cc:1356
+#: src/ui.cc:1503
msgid "View the on-line help"
msgstr "Visualizar a ajuda on-line"
-#: src/ui.cc:1358
+#: src/ui.cc:1505
msgid "User's ^Manual"
msgstr "^Manual do Usuário"
-#: src/ui.cc:1359
+#: src/ui.cc:1506
msgid "View the detailed program manual"
msgstr "Visualizar o manual do programa detalhado"
-#: src/ui.cc:1362
+#: src/ui.cc:1509
msgid "^FAQ"
msgstr "^FAQ"
-#: src/ui.cc:1363
+#: src/ui.cc:1510
msgid "View a list of frequently asked questions"
msgstr "Visualizar uma lista de perguntas feitas frequentemente"
-#: src/ui.cc:1366
-msgid "^ChangeLog"
-msgstr "^C Log de mudanças"
+#: src/ui.cc:1513
+msgid "^NEWS"
+msgstr ""
-#: src/ui.cc:1367
-msgid "View the important changes made in each version of the program"
+#: src/ui.cc:1514
+#, fuzzy
+msgid "View the important changes made in each version of "
msgstr "Visualizar as mudanças importantes feitas em cada versão do programa"
-#: src/ui.cc:1370
+#: src/ui.cc:1517
msgid "^License"
msgstr "^Licença"
-#: src/ui.cc:1371
+#: src/ui.cc:1518
msgid "View the terms under which you may copy the program"
msgstr "Visualizar os termos sob os quais você pode copiar o programa"
-#: src/ui.cc:1486
+#: src/ui.cc:1636
msgid "Actions"
msgstr "Ações"
-#: src/ui.cc:1489
+#: src/ui.cc:1639
msgid "Search"
msgstr "Procurar"
-#: src/ui.cc:1490
+#: src/ui.cc:1640
msgid "Options"
msgstr "Opções"
-#: src/ui.cc:1491
+#: src/ui.cc:1641
msgid "Views"
msgstr "Visões"
-#: src/ui.cc:1492
+#: src/ui.cc:1642
msgid "Help"
msgstr "Ajuda"
-#: src/ui.cc:1537
+#: src/ui.cc:1699
#, c-format
msgid ""
"%s: Menu %s: Help %s: Quit %s: Update %s: Download/Install/Remove Pkgs"
@@ -4110,11 +4381,11 @@
"%s: Menu %s: Ajuda %s: Finaliza %s: Atualiza %s: Baixar/Instalar/Remover "
"Pcts."
-#: src/ui.cc:1799 src/vscreen/vscreen.cc:281
+#: src/ui.cc:1968 src/vscreen/vscreen.cc:281
msgid "yes_key"
msgstr "s"
-#: src/ui.cc:1800 src/vscreen/vscreen.cc:282
+#: src/ui.cc:1969 src/vscreen/vscreen.cc:282
msgid "no_key"
msgstr "n"
@@ -4126,6 +4397,16 @@
msgid "Downloading Changelog"
msgstr "Fazendo download de Logs de Mudanças"
+#: src/view_changelog.cc:54
+#, fuzzy
+msgid "Download Changelog"
+msgstr "Fazendo download de Logs de Mudanças"
+
+#: src/view_changelog.cc:63
+#, c-format
+msgid "%s changes"
+msgstr ""
+
#: src/vscreen/vscreen.cc:119
#, c-format
msgid "Ouch! Got SIGTERM, dying..\n"
@@ -4154,6 +4435,38 @@
msgid "No"
msgstr "Não"
+#~ msgid ""
+#~ "Some packages had unmet dependencies. This may mean that you have\n"
+#~ "requested an impossible situation or if you are using the unstable\n"
+#~ "distribution that some required packages have not yet been created\n"
+#~ "or been moved out of Incoming.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Alguns pacotes possuem dependências não satisfeitas. Isto siginifica\n"
+#~ " que você requisitou uma situação impossÃvel ou, caso você esteja \n"
+#~ " usando a distribuição instável, que alguns pacotes requeridos ainda\n"
+#~ " não foram criados ou não foram movidos da Incoming.\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Please insert the following disc into the drive \"%s\":\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Por favor, insira o seguinte disco no leitor \"%s\":\n"
+#~ "%s"
+
+#~ msgid "Invalid option for interactive mode: -s\n"
+#~ msgstr "Opção inválida para modo interativo: -s\n"
+
+#~ msgid "Information about "
+#~ msgstr "Informação sobre "
+
+#~ msgid "Some broken packages could not be fixed!"
+#~ msgstr "Alguns pacotes quebrados não puderam ser consertados!"
+
+#~ msgid "^ChangeLog"
+#~ msgstr "^C Log de mudanças"
+
#~ msgid "Go away, I'm trying to think.\n"
#~ msgstr "Vá embora, eu estou tentando pensar.\n"
Modified: branches/aptitude-0.3/aptitude/po/ro.po
==============================================================================
--- branches/aptitude-0.3/aptitude/po/ro.po (original)
+++ branches/aptitude-0.3/aptitude/po/ro.po Sat Apr 30 13:41:32 2005
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: aptitude_ro\n"
"Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-01-10 16:26-0800\n"
+"POT-Creation-Date: 2005-04-29 18:11-0400\n"
"PO-Revision-Date: 2004-11-16 15:50+0200\n"
"Last-Translator: Sorin Batariuc <sorin at bonbon.net>\n"
"Language-Team: Romanian <romanian>\n"
@@ -161,16 +161,103 @@
msgstr "Automat ÅŸterge pachetele nefolosite care se potrivesc cu acest filtru"
#: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:184 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
-#: src/vscreen/vs_util.cc:329
+#: src/ui.cc:218 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
+#: src/vscreen/vs_util.cc:328
msgid "Ok"
msgstr "Ok"
#: src/apt_options.cc:242 src/download_list.cc:71 src/mine/cmine.cc:257
-#: src/mine/cmine.cc:330 src/vscreen/vs_util.cc:329
+#: src/mine/cmine.cc:330 src/vscreen/vs_util.cc:328
msgid "Cancel"
msgstr "Anulează"
+#: src/broken_indicator.cc:106 src/solution_dialog.cc:97
+msgid "Internal error: unexpected null solution."
+msgstr ""
+
+#: src/broken_indicator.cc:158
+#, fuzzy
+msgid "Suggest "
+msgstr "Sugerează"
+
+#: src/broken_indicator.cc:164
+#, fuzzy, c-format
+msgid "%d installs"
+msgstr "instalează"
+
+#: src/broken_indicator.cc:169
+#, fuzzy
+msgid "1 install"
+msgstr "instalează"
+
+#: src/broken_indicator.cc:173
+#, c-format
+msgid "%d removals"
+msgstr ""
+
+#: src/broken_indicator.cc:178
+msgid "1 removal"
+msgstr ""
+
+#: src/broken_indicator.cc:182
+#, c-format
+msgid "%d keeps"
+msgstr ""
+
+#: src/broken_indicator.cc:187
+msgid "1 keep"
+msgstr ""
+
+#: src/broken_indicator.cc:191
+#, fuzzy, c-format
+msgid "%d upgrades"
+msgstr "înnoire"
+
+#: src/broken_indicator.cc:196
+#, fuzzy
+msgid "1 upgrade"
+msgstr "înnoire"
+
+#: src/broken_indicator.cc:200
+#, fuzzy, c-format
+msgid "%d downgrades"
+msgstr "de-gradat"
+
+#: src/broken_indicator.cc:205
+#, fuzzy
+msgid "1 downgrade"
+msgstr "de-gradat"
+
+#: src/broken_indicator.cc:214
+#, c-format
+msgid "%s: Examine"
+msgstr ""
+
+#: src/broken_indicator.cc:216
+#, c-format
+msgid "%s: Apply"
+msgstr ""
+
+#: src/broken_indicator.cc:218
+#, fuzzy, c-format
+msgid "%s: Next"
+msgstr "Următorul"
+
+#: src/broken_indicator.cc:220
+#, c-format
+msgid "%s: Previous"
+msgstr ""
+
+#: src/broken_indicator.cc:233
+#, c-format
+msgid "%CSolution search failed. %s: try harder"
+msgstr ""
+
+#: src/broken_indicator.cc:239
+#, c-format
+msgid "%CUnable to resolve dependencies."
+msgstr ""
+
#: src/cmdline/cmdline_action.cc:36
#, c-format
msgid ""
@@ -243,22 +330,22 @@
msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
msgstr "Pachetul %s nu poate fi înnoit, nu se poate interzice o înnoire\n"
-#: src/cmdline/cmdline_action.cc:213
+#: src/cmdline/cmdline_action.cc:198
#, c-format
msgid "Note: selecting the task \"%s: %s\" for installation\n"
msgstr "Notă: alegerea sarcinii \"%s: %s\" pentru instalare\n"
-#: src/cmdline/cmdline_action.cc:240
+#: src/cmdline/cmdline_action.cc:225
#, c-format
msgid "You can only specify a package version with an 'install' command.\n"
msgstr "Puteţi specifica o versiune de pachet doar cu comanda 'install'.\n"
-#: src/cmdline/cmdline_action.cc:246
+#: src/cmdline/cmdline_action.cc:231
#, c-format
msgid "You can only specify a package archive with an 'install' command.\n"
msgstr "Puteţi specifica o arhivă de pachet doar cu comanda 'install'.\n"
-#: src/cmdline/cmdline_action.cc:280
+#: src/cmdline/cmdline_action.cc:265
#, c-format
msgid ""
"Couldn't find package \"%s\", and more than 40\n"
@@ -267,7 +354,7 @@
"Nu pot găsi pachetul \"%s\", şi mai mult de 40 de\n"
"pachete conţin \"%s\" în nume.\n"
-#: src/cmdline/cmdline_action.cc:283
+#: src/cmdline/cmdline_action.cc:268
#, c-format
msgid ""
"Couldn't find package \"%s\". However, the following\n"
@@ -276,14 +363,14 @@
"Nu pot găsi pachetul \"%s\". Oricum, următoarele\n"
"pachete conţin \"%s\" în numele lor:\n"
-#: src/cmdline/cmdline_action.cc:307
+#: src/cmdline/cmdline_action.cc:292
#, c-format
msgid "Couldn't find any package whose name or description matched \"%s\"\n"
msgstr ""
"Nu pot găsi nici un pachet al cărui nume sau descriere să se potrivească cu "
"\"%s\"\n"
-#: src/cmdline/cmdline_action.cc:309
+#: src/cmdline/cmdline_action.cc:294
#, c-format
msgid ""
"Couldn't find any package matching \"%s\", and more than 40\n"
@@ -293,7 +380,7 @@
"40\n"
"de pachete conţin \"%s\" în descrierea lor.\n"
-#: src/cmdline/cmdline_action.cc:312
+#: src/cmdline/cmdline_action.cc:297
#, c-format
msgid ""
"Couldn't find any package matching \"%s\". However, the following\n"
@@ -338,13 +425,13 @@
msgid "Freed %sB of disk space\n"
msgstr "Se vor elibera %sB din spaţiul de pe disc"
-#: src/cmdline/cmdline_do_action.cc:67
+#: src/cmdline/cmdline_do_action.cc:71
#, c-format
msgid "Invalid operation %s"
msgstr "Operaţiune necorespunzătoare %s"
-#: src/cmdline/cmdline_do_action.cc:206 src/cmdline/cmdline_simulate.cc:30
-#: src/cmdline/cmdline_upgrade.cc:89
+#: src/cmdline/cmdline_do_action.cc:201 src/cmdline/cmdline_simulate.cc:31
+#: src/cmdline/cmdline_upgrade.cc:91
#, c-format
msgid "Abort.\n"
msgstr "Abandonează.\n"
@@ -354,7 +441,7 @@
msgid "download: you must specify at least one package to download\n"
msgstr "descărcare: trebuie specificat cel puţin un pachet pentru descărcare\n"
-#: src/cmdline/cmdline_download.cc:43 src/download.cc:342
+#: src/cmdline/cmdline_download.cc:43 src/download.cc:344
msgid "Couldn't read source list"
msgstr "Nu pot citi lista sursă"
@@ -418,96 +505,96 @@
msgid "What is it? It's an elephant being eaten by a snake, of course.\n"
msgstr "Ce este? Este un elefant mâncat de un şarpe, bineînţeles.\n"
-#: src/cmdline/cmdline_prompt.cc:44
+#: src/cmdline/cmdline_prompt.cc:45
msgid "Couldn't read list of sources"
msgstr "Nu pot citi lista surselor"
-#: src/cmdline/cmdline_prompt.cc:219 src/cmdline/cmdline_show_broken.cc:73
+#: src/cmdline/cmdline_prompt.cc:220 src/cmdline/cmdline_show_broken.cc:73
#, c-format
msgid "but %s is to be installed."
msgstr "dar %s e pe cale să fie instalat."
-#: src/cmdline/cmdline_prompt.cc:222 src/cmdline/cmdline_show_broken.cc:76
+#: src/cmdline/cmdline_prompt.cc:223 src/cmdline/cmdline_show_broken.cc:76
#, c-format
msgid "but %s is installed and it is kept back."
msgstr "dar %s este instalat şi este păstrat."
-#: src/cmdline/cmdline_prompt.cc:225 src/cmdline/cmdline_show_broken.cc:79
+#: src/cmdline/cmdline_prompt.cc:226 src/cmdline/cmdline_show_broken.cc:79
#, c-format
msgid "but %s is installed."
msgstr "dar %s este instalat."
-#: src/cmdline/cmdline_prompt.cc:229 src/cmdline/cmdline_show_broken.cc:83
+#: src/cmdline/cmdline_prompt.cc:230 src/cmdline/cmdline_show_broken.cc:83
#, c-format
msgid "but it is not installable"
msgstr "dar nu este instalabil"
-#: src/cmdline/cmdline_prompt.cc:233 src/cmdline/cmdline_show_broken.cc:87
+#: src/cmdline/cmdline_prompt.cc:234 src/cmdline/cmdline_show_broken.cc:87
#, c-format
msgid " which is a virtual package."
msgstr "care este un pachet virtual."
-#: src/cmdline/cmdline_prompt.cc:236 src/cmdline/cmdline_show_broken.cc:90
+#: src/cmdline/cmdline_prompt.cc:237 src/cmdline/cmdline_show_broken.cc:90
#, c-format
msgid " or"
msgstr "sau"
-#: src/cmdline/cmdline_prompt.cc:248
+#: src/cmdline/cmdline_prompt.cc:249
msgid "The following packages are BROKEN:"
msgstr "Următoarele pachete sunt DETERIORATE:"
-#: src/cmdline/cmdline_prompt.cc:249
+#: src/cmdline/cmdline_prompt.cc:250
msgid "The following packages are unused and will be REMOVED:"
msgstr "Următoarele pachete sunt nefolosite şi vor fi ŞTERSE:"
-#: src/cmdline/cmdline_prompt.cc:250
+#: src/cmdline/cmdline_prompt.cc:251
msgid "The following packages have been automatically kept back:"
msgstr "Următoarele pachete au fost automat păstrate:"
-#: src/cmdline/cmdline_prompt.cc:251
+#: src/cmdline/cmdline_prompt.cc:252
msgid "The following NEW packages will be automatically installed:"
msgstr "Următoarele pachete NOI vor fi automat instalate:"
-#: src/cmdline/cmdline_prompt.cc:252
+#: src/cmdline/cmdline_prompt.cc:253
msgid "The following packages will be automatically REMOVED:"
msgstr "Următoarele pachete vor fi automat ŞTERSE:"
-#: src/cmdline/cmdline_prompt.cc:253
+#: src/cmdline/cmdline_prompt.cc:254
msgid "The following packages will be DOWNGRADED:"
msgstr "Următoarele pachete vor fi DE-GRADATE:"
-#: src/cmdline/cmdline_prompt.cc:254
+#: src/cmdline/cmdline_prompt.cc:255
msgid "The following packages have been kept back:"
msgstr "Următoarele pachete au fost păstrate:"
-#: src/cmdline/cmdline_prompt.cc:255
+#: src/cmdline/cmdline_prompt.cc:256
msgid "The following packages will be REINSTALLED:"
msgstr "Următoarele pachete vor fi REINSTALATE:"
-#: src/cmdline/cmdline_prompt.cc:256
+#: src/cmdline/cmdline_prompt.cc:257
msgid "The following NEW packages will be installed:"
msgstr "Următoarele pachete NOI vor fi instalate:"
-#: src/cmdline/cmdline_prompt.cc:257
+#: src/cmdline/cmdline_prompt.cc:258
msgid "The following packages will be REMOVED:"
msgstr "Următoarele pachete vor fi ŞTERSE:"
-#: src/cmdline/cmdline_prompt.cc:258
+#: src/cmdline/cmdline_prompt.cc:259
msgid "The following packages will be upgraded:"
msgstr "Următoarele pachete vor fi înnoite:"
-#: src/cmdline/cmdline_prompt.cc:307
+#: src/cmdline/cmdline_prompt.cc:311
#, c-format
msgid "The following ESSENTIAL packages will be REMOVED!\n"
msgstr "Următoarele pachete ESENŢIALE vor fi ŞTERSE!\n"
-#: src/cmdline/cmdline_prompt.cc:316
+#: src/cmdline/cmdline_prompt.cc:320
#, c-format
msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
msgstr ""
"Următoarele pachete ESENŢIALE se vor DETERIORA de către această acţiune:\n"
-#: src/cmdline/cmdline_prompt.cc:326
+#: src/cmdline/cmdline_prompt.cc:330
#, c-format
msgid ""
"WARNING: Performing this action will probably cause your system to break!\n"
@@ -517,99 +604,102 @@
"sistemului!\n"
" NU continuaţi decât dacă ştiţi EXACT ce aveţi de gând să faceţi!\n"
-#: src/cmdline/cmdline_prompt.cc:328
+#: src/cmdline/cmdline_prompt.cc:332
msgid "I am aware that this is a very bad idea"
msgstr "Sunt conştient că asta este o idee proastă"
-#: src/cmdline/cmdline_prompt.cc:331
+#: src/cmdline/cmdline_prompt.cc:335
#, c-format
msgid "To continue, type the phrase \"%s\":\n"
msgstr "Pentru a continua, tastaţi fraza \"%s\":\n"
-#: src/cmdline/cmdline_prompt.cc:434
+#: src/cmdline/cmdline_prompt.cc:438
#, c-format
msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
msgstr "Următoarele pachete sunt RECOMANDATE dar NU vor fi instalate:\n"
-#: src/cmdline/cmdline_prompt.cc:440
+#: src/cmdline/cmdline_prompt.cc:444
#, c-format
msgid "The following packages are SUGGESTED but will NOT be installed:\n"
msgstr "Următoarele pachete sunt SUGERATE dar NU vor fi instalate:\n"
-#: src/cmdline/cmdline_prompt.cc:445
+#: src/cmdline/cmdline_prompt.cc:449
#, c-format
msgid "No packages will be installed, upgraded, or removed.\n"
msgstr "Nici un pachet nu va fi instalat, înnoit sau şters.\n"
-#: src/cmdline/cmdline_prompt.cc:447
+#: src/cmdline/cmdline_prompt.cc:451
#, c-format
msgid "%lu packages upgraded, %lu newly installed, "
msgstr "%lu pachete înnoite, %lu nou instalate, "
-#: src/cmdline/cmdline_prompt.cc:451
+#: src/cmdline/cmdline_prompt.cc:455
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstalate, "
-#: src/cmdline/cmdline_prompt.cc:453
+#: src/cmdline/cmdline_prompt.cc:457
#, c-format
msgid "%lu downgraded, "
msgstr "%lu de-gradate, "
-#: src/cmdline/cmdline_prompt.cc:455
+#: src/cmdline/cmdline_prompt.cc:459
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu de şters şi %lu neînnoite.\n"
-#: src/cmdline/cmdline_prompt.cc:462
+#: src/cmdline/cmdline_prompt.cc:466
#, c-format
msgid "Need to get %sB/%sB of archives. "
msgstr "Este nevoie de %sB/%sB de arhive. "
-#: src/cmdline/cmdline_prompt.cc:465
+#: src/cmdline/cmdline_prompt.cc:469
#, c-format
msgid "Need to get %sB of archives. "
msgstr "Este nevoie de %sB de arhive. "
-#: src/cmdline/cmdline_prompt.cc:472
+#: src/cmdline/cmdline_prompt.cc:476
#, c-format
msgid "After unpacking %sB will be used.\n"
msgstr "După despachetare %sB vor fi folosiţi.\n"
-#: src/cmdline/cmdline_prompt.cc:475
+#: src/cmdline/cmdline_prompt.cc:479
#, c-format
msgid "After unpacking %sB will be freed.\n"
msgstr "După despachetare %sB vor fi eliberaţi.\n"
-#: src/cmdline/cmdline_prompt.cc:521
+#: src/cmdline/cmdline_prompt.cc:524
#, c-format
msgid "Bad action character '%c'\n"
msgstr "Caracter de acţiune necorespunzător '%c'\n"
-#: src/cmdline/cmdline_prompt.cc:596
+#: src/cmdline/cmdline_prompt.cc:595
#, c-format
msgid "No packages to show -- enter the package names on the line after 'i'.\n"
msgstr ""
"Nici un pachet de arătat -- introduceţi numele pachetului pe o linie după "
"'i'.\n"
-#: src/cmdline/cmdline_prompt.cc:598 src/cmdline/cmdline_prompt.cc:629
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:597
msgid "Press Return to continue."
msgstr "Apăsaţi Enter pentru a continua."
-#: src/cmdline/cmdline_prompt.cc:625
+#: src/cmdline/cmdline_prompt.cc:623
#, c-format
msgid "No packages found -- enter the package names on the line after 'c'.\n"
msgstr ""
"Nici un pachet găsit -- introduceţi numele pachetului pe o linie după 'c'.\n"
-#: src/cmdline/cmdline_prompt.cc:665
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:627
+#, fuzzy
+msgid "Press Return to continue"
+msgstr "Apăsaţi Enter pentru a continua."
+
+#: src/cmdline/cmdline_prompt.cc:675
msgid "Do you want to continue? [Y/n/?] "
msgstr "Vreţi să continuaţi? [Y/n/?] "
-#: src/cmdline/cmdline_prompt.cc:690
+#: src/cmdline/cmdline_prompt.cc:700
#, c-format
msgid ""
"\n"
@@ -620,7 +710,7 @@
"Informaţiile despre dependenţe vor fi arătate.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:692
+#: src/cmdline/cmdline_prompt.cc:702
#, c-format
msgid ""
"\n"
@@ -631,7 +721,7 @@
"Informaţiile despre dependenţe nu vor fi arătate.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:698
+#: src/cmdline/cmdline_prompt.cc:708
#, c-format
msgid ""
"\n"
@@ -642,7 +732,7 @@
"Versiunile vor fi arătate.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:700
+#: src/cmdline/cmdline_prompt.cc:710
#, c-format
msgid ""
"\n"
@@ -653,7 +743,7 @@
"Versiunile nu vor fi arătate.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:705
+#: src/cmdline/cmdline_prompt.cc:715
#, c-format
msgid ""
"\n"
@@ -664,7 +754,7 @@
"Schimbările de dimensiune vor fi arătate.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:717
#, c-format
msgid ""
"\n"
@@ -675,7 +765,7 @@
"Schimbările de dimensiune nu vor fi arătate.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:737
#, c-format
msgid ""
"Commands:\n"
@@ -729,34 +819,89 @@
" _ : Curăţă\n"
" = : Ţine\n"
-#: src/cmdline/cmdline_prompt.cc:751
+#: src/cmdline/cmdline_prompt.cc:761
#, c-format
msgid "Invalid response. Please enter a valid command or '?' for help.\n"
msgstr ""
"Răspuns nevalabil. Vă rog introduceţi o comandă valabilă sau '?' pentru "
"ajutor.\n"
+#: src/cmdline/cmdline_resolver.cc:84
+#, c-format
+msgid "y: %F%nn: %F%nq: %F%n,: %F%n.: %F%n"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:90
+msgid "accept the proposed changes"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:92
+msgid "reject the proposed changes and search for another solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:94
+#, fuzzy
+msgid "give up and quit the program"
+msgstr "IeÅŸire din program"
+
+#: src/cmdline/cmdline_resolver.cc:96
+msgid "move to the next solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:98
+msgid "move to the previous solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:131
+#, fuzzy
+msgid "The following actions will resolve these dependencies:"
+msgstr "Următoarele pachete n-au îndeplinit dependenţele:\n"
+
+#: src/cmdline/cmdline_resolver.cc:146
+msgid "Accept this solution? [Y/n/q/?]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:174
+msgid "Abandoning all efforts to resolve these dependencies."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:184
+#, fuzzy
+msgid "The following commands are available:"
+msgstr "Următoarele pachete sunt DETERIORATE:"
+
+#: src/cmdline/cmdline_resolver.cc:188
+#, fuzzy
+msgid "Invalid response; please enter one of the following commands:"
+msgstr ""
+"Răspuns nevalabil. Vă rog introduceţi o comandă valabilă sau '?' pentru "
+"ajutor.\n"
+
+#: src/cmdline/cmdline_resolver.cc:198
+msgid "No solution found within the allotted time. Try harder? [Y/n]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:226
+#, fuzzy
+msgid "Invalid response; please enter 'y' or 'n'."
+msgstr ""
+"Răspuns nevalabil. Vă rog introduceţi o comandă valabilă sau '?' pentru "
+"ajutor.\n"
+
+#: src/cmdline/cmdline_resolver.cc:235
+msgid "Unable to resolve dependencies! Giving up..."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:240
+msgid "No more solutions."
+msgstr ""
+
#: src/cmdline/cmdline_search.cc:78
#, c-format
msgid "search: You must provide at least one search term\n"
msgstr "căutare: Trebuie să furnizaţi cel puţin un termen de căutare\n"
-#: src/cmdline/cmdline_show_broken.cc:114
-#, c-format
-msgid ""
-"Some packages had unmet dependencies. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming.\n"
-"\n"
-msgstr ""
-"Unele pachete n-au îndeplinit dependenţele. Asta ar putea însemna că aţi\n"
-"cerut o situaţie imposibilă sau că folosiţi distribuţia instabilă\n"
-"în care unele din pachetele necesare n-au fost create încă\n"
-"sau au fost mutate din Incoming.\n"
-"\n"
-
-#: src/cmdline/cmdline_show_broken.cc:115
+#: src/cmdline/cmdline_show_broken.cc:113
#, c-format
msgid "The following packages have unmet dependencies:\n"
msgstr "Următoarele pachete n-au îndeplinit dependenţele:\n"
@@ -954,12 +1099,12 @@
msgid "Description: "
msgstr "Descriere: "
-#: src/cmdline/cmdline_simulate.cc:36
+#: src/cmdline/cmdline_simulate.cc:37
#, c-format
msgid "Would download/install/remove packages.\n"
msgstr "Vrut să descarc/instalez/şterg pachete.\n"
-#: src/cmdline/cmdline_simulate.cc:47
+#: src/cmdline/cmdline_simulate.cc:48
msgid "Internal Error, Ordering didn't finish"
msgstr "Eroare internă, cerinţa n-a fost îndeplinită"
@@ -1001,28 +1146,24 @@
msgid "UNAVAILABLE"
msgstr "INDISPONIBIL"
-#: src/download_bar.cc:57 src/download_list.cc:265
+#: src/download_bar.cc:56 src/download_list.cc:263 src/download_screen.cc:57
#, c-format
-msgid ""
-"Please insert the following disc into the drive \"%s\":\n"
-"%s"
-msgstr ""
-"Vă rog introduceţi următorul disc în unitatea \"%s\":\n"
-"%s"
+msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
+msgstr "Vă rog introduceţi discul numit \"%s\" în unitatea \"%s\""
-#: src/download_bar.cc:76 src/generic/acqprogress.cc:63
+#: src/download_bar.cc:77 src/generic/acqprogress.cc:63
msgid "Hit "
msgstr "Găsit "
-#: src/download_bar.cc:89
+#: src/download_bar.cc:90
msgid "Downloading "
msgstr "Se descarcă "
-#: src/download_bar.cc:102
+#: src/download_bar.cc:103
msgid "Got "
msgstr "Luat "
-#: src/download_bar.cc:156
+#: src/download_bar.cc:157
msgid "Downloading..."
msgstr "Se descarcă..."
@@ -1030,7 +1171,7 @@
msgid "Couldn't read list of package sources"
msgstr "Nu pot citi lista cu sursele pachetelor"
-#: src/download.cc:104 src/download.cc:321
+#: src/download.cc:104 src/download.cc:322
msgid "Couldn't lock list directory..are you root?"
msgstr "Nu pot bloca directorul cu liste... sunteţi root?"
@@ -1042,29 +1183,33 @@
msgid "View the progress of the package list update"
msgstr "Vizualizarea progresului actualizării listelor de pachete"
-#: src/download.cc:159
+#: src/download.cc:113
+msgid "List Update"
+msgstr ""
+
+#: src/download.cc:160
msgid "Couldn't clean out list directories"
msgstr "Nu pot curăţa directoarele listă"
-#: src/download.cc:176 src/ui.cc:1068
+#: src/download.cc:177 src/ui.cc:1152
msgid "Deleting obsolete downloaded files"
msgstr "Ştergere fişiere învechite descărcate"
-#: src/download.cc:181
+#: src/download.cc:182
#, c-format
msgid "Deleting obsolete downloaded files\n"
msgstr "Ştergere fişiere învechite descărcate\n"
-#: src/download.cc:223
+#: src/download.cc:224
#, c-format
msgid "Unable to open %s to log actions"
msgstr "Nu pot să deschid %s pentru înregistrarea acţiunilor"
-#: src/download.cc:229
+#: src/download.cc:230
msgid "log report"
msgstr "raport de jurnal"
-#: src/download.cc:230
+#: src/download.cc:231
#, c-format
msgid ""
"IMPORTANT: this log only lists intended actions; actions which fail due to\n"
@@ -1076,77 +1221,77 @@
"eşuează din pricina unor probleme dpkg ar putea să nu fie completate.\n"
"\n"
-#: src/download.cc:231
+#: src/download.cc:232
#, c-format
msgid "Will install %li packages, and remove %li packages.\n"
msgstr "Se vor instala pachetele %li, se vor ÅŸterge pachetele %li.\n"
-#: src/download.cc:233
+#: src/download.cc:234
#, c-format
msgid "%sB of disk space will be used\n"
msgstr "%sB din spaţiul de pe disc va fi folosit\n"
-#: src/download.cc:236
+#: src/download.cc:237
#, c-format
msgid "%sB bytes of disk space will be freed\n"
msgstr "%sB bytes din spaţiul de pe disc va fi eliberat\n"
-#: src/download.cc:244
+#: src/download.cc:245
#, c-format
msgid "[UPGRADE] %s %s -> %s\n"
msgstr "[ÃŽNNOIRE] %s %s -> %s\n"
-#: src/download.cc:248
+#: src/download.cc:249
#, c-format
msgid "[DOWNGRADE] %s %s -> %s\n"
msgstr "[DE-GRADARE] %s %s -> %s\n"
-#: src/download.cc:258
+#: src/download.cc:259
msgid "REMOVE"
msgstr "ÅžTERGERE"
-#: src/download.cc:264
+#: src/download.cc:265
msgid "INSTALL"
msgstr "INSTALARE"
-#: src/download.cc:267
+#: src/download.cc:268
msgid "REINSTALL"
msgstr "REINSTALARE"
-#: src/download.cc:270
+#: src/download.cc:271
msgid "HOLD"
msgstr "PÄ‚STRARE"
-#: src/download.cc:273
+#: src/download.cc:274
msgid "BROKEN"
msgstr "DETERIORARE"
-#: src/download.cc:276
+#: src/download.cc:277
msgid "REMOVE, NOT USED"
msgstr "ÅžTEGERE, NEFOLOSITE"
-#: src/download.cc:279
+#: src/download.cc:280
msgid "REMOVE, DEPENDENCIES"
msgstr "ÅžTERGERE, DEPENDENÅ¢E"
-#: src/download.cc:282
+#: src/download.cc:283
msgid "INSTALL, DEPENDENCIES"
msgstr "INSTALARE, DEPENDENÅ¢E"
-#: src/download.cc:285
+#: src/download.cc:286
msgid "HOLD, DEPENDENCIES"
msgstr "PÄ‚STRARE, DEPENDENÅ¢E"
-#: src/download.cc:287
+#: src/download.cc:288
msgid "????????"
msgstr "?????????"
-#: src/download.cc:291
+#: src/download.cc:292
#, c-format
msgid "[%s] %s\n"
msgstr "[%s] %s\n"
-#: src/download.cc:294
+#: src/download.cc:295
#, c-format
msgid ""
"===============================================================================\n"
@@ -1157,34 +1302,39 @@
"\n"
"Înregistrare completă.\n"
-#: src/download.cc:329
+#: src/download.cc:330
msgid "Downloading packages"
msgstr "Se descarcă pachetele"
-#: src/download.cc:330
+#: src/download.cc:331
msgid "View the progress of the package download"
msgstr "Vizualizarea progresului descărcării pachetelor"
-#: src/download.cc:352
+#: src/download.cc:332
+#, fuzzy
+msgid "Package Download"
+msgstr "Pachet: "
+
+#: src/download.cc:354
msgid "Internal error: couldn't generate list of packages to download"
msgstr "Eroare internă: nu pot genera lista pachetelor de descărcat"
-#: src/download.cc:413
+#: src/download.cc:415
msgid "Unable to correct for unavailable packages"
msgstr "Nu pot face corectarea pentru pachetele indisponibile"
-#: src/download.cc:465
+#: src/download.cc:467
msgid ""
"Ack! Something bad happened while installing packages. Trying to recover:"
msgstr ""
"Hait! Ceva rău s-a petrecut în timpul instalării pachetelor. Încercare de "
"recuperare:"
-#: src/download.cc:475 src/pkg_item.cc:413
+#: src/download.cc:477 src/pkg_item.cc:432
msgid "Press return to continue.\n"
msgstr "Apasaţi Enter pentru a continua\n"
-#: src/download.cc:506
+#: src/download.cc:508
msgid ""
"Could not regain the system lock! (Perhaps another apt or dpkg is running?)"
msgstr ""
@@ -1246,11 +1396,6 @@
msgid "[ERROR]"
msgstr "[EROARE]"
-#: src/download_screen.cc:57
-#, c-format
-msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
-msgstr "Vă rog introduceţi discul numit \"%s\" în unitatea \"%s\""
-
#: src/download_screen.cc:181
#, c-format
msgid "Downloaded %sB in %ss (%sB/s)."
@@ -1290,115 +1435,115 @@
"Schimbare de mediu: vă rog introduceţi discul '%s' în unitatea '%s' şi "
"apăsaţi Enter\n"
-#: src/generic/aptcache.cc:245
+#: src/generic/aptcache.cc:253
msgid "Can't open Aptitude extended state file"
msgstr "Nu pot deschide fiÅŸierul extins de stare Aptitude"
-#: src/generic/aptcache.cc:252 src/generic/aptcache.cc:305
-#: src/generic/aptcache.cc:307
+#: src/generic/aptcache.cc:260 src/generic/aptcache.cc:313
+#: src/generic/aptcache.cc:315
msgid "Reading extended state information"
msgstr "Citire informaţii de stare extinsă"
-#: src/generic/aptcache.cc:313 src/generic/aptcache.cc:387
-#: src/generic/aptcache.cc:390
+#: src/generic/aptcache.cc:321 src/generic/aptcache.cc:395
+#: src/generic/aptcache.cc:398
msgid "Initializing package states"
msgstr "Iniţializarea stării pachetelor"
-#: src/generic/aptcache.cc:501
+#: src/generic/aptcache.cc:509
msgid "Cannot open Aptitude state file"
msgstr "Nu pot deschide fiÅŸierul de stare Aptitude"
-#: src/generic/aptcache.cc:505 src/generic/aptcache.cc:560
-#: src/generic/aptcache.cc:563
+#: src/generic/aptcache.cc:513 src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:571
msgid "Writing extended state information"
msgstr "Scriere informaţii de stare extinse"
-#: src/generic/aptcache.cc:542
+#: src/generic/aptcache.cc:550
#, 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/aptcache.cc:551
+#: src/generic/aptcache.cc:559
msgid "Couldn't write state file"
msgstr "Nu pot scrie fiÅŸierul de stare"
-#: src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:576
msgid "Error writing state file"
msgstr "Eroare în timpul scrierii fişierului de stare"
-#: src/generic/aptcache.cc:584
+#: src/generic/aptcache.cc:592
msgid "couldn't replace old state file"
msgstr "nu pot înlocui vechiul fişier de stare"
-#: src/generic/aptcache.cc:960
+#: src/generic/aptcache.cc:1000
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/aptcache.cc:1325
+#: src/generic/aptcache.cc:1546
msgid "The list of sources could not be read."
msgstr "Lista cu sursele nu poate fi citită."
-#: src/generic/aptcache.cc:1332
+#: src/generic/aptcache.cc:1553
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/aptcache.cc:1335
+#: src/generic/aptcache.cc:1556
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 "
"fişiere lipsă"
-#: src/generic/apt.cc:141
+#: src/generic/apt.cc:142
#, c-format
msgid "Unable to open %s for writing"
msgstr "Nu pot deschide %s pentru scriere"
-#: src/generic/apt.cc:151
+#: src/generic/apt.cc:152
#, c-format
msgid "Unable to replace %s with new configuration file"
msgstr "Nu pot înlocui %s cu noul fişier de configurare"
-#: src/generic/apt.cc:226
+#: src/generic/apt.cc:227
msgid "Warning: could not lock the cache file. Opening in read-only mode"
msgstr ""
"Avertisment: nu pot încuia fişierul cache. Deschidere în modul doar-citire"
-#: src/generic/matchers.cc:780
+#: src/generic/matchers.cc:797
msgid "Unmatched '('"
msgstr "Nepotrivit '('"
-#: src/generic/matchers.cc:870 src/generic/matchers.cc:949
+#: src/generic/matchers.cc:887 src/generic/matchers.cc:968
#, c-format
msgid "Unknown dependency type: %s"
msgstr "Tip de dependenţă necunoscut: %s"
-#: src/generic/matchers.cc:931
+#: src/generic/matchers.cc:950
#, c-format
msgid "Unknown action type: %s"
msgstr "Tip de acţiune necunoscut: %s"
-#: src/generic/matchers.cc:998
+#: src/generic/matchers.cc:1017
#, c-format
msgid "Unknown priority %s"
msgstr "Prioritate necunoscută: %s"
-#: src/generic/matchers.cc:1020
+#: src/generic/matchers.cc:1039
#, c-format
msgid "Unknown pattern type: %c"
msgstr "Tip de model necunoscut: %c"
-#: src/generic/matchers.cc:1065
+#: src/generic/matchers.cc:1084
msgid "Unexpected empty expression"
msgstr "Expresie goală neaşteptată"
-#: src/generic/matchers.cc:1100
+#: src/generic/matchers.cc:1119
msgid "Badly formed expression"
msgstr "Expresie formată greşit"
-#: src/generic/matchers.cc:1129
+#: src/generic/matchers.cc:1148
msgid "Unexpected ')'"
msgstr "NeaÅŸteptat ')'"
@@ -1424,7 +1569,7 @@
msgid "Can't get value of $HOME, using TMPDIR (insecure)"
msgstr "Nu pot obţine valoarea lui $HOME, folosesc TMPDIR (nesigur)"
-#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:60
+#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:61
#, c-format
msgid "ChangeLog of %s"
msgstr "Jurnal de modificări al %s"
@@ -1634,17 +1779,17 @@
msgid "Invalid sorting policy type '%s'"
msgstr "Tip nevalid de politică de sortare '%s'"
-#: src/main.cc:68
+#: src/main.cc:67
#, c-format
msgid "%s %s compiled at %s %s\n"
msgstr "%s %s compilat la %s %s\n"
-#: src/main.cc:71
+#: src/main.cc:70
#, c-format
msgid "Compiler: g++ %s\n"
msgstr "Compilator: g++ %s\n"
-#: src/main.cc:74
+#: src/main.cc:73
#, c-format
msgid ""
"\n"
@@ -1653,7 +1798,7 @@
"\n"
"Versiune NCurses: %s\n"
-#: src/main.cc:76
+#: src/main.cc:75
#, c-format
msgid ""
"\n"
@@ -1662,22 +1807,22 @@
"\n"
"Versiune Curses: %s\n"
-#: src/main.cc:78
+#: src/main.cc:77
#, c-format
msgid "libsigc++ version: %s\n"
msgstr "Versiune libsigc++: %s\n"
-#: src/main.cc:84
+#: src/main.cc:83
#, c-format
msgid "Usage: aptitude [-S fname] [-u|-i]"
msgstr "Utilizare: aptitude [-S fnume] [-u|-i]"
-#: src/main.cc:86
+#: src/main.cc:85
#, c-format
msgid " aptitude [options] <action> ..."
msgstr " aptitude [opţiuni] <acţiune> ..."
-#: src/main.cc:88
+#: src/main.cc:87
#, c-format
msgid ""
" Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -1687,42 +1832,42 @@
"interactiv):\n"
"\n"
-#: src/main.cc:89
+#: src/main.cc:88
#, c-format
msgid " install - Install/upgrade packages\n"
msgstr " instalare - Instalează/înnoieşte pachetele\n"
-#: src/main.cc:90
+#: src/main.cc:89
#, c-format
msgid " remove - Remove packages\n"
msgstr " ÅŸterge - Åžterge pachetele\n"
-#: src/main.cc:91
+#: src/main.cc:90
#, c-format
msgid " purge - Remove packages and their configuration files\n"
msgstr " curăţă - Curăţă pachetele şi fişierele lor de configurare\n"
-#: src/main.cc:92
+#: src/main.cc:91
#, c-format
msgid " hold - Place packages on hold\n"
msgstr " reţine - Pune pachetele în aşteptare\n"
-#: src/main.cc:93
+#: src/main.cc:92
#, c-format
msgid " unhold - Cancel a hold command for a package\n"
msgstr " nereţine - Anulează comanda de reţinere pentru un pachet\n"
-#: src/main.cc:94
+#: src/main.cc:93
#, c-format
msgid " markauto - Mark packages as having been automatically installed\n"
msgstr " auto-marcare - Marchează pachetele ca fiind automat instalate\n"
-#: src/main.cc:95
+#: src/main.cc:94
#, c-format
msgid " unmarkauto - Mark packages as having been manually installed\n"
msgstr " ne-auto-marcare - Marchează pachetele ca fiind instalate manual\n"
-#: src/main.cc:100
+#: src/main.cc:99
#, c-format
msgid ""
" forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -1731,18 +1876,18 @@
" versiune interzisă - Interzice aptitude de a înnoi o anumită versiune de "
"pachet.\n"
-#: src/main.cc:101
+#: src/main.cc:100
#, c-format
msgid " update - Download lists of new/upgradable packages\n"
msgstr ""
" actualizare - Descarcă listele de pachete noi/posibil de înnoit\n"
-#: src/main.cc:102
+#: src/main.cc:101
#, c-format
msgid " upgrade - Perform a safe upgrade\n"
msgstr " înnoire - Execută o înnoire sigură\n"
-#: src/main.cc:103
+#: src/main.cc:102
#, c-format
msgid ""
" dist-upgrade - Perform an upgrade, possibly installing and removing "
@@ -1750,70 +1895,70 @@
msgstr ""
" înnoire distribuţie - Execută o înnoire, instalând şi ştergând pachete\n"
-#: src/main.cc:104
+#: src/main.cc:103
#, c-format
msgid " forget-new - Forget what packages are \"new\"\n"
msgstr " uită de noi - Uită ce pachete sunt \"noi\"\n"
-#: src/main.cc:105
+#: src/main.cc:104
#, c-format
msgid " search - Search for a package by name and/or expression\n"
msgstr " caută - Caută un pachet după nume şi/sau expresie\n"
-#: src/main.cc:106
+#: src/main.cc:105
#, c-format
msgid " show - Display detailed information about a package\n"
msgstr " arată - Afişează informaţii detaliate despre un pachet\n"
-#: src/main.cc:107
+#: src/main.cc:106
#, c-format
msgid " clean - Erase downloaded package files\n"
msgstr " curăţă - Şterge fişierele pachetelor descărcate\n"
-#: src/main.cc:108
+#: src/main.cc:107
#, c-format
msgid " autoclean - Erase old downloaded package files\n"
msgstr " autocurăţare - Şterge vechile fişiere ale pachetelor descărcate\n"
-#: src/main.cc:109
+#: src/main.cc:108
#, c-format
msgid " changelog - View a package's changelog\n"
msgstr ""
" jurnal de modificări - Vizualizare jurnal de modificări al unui pachet\n"
-#: src/main.cc:110
+#: src/main.cc:109
#, c-format
msgid " download - Download the .deb file for a package\n"
msgstr "descărcare - Descarcă fişierul .deb pentru un pachet\n"
-#: src/main.cc:112
+#: src/main.cc:111
#, c-format
msgid " Options:\n"
msgstr " Opţiuni:\n"
-#: src/main.cc:113
+#: src/main.cc:112
#, c-format
msgid " -h This help text\n"
msgstr " -h Acest text de ajutor\n"
-#: src/main.cc:114
+#: src/main.cc:113
#, c-format
msgid " -s Simulate actions, but do not actually perform them.\n"
msgstr " -s Simulează acţiunea, dar n-o executa în realitate.\n"
-#: src/main.cc:115
+#: src/main.cc:114
#, c-format
msgid ""
" -d Only download packages, do not install or remove anything.\n"
msgstr ""
" -d Doar descarcă pachetele, nu instala sau şterge nimic.\n"
-#: src/main.cc:116
+#: src/main.cc:115
#, c-format
msgid " -P Always prompt for confirmation or actions\n"
msgstr " -P Întodeauna cere confirmare pentru acţiuni\n"
-#: src/main.cc:117
+#: src/main.cc:116
#, c-format
msgid ""
" -y Assume that the answer to simple yes/no questions is 'yes'\n"
@@ -1821,7 +1966,7 @@
" -y Presupune că răspunsul la întrebările simple da/nu este "
"'da'\n"
-#: src/main.cc:118
+#: src/main.cc:117
#, c-format
msgid ""
" -F format Specify a format for displaying search results; see the "
@@ -1830,7 +1975,7 @@
" -F format Specifică un format pentru afişarea rezultatelor căutării; "
"vezi manualul\n"
-#: src/main.cc:119
+#: src/main.cc:118
#, c-format
msgid ""
" -O order Specify how search results should be sorted; see the manual\n"
@@ -1838,7 +1983,7 @@
" -O ordine Specifică modul în care rezultatele căutării să fie "
"sortate; vezi manual\n"
-#: src/main.cc:120
+#: src/main.cc:119
#, c-format
msgid ""
" -w width Specify the display width for formatting search results\n"
@@ -1846,28 +1991,28 @@
" -w lăţime Specifică lăţimea afişării pentru formatarea rezultatului "
"de căutare\n"
-#: src/main.cc:121
+#: src/main.cc:120
#, c-format
msgid " -f Aggressively try to fix broken packages.\n"
msgstr " -f Încearcă în mod agresiv să repar pachetele.\n"
-#: src/main.cc:122
+#: src/main.cc:121
#, c-format
msgid " -V Show which versions of packages are to be installed.\n"
msgstr " -V Arată ce versiuni de pachete sunt instalate.\n"
-#: src/main.cc:123
+#: src/main.cc:122
#, c-format
msgid ""
" -D Show the dependencies of automatically changed packages.\n"
msgstr " -D Arată dependenţele pachetelor schimbate automat.\n"
-#: src/main.cc:124
+#: src/main.cc:123
#, c-format
msgid " -Z\t\t Show the change in installed size of each package.\n"
msgstr " -Z\t\t Arată modificarea dimensiunii fiecărui pachet instalat.\n"
-#: src/main.cc:125
+#: src/main.cc:124
#, c-format
msgid ""
" -v Display extra information. (may be supplied multiple times)\n"
@@ -1875,20 +2020,20 @@
" -v Afişează informaţii suplimentare (poate fi folosită de mai "
"multe ori)\n"
-#: src/main.cc:126
+#: src/main.cc:125
#, c-format
msgid ""
" -t [release] Set the release from which packages should be installed\n"
msgstr ""
" -t [producţie] Impune producţia din care pachetele ar trebui instalate\n"
-#: src/main.cc:127
+#: src/main.cc:126
#, c-format
msgid " -o key=val Directly set the configuration option named 'key'\n"
msgstr ""
" -o key=val Ajustează direct opţiunea de configurare numită 'key'\n"
-#: src/main.cc:128
+#: src/main.cc:127
#, c-format
msgid ""
" --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -1898,59 +2043,67 @@
"dependenţe\n"
".......................puternice sau nu\n"
-#: src/main.cc:129
+#: src/main.cc:128
#, c-format
msgid " -S fname: Read the aptitude extended status info from fname.\n"
msgstr " -S fnume: Citeşte informaţiile de stare extinsă aptitude din fnume.\n"
-#: src/main.cc:130
+#: src/main.cc:129
#, c-format
msgid " -u : Download new package lists on startup.\n"
msgstr " -u : Descarcă listele cu pachetele noi la pornire.\n"
-#: src/main.cc:131
+#: src/main.cc:130
#, c-format
msgid " -i : Perform an install run on startup.\n"
msgstr " -i : Execută comanda de instalare la pornire\n"
-#: src/main.cc:133
+#: src/main.cc:132
#, c-format
msgid " This aptitude does not have Super Cow Powers.\n"
msgstr " Acest aptitude n-are puterile unei Super Vaci.\n"
-#: src/main.cc:254
+#: src/main.cc:253
#, c-format
msgid "-o requires an argument of the form key=value, got %s"
msgstr "-o necesită un argument de forma key=valoare, primit %s"
-#: src/main.cc:300 src/main.cc:309
+#: src/main.cc:299 src/main.cc:308
msgid "WEIRDNESS: unknown option code received\n"
msgstr "CIUDĂŢENIE: primit cod opţiune necunoscut\n"
-#: src/main.cc:318
+#: src/main.cc:317
msgid "Only one of -u and -i may be specified\n"
msgstr "Doar unul din -u ÅŸi -i poate fi specificat\n"
-#: src/main.cc:326
+#: src/main.cc:325
msgid ""
"-u and -i may not be specified in command-line mode (eg, with 'install')"
msgstr ""
"-u şi -i pot să nu fie specificaţi în modul linie de comandă (ex., cu "
"'install')"
-#: src/main.cc:337
+#: src/main.cc:342
msgid "-u and -i may not be specified with a command"
msgstr "-u şi -i pot să nu fie specificaţi cu o comandă"
-#: src/main.cc:392
+#: src/main.cc:399
#, c-format
msgid "Unknown command \"%s\"\n"
msgstr "Comandă necunoscută \"%s\"\n"
-#: src/main.cc:400
+#: src/main.cc:406 src/main.cc:463
+msgid "Internal error: uncaught 'out of solutions' exception.\n"
+msgstr ""
+
+#: src/main.cc:411 src/main.cc:468
+msgid "Internal error: uncaught 'out of time' exception.\n"
+msgstr ""
+
+#: src/main.cc:418
#, c-format
-msgid "Invalid option for interactive mode: -s\n"
-msgstr "Opţiune nevalidă pentru modul interactiv: -s\n"
+msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
+msgstr ""
#: src/mine/cmine.cc:93
#, c-format
@@ -1978,7 +2131,7 @@
msgid "Lost"
msgstr "Pierdut"
-#: src/mine/cmine.cc:119 src/ui.cc:1005
+#: src/mine/cmine.cc:119 src/ui.cc:1089
msgid "Minesweeper"
msgstr "Detector de mine"
@@ -2155,7 +2308,7 @@
msgid "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
msgstr "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
-#: src/pkg_columnizer.cc:84 src/ui.cc:1488
+#: src/pkg_columnizer.cc:84 src/ui.cc:1638
msgid "Package"
msgstr "Pachet"
@@ -2416,13 +2569,14 @@
" Pachetele în secţiunea 'base' sunt parte a sistemului iniţial de instalare."
#: src/pkg_grouppolicy.cc:158
+#, fuzzy
msgid ""
"Programs for faxmodems and other communications devices\n"
" Packages in the 'comm' section are used to control modems and other "
"hardware communications devices. This includes software to control faxmodems "
"(for instance, PPP for dial-up internet connections and programs originally "
-"written for that purpose (zmodem/kermit), as well as software to control "
-"cellular phones, interface with FidoNet, and run a BBS."
+"written for that purpose, such as zmodem/kermit), as well as software to "
+"control cellular phones, interface with FidoNet, and run a BBS."
msgstr ""
"Programe pentru faxmodem-uri şi alte dispozitive de comunicaţii\n"
" Pachetele din secţiunea 'comm' sunt folosite pentru a controla modemurile "
@@ -2879,14 +3033,15 @@
"acum în 'main'."
#: src/pkg_grouppolicy.cc:193
+#, fuzzy
msgid ""
"Programs which are not free software\n"
" Packages in the 'non-free' section are not part of Debian.\n"
" .\n"
" These packages fail to meet one or more of the requirements of the Debian "
-"Free Software Guidelines (see below) You should read the license of programs "
-"in this section to be sure that you are allowed to use them in the way you "
-"intend.\n"
+"Free Software Guidelines (see below). You should read the license of "
+"programs in this section to be sure that you are allowed to use them in the "
+"way you intend.\n"
" .\n"
" For more information about what Debian considers to be Free Software, see "
"http://www.debian.org/social_contract#guidelines"
@@ -2950,11 +3105,12 @@
" O versiune mai nouă a acestor programe este disponibilă."
#: src/pkg_grouppolicy.cc:320
+#, fuzzy
msgid ""
"New Packages\n"
" These packages have been added to Debian since the last time you cleared "
-"the list of \"new\" packages. (choose \"Forget new packages\" from the "
-"Actions menu to empty this list)"
+"the list of \"new\" packages (choose \"Forget new packages\" from the "
+"Actions menu to empty this list)."
msgstr ""
"Pachete noi\n"
" Aceste pachete au fost adăugate în Debian de când aţi golit ultima dată "
@@ -3207,101 +3363,121 @@
msgid "Versions"
msgstr "Versiuni"
-#: src/pkg_item.cc:54
+#: src/pkg_item.cc:55
msgid "Yes, I am aware this is a very bad idea"
msgstr "Da, sunt conştient că asta-i o idee rea"
#: src/pkg_item.cc:80
-#, c-format
+#, fuzzy, c-format
msgid ""
-"%s is an essential package!\n"
-"\n"
-"Are you sure you want to remove it?\n"
-"Type '%s' if you are."
+"%s is an essential package!%n%nAre you sure you want to remove it?%nType '%"
+"s' if you are."
msgstr ""
"%s este un pachet esenţial!\n"
"\n"
"Sunteţi sigur că vreţi să-l ştergeţi?\n"
"Tastaţi '%s' dacă sunteţi."
-#: src/pkg_item.cc:219
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:625
#, c-format
msgid "Information about %s"
msgstr "Informaţii despre %s"
-#: src/pkg_item.cc:304
-msgid "Available versions of "
+#: src/pkg_item.cc:224 src/pkg_ver_item.cc:627
+#, c-format
+msgid "%s info"
+msgstr ""
+
+#: src/pkg_item.cc:310
+#, fuzzy, c-format
+msgid "Available versions of %s"
msgstr "Versiuni disponibile ale "
-#: src/pkg_item.cc:312 src/pkg_ver_item.cc:648
+#: src/pkg_item.cc:313
+#, fuzzy, c-format
+msgid "%s versions"
+msgstr "Versiuni"
+
+#: src/pkg_item.cc:325 src/pkg_ver_item.cc:655
#, c-format
msgid "Dependencies of %s"
msgstr "Dependenţele %s"
-#: src/pkg_item.cc:322 src/pkg_ver_item.cc:657
+#: src/pkg_item.cc:327 src/pkg_ver_item.cc:657
+#, c-format
+msgid "%s deps"
+msgstr ""
+
+#: src/pkg_item.cc:338 src/pkg_ver_item.cc:667
#, c-format
msgid "Packages depending on %s"
msgstr "Pachete ce depind de %s"
-#: src/pkg_item.cc:373 src/pkg_ver_item.cc:694
+#: src/pkg_item.cc:340 src/pkg_ver_item.cc:669
+#, c-format
+msgid "%s reverse deps"
+msgstr ""
+
+#: src/pkg_item.cc:392 src/pkg_ver_item.cc:707
#, c-format
msgid "Reporting a bug in %s:\n"
msgstr "Raportare eroare în %s:\n"
-#: src/pkg_item.cc:395
+#: src/pkg_item.cc:414
+#, fuzzy
msgid ""
-"You are not root and I cannot find any way\n"
-"to become root. To reconfigure this package,\n"
-"install the menu package, the login package,\n"
-"or run aptitude as root."
+"You are not root and I cannot find any way to become root. To reconfigure "
+"this package, install the menu package, the login package, or run aptitude "
+"as root."
msgstr ""
"Nu sunteţi root şi nu găsesc nici o cale să\n"
"deveniţi root. Pentru a reconfigura acest pachet,\n"
"instalaţi pachetul menu, pachetul login, sau\n"
"rulaţi aptitude ca root."
-#: src/pkg_item.cc:403
+#: src/pkg_item.cc:422
#, c-format
msgid "Reconfiguring %s\n"
msgstr "Reconfigurare %s\n"
-#: src/pkg_item.cc:428
+#: src/pkg_item.cc:447
msgid "Hierarchy editor"
msgstr "Editor de ierarhie"
+#: src/pkg_item.cc:447
+#, fuzzy
+msgid "Hierarchy Editor"
+msgstr "Editor de ierarhie"
+
#: src/pkg_tree.cc:325
msgid "Search for: "
msgstr "Căutare pentru: "
-#: src/pkg_tree.cc:585
+#: src/pkg_tree.cc:568
msgid "All Packages"
msgstr "Toate pachetele"
-#: src/pkg_tree.cc:598 src/pkg_tree.cc:607
+#: src/pkg_tree.cc:581 src/pkg_tree.cc:590
msgid "Building view"
msgstr "Construire vizualizare"
-#: src/pkg_tree.cc:649
+#: src/pkg_tree.cc:632
#, c-format
msgid "No packages matched the pattern \"%s\"."
msgstr "Nici un pachet nu îndeplineşte modelul \"%s\"."
-#: src/pkg_tree.cc:671
+#: src/pkg_tree.cc:654
msgid "Enter the new package tree limit: "
msgstr "Introduceţi limita arborelui de pachete noi: "
-#: src/pkg_tree.cc:705
+#: src/pkg_tree.cc:688
msgid "Enter the new package grouping mechanism for this display: "
msgstr "Introduceţi noul mecanism de grupare pachete pentru acest afişaj: "
-#: src/pkg_tree.cc:713
+#: src/pkg_tree.cc:696
msgid "Enter the new package sorting mechanism for this display: "
msgstr "Introduceţi noul mecanism de sortare pachete pentru acest afişaj: "
-#: src/pkg_ver_item.cc:623
-msgid "Information about "
-msgstr "Informaţii despre "
-
#: src/pkg_view.cc:344
msgid "make_package_view: error in arguments -- two main widgets??"
msgstr "make_package_view: eroare în argumente -- două widget-uri principale??"
@@ -3317,7 +3493,7 @@
msgid "make_package_view: bad argument!"
msgstr "make_package_view: argument nevalid!"
-#: src/pkg_view.cc:492
+#: src/pkg_view.cc:495
msgid "make_package_view: no main widget found"
msgstr "make_package_view: nu s-a găsit nici un widget principal"
@@ -3535,6 +3711,74 @@
"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:74
+msgid "The package cache is not available."
+msgstr ""
+
+#: src/solution_dialog.cc:82
+#, fuzzy
+msgid "No packages are broken."
+msgstr "Unele pachete sunt deteriorate. Să încerc să le repar?"
+
+#: src/solution_dialog.cc:103
+msgid "No resolution found."
+msgstr ""
+
+#: src/solution_dialog.cc:107
+#, c-format
+msgid ""
+"Time exhausted while searching for a solution (you can select \"Next Solution"
+"\" or press %s to try harder)."
+msgstr ""
+
+#: src/solution_dialog.cc:146
+#, fuzzy
+msgid "Previous"
+msgstr "Furnizează"
+
+#: src/solution_dialog.cc:147
+#, fuzzy
+msgid "Next"
+msgstr "Următorul"
+
+#: src/solution_dialog.cc:148
+msgid "Apply"
+msgstr ""
+
+#: src/solution_dialog.cc:149
+#, fuzzy
+msgid "Close"
+msgstr "ÃŽn^chide"
+
+#: src/solution_fragment.cc:125
+#, fuzzy
+msgid "%BRemove%b the following packages:%n"
+msgstr "Următoarele pachete sunt DETERIORATE:"
+
+#: src/solution_fragment.cc:135
+#, fuzzy
+msgid "%BInstall%b the following packages:%n"
+msgstr "Următoarele pachete sunt DETERIORATE:"
+
+#: src/solution_fragment.cc:148
+msgid "%BKeep%b the following packages at their current version:%n"
+msgstr ""
+
+#: src/solution_fragment.cc:161
+#, fuzzy
+msgid "%BUpgrade%b the following packages:%n"
+msgstr "Următoarele pachete sunt DETERIORATE:"
+
+#: src/solution_fragment.cc:176
+#, fuzzy
+msgid "%BDowngrade%b the following packages:%n"
+msgstr "Se descarcă pachetele"
+
+#: src/solution_fragment.cc:190
+#, c-format
+msgid "Score is %d"
+msgstr ""
+
#: src/trust.cc:17 src/trust.cc:19
msgid "WARNING"
msgstr ""
@@ -3546,52 +3790,52 @@
"system."
msgstr ""
-#: src/ui.cc:143
+#: src/ui.cc:164
msgid "Er, there aren't any errors, this shouldn't have happened.."
msgstr "Ah, nu sunt deloc erori, asta n-ar fi trebuit sa se întâmple..."
-#: src/ui.cc:149
+#: src/ui.cc:170
msgid "E:"
msgstr ""
-#: src/ui.cc:151
+#: src/ui.cc:172
msgid "W:"
msgstr ""
-#: src/ui.cc:172
+#: src/ui.cc:193
msgid "Search for:"
msgstr "Căutare pentru:"
-#: src/ui.cc:205
+#: src/ui.cc:261
msgid "You already are root!"
msgstr "Sunteţi deja root!"
-#: src/ui.cc:303
+#: src/ui.cc:359
msgid ""
"Subprocess exited with an error -- did you type your password correctly?"
msgstr "Subproces terminat cu eroare -- aţi tastat corect parola?"
-#: src/ui.cc:331
+#: src/ui.cc:387
msgid "Loading cache"
msgstr "Încărcare cache"
-#: src/ui.cc:353
+#: src/ui.cc:409
msgid "Really quit Aptitude?"
msgstr "Chiar părăsiţi Aptitude?"
-#: src/ui.cc:432
+#: src/ui.cc:488
msgid "Really discard your personal settings and reload the defaults?"
msgstr "Chiar renunţaţi la setările personale şi reîncărcaţi cele implicite?"
-#: src/ui.cc:532
+#: src/ui.cc:588 src/ui.cc:590 src/ui.cc:618 src/ui.cc:620
msgid "Packages"
msgstr "Pachete"
-#: src/ui.cc:533 src/ui.cc:560
+#: src/ui.cc:589 src/ui.cc:619
msgid "View available packages and choose actions to perform"
msgstr "Vizualizaţi pachetele disponibile şi alegeţi acţiunile de executat"
-#: src/ui.cc:599
+#: src/ui.cc:666
#, fuzzy
msgid ""
"%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
@@ -3609,15 +3853,15 @@
"redistribuiţi\n"
"în anumite condiţii; vedeţi 'licenţa' pentru detalii."
-#: src/ui.cc:620
+#: src/ui.cc:687
msgid "help.txt"
msgstr "help.txt"
-#: src/ui.cc:636
+#: src/ui.cc:703
msgid "README"
msgstr "CITEÅžTE-MÄ‚"
-#: src/ui.cc:718
+#: src/ui.cc:785
msgid ""
"%C%BWARNING%b: untrusted versions of the following packages will be "
"installed!%n%nUntrusted packages could %Bcompromise your system's security%"
@@ -3625,62 +3869,72 @@
"this is what you want to do.%n%n"
msgstr ""
-#: src/ui.cc:732
+#: src/ui.cc:799
#, fuzzy
msgid "Really Continue"
msgstr "Continuă"
-#: src/ui.cc:734
+#: src/ui.cc:801
msgid "Abort Installation"
msgstr ""
-#: src/ui.cc:796
+#: src/ui.cc:862
msgid "Preview of package installation"
msgstr "Previzualizează pachetele instalate"
-#: src/ui.cc:797
+#: src/ui.cc:863
msgid "View and/or adjust the actions that will be performed"
msgstr "Vizualizează şi/sau ajustează acţiunile ce vor fi executate"
-#: src/ui.cc:837
-msgid "Some packages were broken and have been fixed"
+#: src/ui.cc:864
+#, fuzzy
+msgid "Preview"
+msgstr "^Precedent"
+
+#: src/ui.cc:900
+#, fuzzy
+msgid "Some packages were broken and have been fixed:"
msgstr "Unele pachete au fost deteriorate ÅŸi s-au reparat"
-#: src/ui.cc:839
-msgid "Some broken packages could not be fixed!"
-msgstr "Unele pachete deteriorate nu pot fi reparate!"
+#: src/ui.cc:906
+msgid "No solution to these dependency problems exists!"
+msgstr ""
-#: src/ui.cc:847 src/ui.cc:959
-msgid "Some packages are broken. Try to fix them?"
-msgstr "Unele pachete sunt deteriorate. Să încerc să le repar?"
+#: src/ui.cc:912
+#, c-format
+msgid ""
+"Ran out of time while trying to resolver dependencies (press \"%s\" to try "
+"harder)"
+msgstr ""
-#: src/ui.cc:860
+#: src/ui.cc:958
+#, fuzzy
msgid ""
-"Installing/removing packages requires administrative privileges, which\n"
-"you currently do not have. Would you like to change to the root account?\n"
+"Installing/removing packages requires administrative privileges, which you "
+"currently do not have. Would you like to change to the root account?"
msgstr ""
"Instalarea/ştergerea pachetelor necesită privilegii administrative, care\n"
"acum nu le aveţi. Vreţi să schimb către contul de root?\n"
-#: src/ui.cc:863 src/ui.cc:993
+#: src/ui.cc:961 src/ui.cc:1077
msgid "Become root"
msgstr "Devin root"
-#: src/ui.cc:865 src/ui.cc:995
+#: src/ui.cc:963 src/ui.cc:1079
msgid "Don't become root"
msgstr "Nu devin root"
-#: src/ui.cc:870 src/ui.cc:1000
+#: src/ui.cc:968 src/ui.cc:1084
msgid "A package-list update or install run is already taking place."
msgstr ""
"O actualizare de listă de pachete sau o instanţă de instalare deja ocupă "
"locul."
-#: src/ui.cc:897
+#: src/ui.cc:995
msgid "No packages are scheduled to be installed, removed, or upgraded."
msgstr "Nici un pachet nu-i programat sa fie instalat, şters sau înnoit."
-#: src/ui.cc:903
+#: src/ui.cc:1001
#, fuzzy
msgid ""
"No packages will be installed, removed or upgraded. Some packages could be "
@@ -3692,168 +3946,183 @@
"Unele pachete ar putea fi înnoite, dar n-aţi ales asta.\n"
"Apăsaţi \"U\" pentru a pregăti o înnoire."
-#: src/ui.cc:990
+#: src/ui.cc:1073
+#, fuzzy
msgid ""
-"Updating the package lists requires administrative privileges, which\n"
-"you currently do not have. Would you like to change to the root account?\n"
+"Updating the package lists requires administrative privileges, which you "
+"currently do not have. Would you like to change to the root account?"
msgstr ""
"Actualizarea listelor de pachete necesită privilegii administrative, ceea "
"ce\n"
"n-aveţi acum. Vreţi să schimb către contul de root?\n"
-#: src/ui.cc:1005 src/ui.cc:1198
+#: src/ui.cc:1089 src/ui.cc:1345
msgid "Waste time trying to find mines"
msgstr "Pierdere de timp încercând găsirea minelor"
-#: src/ui.cc:1012 src/ui.cc:1065
+#: src/ui.cc:1096 src/ui.cc:1149
msgid "Cleaning while a download is in progress is not allowed"
msgstr "Curăţarea în timp ce descărcarea este în desfăşurare nu este permisă"
-#: src/ui.cc:1015
+#: src/ui.cc:1099
msgid "Deleting downloaded files"
msgstr "Ştergere fişiere descărcate"
-#: src/ui.cc:1029
+#: src/ui.cc:1113
msgid "Downloaded package files have been deleted"
msgstr "Fişierele pachetelor descărcate au fost şterse"
-#: src/ui.cc:1090
+#: src/ui.cc:1174
#, fuzzy, c-format
msgid ""
"Obsolete downloaded package files have been deleted, freeing %sB of disk "
"space."
msgstr "Fişierele pachetelor învechite şi descărcate au fost şterse"
-#: src/ui.cc:1174
+#: src/ui.cc:1246
+msgid "All solutions exhausted."
+msgstr ""
+
+#: src/ui.cc:1251 src/ui.cc:1282
+#, fuzzy
+msgid "Ran out of time while trying to find a solution."
+msgstr "Pierdere de timp încercând găsirea minelor"
+
+#: src/ui.cc:1276
+msgid "Unable to find a solution to apply."
+msgstr ""
+
+#: src/ui.cc:1321
msgid "^Install/remove packages"
msgstr "^Instalează/şterge pachete"
-#: src/ui.cc:1175
+#: src/ui.cc:1322
msgid "Perform all pending installs and removals"
msgstr "Execută toate instalările şi ştergerile nerezolvate"
-#: src/ui.cc:1177
+#: src/ui.cc:1324
msgid "^Update package list"
msgstr "Act^ualizează lista de pachete"
-#: src/ui.cc:1178
+#: src/ui.cc:1325
msgid "Check for new versions of packages"
msgstr "Verificare pentru noi versiuni de pachete"
-#: src/ui.cc:1181
+#: src/ui.cc:1328
msgid "^Forget new packages"
msgstr "Uită de noile pachete"
-#: src/ui.cc:1182
+#: src/ui.cc:1329
msgid "Forget which packages are \"new\""
msgstr "Uită de pachetele care sunt \"noi\""
-#: src/ui.cc:1185
+#: src/ui.cc:1332
msgid "^Clean package cache"
msgstr "^Curăţă cache-ul pachetului"
-#: src/ui.cc:1186
+#: src/ui.cc:1333
msgid "Delete package files which were previously downloaded"
msgstr "Şterge fişierele pachetelor care-au fost anterior descărcate"
-#: src/ui.cc:1189
+#: src/ui.cc:1336
msgid "Clean ^obsolete files"
msgstr "Curăţă fişierele învechite"
-#: src/ui.cc:1190
+#: src/ui.cc:1337
msgid "Delete package files which can no longer be downloaded"
msgstr "Şterge fişierele pachetelor ce nu mai pot fi descărcate"
-#: src/ui.cc:1193
+#: src/ui.cc:1340
msgid "Mark ^Upgradable"
msgstr "Marchează ca posibil de înnoit"
-#: src/ui.cc:1194
+#: src/ui.cc:1341
msgid "Mark all upgradable packages which are not held for upgrade"
msgstr ""
"Marchează toate pachetele ce ar putea fi înnoite care nu sunt reţinute "
"pentru înnoire"
-#: src/ui.cc:1197
+#: src/ui.cc:1344
msgid "^Play Minesweeper"
msgstr "Joacă Detectorul de Mine"
-#: src/ui.cc:1200
+#: src/ui.cc:1347
msgid "^Become root"
msgstr "Devenire root"
-#: src/ui.cc:1201
+#: src/ui.cc:1348
+#, fuzzy
msgid ""
-"Run 'su' to become root; this will restart the program, but your\n"
-"settings will be preserved"
+"Run 'su' to become root; this will restart the program, but your settings "
+"will be preserved"
msgstr ""
"Execută 'su' pentru a deveni root; asta va reporni programul, dar\n"
"setările dvs. vor fi păstrate"
-#: src/ui.cc:1204
+#: src/ui.cc:1351
msgid "^Reload package cache"
msgstr "^Reîncarcă cache-ul pachetului"
-#: src/ui.cc:1205
+#: src/ui.cc:1352
msgid "Reload the package cache"
msgstr "Reîncărcare cache-ul pachetului"
-#: src/ui.cc:1211
+#: src/ui.cc:1358
msgid "^Quit"
msgstr "IeÅŸire"
-#: src/ui.cc:1212
+#: src/ui.cc:1359
msgid "Exit the program"
msgstr "IeÅŸire din program"
-#: src/ui.cc:1218 src/ui.cc:1487
+#: src/ui.cc:1365 src/ui.cc:1637
msgid "Undo"
msgstr "Renunţă"
-#: src/ui.cc:1219
+#: src/ui.cc:1366
msgid "Undo the last package operation or group of operations"
msgstr "Renunţă la ultima operaţiune de pachet sau grup de operaţiuni"
-#: src/ui.cc:1226
+#: src/ui.cc:1373
msgid "^Install"
msgstr "^Instalează"
-#: src/ui.cc:1227
+#: src/ui.cc:1374
msgid "Flag the currently selected package for installation or upgrade"
msgstr "Semnalizează pachetul curent selectat pentru instalare sau înnoire"
-#: src/ui.cc:1230
+#: src/ui.cc:1377
msgid "^Remove"
msgstr "Åžte^rge"
-#: src/ui.cc:1231
+#: src/ui.cc:1378
msgid "Flag the currently selected package for removal"
msgstr "Semnalizează pachetul curent selectat pentru ştergere"
-#: src/ui.cc:1234
+#: src/ui.cc:1381
msgid "^Purge"
msgstr "Curăţă"
-#: src/ui.cc:1235
+#: src/ui.cc:1382
msgid ""
"Flag the currently selected package and its configuration files for removal"
msgstr ""
"Semnalizează pachetul curent selectat şi fişierele sale de configurare "
"pentru ÅŸtergere"
-#: src/ui.cc:1238
+#: src/ui.cc:1385
msgid "^Keep"
msgstr "Å¢ine"
-#: src/ui.cc:1239
+#: src/ui.cc:1386
msgid "Cancel any action on the selected package"
msgstr "Anulează orice acţiune pentru pachetul selectat"
-#: src/ui.cc:1242
+#: src/ui.cc:1389
msgid "^Hold"
msgstr "Reţine"
-#: src/ui.cc:1243
+#: src/ui.cc:1390
msgid ""
"Cancel any action on the selected package, and protect it from future "
"upgrades"
@@ -3861,240 +4130,244 @@
"Anulează orice acţiune pentru pachetul selectat, şi protejează-l de viitoare "
"înnoiri"
-#: src/ui.cc:1246
+#: src/ui.cc:1393
msgid "Mark ^Auto"
msgstr "Marchează ^automat"
-#: src/ui.cc:1247
+#: src/ui.cc:1394
+#, fuzzy
msgid ""
-"Mark the selected package as having been automatically installed;\n"
-"it will automatically be removed if no other packages depend on it"
+"Mark the selected package as having been automatically installed; it will "
+"automatically be removed if no other packages depend on it"
msgstr ""
"Marchează pachetul selectat ca fiind instalat automat;\n"
"va fi şters automat dacă nici un alt pachet nu depinde de el"
-#: src/ui.cc:1250
+#: src/ui.cc:1397
msgid "Mark ^Manual"
msgstr "Marchează ^manual"
-#: src/ui.cc:1251
+#: src/ui.cc:1398
+#, fuzzy
msgid ""
-"Mark the selected package as having been manually installed;\n"
-"it will not be removed unless you manually remove it"
+"Mark the selected package as having been manually installed; it will not be "
+"removed unless you manually remove it"
msgstr ""
"Marchează pachetul selectat ca fiind instalat manual;\n"
"nu va fi şters decât dacă îl veţi şterge manual"
-#: src/ui.cc:1254
+#: src/ui.cc:1401
msgid "^Forbid Version"
msgstr "Interzice versiunea"
-#: src/ui.cc:1255
+#: src/ui.cc:1402
+#, fuzzy
msgid ""
-"Forbid the candidate version of the selected package from being installed;\n"
+"Forbid the candidate version of the selected package from being installed; "
"newer versions of the package will be installed as usual"
msgstr ""
"Interzice versiunea candidat pentru pachetul selectat de a fi instalat;\n"
"noile versiuni ale pachetului vor fi instalate ca de obicei"
-#: src/ui.cc:1259
+#: src/ui.cc:1406
msgid "I^nformation"
msgstr "I^nformaţii"
-#: src/ui.cc:1260
+#: src/ui.cc:1407
msgid "Display more information about the selected package"
msgstr "Afişează mai multe informaţii despre pachetul selectat"
-#: src/ui.cc:1263
+#: src/ui.cc:1410
msgid "^Changelog"
msgstr "Jurnal de modifi^cări"
-#: src/ui.cc:1264
+#: src/ui.cc:1411
msgid "Display the Debian changelog of the selected package"
msgstr "Afişează jurnalul de modificări Debian pentru pachetul selectat"
-#: src/ui.cc:1271
+#: src/ui.cc:1418
msgid "^Find"
msgstr "Găseşte"
-#: src/ui.cc:1272
+#: src/ui.cc:1419
msgid "Search for a package"
msgstr "Căutarea unui pachet"
-#: src/ui.cc:1275
+#: src/ui.cc:1422
msgid "Find ^Again"
msgstr "Mai găseşte od^ată"
-#: src/ui.cc:1276
+#: src/ui.cc:1423
msgid "Repeat the last search"
msgstr "Repetă ultima căutare"
-#: src/ui.cc:1280
+#: src/ui.cc:1427
msgid "^Limit Display"
msgstr "^Limitează afişajul"
-#: src/ui.cc:1281
+#: src/ui.cc:1428
msgid "Apply a filter to the package list"
msgstr "Aplică un filtru listei de pachete"
-#: src/ui.cc:1284
+#: src/ui.cc:1431
msgid "^Un-Limit Display"
msgstr "Nelimitează afişajul"
-#: src/ui.cc:1285
+#: src/ui.cc:1432
msgid "Remove the filter from the package list"
msgstr "Åžterge filtrul din lista de pachete"
-#: src/ui.cc:1289
+#: src/ui.cc:1436
msgid "Find ^Broken"
msgstr "Găseşte deteriorat"
-#: src/ui.cc:1290
+#: src/ui.cc:1437
msgid "Find the next package with unsatisfied dependencies"
msgstr "Găseşte următorul pachet cu dependenţe nesatisfăcute"
-#: src/ui.cc:1297
+#: src/ui.cc:1444
msgid "^UI options"
msgstr "Opţiuni interfaţă ^utilizator"
-#: src/ui.cc:1298
+#: src/ui.cc:1445
msgid "Change the settings which affect the user interface"
msgstr "Schimbă ajustările ce afectează interfaţa utilizatorului"
-#: src/ui.cc:1301
+#: src/ui.cc:1448
msgid "^Dependency handling"
msgstr "Manevrarea ^dependenţelor"
-#: src/ui.cc:1302
+#: src/ui.cc:1449
msgid "Change the settings which affect how package dependencies are handled"
msgstr ""
"Schimbă ajustările ce afectează modul în care sunt manevrate dependenţele"
-#: src/ui.cc:1305
+#: src/ui.cc:1452
msgid "^Miscellaneous"
msgstr "Diverse"
-#: src/ui.cc:1306
+#: src/ui.cc:1453
msgid "Change miscellaneous program settings"
msgstr "Schimbă diverse ajustări ale programului"
-#: src/ui.cc:1311
+#: src/ui.cc:1458
msgid "^Revert options"
msgstr "^Revenire opţiuni"
-#: src/ui.cc:1312
+#: src/ui.cc:1459
msgid "Reset all settings to the system defaults"
msgstr "Refacere toate ajustările la cele implicite ale sistemului"
-#: src/ui.cc:1323
+#: src/ui.cc:1470
msgid "^Next"
msgstr "Următorul"
-#: src/ui.cc:1324
+#: src/ui.cc:1471
msgid "View next display"
msgstr "Vizualizare următorul afişaj"
-#: src/ui.cc:1327
+#: src/ui.cc:1474
msgid "^Prev"
msgstr "^Precedent"
-#: src/ui.cc:1328
+#: src/ui.cc:1475
msgid "View previous display"
msgstr "Vizualizare afiÅŸaj precedent"
-#: src/ui.cc:1331
+#: src/ui.cc:1478
msgid "^Close"
msgstr "ÃŽn^chide"
-#: src/ui.cc:1332
+#: src/ui.cc:1479
msgid "Close this display"
msgstr "ÃŽnchide acest afiÅŸaj"
-#: src/ui.cc:1337
+#: src/ui.cc:1484
msgid "New Package ^View"
msgstr "Nouă ^vizualizare pachet"
-#: src/ui.cc:1338
+#: src/ui.cc:1485
msgid "Create a new default package view"
msgstr "Crearea unei noi vizualizări de pachet implicite"
-#: src/ui.cc:1341
+#: src/ui.cc:1488
msgid "New Categorical ^Browser"
msgstr "Nouă răsfoire de categorii"
-#: src/ui.cc:1343
+#: src/ui.cc:1490
msgid "Browse packages by category"
msgstr "Răsfoieşte pachetele după categorie"
-#: src/ui.cc:1351
+#: src/ui.cc:1498
msgid "^About"
msgstr "Despre"
-#: src/ui.cc:1352
+#: src/ui.cc:1499
msgid "View information about this program"
msgstr "Vizualizare informaţii despre acest program"
-#: src/ui.cc:1355
+#: src/ui.cc:1502
msgid "^Help"
msgstr "Ajutor"
-#: src/ui.cc:1356
+#: src/ui.cc:1503
msgid "View the on-line help"
msgstr "Vizualizare ajutor în direct"
-#: src/ui.cc:1358
+#: src/ui.cc:1505
msgid "User's ^Manual"
msgstr "^Manual de utilizare"
-#: src/ui.cc:1359
+#: src/ui.cc:1506
msgid "View the detailed program manual"
msgstr "Vizualizarea manualului detaliat al programului"
-#: src/ui.cc:1362
+#: src/ui.cc:1509
msgid "^FAQ"
msgstr "Întrebări ^frecvente"
-#: src/ui.cc:1363
+#: src/ui.cc:1510
msgid "View a list of frequently asked questions"
msgstr "Vizualizare listă de întrebări frecvente"
-#: src/ui.cc:1366
-msgid "^ChangeLog"
-msgstr "Jurnal de modifi^cări"
+#: src/ui.cc:1513
+msgid "^NEWS"
+msgstr ""
-#: src/ui.cc:1367
-msgid "View the important changes made in each version of the program"
+#: src/ui.cc:1514
+#, fuzzy
+msgid "View the important changes made in each version of "
msgstr "Vedeţi schimbările importante făcute în fiecare versiune a programului"
-#: src/ui.cc:1370
+#: src/ui.cc:1517
msgid "^License"
msgstr "^Licenţă"
-#: src/ui.cc:1371
+#: src/ui.cc:1518
msgid "View the terms under which you may copy the program"
msgstr "Vedeţi condiţiile în care puteţi copia programul"
-#: src/ui.cc:1486
+#: src/ui.cc:1636
msgid "Actions"
msgstr "Acţiuni"
-#: src/ui.cc:1489
+#: src/ui.cc:1639
msgid "Search"
msgstr "Căutare"
-#: src/ui.cc:1490
+#: src/ui.cc:1640
msgid "Options"
msgstr "Opţiuni"
-#: src/ui.cc:1491
+#: src/ui.cc:1641
msgid "Views"
msgstr "Vizualizări"
-#: src/ui.cc:1492
+#: src/ui.cc:1642
msgid "Help"
msgstr "Ajutor"
-#: src/ui.cc:1537
+#: src/ui.cc:1699
#, c-format
msgid ""
"%s: Menu %s: Help %s: Quit %s: Update %s: Download/Install/Remove Pkgs"
@@ -4102,11 +4375,11 @@
"%s: Meniu %s: Ajutor %s: Ieşire %s: Actualizare %s: Descărcare/Instalare/"
"Åžtergere pachete"
-#: src/ui.cc:1799 src/vscreen/vscreen.cc:281
+#: src/ui.cc:1968 src/vscreen/vscreen.cc:281
msgid "yes_key"
msgstr "yes_key"
-#: src/ui.cc:1800 src/vscreen/vscreen.cc:282
+#: src/ui.cc:1969 src/vscreen/vscreen.cc:282
msgid "no_key"
msgstr "no_key"
@@ -4120,6 +4393,16 @@
msgid "Downloading Changelog"
msgstr "Descărcare registru de schimbări"
+#: src/view_changelog.cc:54
+#, fuzzy
+msgid "Download Changelog"
+msgstr "Descărcare registru de schimbări"
+
+#: src/view_changelog.cc:63
+#, c-format
+msgid "%s changes"
+msgstr ""
+
#: src/vscreen/vscreen.cc:119
#, c-format
msgid "Ouch! Got SIGTERM, dying..\n"
@@ -4147,3 +4430,36 @@
#: src/vscreen/vs_util.cc:175 src/vscreen/vs_util.cc:212
msgid "No"
msgstr "Nu"
+
+#~ msgid ""
+#~ "Some packages had unmet dependencies. This may mean that you have\n"
+#~ "requested an impossible situation or if you are using the unstable\n"
+#~ "distribution that some required packages have not yet been created\n"
+#~ "or been moved out of Incoming.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Unele pachete n-au îndeplinit dependenţele. Asta ar putea însemna că "
+#~ "aţi\n"
+#~ "cerut o situaţie imposibilă sau că folosiţi distribuţia instabilă\n"
+#~ "în care unele din pachetele necesare n-au fost create încă\n"
+#~ "sau au fost mutate din Incoming.\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Please insert the following disc into the drive \"%s\":\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Vă rog introduceţi următorul disc în unitatea \"%s\":\n"
+#~ "%s"
+
+#~ msgid "Invalid option for interactive mode: -s\n"
+#~ msgstr "Opţiune nevalidă pentru modul interactiv: -s\n"
+
+#~ msgid "Information about "
+#~ msgstr "Informaţii despre "
+
+#~ msgid "Some broken packages could not be fixed!"
+#~ msgstr "Unele pachete deteriorate nu pot fi reparate!"
+
+#~ msgid "^ChangeLog"
+#~ msgstr "Jurnal de modifi^cări"
Modified: branches/aptitude-0.3/aptitude/po/ru.po
==============================================================================
--- branches/aptitude-0.3/aptitude/po/ru.po (original)
+++ branches/aptitude-0.3/aptitude/po/ru.po Sat Apr 30 13:41:32 2005
@@ -14,7 +14,7 @@
msgstr ""
"Project-Id-Version: aptitude_ru\n"
"Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-01-10 16:26-0800\n"
+"POT-Creation-Date: 2005-04-29 18:11-0400\n"
"PO-Revision-Date: 2004-09-27 22:47+0200\n"
"Last-Translator: Yuriy Talakan' <yt at amur.elektra.ru>\n"
"Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
@@ -161,16 +161,103 @@
"ÐвтоматичеÑки удалÑÑ‚ÑŒ неиÑпользуемые пакеты, подходÑщие под Ñтот фильтр"
#: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:184 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
-#: src/vscreen/vs_util.cc:329
+#: src/ui.cc:218 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
+#: src/vscreen/vs_util.cc:328
msgid "Ok"
msgstr "Ok"
#: src/apt_options.cc:242 src/download_list.cc:71 src/mine/cmine.cc:257
-#: src/mine/cmine.cc:330 src/vscreen/vs_util.cc:329
+#: src/mine/cmine.cc:330 src/vscreen/vs_util.cc:328
msgid "Cancel"
msgstr "Отменить"
+#: src/broken_indicator.cc:106 src/solution_dialog.cc:97
+msgid "Internal error: unexpected null solution."
+msgstr ""
+
+#: src/broken_indicator.cc:158
+#, fuzzy
+msgid "Suggest "
+msgstr "ПредлагаютÑÑ"
+
+#: src/broken_indicator.cc:164
+#, fuzzy, c-format
+msgid "%d installs"
+msgstr "install"
+
+#: src/broken_indicator.cc:169
+#, fuzzy
+msgid "1 install"
+msgstr "install"
+
+#: src/broken_indicator.cc:173
+#, c-format
+msgid "%d removals"
+msgstr ""
+
+#: src/broken_indicator.cc:178
+msgid "1 removal"
+msgstr ""
+
+#: src/broken_indicator.cc:182
+#, c-format
+msgid "%d keeps"
+msgstr ""
+
+#: src/broken_indicator.cc:187
+msgid "1 keep"
+msgstr ""
+
+#: src/broken_indicator.cc:191
+#, fuzzy, c-format
+msgid "%d upgrades"
+msgstr "upgrade"
+
+#: src/broken_indicator.cc:196
+#, fuzzy
+msgid "1 upgrade"
+msgstr "upgrade"
+
+#: src/broken_indicator.cc:200
+#, fuzzy, c-format
+msgid "%d downgrades"
+msgstr "заменено на более Ñтарые"
+
+#: src/broken_indicator.cc:205
+#, fuzzy
+msgid "1 downgrade"
+msgstr "заменено на более Ñтарые"
+
+#: src/broken_indicator.cc:214
+#, c-format
+msgid "%s: Examine"
+msgstr ""
+
+#: src/broken_indicator.cc:216
+#, c-format
+msgid "%s: Apply"
+msgstr ""
+
+#: src/broken_indicator.cc:218
+#, fuzzy, c-format
+msgid "%s: Next"
+msgstr "^Следующее"
+
+#: src/broken_indicator.cc:220
+#, c-format
+msgid "%s: Previous"
+msgstr ""
+
+#: src/broken_indicator.cc:233
+#, c-format
+msgid "%CSolution search failed. %s: try harder"
+msgstr ""
+
+#: src/broken_indicator.cc:239
+#, c-format
+msgid "%CUnable to resolve dependencies."
+msgstr ""
+
#: src/cmdline/cmdline_action.cc:36
#, c-format
msgid ""
@@ -242,22 +329,22 @@
msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
msgstr "Пакет %s не обновлÑемый, поÑтому Ð½ÐµÐ»ÑŒÐ·Ñ Ð·Ð°Ð¿Ñ€ÐµÑ‚Ð¸Ñ‚ÑŒ его обновление\n"
-#: src/cmdline/cmdline_action.cc:213
+#: src/cmdline/cmdline_action.cc:198
#, c-format
msgid "Note: selecting the task \"%s: %s\" for installation\n"
msgstr "Замечание: выбрана задача \"%s: %s\" Ð´Ð»Ñ ÑƒÑтановки\n"
-#: src/cmdline/cmdline_action.cc:240
+#: src/cmdline/cmdline_action.cc:225
#, c-format
msgid "You can only specify a package version with an 'install' command.\n"
msgstr "Ð’Ñ‹ можете указать верÑию пакета только в команде 'install'.\n"
-#: src/cmdline/cmdline_action.cc:246
+#: src/cmdline/cmdline_action.cc:231
#, c-format
msgid "You can only specify a package archive with an 'install' command.\n"
msgstr "Вы можете указать архив пакета только в команде 'install'.\n"
-#: src/cmdline/cmdline_action.cc:280
+#: src/cmdline/cmdline_action.cc:265
#, c-format
msgid ""
"Couldn't find package \"%s\", and more than 40\n"
@@ -266,7 +353,7 @@
"Ðе удалоÑÑŒ найти пакет \"%s\", и более чем 40\n"
"пакетов Ñодержат \"%s\" в Ñвоём имени.\n"
-#: src/cmdline/cmdline_action.cc:283
+#: src/cmdline/cmdline_action.cc:268
#, c-format
msgid ""
"Couldn't find package \"%s\". However, the following\n"
@@ -275,13 +362,13 @@
"Ðе удалоÑÑŒ найти пакет \"%s\". Однако, Ñледующие\n"
"пакеты Ñодержат \"%s\" в Ñвоём имени:\n"
-#: src/cmdline/cmdline_action.cc:307
+#: src/cmdline/cmdline_action.cc:292
#, c-format
msgid "Couldn't find any package whose name or description matched \"%s\"\n"
msgstr ""
"Ðе удалоÑÑŒ найти пакеты, Ñодержащих \"%s\" в Ñвоём имени или опиÑании\n"
-#: src/cmdline/cmdline_action.cc:309
+#: src/cmdline/cmdline_action.cc:294
#, c-format
msgid ""
"Couldn't find any package matching \"%s\", and more than 40\n"
@@ -290,7 +377,7 @@
"Ðе удалоÑÑŒ найти пакет имеющий \"%s\", и более чем 40\n"
"пакетов Ñодержат \"%s\" в Ñвоём опиÑании.\n"
-#: src/cmdline/cmdline_action.cc:312
+#: src/cmdline/cmdline_action.cc:297
#, c-format
msgid ""
"Couldn't find any package matching \"%s\". However, the following\n"
@@ -335,13 +422,13 @@
msgid "Freed %sB of disk space\n"
msgstr "Будет оÑвобождено %sБ диÑкового проÑтранÑтва"
-#: src/cmdline/cmdline_do_action.cc:67
+#: src/cmdline/cmdline_do_action.cc:71
#, c-format
msgid "Invalid operation %s"
msgstr "ÐÐµÐ²ÐµÑ€Ð½Ð°Ñ Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ñ %s"
-#: src/cmdline/cmdline_do_action.cc:206 src/cmdline/cmdline_simulate.cc:30
-#: src/cmdline/cmdline_upgrade.cc:89
+#: src/cmdline/cmdline_do_action.cc:201 src/cmdline/cmdline_simulate.cc:31
+#: src/cmdline/cmdline_upgrade.cc:91
#, c-format
msgid "Abort.\n"
msgstr "Прервать.\n"
@@ -351,7 +438,7 @@
msgid "download: you must specify at least one package to download\n"
msgstr "загрузка: вы должны указать Ñ…Ð¾Ñ‚Ñ Ð±Ñ‹ один пакет Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸\n"
-#: src/cmdline/cmdline_download.cc:43 src/download.cc:342
+#: src/cmdline/cmdline_download.cc:43 src/download.cc:344
msgid "Couldn't read source list"
msgstr "Ðе удалоÑÑŒ прочитать файл sources.list"
@@ -415,97 +502,97 @@
msgid "What is it? It's an elephant being eaten by a snake, of course.\n"
msgstr "Что Ñто? Ðто Ñлон, которого проглотила змеÑ, конечно.\n"
-#: src/cmdline/cmdline_prompt.cc:44
+#: src/cmdline/cmdline_prompt.cc:45
msgid "Couldn't read list of sources"
msgstr "Ðе удалоÑÑŒ прочеÑÑ‚ÑŒ ÑпиÑок иÑточников"
-#: src/cmdline/cmdline_prompt.cc:219 src/cmdline/cmdline_show_broken.cc:73
+#: src/cmdline/cmdline_prompt.cc:220 src/cmdline/cmdline_show_broken.cc:73
#, c-format
msgid "but %s is to be installed."
msgstr "но уÑтанавливаетÑÑ %s."
-#: src/cmdline/cmdline_prompt.cc:222 src/cmdline/cmdline_show_broken.cc:76
+#: src/cmdline/cmdline_prompt.cc:223 src/cmdline/cmdline_show_broken.cc:76
#, c-format
msgid "but %s is installed and it is kept back."
msgstr "но уÑтановлен %s и удерживаетÑÑ."
-#: src/cmdline/cmdline_prompt.cc:225 src/cmdline/cmdline_show_broken.cc:79
+#: src/cmdline/cmdline_prompt.cc:226 src/cmdline/cmdline_show_broken.cc:79
#, c-format
msgid "but %s is installed."
msgstr "но уÑтановлен %s "
-#: src/cmdline/cmdline_prompt.cc:229 src/cmdline/cmdline_show_broken.cc:83
+#: src/cmdline/cmdline_prompt.cc:230 src/cmdline/cmdline_show_broken.cc:83
#, c-format
msgid "but it is not installable"
msgstr "но его невозможно уÑтановить"
-#: src/cmdline/cmdline_prompt.cc:233 src/cmdline/cmdline_show_broken.cc:87
+#: src/cmdline/cmdline_prompt.cc:234 src/cmdline/cmdline_show_broken.cc:87
#, c-format
msgid " which is a virtual package."
msgstr " который ÑвлÑетÑÑ Ð²Ð¸Ñ€Ñ‚ÑƒÐ°Ð»ÑŒÐ½Ñ‹Ð¼ пакетом."
-#: src/cmdline/cmdline_prompt.cc:236 src/cmdline/cmdline_show_broken.cc:90
+#: src/cmdline/cmdline_prompt.cc:237 src/cmdline/cmdline_show_broken.cc:90
#, c-format
msgid " or"
msgstr " или"
-#: src/cmdline/cmdline_prompt.cc:248
+#: src/cmdline/cmdline_prompt.cc:249
msgid "The following packages are BROKEN:"
msgstr "Следующие пакеты ÐЕРÐБОТОСПОСОБÐЫ:"
-#: src/cmdline/cmdline_prompt.cc:249
+#: src/cmdline/cmdline_prompt.cc:250
msgid "The following packages are unused and will be REMOVED:"
msgstr " Следующие пакеты не иÑпользуютÑÑ Ð¸ будут УДÐЛЕÐЫ:"
-#: src/cmdline/cmdline_prompt.cc:250
+#: src/cmdline/cmdline_prompt.cc:251
msgid "The following packages have been automatically kept back:"
msgstr "Следующие пакеты будут автоматичеÑки удержаны:"
-#: src/cmdline/cmdline_prompt.cc:251
+#: src/cmdline/cmdline_prompt.cc:252
msgid "The following NEW packages will be automatically installed:"
msgstr "Следующие ÐОВЫЕ пакеты будут автоматичеÑки уÑтановлены:"
-#: src/cmdline/cmdline_prompt.cc:252
+#: src/cmdline/cmdline_prompt.cc:253
msgid "The following packages will be automatically REMOVED:"
msgstr "Следующие пакеты будут автоматичеÑки УДÐЛЕÐЫ:"
-#: src/cmdline/cmdline_prompt.cc:253
+#: src/cmdline/cmdline_prompt.cc:254
msgid "The following packages will be DOWNGRADED:"
msgstr "Следующие пакеты будут ЗÐМЕÐЕÐЫ ÐРБОЛЕЕ СТÐРЫЕ:"
-#: src/cmdline/cmdline_prompt.cc:254
+#: src/cmdline/cmdline_prompt.cc:255
msgid "The following packages have been kept back:"
msgstr "Следующие пакеты оÑтавлены не обновлёнными:"
-#: src/cmdline/cmdline_prompt.cc:255
+#: src/cmdline/cmdline_prompt.cc:256
msgid "The following packages will be REINSTALLED:"
msgstr "Следующие пакеты будут ПЕРЕУСТÐÐОВЛЕÐЫ:"
-#: src/cmdline/cmdline_prompt.cc:256
+#: src/cmdline/cmdline_prompt.cc:257
msgid "The following NEW packages will be installed:"
msgstr "Следующие ÐОВЫЕ пакеты будут уÑтановлены:"
-#: src/cmdline/cmdline_prompt.cc:257
+#: src/cmdline/cmdline_prompt.cc:258
msgid "The following packages will be REMOVED:"
msgstr "Следующие пакеты будут УДÐЛЕÐЫ:"
-#: src/cmdline/cmdline_prompt.cc:258
+#: src/cmdline/cmdline_prompt.cc:259
msgid "The following packages will be upgraded:"
msgstr "Следующие пакеты будут обновлены:"
-#: src/cmdline/cmdline_prompt.cc:307
+#: src/cmdline/cmdline_prompt.cc:311
#, c-format
msgid "The following ESSENTIAL packages will be REMOVED!\n"
msgstr "Следующие пакеты ПЕРВОЙ ÐЕОБХОДИМОСТИ будут УДÐЛЕÐЫ!\n"
-#: src/cmdline/cmdline_prompt.cc:316
+#: src/cmdline/cmdline_prompt.cc:320
#, c-format
msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
msgstr ""
"Следующие пакеты ПЕРВОЙ ÐЕОБХОДИМОСТИ Ñтанут ÐЕРÐБОТОСПОСОБÐЫ из-за Ñтого "
"дейÑтвиÑ:\n"
-#: src/cmdline/cmdline_prompt.cc:326
+#: src/cmdline/cmdline_prompt.cc:330
#, c-format
msgid ""
"WARNING: Performing this action will probably cause your system to break!\n"
@@ -514,98 +601,101 @@
"ПРЕДУПРЕЖДЕÐИЕ: Выполнение Ñтого дейÑÑ‚Ð²Ð¸Ñ Ð²ÐµÑ€Ð¾Ñтно иÑпортит вашу ÑиÑтему!\n"
" ОÑтановитеÑÑŒ, еÑли ТОЧÐО не знаете, что делаете!\n"
-#: src/cmdline/cmdline_prompt.cc:328
+#: src/cmdline/cmdline_prompt.cc:332
msgid "I am aware that this is a very bad idea"
msgstr "Я знаю, что Ñто очень Ð¿Ð»Ð¾Ñ…Ð°Ñ Ð¸Ð´ÐµÑ"
-#: src/cmdline/cmdline_prompt.cc:331
+#: src/cmdline/cmdline_prompt.cc:335
#, c-format
msgid "To continue, type the phrase \"%s\":\n"
msgstr "Чтобы продолжить, наберите фразу \"%s\":\n"
-#: src/cmdline/cmdline_prompt.cc:434
+#: src/cmdline/cmdline_prompt.cc:438
#, c-format
msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
msgstr ""
"РЕКОМЕÐДУЮТСЯ Ñледующие пакеты, но автоматичеÑки они уÑтановлены ÐЕ БУДУТ:\n"
-#: src/cmdline/cmdline_prompt.cc:440
+#: src/cmdline/cmdline_prompt.cc:444
#, c-format
msgid "The following packages are SUGGESTED but will NOT be installed:\n"
msgstr ""
"ПРЕДЛÐГÐЮТСЯ Ñледующие пакеты, но автоматичеÑки они уÑтановлены ÐЕ БУДУТ:\n"
-#: src/cmdline/cmdline_prompt.cc:445
+#: src/cmdline/cmdline_prompt.cc:449
#, c-format
msgid "No packages will be installed, upgraded, or removed.\n"
msgstr "Ðи одного пакета не будет уÑтановлено, обновлено или удалено.\n"
-#: src/cmdline/cmdline_prompt.cc:447
+#: src/cmdline/cmdline_prompt.cc:451
#, c-format
msgid "%lu packages upgraded, %lu newly installed, "
msgstr "%lu пакетов обновлено, %lu уÑтановлено новых, "
-#: src/cmdline/cmdline_prompt.cc:451
+#: src/cmdline/cmdline_prompt.cc:455
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu переуÑтановлено, "
-#: src/cmdline/cmdline_prompt.cc:453
+#: src/cmdline/cmdline_prompt.cc:457
#, c-format
msgid "%lu downgraded, "
msgstr "%lu пакетов заменены на Ñтарые верÑии, "
-#: src/cmdline/cmdline_prompt.cc:455
+#: src/cmdline/cmdline_prompt.cc:459
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu пакетов отмечено Ð´Ð»Ñ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ, и %lu пакетов не обновлено.\n"
-#: src/cmdline/cmdline_prompt.cc:462
+#: src/cmdline/cmdline_prompt.cc:466
#, c-format
msgid "Need to get %sB/%sB of archives. "
msgstr "Ðеобходимо получить %sB/%sB архивов. "
-#: src/cmdline/cmdline_prompt.cc:465
+#: src/cmdline/cmdline_prompt.cc:469
#, c-format
msgid "Need to get %sB of archives. "
msgstr "Ðеобходимо получить %sB архивов. "
-#: src/cmdline/cmdline_prompt.cc:472
+#: src/cmdline/cmdline_prompt.cc:476
#, c-format
msgid "After unpacking %sB will be used.\n"
msgstr "ПоÑле раÑпаковки %sB будет занÑто.\n"
-#: src/cmdline/cmdline_prompt.cc:475
+#: src/cmdline/cmdline_prompt.cc:479
#, c-format
msgid "After unpacking %sB will be freed.\n"
msgstr "ПоÑле раÑпаковки оÑвободитÑÑ %sB.\n"
-#: src/cmdline/cmdline_prompt.cc:521
+#: src/cmdline/cmdline_prompt.cc:524
#, c-format
msgid "Bad action character '%c'\n"
msgstr "Ðеверный Ñимвол '%c' Ð´Ð»Ñ Ð²Ñ‹Ð±Ð¾Ñ€Ð° дейÑтвиÑ\n"
-#: src/cmdline/cmdline_prompt.cc:596
+#: src/cmdline/cmdline_prompt.cc:595
#, c-format
msgid "No packages to show -- enter the package names on the line after 'i'.\n"
msgstr "Ðет пакетов Ð´Ð»Ñ Ð¿Ð¾ÐºÐ°Ð·Ð° -- введите имена пакетов в Ñтроке поÑле 'i'.\n"
-#: src/cmdline/cmdline_prompt.cc:598 src/cmdline/cmdline_prompt.cc:629
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:597
msgid "Press Return to continue."
msgstr "Ðажмите Ввод Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ñ."
-#: src/cmdline/cmdline_prompt.cc:625
+#: src/cmdline/cmdline_prompt.cc:623
#, c-format
msgid "No packages found -- enter the package names on the line after 'c'.\n"
msgstr "Пакеты не найдены -- введите имена пакетов в Ñтроке поÑле 'c'.\n"
-#: src/cmdline/cmdline_prompt.cc:665
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:627
+#, fuzzy
+msgid "Press Return to continue"
+msgstr "Ðажмите Ввод Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ñ."
+
+#: src/cmdline/cmdline_prompt.cc:675
msgid "Do you want to continue? [Y/n/?] "
msgstr "Хотите продолжить? [Y/n/?] "
-#: src/cmdline/cmdline_prompt.cc:690
+#: src/cmdline/cmdline_prompt.cc:700
#, c-format
msgid ""
"\n"
@@ -616,7 +706,7 @@
"Будет отображатьÑÑ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ завиÑимоÑÑ‚ÑÑ….\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:692
+#: src/cmdline/cmdline_prompt.cc:702
#, c-format
msgid ""
"\n"
@@ -627,7 +717,7 @@
"Ðе будет отображатьÑÑ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ завиÑимоÑÑ‚ÑÑ….\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:698
+#: src/cmdline/cmdline_prompt.cc:708
#, c-format
msgid ""
"\n"
@@ -638,7 +728,7 @@
"Будет отображатьÑÑ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ верÑиÑÑ….\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:700
+#: src/cmdline/cmdline_prompt.cc:710
#, c-format
msgid ""
"\n"
@@ -649,7 +739,7 @@
"Ðе будет отображатьÑÑ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ верÑиÑÑ….\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:705
+#: src/cmdline/cmdline_prompt.cc:715
#, c-format
msgid ""
"\n"
@@ -660,7 +750,7 @@
"Будет отображатьÑÑ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾Ð± изменении размеров.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:717
#, c-format
msgid ""
"\n"
@@ -671,7 +761,7 @@
"Ðе будет отображатьÑÑ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾Ð± изменении размеров.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:737
#, c-format
msgid ""
"Commands:\n"
@@ -721,32 +811,83 @@
" _ : ВычиÑтить\n"
" = : ЗафикÑировать\n"
-#: src/cmdline/cmdline_prompt.cc:751
+#: src/cmdline/cmdline_prompt.cc:761
#, c-format
msgid "Invalid response. Please enter a valid command or '?' for help.\n"
msgstr "Ðеверный ответ. Введите допуÑтимую команду или '?' Ð´Ð»Ñ Ñправки.\n"
+#: src/cmdline/cmdline_resolver.cc:84
+#, c-format
+msgid "y: %F%nn: %F%nq: %F%n,: %F%n.: %F%n"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:90
+msgid "accept the proposed changes"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:92
+msgid "reject the proposed changes and search for another solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:94
+#, fuzzy
+msgid "give up and quit the program"
+msgstr "Завершить работу программы"
+
+#: src/cmdline/cmdline_resolver.cc:96
+msgid "move to the next solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:98
+msgid "move to the previous solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:131
+#, fuzzy
+msgid "The following actions will resolve these dependencies:"
+msgstr "Следующие пакеты имеют неудовлетворённые завиÑимоÑти:\n"
+
+#: src/cmdline/cmdline_resolver.cc:146
+msgid "Accept this solution? [Y/n/q/?]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:174
+msgid "Abandoning all efforts to resolve these dependencies."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:184
+#, fuzzy
+msgid "The following commands are available:"
+msgstr "Следующие пакеты ÐЕРÐБОТОСПОСОБÐЫ:"
+
+#: src/cmdline/cmdline_resolver.cc:188
+#, fuzzy
+msgid "Invalid response; please enter one of the following commands:"
+msgstr "Ðеверный ответ. Введите допуÑтимую команду или '?' Ð´Ð»Ñ Ñправки.\n"
+
+#: src/cmdline/cmdline_resolver.cc:198
+msgid "No solution found within the allotted time. Try harder? [Y/n]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:226
+#, fuzzy
+msgid "Invalid response; please enter 'y' or 'n'."
+msgstr "Ðеверный ответ. Введите допуÑтимую команду или '?' Ð´Ð»Ñ Ñправки.\n"
+
+#: src/cmdline/cmdline_resolver.cc:235
+msgid "Unable to resolve dependencies! Giving up..."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:240
+msgid "No more solutions."
+msgstr ""
+
#: src/cmdline/cmdline_search.cc:78
#, c-format
msgid "search: You must provide at least one search term\n"
msgstr "поиÑк: Ð’Ñ‹ должны ввеÑти Ñ…Ð¾Ñ‚Ñ Ð±Ñ‹ одно Ñлово\n"
-#: src/cmdline/cmdline_show_broken.cc:114
-#, c-format
-msgid ""
-"Some packages had unmet dependencies. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming.\n"
-"\n"
-msgstr ""
-"Ðекоторые пакеты имеют неудовлетворённые завиÑимоÑти. Ðто может\n"
-"означать, что вы запроÑили невозможного или, еÑли вы иÑпользуете\n"
-"диÑтрибутив unstable, что требуемые пакеты ещё не Ñозданы или не\n"
-"были помещены в Incoming.\n"
-"\n"
-
-#: src/cmdline/cmdline_show_broken.cc:115
+#: src/cmdline/cmdline_show_broken.cc:113
#, c-format
msgid "The following packages have unmet dependencies:\n"
msgstr "Следующие пакеты имеют неудовлетворённые завиÑимоÑти:\n"
@@ -944,12 +1085,12 @@
msgid "Description: "
msgstr "ОпиÑание: "
-#: src/cmdline/cmdline_simulate.cc:36
+#: src/cmdline/cmdline_simulate.cc:37
#, c-format
msgid "Would download/install/remove packages.\n"
msgstr "Загрузить/уÑтановить/удалить пакеты.\n"
-#: src/cmdline/cmdline_simulate.cc:47
+#: src/cmdline/cmdline_simulate.cc:48
msgid "Internal Error, Ordering didn't finish"
msgstr "ВнутреннÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ°, УпорÑдочивание не закончено"
@@ -991,28 +1132,24 @@
msgid "UNAVAILABLE"
msgstr "ÐЕДОСТУПÐО"
-#: src/download_bar.cc:57 src/download_list.cc:265
+#: src/download_bar.cc:56 src/download_list.cc:263 src/download_screen.cc:57
#, c-format
-msgid ""
-"Please insert the following disc into the drive \"%s\":\n"
-"%s"
-msgstr ""
-"Ð’Ñтавьте Ñледующий диÑк в привод \"%s\":\n"
-"%s"
+msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
+msgstr "Ð’Ñтавьте диÑк, помеченный как \"%s\" в привод \"%s\""
-#: src/download_bar.cc:76 src/generic/acqprogress.cc:63
+#: src/download_bar.cc:77 src/generic/acqprogress.cc:63
msgid "Hit "
msgstr "Попадание"
-#: src/download_bar.cc:89
+#: src/download_bar.cc:90
msgid "Downloading "
msgstr "Загрузка"
-#: src/download_bar.cc:102
+#: src/download_bar.cc:103
msgid "Got "
msgstr "Получен "
-#: src/download_bar.cc:156
+#: src/download_bar.cc:157
msgid "Downloading..."
msgstr "Загрузка..."
@@ -1020,7 +1157,7 @@
msgid "Couldn't read list of package sources"
msgstr "Ðе удалоÑÑŒ прочитать ÑпиÑок иÑточников пакетов"
-#: src/download.cc:104 src/download.cc:321
+#: src/download.cc:104 src/download.cc:322
msgid "Couldn't lock list directory..are you root?"
msgstr "Ðе удалоÑÑŒ заблокировать каталог lists. Ð’Ñ‹ Ñуперпользователь?"
@@ -1032,29 +1169,33 @@
msgid "View the progress of the package list update"
msgstr "Показывать ход Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ ÑпиÑка пакетов"
-#: src/download.cc:159
+#: src/download.cc:113
+msgid "List Update"
+msgstr ""
+
+#: src/download.cc:160
msgid "Couldn't clean out list directories"
msgstr "Ðе удалоÑÑŒ очиÑтить каталог list"
-#: src/download.cc:176 src/ui.cc:1068
+#: src/download.cc:177 src/ui.cc:1152
msgid "Deleting obsolete downloaded files"
msgstr "Удаление уÑтаревших загруженных файлов"
-#: src/download.cc:181
+#: src/download.cc:182
#, c-format
msgid "Deleting obsolete downloaded files\n"
msgstr "Удаление уÑтаревших загруженных файлов\n"
-#: src/download.cc:223
+#: src/download.cc:224
#, c-format
msgid "Unable to open %s to log actions"
msgstr "Ðе удаётÑÑ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚ÑŒ %s Ð´Ð»Ñ Ð¿Ñ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð´ÐµÐ¹Ñтвий"
-#: src/download.cc:229
+#: src/download.cc:230
msgid "log report"
msgstr "журнал отчёта"
-#: src/download.cc:230
+#: src/download.cc:231
#, c-format
msgid ""
"IMPORTANT: this log only lists intended actions; actions which fail due to\n"
@@ -1066,77 +1207,77 @@
"незавершёнными\n"
"\n"
-#: src/download.cc:231
+#: src/download.cc:232
#, c-format
msgid "Will install %li packages, and remove %li packages.\n"
msgstr "Будет уÑтановлено %li пакетов, и %li пакетов будет удалено.\n"
-#: src/download.cc:233
+#: src/download.cc:234
#, c-format
msgid "%sB of disk space will be used\n"
msgstr "%sB диÑкового проÑтранÑтва будет иÑпользовано\n"
-#: src/download.cc:236
+#: src/download.cc:237
#, c-format
msgid "%sB bytes of disk space will be freed\n"
msgstr "%sB байт диÑкового проÑтранÑтва будет оÑвобождено\n"
-#: src/download.cc:244
+#: src/download.cc:245
#, c-format
msgid "[UPGRADE] %s %s -> %s\n"
msgstr "[ОБÐОВЛЕÐИЕ] %s %s -> %s\n"
-#: src/download.cc:248
+#: src/download.cc:249
#, c-format
msgid "[DOWNGRADE] %s %s -> %s\n"
msgstr "[ЗÐМЕÐÐ ÐРСТÐРЫЕ] %s %s -> %s\n"
-#: src/download.cc:258
+#: src/download.cc:259
msgid "REMOVE"
msgstr "УДÐЛИТЬ"
-#: src/download.cc:264
+#: src/download.cc:265
msgid "INSTALL"
msgstr "УСТÐÐОВИТЬ"
-#: src/download.cc:267
+#: src/download.cc:268
msgid "REINSTALL"
msgstr "ПЕРЕУСТÐÐОВИТЬ"
-#: src/download.cc:270
+#: src/download.cc:271
msgid "HOLD"
msgstr "ФИКСИРОВÐТЬ"
-#: src/download.cc:273
+#: src/download.cc:274
msgid "BROKEN"
msgstr "ÐЕРÐБОТОСПОСОБÐЫ"
-#: src/download.cc:276
+#: src/download.cc:277
msgid "REMOVE, NOT USED"
msgstr "УДÐЛИТЬ, ÐЕ ИСПОЛЬЗОВÐТЬ"
-#: src/download.cc:279
+#: src/download.cc:280
msgid "REMOVE, DEPENDENCIES"
msgstr "УДÐЛИТЬ, ЗÐВИСИМОСТИ"
-#: src/download.cc:282
+#: src/download.cc:283
msgid "INSTALL, DEPENDENCIES"
msgstr "УСТÐÐОВИТЬ, ЗÐВИСИМОСТИ"
-#: src/download.cc:285
+#: src/download.cc:286
msgid "HOLD, DEPENDENCIES"
msgstr "ФИКСИРОВÐТЬ, ЗÐВИСИМОСТИ"
-#: src/download.cc:287
+#: src/download.cc:288
msgid "????????"
msgstr "????????"
-#: src/download.cc:291
+#: src/download.cc:292
#, c-format
msgid "[%s] %s\n"
msgstr "[%s] %s\n"
-#: src/download.cc:294
+#: src/download.cc:295
#, c-format
msgid ""
"===============================================================================\n"
@@ -1147,34 +1288,39 @@
"\n"
"Конец журнала.\n"
-#: src/download.cc:329
+#: src/download.cc:330
msgid "Downloading packages"
msgstr "Загрузка пакетов"
-#: src/download.cc:330
+#: src/download.cc:331
msgid "View the progress of the package download"
msgstr "Показывать ход загрузки пакетов"
-#: src/download.cc:352
+#: src/download.cc:332
+#, fuzzy
+msgid "Package Download"
+msgstr "Пакет: "
+
+#: src/download.cc:354
msgid "Internal error: couldn't generate list of packages to download"
msgstr ""
"ВнутреннÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ°: не удалоÑÑŒ Ñгенерировать ÑпиÑок пакетов Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸"
-#: src/download.cc:413
+#: src/download.cc:415
msgid "Unable to correct for unavailable packages"
msgstr "Ðе удаётÑÑ Ñкорректировать недоÑтупноÑÑ‚ÑŒ пакетов"
-#: src/download.cc:465
+#: src/download.cc:467
msgid ""
"Ack! Something bad happened while installing packages. Trying to recover:"
msgstr ""
"Что-то плохое ÑлучилоÑÑŒ во Ð²Ñ€ÐµÐ¼Ñ ÑƒÑтановки пакетов. Попытка воÑÑтановить:"
-#: src/download.cc:475 src/pkg_item.cc:413
+#: src/download.cc:477 src/pkg_item.cc:432
msgid "Press return to continue.\n"
msgstr "Ðажмите Ввод Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ñ.\n"
-#: src/download.cc:506
+#: src/download.cc:508
msgid ""
"Could not regain the system lock! (Perhaps another apt or dpkg is running?)"
msgstr ""
@@ -1236,11 +1382,6 @@
msgid "[ERROR]"
msgstr "[ОШИБКÐ]"
-#: src/download_screen.cc:57
-#, c-format
-msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
-msgstr "Ð’Ñтавьте диÑк, помеченный как \"%s\" в привод \"%s\""
-
#: src/download_screen.cc:181
#, c-format
msgid "Downloaded %sB in %ss (%sB/s)."
@@ -1280,117 +1421,117 @@
"Смена ноÑителÑ: вÑтавьте диÑк, помеченный как '%s' в привод '%s' и нажмите "
"ввод\n"
-#: src/generic/aptcache.cc:245
+#: src/generic/aptcache.cc:253
msgid "Can't open Aptitude extended state file"
msgstr "Ðе удаётÑÑ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚ÑŒ файл раÑширенных ÑоÑтоÑний Aptitude"
-#: src/generic/aptcache.cc:252 src/generic/aptcache.cc:305
-#: src/generic/aptcache.cc:307
+#: src/generic/aptcache.cc:260 src/generic/aptcache.cc:313
+#: src/generic/aptcache.cc:315
msgid "Reading extended state information"
msgstr "Чтение информации о раÑширенных ÑоÑтоÑниÑÑ…"
-#: src/generic/aptcache.cc:313 src/generic/aptcache.cc:387
-#: src/generic/aptcache.cc:390
+#: src/generic/aptcache.cc:321 src/generic/aptcache.cc:395
+#: src/generic/aptcache.cc:398
msgid "Initializing package states"
msgstr "Ð˜Ð½Ð¸Ñ†Ð¸Ð°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ñ ÑоÑтоÑний пакетов"
-#: src/generic/aptcache.cc:501
+#: src/generic/aptcache.cc:509
msgid "Cannot open Aptitude state file"
msgstr "Ðе удаётÑÑ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚ÑŒ файл ÑоÑтоÑний Aptitude"
-#: src/generic/aptcache.cc:505 src/generic/aptcache.cc:560
-#: src/generic/aptcache.cc:563
+#: src/generic/aptcache.cc:513 src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:571
msgid "Writing extended state information"
msgstr "ЗапиÑÑŒ информации раÑширенных ÑоÑтоÑний"
-#: src/generic/aptcache.cc:542
+#: src/generic/aptcache.cc:550
#, c-format
msgid "Internal buffer overflow on package \"%s\" while writing state file"
msgstr ""
"Внутреннее переполнение буфера на пакете \"%s\" во Ð²Ñ€ÐµÐ¼Ñ Ð·Ð°Ð¿Ð¸Ñи файла "
"ÑоÑтоÑний"
-#: src/generic/aptcache.cc:551
+#: src/generic/aptcache.cc:559
msgid "Couldn't write state file"
msgstr "Ðе удалоÑÑŒ запиÑать файл ÑоÑтоÑний"
-#: src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:576
msgid "Error writing state file"
msgstr "Ошибка запиÑи файла ÑоÑтоÑний"
-#: src/generic/aptcache.cc:584
+#: src/generic/aptcache.cc:592
msgid "couldn't replace old state file"
msgstr "не удалоÑÑŒ заменить Ñтарый файл ÑоÑтоÑний"
-#: src/generic/aptcache.cc:960
+#: src/generic/aptcache.cc:1000
msgid "Unable to correct dependencies, some packages cannot be installed"
msgstr ""
"Ðе удаётÑÑ Ð¾Ñ‚ÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ завиÑимоÑти; некоторые пакеты не могут быть "
"уÑтановлены"
-#: src/generic/aptcache.cc:1325
+#: src/generic/aptcache.cc:1546
msgid "The list of sources could not be read."
msgstr "Ðе удалоÑÑŒ прочитать sources.list"
-#: src/generic/aptcache.cc:1332
+#: src/generic/aptcache.cc:1553
msgid "The package lists or status file could not be parsed or opened."
msgstr "Ðе удалоÑÑŒ обработать или открыть ÑпиÑок пакетов или файл ÑоÑтоÑний."
-#: src/generic/aptcache.cc:1335
+#: src/generic/aptcache.cc:1556
msgid "You may want to update the package lists to correct these missing files"
msgstr ""
"Возможно, вы захотите обновить ÑпиÑок пакетов, чтобы не было Ñтих "
"пропущенных файлов"
-#: src/generic/apt.cc:141
+#: src/generic/apt.cc:142
#, c-format
msgid "Unable to open %s for writing"
msgstr "Ðе удаётÑÑ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚ÑŒ %s Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи"
-#: src/generic/apt.cc:151
+#: src/generic/apt.cc:152
#, c-format
msgid "Unable to replace %s with new configuration file"
msgstr "Ðе удаётÑÑ Ð·Ð°Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ %s новым конфигурационным файлом"
-#: src/generic/apt.cc:226
+#: src/generic/apt.cc:227
msgid "Warning: could not lock the cache file. Opening in read-only mode"
msgstr ""
"Предупреждение: не удалоÑÑŒ заблокировать файл кÑша. Открытие в режиме только "
"Ð´Ð»Ñ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ"
-#: src/generic/matchers.cc:780
+#: src/generic/matchers.cc:797
msgid "Unmatched '('"
msgstr "ÐеÑовпападющее '('"
-#: src/generic/matchers.cc:870 src/generic/matchers.cc:949
+#: src/generic/matchers.cc:887 src/generic/matchers.cc:968
#, c-format
msgid "Unknown dependency type: %s"
msgstr "ÐеизвеÑтный тип завиÑимоÑти: %s"
-#: src/generic/matchers.cc:931
+#: src/generic/matchers.cc:950
#, c-format
msgid "Unknown action type: %s"
msgstr "ÐеизвеÑтный тип дейÑтвиÑ: %s"
-#: src/generic/matchers.cc:998
+#: src/generic/matchers.cc:1017
#, c-format
msgid "Unknown priority %s"
msgstr "ÐеизвеÑтный приоритет: %s"
-#: src/generic/matchers.cc:1020
+#: src/generic/matchers.cc:1039
#, c-format
msgid "Unknown pattern type: %c"
msgstr "ÐеизвеÑтный тип шаблона: %c"
-#: src/generic/matchers.cc:1065
+#: src/generic/matchers.cc:1084
msgid "Unexpected empty expression"
msgstr "Ðеожиданное пуÑтое выражение"
-#: src/generic/matchers.cc:1100
+#: src/generic/matchers.cc:1119
msgid "Badly formed expression"
msgstr "Ðеправильно оформленное выражение"
-#: src/generic/matchers.cc:1129
+#: src/generic/matchers.cc:1148
msgid "Unexpected ')'"
msgstr "Ðеожиданное ')'"
@@ -1413,7 +1554,7 @@
msgid "Can't get value of $HOME, using TMPDIR (insecure)"
msgstr "Ðе удаётÑÑ Ð¿Ð¾Ð»ÑƒÑ‡Ð¸Ñ‚ÑŒ значение $HOME, иÑпользуетÑÑ TMPDIR (небезопаÑно)"
-#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:60
+#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:61
#, c-format
msgid "ChangeLog of %s"
msgstr "ChangeLog Ð´Ð»Ñ %s"
@@ -1617,17 +1758,17 @@
msgid "Invalid sorting policy type '%s'"
msgstr "Ðеверный тип Ñортирующего правила '%s'"
-#: src/main.cc:68
+#: src/main.cc:67
#, c-format
msgid "%s %s compiled at %s %s\n"
msgstr "%s %s Ñкомпилировано в %s %s\n"
-#: src/main.cc:71
+#: src/main.cc:70
#, c-format
msgid "Compiler: g++ %s\n"
msgstr "КомпилÑтор: g++ %s\n"
-#: src/main.cc:74
+#: src/main.cc:73
#, c-format
msgid ""
"\n"
@@ -1636,7 +1777,7 @@
"\n"
"ВерÑÐ¸Ñ NCurses: %s\n"
-#: src/main.cc:76
+#: src/main.cc:75
#, c-format
msgid ""
"\n"
@@ -1645,22 +1786,22 @@
"\n"
"ВерÑÐ¸Ñ Curses: %s\n"
-#: src/main.cc:78
+#: src/main.cc:77
#, c-format
msgid "libsigc++ version: %s\n"
msgstr "ВерÑÐ¸Ñ libsigc++: %s\n"
-#: src/main.cc:84
+#: src/main.cc:83
#, c-format
msgid "Usage: aptitude [-S fname] [-u|-i]"
msgstr "ИÑпользование: aptitude [-S имÑфайла] [-u|-i]"
-#: src/main.cc:86
+#: src/main.cc:85
#, c-format
msgid " aptitude [options] <action> ..."
msgstr " aptitude [параметры] <дейÑтвие> ..."
-#: src/main.cc:88
+#: src/main.cc:87
#, c-format
msgid ""
" Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -1669,42 +1810,42 @@
" ДейÑÑ‚Ð²Ð¸Ñ (еÑли не задано, aptitude запуÑкаетÑÑ Ð² диалоговом режиме):\n"
"\n"
-#: src/main.cc:89
+#: src/main.cc:88
#, c-format
msgid " install - Install/upgrade packages\n"
msgstr " install - УÑтановить/обновить пакеты\n"
-#: src/main.cc:90
+#: src/main.cc:89
#, c-format
msgid " remove - Remove packages\n"
msgstr " remove - Удалить пакеты\n"
-#: src/main.cc:91
+#: src/main.cc:90
#, c-format
msgid " purge - Remove packages and their configuration files\n"
msgstr " purge - Удалить пакеты и их файлы конфигурации\n"
-#: src/main.cc:92
+#: src/main.cc:91
#, c-format
msgid " hold - Place packages on hold\n"
msgstr " hold - ЗафикÑировать пакеты\n"
-#: src/main.cc:93
+#: src/main.cc:92
#, c-format
msgid " unhold - Cancel a hold command for a package\n"
msgstr " unhold - Отменить команду hold Ð´Ð»Ñ Ð¿Ð°ÐºÐµÑ‚Ð°\n"
-#: src/main.cc:94
+#: src/main.cc:93
#, c-format
msgid " markauto - Mark packages as having been automatically installed\n"
msgstr " markauto - Пометить пакет, что он был уÑтановлен автоматичеÑки\n"
-#: src/main.cc:95
+#: src/main.cc:94
#, c-format
msgid " unmarkauto - Mark packages as having been manually installed\n"
msgstr " unmarkauto - Пометить пакет, что он был уÑтановлен вручную\n"
-#: src/main.cc:100
+#: src/main.cc:99
#, c-format
msgid ""
" forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -1712,17 +1853,17 @@
msgstr ""
" forbid-version - Запретить aptitude обновлÑÑ‚ÑŒ определённую верÑию пакета.\n"
-#: src/main.cc:101
+#: src/main.cc:100
#, c-format
msgid " update - Download lists of new/upgradable packages\n"
msgstr " update - Загрузить ÑпиÑок новых/обновлённых пакетов\n"
-#: src/main.cc:102
+#: src/main.cc:101
#, c-format
msgid " upgrade - Perform a safe upgrade\n"
msgstr " upgrade - Выполнить безопаÑное обновление\n"
-#: src/main.cc:103
+#: src/main.cc:102
#, c-format
msgid ""
" dist-upgrade - Perform an upgrade, possibly installing and removing "
@@ -1730,58 +1871,58 @@
msgstr ""
" dist-upgrade - Выполнить обновление, возможна уÑтановка и удаление пакетов\n"
-#: src/main.cc:104
+#: src/main.cc:103
#, c-format
msgid " forget-new - Forget what packages are \"new\"\n"
msgstr " forget-new - Забыть, какие пакеты \"новые\"\n"
-#: src/main.cc:105
+#: src/main.cc:104
#, c-format
msgid " search - Search for a package by name and/or expression\n"
msgstr " search - ПоиÑк пакета по имени и/или выражению\n"
-#: src/main.cc:106
+#: src/main.cc:105
#, c-format
msgid " show - Display detailed information about a package\n"
msgstr " show - Показать подробную информацию о пакете\n"
-#: src/main.cc:107
+#: src/main.cc:106
#, c-format
msgid " clean - Erase downloaded package files\n"
msgstr " clean - Удалить загруженные файлы пакетов\n"
-#: src/main.cc:108
+#: src/main.cc:107
#, c-format
msgid " autoclean - Erase old downloaded package files\n"
msgstr " autoclean - Удалить Ñтарые загруженные файлы пакетов\n"
-#: src/main.cc:109
+#: src/main.cc:108
#, c-format
msgid " changelog - View a package's changelog\n"
msgstr " changelog - ПоÑмотреть changelog пакета\n"
-#: src/main.cc:110
+#: src/main.cc:109
#, c-format
msgid " download - Download the .deb file for a package\n"
msgstr " download - Загрузить файл .deb Ð´Ð»Ñ Ð¿Ð°ÐºÐµÑ‚Ð°\n"
-#: src/main.cc:112
+#: src/main.cc:111
#, c-format
msgid " Options:\n"
msgstr " Параметры:\n"
-#: src/main.cc:113
+#: src/main.cc:112
#, c-format
msgid " -h This help text\n"
msgstr " -h Ðтот текÑÑ‚ помощи\n"
-#: src/main.cc:114
+#: src/main.cc:113
#, c-format
msgid " -s Simulate actions, but do not actually perform them.\n"
msgstr ""
" -s Имитировать дейÑтвиÑ, но не выполнÑÑ‚ÑŒ их на Ñамом деле.\n"
-#: src/main.cc:115
+#: src/main.cc:114
#, c-format
msgid ""
" -d Only download packages, do not install or remove anything.\n"
@@ -1789,18 +1930,18 @@
" -d Только загрузить пакеты, ничего не уÑтанавливать и не "
"удалÑÑ‚ÑŒ.\n"
-#: src/main.cc:116
+#: src/main.cc:115
#, c-format
msgid " -P Always prompt for confirmation or actions\n"
msgstr " -P Ð’Ñегда Ñпрашивать подтверждение или дейÑтвиÑ\n"
-#: src/main.cc:117
+#: src/main.cc:116
#, c-format
msgid ""
" -y Assume that the answer to simple yes/no questions is 'yes'\n"
msgstr " -y Предполагать ответ 'yes' на проÑтой Ð²Ð¾Ð¿Ñ€Ð¾Ñ yes/no\n"
-#: src/main.cc:118
+#: src/main.cc:117
#, c-format
msgid ""
" -F format Specify a format for displaying search results; see the "
@@ -1809,7 +1950,7 @@
" -F format Задать формат Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ Ñ€ÐµÐ·ÑƒÐ»ÑŒÑ‚Ð°Ñ‚Ð¾Ð² поиÑка; Ñмотрите "
"руководÑтво\n"
-#: src/main.cc:119
+#: src/main.cc:118
#, c-format
msgid ""
" -O order Specify how search results should be sorted; see the manual\n"
@@ -1817,35 +1958,35 @@
" -O order Задать формат Ñортировки результатов поиÑка; Ñмотрите "
"руководÑтво\n"
-#: src/main.cc:120
+#: src/main.cc:119
#, c-format
msgid ""
" -w width Specify the display width for formatting search results\n"
msgstr " -w width Задать ширину вывода результатов поиÑка\n"
-#: src/main.cc:121
+#: src/main.cc:120
#, c-format
msgid " -f Aggressively try to fix broken packages.\n"
msgstr " -f Принудительно иÑправлÑÑ‚ÑŒ неработоÑпоÑобные пакеты.\n"
-#: src/main.cc:122
+#: src/main.cc:121
#, c-format
msgid " -V Show which versions of packages are to be installed.\n"
msgstr " -V Показывать верÑию уÑтанавливаемых пакетов.\n"
-#: src/main.cc:123
+#: src/main.cc:122
#, c-format
msgid ""
" -D Show the dependencies of automatically changed packages.\n"
msgstr ""
" -D Показывать завиÑимоÑти автоматичеÑки изменÑемых пакетов.\n"
-#: src/main.cc:124
+#: src/main.cc:123
#, c-format
msgid " -Z\t\t Show the change in installed size of each package.\n"
msgstr " -Z\t\t Показывать изменение размера уÑтановки каждого пакета.\n"
-#: src/main.cc:125
+#: src/main.cc:124
#, c-format
msgid ""
" -v Display extra information. (may be supplied multiple times)\n"
@@ -1853,21 +1994,21 @@
" -v Отображать дополнительную информацию. (может быть введено "
"неÑколько раз)\n"
-#: src/main.cc:126
+#: src/main.cc:125
#, c-format
msgid ""
" -t [release] Set the release from which packages should be installed\n"
msgstr ""
" -t [release] Задать выпуÑк, из которого должны быть уÑтановлены пакеты\n"
-#: src/main.cc:127
+#: src/main.cc:126
#, c-format
msgid " -o key=val Directly set the configuration option named 'key'\n"
msgstr ""
" -o key=val Вручную уÑтановить значение параметра наÑтройки Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ "
"'key'\n"
-#: src/main.cc:128
+#: src/main.cc:127
#, c-format
msgid ""
" --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -1876,60 +2017,68 @@
" --with(out)-recommends\tУказать, будут ли рекомендуемые пакеты\n"
" трактоватьÑÑ ÐºÐ°Ðº Ñтрогие завиÑимоÑти\n"
-#: src/main.cc:129
+#: src/main.cc:128
#, c-format
msgid " -S fname: Read the aptitude extended status info from fname.\n"
msgstr ""
" -S fname: Читать aptitude информацию о раÑширенном ÑтатуÑе из fname.\n"
-#: src/main.cc:130
+#: src/main.cc:129
#, c-format
msgid " -u : Download new package lists on startup.\n"
msgstr " -u : Загрузить ÑпиÑок новых пакетов при запуÑке.\n"
-#: src/main.cc:131
+#: src/main.cc:130
#, c-format
msgid " -i : Perform an install run on startup.\n"
msgstr " -i : ЗапуÑтить уÑтановку при запуÑке.\n"
-#: src/main.cc:133
+#: src/main.cc:132
#, c-format
msgid " This aptitude does not have Super Cow Powers.\n"
msgstr " Ðта верÑÐ¸Ñ aptitude не имеет \"Super Cow Powers\".\n"
-#: src/main.cc:254
+#: src/main.cc:253
#, c-format
msgid "-o requires an argument of the form key=value, got %s"
msgstr "-o требуетÑÑ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€ в виде ключ=значение, получен %s"
-#: src/main.cc:300 src/main.cc:309
+#: src/main.cc:299 src/main.cc:308
msgid "WEIRDNESS: unknown option code received\n"
msgstr "СТРÐÐÐОСТЬ: получен неизвеÑтный код параметра\n"
-#: src/main.cc:318
+#: src/main.cc:317
msgid "Only one of -u and -i may be specified\n"
msgstr "Можно указать только -u или -i\n"
-#: src/main.cc:326
+#: src/main.cc:325
msgid ""
"-u and -i may not be specified in command-line mode (eg, with 'install')"
msgstr ""
"-u и -i не могут быть заданы в режиме командной Ñтроки (например, Ñ "
"'install')"
-#: src/main.cc:337
+#: src/main.cc:342
msgid "-u and -i may not be specified with a command"
msgstr "-u и -i не могут быть заданы Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¾Ð¹"
-#: src/main.cc:392
+#: src/main.cc:399
#, c-format
msgid "Unknown command \"%s\"\n"
msgstr "ÐеизвеÑÑ‚Ð½Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° \"%s\"\n"
-#: src/main.cc:400
+#: src/main.cc:406 src/main.cc:463
+msgid "Internal error: uncaught 'out of solutions' exception.\n"
+msgstr ""
+
+#: src/main.cc:411 src/main.cc:468
+msgid "Internal error: uncaught 'out of time' exception.\n"
+msgstr ""
+
+#: src/main.cc:418
#, c-format
-msgid "Invalid option for interactive mode: -s\n"
-msgstr "Ðеверный параметр Ð´Ð»Ñ Ð´Ð¸Ð°Ð»Ð¾Ð³Ð¾Ð²Ð¾Ð³Ð¾ режима: -s\n"
+msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
+msgstr ""
#: src/mine/cmine.cc:93
#, c-format
@@ -1957,7 +2106,7 @@
msgid "Lost"
msgstr "Проиграл"
-#: src/mine/cmine.cc:119 src/ui.cc:1005
+#: src/mine/cmine.cc:119 src/ui.cc:1089
msgid "Minesweeper"
msgstr "Сапёр"
@@ -2133,7 +2282,7 @@
msgid "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
msgstr "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
-#: src/pkg_columnizer.cc:84 src/ui.cc:1488
+#: src/pkg_columnizer.cc:84 src/ui.cc:1638
msgid "Package"
msgstr "Пакет"
@@ -2392,13 +2541,14 @@
" Пакеты в разделе 'base' ÑвлÑÑŽÑ‚ÑÑ Ñ‡Ð°Ñтью начальной уÑтановки ÑиÑтемы."
#: src/pkg_grouppolicy.cc:158
+#, fuzzy
msgid ""
"Programs for faxmodems and other communications devices\n"
" Packages in the 'comm' section are used to control modems and other "
"hardware communications devices. This includes software to control faxmodems "
"(for instance, PPP for dial-up internet connections and programs originally "
-"written for that purpose (zmodem/kermit), as well as software to control "
-"cellular phones, interface with FidoNet, and run a BBS."
+"written for that purpose, such as zmodem/kermit), as well as software to "
+"control cellular phones, interface with FidoNet, and run a BBS."
msgstr ""
"Программы Ð´Ð»Ñ Ñ„Ð°ÐºÑ-модемов и других уÑтройÑтв ÑвÑзи\n"
" Пакеты в разделе 'comm' иÑпользуютÑÑ Ð´Ð»Ñ ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¼Ð¾Ð´ÐµÐ¼Ð¾Ð² и "
@@ -2852,14 +3002,15 @@
"в Ñтом разделе, теперь в 'main'."
#: src/pkg_grouppolicy.cc:193
+#, fuzzy
msgid ""
"Programs which are not free software\n"
" Packages in the 'non-free' section are not part of Debian.\n"
" .\n"
" These packages fail to meet one or more of the requirements of the Debian "
-"Free Software Guidelines (see below) You should read the license of programs "
-"in this section to be sure that you are allowed to use them in the way you "
-"intend.\n"
+"Free Software Guidelines (see below). You should read the license of "
+"programs in this section to be sure that you are allowed to use them in the "
+"way you intend.\n"
" .\n"
" For more information about what Debian considers to be Free Software, see "
"http://www.debian.org/social_contract#guidelines"
@@ -2923,11 +3074,12 @@
" Ð”Ð»Ñ Ñтих пакетов доÑтупны новые верÑии."
#: src/pkg_grouppolicy.cc:320
+#, fuzzy
msgid ""
"New Packages\n"
" These packages have been added to Debian since the last time you cleared "
-"the list of \"new\" packages. (choose \"Forget new packages\" from the "
-"Actions menu to empty this list)"
+"the list of \"new\" packages (choose \"Forget new packages\" from the "
+"Actions menu to empty this list)."
msgstr ""
"Ðовые пакеты\n"
" Ðти пакеты были добавлены в Debian поÑле поÑледней очиÑтки вашегоÑпиÑка "
@@ -3177,101 +3329,121 @@
msgid "Versions"
msgstr "ВерÑии"
-#: src/pkg_item.cc:54
+#: src/pkg_item.cc:55
msgid "Yes, I am aware this is a very bad idea"
msgstr "Да, Ñ Ð¿Ð¾Ð½Ð¸Ð¼Ð°ÑŽ, что Ñто Ð¿Ð»Ð¾Ñ…Ð°Ñ Ð¸Ð´ÐµÑ"
#: src/pkg_item.cc:80
-#, c-format
+#, fuzzy, c-format
msgid ""
-"%s is an essential package!\n"
-"\n"
-"Are you sure you want to remove it?\n"
-"Type '%s' if you are."
+"%s is an essential package!%n%nAre you sure you want to remove it?%nType '%"
+"s' if you are."
msgstr ""
"%s Ñто пакет первой необходимоÑти!\n"
"\n"
"Вы точно хотите его удалить?\n"
"Введите '%s', еÑли Ñто так."
-#: src/pkg_item.cc:219
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:625
#, c-format
msgid "Information about %s"
msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ %s"
-#: src/pkg_item.cc:304
-msgid "Available versions of "
+#: src/pkg_item.cc:224 src/pkg_ver_item.cc:627
+#, c-format
+msgid "%s info"
+msgstr ""
+
+#: src/pkg_item.cc:310
+#, fuzzy, c-format
+msgid "Available versions of %s"
msgstr "ДоÑтупные верÑии Ð´Ð»Ñ "
-#: src/pkg_item.cc:312 src/pkg_ver_item.cc:648
+#: src/pkg_item.cc:313
+#, fuzzy, c-format
+msgid "%s versions"
+msgstr "ВерÑии"
+
+#: src/pkg_item.cc:325 src/pkg_ver_item.cc:655
#, c-format
msgid "Dependencies of %s"
msgstr "ЗавиÑимоÑти от %s"
-#: src/pkg_item.cc:322 src/pkg_ver_item.cc:657
+#: src/pkg_item.cc:327 src/pkg_ver_item.cc:657
+#, c-format
+msgid "%s deps"
+msgstr ""
+
+#: src/pkg_item.cc:338 src/pkg_ver_item.cc:667
#, c-format
msgid "Packages depending on %s"
msgstr "Пакеты, завиÑÑщие от %s"
-#: src/pkg_item.cc:373 src/pkg_ver_item.cc:694
+#: src/pkg_item.cc:340 src/pkg_ver_item.cc:669
+#, c-format
+msgid "%s reverse deps"
+msgstr ""
+
+#: src/pkg_item.cc:392 src/pkg_ver_item.cc:707
#, c-format
msgid "Reporting a bug in %s:\n"
msgstr "Отправка бага в %s:\n"
-#: src/pkg_item.cc:395
+#: src/pkg_item.cc:414
+#, fuzzy
msgid ""
-"You are not root and I cannot find any way\n"
-"to become root. To reconfigure this package,\n"
-"install the menu package, the login package,\n"
-"or run aptitude as root."
+"You are not root and I cannot find any way to become root. To reconfigure "
+"this package, install the menu package, the login package, or run aptitude "
+"as root."
msgstr ""
"Ð’Ñ‹ не ÑвлÑетеÑÑŒ Ñуперпользователем и не удалоÑÑŒ\n"
"повыÑить привелегии до ÑуперпользователÑ. Ð”Ð»Ñ Ð¿ÐµÑ€ÐµÐ½Ð°Ñтройки Ñтого пакета,\n"
"уÑтановите пакет menu, login,\n"
"или запуÑтите aptitude когда получите права ÑуперпользователÑ."
-#: src/pkg_item.cc:403
+#: src/pkg_item.cc:422
#, c-format
msgid "Reconfiguring %s\n"
msgstr "ПеренаÑтройка %s\n"
-#: src/pkg_item.cc:428
+#: src/pkg_item.cc:447
msgid "Hierarchy editor"
msgstr "Редактор иерархии"
+#: src/pkg_item.cc:447
+#, fuzzy
+msgid "Hierarchy Editor"
+msgstr "Редактор иерархии"
+
#: src/pkg_tree.cc:325
msgid "Search for: "
msgstr "ПоиÑк:"
-#: src/pkg_tree.cc:585
+#: src/pkg_tree.cc:568
msgid "All Packages"
msgstr "Ð’Ñе пакеты"
-#: src/pkg_tree.cc:598 src/pkg_tree.cc:607
+#: src/pkg_tree.cc:581 src/pkg_tree.cc:590
msgid "Building view"
msgstr "ПоÑтроение вида"
-#: src/pkg_tree.cc:649
+#: src/pkg_tree.cc:632
#, c-format
msgid "No packages matched the pattern \"%s\"."
msgstr "Ðет пакетов, попадающих под шаблон \"%s\"."
-#: src/pkg_tree.cc:671
+#: src/pkg_tree.cc:654
msgid "Enter the new package tree limit: "
msgstr "Введите новый ограничитель дерева пакетов: "
-#: src/pkg_tree.cc:705
+#: src/pkg_tree.cc:688
msgid "Enter the new package grouping mechanism for this display: "
msgstr "Введите новый механизм группировки пакетов Ð´Ð»Ñ Ñтого вида: "
-#: src/pkg_tree.cc:713
+#: src/pkg_tree.cc:696
msgid "Enter the new package sorting mechanism for this display: "
msgstr "Введите новый механизм Ñортировки пакетов Ð´Ð»Ñ Ñтого вида: "
-#: src/pkg_ver_item.cc:623
-msgid "Information about "
-msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾"
-
#: src/pkg_view.cc:344
msgid "make_package_view: error in arguments -- two main widgets??"
msgstr "make_package_view: ошибка в аргументах -- два главных виджета??"
@@ -3287,7 +3459,7 @@
msgid "make_package_view: bad argument!"
msgstr "make_package_view: неверный аргумент!"
-#: src/pkg_view.cc:492
+#: src/pkg_view.cc:495
msgid "make_package_view: no main widget found"
msgstr "make_package_view: не найден главный виджет"
@@ -3497,6 +3669,74 @@
"Следующие пакеты завиÑÑÑ‚ от верÑии %B%s%b of %B%s%b, и будут иÑпорчены еÑли %"
"s."
+#: src/solution_dialog.cc:74
+msgid "The package cache is not available."
+msgstr ""
+
+#: src/solution_dialog.cc:82
+#, fuzzy
+msgid "No packages are broken."
+msgstr "Ðекоторые пакеты неработоÑпоÑобны. ПопытатьÑÑ Ð¸Ñправить?"
+
+#: src/solution_dialog.cc:103
+msgid "No resolution found."
+msgstr ""
+
+#: src/solution_dialog.cc:107
+#, c-format
+msgid ""
+"Time exhausted while searching for a solution (you can select \"Next Solution"
+"\" or press %s to try harder)."
+msgstr ""
+
+#: src/solution_dialog.cc:146
+#, fuzzy
+msgid "Previous"
+msgstr "ПредоÑтавлÑÑŽÑ‚"
+
+#: src/solution_dialog.cc:147
+#, fuzzy
+msgid "Next"
+msgstr "^Следующее"
+
+#: src/solution_dialog.cc:148
+msgid "Apply"
+msgstr ""
+
+#: src/solution_dialog.cc:149
+#, fuzzy
+msgid "Close"
+msgstr "^Закрыть"
+
+#: src/solution_fragment.cc:125
+#, fuzzy
+msgid "%BRemove%b the following packages:%n"
+msgstr "Следующие пакеты ÐЕРÐБОТОСПОСОБÐЫ:"
+
+#: src/solution_fragment.cc:135
+#, fuzzy
+msgid "%BInstall%b the following packages:%n"
+msgstr "Следующие пакеты ÐЕРÐБОТОСПОСОБÐЫ:"
+
+#: src/solution_fragment.cc:148
+msgid "%BKeep%b the following packages at their current version:%n"
+msgstr ""
+
+#: src/solution_fragment.cc:161
+#, fuzzy
+msgid "%BUpgrade%b the following packages:%n"
+msgstr "Следующие пакеты ÐЕРÐБОТОСПОСОБÐЫ:"
+
+#: src/solution_fragment.cc:176
+#, fuzzy
+msgid "%BDowngrade%b the following packages:%n"
+msgstr "Загрузка пакетов"
+
+#: src/solution_fragment.cc:190
+#, c-format
+msgid "Score is %d"
+msgstr ""
+
#: src/trust.cc:17 src/trust.cc:19
msgid "WARNING"
msgstr ""
@@ -3508,52 +3748,52 @@
"system."
msgstr ""
-#: src/ui.cc:143
+#: src/ui.cc:164
msgid "Er, there aren't any errors, this shouldn't have happened.."
msgstr "Er, еÑÑ‚ÑŒ какие-то ошибки, Ñтого не должно было произойти.."
-#: src/ui.cc:149
+#: src/ui.cc:170
msgid "E:"
msgstr ""
-#: src/ui.cc:151
+#: src/ui.cc:172
msgid "W:"
msgstr ""
-#: src/ui.cc:172
+#: src/ui.cc:193
msgid "Search for:"
msgstr "ПоиÑк:"
-#: src/ui.cc:205
+#: src/ui.cc:261
msgid "You already are root!"
msgstr "Ð’Ñ‹ уже Ñуперпользователь!"
-#: src/ui.cc:303
+#: src/ui.cc:359
msgid ""
"Subprocess exited with an error -- did you type your password correctly?"
msgstr "ПодпроцеÑÑ Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ð»ÑÑ Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ¾Ð¹ -- вы ввели правильный пароль?"
-#: src/ui.cc:331
+#: src/ui.cc:387
msgid "Loading cache"
msgstr "Загрузка кÑша"
-#: src/ui.cc:353
+#: src/ui.cc:409
msgid "Really quit Aptitude?"
msgstr "Завершить работу Ñ Aptitude?"
-#: src/ui.cc:432
+#: src/ui.cc:488
msgid "Really discard your personal settings and reload the defaults?"
msgstr "Стереть вÑе перÑональные наÑтройки и загрузить Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð¿Ð¾ умолчанию?"
-#: src/ui.cc:532
+#: src/ui.cc:588 src/ui.cc:590 src/ui.cc:618 src/ui.cc:620
msgid "Packages"
msgstr "Пакеты"
-#: src/ui.cc:533 src/ui.cc:560
+#: src/ui.cc:589 src/ui.cc:619
msgid "View available packages and choose actions to perform"
msgstr "ПроÑмотр доÑтупных пакетов и выбор желаемого дейÑтвиÑ"
-#: src/ui.cc:599
+#: src/ui.cc:666
#, fuzzy
msgid ""
"%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
@@ -3571,15 +3811,15 @@
"определённых уÑловиÑÑ…\n"
"подробней, Ñмотрите 'ЛицензиÑ'."
-#: src/ui.cc:620
+#: src/ui.cc:687
msgid "help.txt"
msgstr "help-ru.txt"
-#: src/ui.cc:636
+#: src/ui.cc:703
msgid "README"
msgstr "README"
-#: src/ui.cc:718
+#: src/ui.cc:785
msgid ""
"%C%BWARNING%b: untrusted versions of the following packages will be "
"installed!%n%nUntrusted packages could %Bcompromise your system's security%"
@@ -3587,60 +3827,70 @@
"this is what you want to do.%n%n"
msgstr ""
-#: src/ui.cc:732
+#: src/ui.cc:799
#, fuzzy
msgid "Really Continue"
msgstr "Продолжить"
-#: src/ui.cc:734
+#: src/ui.cc:801
msgid "Abort Installation"
msgstr ""
-#: src/ui.cc:796
+#: src/ui.cc:862
msgid "Preview of package installation"
msgstr "Обзор уÑтанавливаемых пакетов"
-#: src/ui.cc:797
+#: src/ui.cc:863
msgid "View and/or adjust the actions that will be performed"
msgstr "Показать и/или выверить дейÑтвиÑ, которые будут выполнены"
-#: src/ui.cc:837
-msgid "Some packages were broken and have been fixed"
+#: src/ui.cc:864
+#, fuzzy
+msgid "Preview"
+msgstr "^Предыдущее"
+
+#: src/ui.cc:900
+#, fuzzy
+msgid "Some packages were broken and have been fixed:"
msgstr "Ðекоторые неработоÑпоÑобные пакеты были иÑправлены"
-#: src/ui.cc:839
-msgid "Some broken packages could not be fixed!"
-msgstr "Ðекоторые неработоÑпоÑобные пакеты иÑправить не удалоÑÑŒ!"
+#: src/ui.cc:906
+msgid "No solution to these dependency problems exists!"
+msgstr ""
-#: src/ui.cc:847 src/ui.cc:959
-msgid "Some packages are broken. Try to fix them?"
-msgstr "Ðекоторые пакеты неработоÑпоÑобны. ПопытатьÑÑ Ð¸Ñправить?"
+#: src/ui.cc:912
+#, c-format
+msgid ""
+"Ran out of time while trying to resolver dependencies (press \"%s\" to try "
+"harder)"
+msgstr ""
-#: src/ui.cc:860
+#: src/ui.cc:958
+#, fuzzy
msgid ""
-"Installing/removing packages requires administrative privileges, which\n"
-"you currently do not have. Would you like to change to the root account?\n"
+"Installing/removing packages requires administrative privileges, which you "
+"currently do not have. Would you like to change to the root account?"
msgstr ""
"Ð”Ð»Ñ ÑƒÑтановки/ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Ð¿Ð°ÐºÐµÑ‚Ð¾Ð² требуютÑÑ Ð°Ð´Ð¼Ð¸Ð½Ð¸Ñтративные права, которыми\n"
"вы в данный момент не обладаете. Получить права ÑуперпользователÑ?\n"
-#: src/ui.cc:863 src/ui.cc:993
+#: src/ui.cc:961 src/ui.cc:1077
msgid "Become root"
msgstr "Стать Ñуперпользователем"
-#: src/ui.cc:865 src/ui.cc:995
+#: src/ui.cc:963 src/ui.cc:1079
msgid "Don't become root"
msgstr "Ðе ÑтановитьÑÑ Ñуперпользователем"
-#: src/ui.cc:870 src/ui.cc:1000
+#: src/ui.cc:968 src/ui.cc:1084
msgid "A package-list update or install run is already taking place."
msgstr "ЗапуÑк Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ ÑпиÑка пакетов или уÑтановка уже произведены."
-#: src/ui.cc:897
+#: src/ui.cc:995
msgid "No packages are scheduled to be installed, removed, or upgraded."
msgstr "Ðет пакетов Ð´Ð»Ñ ÑƒÑтановки, ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Ð¸Ð»Ð¸ обновлениÑ."
-#: src/ui.cc:903
+#: src/ui.cc:1001
#, fuzzy
msgid ""
"No packages will be installed, removed or upgraded. Some packages could be "
@@ -3652,164 +3902,179 @@
"Ðекоторые пакеты могут быть обновлены, но вы не задали их обновление.\n"
"Введите \"U\", чтобы пометить их Ð´Ð»Ñ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ."
-#: src/ui.cc:990
+#: src/ui.cc:1073
+#, fuzzy
msgid ""
-"Updating the package lists requires administrative privileges, which\n"
-"you currently do not have. Would you like to change to the root account?\n"
+"Updating the package lists requires administrative privileges, which you "
+"currently do not have. Would you like to change to the root account?"
msgstr ""
"Ð”Ð»Ñ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ ÑпиÑка пакетов требуютÑÑ Ð°Ð´Ð¼Ð¸Ð½Ð¸Ñтративные права, которыми\n"
"вы в данный момент не обладаете. Получить права ÑуперпользователÑ?\n"
-#: src/ui.cc:1005 src/ui.cc:1198
+#: src/ui.cc:1089 src/ui.cc:1345
msgid "Waste time trying to find mines"
msgstr "Убьём Ð²Ñ€ÐµÐ¼Ñ Ð² поиÑках мин"
-#: src/ui.cc:1012 src/ui.cc:1065
+#: src/ui.cc:1096 src/ui.cc:1149
msgid "Cleaning while a download is in progress is not allowed"
msgstr "ОчиÑтка во Ð²Ñ€ÐµÐ¼Ñ Ð¿Ñ€Ð¾Ñ†ÐµÑÑа загрузки невозможна"
-#: src/ui.cc:1015
+#: src/ui.cc:1099
msgid "Deleting downloaded files"
msgstr "Удаление загруженных файлов"
-#: src/ui.cc:1029
+#: src/ui.cc:1113
msgid "Downloaded package files have been deleted"
msgstr "Загруженные файлы были удалены"
-#: src/ui.cc:1090
+#: src/ui.cc:1174
#, fuzzy, c-format
msgid ""
"Obsolete downloaded package files have been deleted, freeing %sB of disk "
"space."
msgstr "Загруженные файлы Ñ ÑƒÑтаревшими пакетами были удалены"
-#: src/ui.cc:1174
+#: src/ui.cc:1246
+msgid "All solutions exhausted."
+msgstr ""
+
+#: src/ui.cc:1251 src/ui.cc:1282
+#, fuzzy
+msgid "Ran out of time while trying to find a solution."
+msgstr "Убьём Ð²Ñ€ÐµÐ¼Ñ Ð² поиÑках мин"
+
+#: src/ui.cc:1276
+msgid "Unable to find a solution to apply."
+msgstr ""
+
+#: src/ui.cc:1321
msgid "^Install/remove packages"
msgstr "^УÑтановить/удалить пакеты"
-#: src/ui.cc:1175
+#: src/ui.cc:1322
msgid "Perform all pending installs and removals"
msgstr "Выполнить вÑе незаконченные уÑтановки и удалениÑ"
-#: src/ui.cc:1177
+#: src/ui.cc:1324
msgid "^Update package list"
msgstr "^Обновить ÑпиÑок пакетов"
-#: src/ui.cc:1178
+#: src/ui.cc:1325
msgid "Check for new versions of packages"
msgstr "Проверить, еÑÑ‚ÑŒ ли новые верÑии пакетов"
-#: src/ui.cc:1181
+#: src/ui.cc:1328
msgid "^Forget new packages"
msgstr "^Забыть о новых пакетах"
-#: src/ui.cc:1182
+#: src/ui.cc:1329
msgid "Forget which packages are \"new\""
msgstr "Забыть о \"новых\" пакетах"
-#: src/ui.cc:1185
+#: src/ui.cc:1332
msgid "^Clean package cache"
msgstr "^ОчиÑтить кÑш пакетов"
-#: src/ui.cc:1186
+#: src/ui.cc:1333
msgid "Delete package files which were previously downloaded"
msgstr "Удалить ранее загруженные файлы пакетов"
-#: src/ui.cc:1189
+#: src/ui.cc:1336
msgid "Clean ^obsolete files"
msgstr "ОчиÑтить ^уÑтаревшие файлы"
-#: src/ui.cc:1190
+#: src/ui.cc:1337
msgid "Delete package files which can no longer be downloaded"
msgstr "Удалить файлы пакетов, которые больше никогда не будут загружены"
-#: src/ui.cc:1193
+#: src/ui.cc:1340
msgid "Mark ^Upgradable"
msgstr "Пометить ^обновлÑемые"
-#: src/ui.cc:1194
+#: src/ui.cc:1341
msgid "Mark all upgradable packages which are not held for upgrade"
msgstr ""
"Пометить вÑе обновлÑемые пакеты, которые не зафикÑированы от обновлениÑ"
-#: src/ui.cc:1197
+#: src/ui.cc:1344
msgid "^Play Minesweeper"
msgstr "^Играть в Ñапёра"
-#: src/ui.cc:1200
+#: src/ui.cc:1347
msgid "^Become root"
msgstr "^Стать Ñуперпользователем"
-#: src/ui.cc:1201
+#: src/ui.cc:1348
+#, fuzzy
msgid ""
-"Run 'su' to become root; this will restart the program, but your\n"
-"settings will be preserved"
+"Run 'su' to become root; this will restart the program, but your settings "
+"will be preserved"
msgstr ""
"ЗапуÑк 'su', чтобы Ñтать Ñуперпользователем. Ðто приведёт к перезапуÑку\n"
"программы, но ваши наÑтройки будут Ñохранены."
-#: src/ui.cc:1204
+#: src/ui.cc:1351
msgid "^Reload package cache"
msgstr "^Перезагрузить кÑш пакетов"
-#: src/ui.cc:1205
+#: src/ui.cc:1352
msgid "Reload the package cache"
msgstr "Перезагрузить кÑш пакетов."
-#: src/ui.cc:1211
+#: src/ui.cc:1358
msgid "^Quit"
msgstr "^Выйти"
-#: src/ui.cc:1212
+#: src/ui.cc:1359
msgid "Exit the program"
msgstr "Завершить работу программы"
-#: src/ui.cc:1218 src/ui.cc:1487
+#: src/ui.cc:1365 src/ui.cc:1637
msgid "Undo"
msgstr "Откат"
-#: src/ui.cc:1219
+#: src/ui.cc:1366
msgid "Undo the last package operation or group of operations"
msgstr "Отменить поÑледнюю операцию Ñ Ð¿Ð°ÐºÐµÑ‚Ð¾Ð¼ или группу операций"
-#: src/ui.cc:1226
+#: src/ui.cc:1373
msgid "^Install"
msgstr "^Install"
-#: src/ui.cc:1227
+#: src/ui.cc:1374
msgid "Flag the currently selected package for installation or upgrade"
msgstr "Пометить выделенный пакет Ð´Ð»Ñ ÑƒÑтановки или обновлениÑ"
-#: src/ui.cc:1230
+#: src/ui.cc:1377
msgid "^Remove"
msgstr "^Remove"
-#: src/ui.cc:1231
+#: src/ui.cc:1378
msgid "Flag the currently selected package for removal"
msgstr "Пометить выделенный пакет Ð´Ð»Ñ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ"
-#: src/ui.cc:1234
+#: src/ui.cc:1381
msgid "^Purge"
msgstr "^Purge"
-#: src/ui.cc:1235
+#: src/ui.cc:1382
msgid ""
"Flag the currently selected package and its configuration files for removal"
msgstr "Пометить выделенный пакет Ð´Ð»Ñ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Ð²Ð¼ÐµÑте Ñ ÐµÐ³Ð¾ файлами наÑтройки"
-#: src/ui.cc:1238
+#: src/ui.cc:1385
msgid "^Keep"
msgstr "^Keep"
-#: src/ui.cc:1239
+#: src/ui.cc:1386
msgid "Cancel any action on the selected package"
msgstr "Отменить любое дейÑтвие над выделенным пакетом"
-#: src/ui.cc:1242
+#: src/ui.cc:1389
msgid "^Hold"
msgstr "^Hold"
-#: src/ui.cc:1243
+#: src/ui.cc:1390
msgid ""
"Cancel any action on the selected package, and protect it from future "
"upgrades"
@@ -3817,250 +4082,254 @@
"Отменить любое дейÑтвие над выделенным пакетом и защитить его от дальнейших "
"обновлений"
-#: src/ui.cc:1246
+#: src/ui.cc:1393
msgid "Mark ^Auto"
msgstr "Отметить ^Auto"
-#: src/ui.cc:1247
+#: src/ui.cc:1394
+#, fuzzy
msgid ""
-"Mark the selected package as having been automatically installed;\n"
-"it will automatically be removed if no other packages depend on it"
+"Mark the selected package as having been automatically installed; it will "
+"automatically be removed if no other packages depend on it"
msgstr ""
"Отметить выделенные пакеты, как-будто они были выбраны автоматичеÑки;\n"
"они будут автоматичеÑки удалены, еÑли не оÑтанетÑÑ Ð¿Ð°ÐºÐµÑ‚Ð¾Ð², от них завиÑÑщих"
-#: src/ui.cc:1250
+#: src/ui.cc:1397
msgid "Mark ^Manual"
msgstr "Отметить ^Manual"
-#: src/ui.cc:1251
+#: src/ui.cc:1398
+#, fuzzy
msgid ""
-"Mark the selected package as having been manually installed;\n"
-"it will not be removed unless you manually remove it"
+"Mark the selected package as having been manually installed; it will not be "
+"removed unless you manually remove it"
msgstr ""
"Отметить выделенные пакеты, как-будто они были выбраны вручную;\n"
"они не будут удалены, пока вы вручную не Ñделаете Ñтого"
-#: src/ui.cc:1254
+#: src/ui.cc:1401
msgid "^Forbid Version"
msgstr "^Forbid верÑию"
-#: src/ui.cc:1255
+#: src/ui.cc:1402
+#, fuzzy
msgid ""
-"Forbid the candidate version of the selected package from being installed;\n"
+"Forbid the candidate version of the selected package from being installed; "
"newer versions of the package will be installed as usual"
msgstr ""
"Запретить уÑтановку верÑии веделенного пакета;\n"
"новые верÑии пакета будут уÑтанавливатьÑÑ ÐºÐ°Ðº обычно"
-#: src/ui.cc:1259
+#: src/ui.cc:1406
msgid "I^nformation"
msgstr "I^nformation"
-#: src/ui.cc:1260
+#: src/ui.cc:1407
msgid "Display more information about the selected package"
msgstr "Показать больше информации о выделенном пакете"
-#: src/ui.cc:1263
+#: src/ui.cc:1410
msgid "^Changelog"
msgstr "^ChangeLog"
-#: src/ui.cc:1264
+#: src/ui.cc:1411
msgid "Display the Debian changelog of the selected package"
msgstr "Показать Debian changelog выделенного пакета"
-#: src/ui.cc:1271
+#: src/ui.cc:1418
msgid "^Find"
msgstr "^Find"
-#: src/ui.cc:1272
+#: src/ui.cc:1419
msgid "Search for a package"
msgstr "Ðайти пакет"
-#: src/ui.cc:1275
+#: src/ui.cc:1422
msgid "Find ^Again"
msgstr "Ðайти ^ОпÑÑ‚ÑŒ"
-#: src/ui.cc:1276
+#: src/ui.cc:1423
msgid "Repeat the last search"
msgstr "Повторить поÑледний поиÑк"
-#: src/ui.cc:1280
+#: src/ui.cc:1427
msgid "^Limit Display"
msgstr "^Limit Display"
-#: src/ui.cc:1281
+#: src/ui.cc:1428
msgid "Apply a filter to the package list"
msgstr "Применить фильтр к ÑпиÑку пакетов"
-#: src/ui.cc:1284
+#: src/ui.cc:1431
msgid "^Un-Limit Display"
msgstr "^Un-Limit Display"
-#: src/ui.cc:1285
+#: src/ui.cc:1432
msgid "Remove the filter from the package list"
msgstr "СнÑÑ‚ÑŒ фильтр Ñо ÑпиÑка пакетов"
-#: src/ui.cc:1289
+#: src/ui.cc:1436
msgid "Find ^Broken"
msgstr "Ðайти ^Broken"
-#: src/ui.cc:1290
+#: src/ui.cc:1437
msgid "Find the next package with unsatisfied dependencies"
msgstr "Ðайти Ñледующий пакет Ñ Ð½ÐµÑƒÐ´Ð¾Ð²Ð»ÐµÑ‚Ð²Ð¾Ñ€Ñ‘Ð½Ð½Ñ‹Ð¼Ð¸ завиÑимоÑÑ‚Ñми"
-#: src/ui.cc:1297
+#: src/ui.cc:1444
msgid "^UI options"
msgstr "^ÐаÑтройки интерфейÑа"
-#: src/ui.cc:1298
+#: src/ui.cc:1445
msgid "Change the settings which affect the user interface"
msgstr "Изменить наÑтройки, отноÑÑщиеÑÑ Ðº интерфейÑу пользователÑ"
-#: src/ui.cc:1301
+#: src/ui.cc:1448
msgid "^Dependency handling"
msgstr "^Работа Ñ Ð·Ð°Ð²Ð¸ÑимоÑÑ‚Ñми"
-#: src/ui.cc:1302
+#: src/ui.cc:1449
msgid "Change the settings which affect how package dependencies are handled"
msgstr "Изменить наÑтройки, отноÑÑщиеÑÑ Ðº тому как обрабатываютÑÑ Ð·Ð°Ð²Ð¸ÑимоÑти"
-#: src/ui.cc:1305
+#: src/ui.cc:1452
msgid "^Miscellaneous"
msgstr "^Разное"
-#: src/ui.cc:1306
+#: src/ui.cc:1453
msgid "Change miscellaneous program settings"
msgstr "Изменить другие наÑтройки программы"
-#: src/ui.cc:1311
+#: src/ui.cc:1458
msgid "^Revert options"
msgstr "^Отменить наÑтройки"
-#: src/ui.cc:1312
+#: src/ui.cc:1459
msgid "Reset all settings to the system defaults"
msgstr "СброÑить вÑе наÑтройки в Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð¿Ð¾ умолчанию"
-#: src/ui.cc:1323
+#: src/ui.cc:1470
msgid "^Next"
msgstr "^Следующее"
-#: src/ui.cc:1324
+#: src/ui.cc:1471
msgid "View next display"
msgstr "Перейти к Ñледующему окну"
-#: src/ui.cc:1327
+#: src/ui.cc:1474
msgid "^Prev"
msgstr "^Предыдущее"
-#: src/ui.cc:1328
+#: src/ui.cc:1475
msgid "View previous display"
msgstr "Перейти к предыдущему окну"
-#: src/ui.cc:1331
+#: src/ui.cc:1478
msgid "^Close"
msgstr "^Закрыть"
-#: src/ui.cc:1332
+#: src/ui.cc:1479
msgid "Close this display"
msgstr "Закрыть Ñто окно"
-#: src/ui.cc:1337
+#: src/ui.cc:1484
msgid "New Package ^View"
msgstr "Ðовое ^окно Пакета"
-#: src/ui.cc:1338
+#: src/ui.cc:1485
msgid "Create a new default package view"
msgstr "Создать новое окно пакета по умолчанию"
-#: src/ui.cc:1341
+#: src/ui.cc:1488
msgid "New Categorical ^Browser"
msgstr "Ðовый ^браузер категорий"
-#: src/ui.cc:1343
+#: src/ui.cc:1490
msgid "Browse packages by category"
msgstr "Показывать пакеты ÑоглаÑно категориÑм"
-#: src/ui.cc:1351
+#: src/ui.cc:1498
msgid "^About"
msgstr "^О программе"
-#: src/ui.cc:1352
+#: src/ui.cc:1499
msgid "View information about this program"
msgstr "Показать информацию об Ñтой программе"
-#: src/ui.cc:1355
+#: src/ui.cc:1502
msgid "^Help"
msgstr "^Помощь"
-#: src/ui.cc:1356
+#: src/ui.cc:1503
msgid "View the on-line help"
msgstr "Показать Ñтраницу помощи"
-#: src/ui.cc:1358
+#: src/ui.cc:1505
msgid "User's ^Manual"
msgstr "^РуководÑтво пользователÑ"
-#: src/ui.cc:1359
+#: src/ui.cc:1506
msgid "View the detailed program manual"
msgstr "Показать подробное руководÑтво Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ñ‹"
-#: src/ui.cc:1362
+#: src/ui.cc:1509
msgid "^FAQ"
msgstr "^ЧÐВО"
-#: src/ui.cc:1363
+#: src/ui.cc:1510
msgid "View a list of frequently asked questions"
msgstr "Показать ÑпиÑок чаÑто задаваемых вопроÑов"
-#: src/ui.cc:1366
-msgid "^ChangeLog"
-msgstr "^ChangeLog"
+#: src/ui.cc:1513
+msgid "^NEWS"
+msgstr ""
-#: src/ui.cc:1367
-msgid "View the important changes made in each version of the program"
+#: src/ui.cc:1514
+#, fuzzy
+msgid "View the important changes made in each version of "
msgstr "Показать важные изменениÑ, Ñделанные в каждой верÑии Ñтой программы"
-#: src/ui.cc:1370
+#: src/ui.cc:1517
msgid "^License"
msgstr "^ЛицензиÑ"
-#: src/ui.cc:1371
+#: src/ui.cc:1518
msgid "View the terms under which you may copy the program"
msgstr "Показать уÑловиÑ, ÑоглаÑно которым вы можете копировать программу"
-#: src/ui.cc:1486
+#: src/ui.cc:1636
msgid "Actions"
msgstr "ДейÑтвиÑ"
-#: src/ui.cc:1489
+#: src/ui.cc:1639
msgid "Search"
msgstr "ПоиÑк"
-#: src/ui.cc:1490
+#: src/ui.cc:1640
msgid "Options"
msgstr "Параметры"
-#: src/ui.cc:1491
+#: src/ui.cc:1641
msgid "Views"
msgstr "Окна"
-#: src/ui.cc:1492
+#: src/ui.cc:1642
msgid "Help"
msgstr "Помощь"
-#: src/ui.cc:1537
+#: src/ui.cc:1699
#, c-format
msgid ""
"%s: Menu %s: Help %s: Quit %s: Update %s: Download/Install/Remove Pkgs"
msgstr ""
"%s: Меню %s: Помощь %s: Выход %s: Обновить %s: Загруз/УÑтан/Удал пкт"
-#: src/ui.cc:1799 src/vscreen/vscreen.cc:281
+#: src/ui.cc:1968 src/vscreen/vscreen.cc:281
msgid "yes_key"
msgstr "yes_key"
-#: src/ui.cc:1800 src/vscreen/vscreen.cc:282
+#: src/ui.cc:1969 src/vscreen/vscreen.cc:282
msgid "no_key"
msgstr "no_key"
@@ -4072,6 +4341,16 @@
msgid "Downloading Changelog"
msgstr "Загрузка Changelog"
+#: src/view_changelog.cc:54
+#, fuzzy
+msgid "Download Changelog"
+msgstr "Загрузка Changelog"
+
+#: src/view_changelog.cc:63
+#, c-format
+msgid "%s changes"
+msgstr ""
+
#: src/vscreen/vscreen.cc:119
#, c-format
msgid "Ouch! Got SIGTERM, dying..\n"
@@ -4100,6 +4379,38 @@
msgid "No"
msgstr "Ðет"
+#~ msgid ""
+#~ "Some packages had unmet dependencies. This may mean that you have\n"
+#~ "requested an impossible situation or if you are using the unstable\n"
+#~ "distribution that some required packages have not yet been created\n"
+#~ "or been moved out of Incoming.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Ðекоторые пакеты имеют неудовлетворённые завиÑимоÑти. Ðто может\n"
+#~ "означать, что вы запроÑили невозможного или, еÑли вы иÑпользуете\n"
+#~ "диÑтрибутив unstable, что требуемые пакеты ещё не Ñозданы или не\n"
+#~ "были помещены в Incoming.\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Please insert the following disc into the drive \"%s\":\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Ð’Ñтавьте Ñледующий диÑк в привод \"%s\":\n"
+#~ "%s"
+
+#~ msgid "Invalid option for interactive mode: -s\n"
+#~ msgstr "Ðеверный параметр Ð´Ð»Ñ Ð´Ð¸Ð°Ð»Ð¾Ð³Ð¾Ð²Ð¾Ð³Ð¾ режима: -s\n"
+
+#~ msgid "Information about "
+#~ msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾"
+
+#~ msgid "Some broken packages could not be fixed!"
+#~ msgstr "Ðекоторые неработоÑпоÑобные пакеты иÑправить не удалоÑÑŒ!"
+
+#~ msgid "^ChangeLog"
+#~ msgstr "^ChangeLog"
+
#~ msgid "Go away, I'm trying to think.\n"
#~ msgstr "Deixeu-me tranquil, estic intentant pensar.\n"
Modified: branches/aptitude-0.3/aptitude/po/sk.po
==============================================================================
--- branches/aptitude-0.3/aptitude/po/sk.po (original)
+++ branches/aptitude-0.3/aptitude/po/sk.po Sat Apr 30 13:41:32 2005
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: aptitude\n"
"Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-01-10 16:26-0800\n"
+"POT-Creation-Date: 2005-04-29 18:11-0400\n"
"PO-Revision-Date: 2004-11-08 11:53+0100\n"
"Last-Translator: Stanislav Valášek <stano_valasek at pobox.sk>\n"
"Language-Team: Slovak <sk-i18n at lists.linux.sk>\n"
@@ -150,16 +150,103 @@
msgstr "Automaticky odstrániÅ¥ nepoužÃvané balÃky vyhovujúce filtru"
#: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:184 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
-#: src/vscreen/vs_util.cc:329
+#: src/ui.cc:218 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
+#: src/vscreen/vs_util.cc:328
msgid "Ok"
msgstr "Ok"
#: src/apt_options.cc:242 src/download_list.cc:71 src/mine/cmine.cc:257
-#: src/mine/cmine.cc:330 src/vscreen/vs_util.cc:329
+#: src/mine/cmine.cc:330 src/vscreen/vs_util.cc:328
msgid "Cancel"
msgstr "Zrušiť"
+#: src/broken_indicator.cc:106 src/solution_dialog.cc:97
+msgid "Internal error: unexpected null solution."
+msgstr ""
+
+#: src/broken_indicator.cc:158
+#, fuzzy
+msgid "Suggest "
+msgstr "Navrhuje"
+
+#: src/broken_indicator.cc:164
+#, fuzzy, c-format
+msgid "%d installs"
+msgstr "inštalovať"
+
+#: src/broken_indicator.cc:169
+#, fuzzy
+msgid "1 install"
+msgstr "inštalovať"
+
+#: src/broken_indicator.cc:173
+#, c-format
+msgid "%d removals"
+msgstr ""
+
+#: src/broken_indicator.cc:178
+msgid "1 removal"
+msgstr ""
+
+#: src/broken_indicator.cc:182
+#, c-format
+msgid "%d keeps"
+msgstr ""
+
+#: src/broken_indicator.cc:187
+msgid "1 keep"
+msgstr ""
+
+#: src/broken_indicator.cc:191
+#, fuzzy, c-format
+msgid "%d upgrades"
+msgstr "aktualizovať"
+
+#: src/broken_indicator.cc:196
+#, fuzzy
+msgid "1 upgrade"
+msgstr "aktualizovať"
+
+#: src/broken_indicator.cc:200
+#, fuzzy, c-format
+msgid "%d downgrades"
+msgstr "degradovaný"
+
+#: src/broken_indicator.cc:205
+#, fuzzy
+msgid "1 downgrade"
+msgstr "degradovaný"
+
+#: src/broken_indicator.cc:214
+#, c-format
+msgid "%s: Examine"
+msgstr ""
+
+#: src/broken_indicator.cc:216
+#, c-format
+msgid "%s: Apply"
+msgstr ""
+
+#: src/broken_indicator.cc:218
+#, fuzzy, c-format
+msgid "%s: Next"
+msgstr "ÄŽalÅ¡Ã"
+
+#: src/broken_indicator.cc:220
+#, c-format
+msgid "%s: Previous"
+msgstr ""
+
+#: src/broken_indicator.cc:233
+#, c-format
+msgid "%CSolution search failed. %s: try harder"
+msgstr ""
+
+#: src/broken_indicator.cc:239
+#, c-format
+msgid "%CUnable to resolve dependencies."
+msgstr ""
+
#: src/cmdline/cmdline_action.cc:36
#, c-format
msgid ""
@@ -231,22 +318,22 @@
msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
msgstr "BalÃk %s nie je aktualizovateľný, nemožno teda zakázat aktualizáciu\n"
-#: src/cmdline/cmdline_action.cc:213
+#: src/cmdline/cmdline_action.cc:198
#, c-format
msgid "Note: selecting the task \"%s: %s\" for installation\n"
msgstr "Pozn: vyberám na inštaláciu úlohu \"%s: %s\"\n"
-#: src/cmdline/cmdline_action.cc:240
+#: src/cmdline/cmdline_action.cc:225
#, c-format
msgid "You can only specify a package version with an 'install' command.\n"
msgstr "Verziu balÃku môžete zadaÅ¥ iba s prÃkazom 'install'.\n"
-#: src/cmdline/cmdline_action.cc:246
+#: src/cmdline/cmdline_action.cc:231
#, c-format
msgid "You can only specify a package archive with an 'install' command.\n"
msgstr "ArchÃv balÃku môžete zadaÅ¥ iba s prÃkazom 'install'.\n"
-#: src/cmdline/cmdline_action.cc:280
+#: src/cmdline/cmdline_action.cc:265
#, c-format
msgid ""
"Couldn't find package \"%s\", and more than 40\n"
@@ -255,7 +342,7 @@
"Nemohol som nájsÅ¥ balÃk \"%s\" a viac než 40\n"
"balÃkov obsahuje \"%s\" vo svojom názve.\n"
-#: src/cmdline/cmdline_action.cc:283
+#: src/cmdline/cmdline_action.cc:268
#, c-format
msgid ""
"Couldn't find package \"%s\". However, the following\n"
@@ -264,13 +351,13 @@
"Nemohol som nájsÅ¥ balÃk \"%s\", ale nasledujúce balÃky\n"
"obsahujú \"%s\" vo svojom názve:\n"
-#: src/cmdline/cmdline_action.cc:307
+#: src/cmdline/cmdline_action.cc:292
#, c-format
msgid "Couldn't find any package whose name or description matched \"%s\"\n"
msgstr ""
"Nemohol som nájsÅ¥ balÃk, ktorého názov alebo popis sa zhoduje s \"%s\"\n"
-#: src/cmdline/cmdline_action.cc:309
+#: src/cmdline/cmdline_action.cc:294
#, c-format
msgid ""
"Couldn't find any package matching \"%s\", and more than 40\n"
@@ -279,7 +366,7 @@
"Nemohol som nájsÅ¥ balÃk vyhovujúci \"%s\" a viac než 40\n"
"balÃkov obsahuje \"%s\" vo svojom popise.\n"
-#: src/cmdline/cmdline_action.cc:312
+#: src/cmdline/cmdline_action.cc:297
#, c-format
msgid ""
"Couldn't find any package matching \"%s\". However, the following\n"
@@ -322,13 +409,13 @@
msgid "Freed %sB of disk space\n"
msgstr "Na disku sa uvoľnà %sB"
-#: src/cmdline/cmdline_do_action.cc:67
+#: src/cmdline/cmdline_do_action.cc:71
#, c-format
msgid "Invalid operation %s"
msgstr "Neplatná operácia %s"
-#: src/cmdline/cmdline_do_action.cc:206 src/cmdline/cmdline_simulate.cc:30
-#: src/cmdline/cmdline_upgrade.cc:89
+#: src/cmdline/cmdline_do_action.cc:201 src/cmdline/cmdline_simulate.cc:31
+#: src/cmdline/cmdline_upgrade.cc:91
#, c-format
msgid "Abort.\n"
msgstr "Preruš.\n"
@@ -338,7 +425,7 @@
msgid "download: you must specify at least one package to download\n"
msgstr "download: musÃte zadaÅ¥ aspoň jeden balÃk na stiahnutie\n"
-#: src/cmdline/cmdline_download.cc:43 src/download.cc:342
+#: src/cmdline/cmdline_download.cc:43 src/download.cc:344
msgid "Couldn't read source list"
msgstr "Nemôžem ÄÃtaÅ¥ zoznam zdrojov"
@@ -403,95 +490,95 @@
msgid "What is it? It's an elephant being eaten by a snake, of course.\n"
msgstr "Čo to je? Čo by to bolo! Predsa had žerúci slona.\n"
-#: src/cmdline/cmdline_prompt.cc:44
+#: src/cmdline/cmdline_prompt.cc:45
msgid "Couldn't read list of sources"
msgstr "Nemôžem ÄÃtaÅ¥ zoznam zdrojov"
-#: src/cmdline/cmdline_prompt.cc:219 src/cmdline/cmdline_show_broken.cc:73
+#: src/cmdline/cmdline_prompt.cc:220 src/cmdline/cmdline_show_broken.cc:73
#, c-format
msgid "but %s is to be installed."
msgstr "ale %s sa bude inštalovať."
-#: src/cmdline/cmdline_prompt.cc:222 src/cmdline/cmdline_show_broken.cc:76
+#: src/cmdline/cmdline_prompt.cc:223 src/cmdline/cmdline_show_broken.cc:76
#, c-format
msgid "but %s is installed and it is kept back."
msgstr "ale %s je nainštalovaný a je podržaný v aktuálnom stave."
-#: src/cmdline/cmdline_prompt.cc:225 src/cmdline/cmdline_show_broken.cc:79
+#: src/cmdline/cmdline_prompt.cc:226 src/cmdline/cmdline_show_broken.cc:79
#, c-format
msgid "but %s is installed."
msgstr "ale %s nie je inštalovaný."
-#: src/cmdline/cmdline_prompt.cc:229 src/cmdline/cmdline_show_broken.cc:83
+#: src/cmdline/cmdline_prompt.cc:230 src/cmdline/cmdline_show_broken.cc:83
#, c-format
msgid "but it is not installable"
msgstr "ale nedá sa nainštalovať"
-#: src/cmdline/cmdline_prompt.cc:233 src/cmdline/cmdline_show_broken.cc:87
+#: src/cmdline/cmdline_prompt.cc:234 src/cmdline/cmdline_show_broken.cc:87
#, c-format
msgid " which is a virtual package."
msgstr " Äo je virtuálny balÃk."
-#: src/cmdline/cmdline_prompt.cc:236 src/cmdline/cmdline_show_broken.cc:90
+#: src/cmdline/cmdline_prompt.cc:237 src/cmdline/cmdline_show_broken.cc:90
#, c-format
msgid " or"
msgstr " alebo"
-#: src/cmdline/cmdline_prompt.cc:248
+#: src/cmdline/cmdline_prompt.cc:249
msgid "The following packages are BROKEN:"
msgstr "Nasledujúce balÃky sú POÅ KODENÉ:"
-#: src/cmdline/cmdline_prompt.cc:249
+#: src/cmdline/cmdline_prompt.cc:250
msgid "The following packages are unused and will be REMOVED:"
msgstr "Nasledujúce balÃky sú nepoužÃvané a budú ODSTRÃNENÉ:"
-#: src/cmdline/cmdline_prompt.cc:250
+#: src/cmdline/cmdline_prompt.cc:251
msgid "The following packages have been automatically kept back:"
msgstr "Nasledujúce balÃky sú automaticky podržané v aktuálnom stavu:"
-#: src/cmdline/cmdline_prompt.cc:251
+#: src/cmdline/cmdline_prompt.cc:252
msgid "The following NEW packages will be automatically installed:"
msgstr "Nasledujúce NOVÉ balÃky budú nainÅ¡talované automaticky:"
-#: src/cmdline/cmdline_prompt.cc:252
+#: src/cmdline/cmdline_prompt.cc:253
msgid "The following packages will be automatically REMOVED:"
msgstr "Nasledujúce balÃky budú automaticky ODSTRÃNENÉ:"
-#: src/cmdline/cmdline_prompt.cc:253
+#: src/cmdline/cmdline_prompt.cc:254
msgid "The following packages will be DOWNGRADED:"
msgstr "Nasledujúce balÃky budú DEGRADOVANÉ:"
-#: src/cmdline/cmdline_prompt.cc:254
+#: src/cmdline/cmdline_prompt.cc:255
msgid "The following packages have been kept back:"
msgstr "Nasledujúce balÃky sú podržané v aktuálnom stave:"
-#: src/cmdline/cmdline_prompt.cc:255
+#: src/cmdline/cmdline_prompt.cc:256
msgid "The following packages will be REINSTALLED:"
msgstr "Nasledujúce balÃky budú reinÅ¡talované:"
-#: src/cmdline/cmdline_prompt.cc:256
+#: src/cmdline/cmdline_prompt.cc:257
msgid "The following NEW packages will be installed:"
msgstr "Nasledujúce NOVÉ balÃky budú inÅ¡talované:"
-#: src/cmdline/cmdline_prompt.cc:257
+#: src/cmdline/cmdline_prompt.cc:258
msgid "The following packages will be REMOVED:"
msgstr "Nasledujúce balÃky budú ODSTRÃNENÉ:"
-#: src/cmdline/cmdline_prompt.cc:258
+#: src/cmdline/cmdline_prompt.cc:259
msgid "The following packages will be upgraded:"
msgstr "Nasledujúce balÃky budú aktualizované:"
-#: src/cmdline/cmdline_prompt.cc:307
+#: src/cmdline/cmdline_prompt.cc:311
#, c-format
msgid "The following ESSENTIAL packages will be REMOVED!\n"
msgstr "Nasledujúce NUTNÉ balÃky budú ODSTRÃNENÉ!\n"
-#: src/cmdline/cmdline_prompt.cc:316
+#: src/cmdline/cmdline_prompt.cc:320
#, c-format
msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
msgstr "Nasledujúce NUTNÉ balÃky budú touto akciou PORUÅ ENÉ:\n"
-#: src/cmdline/cmdline_prompt.cc:326
+#: src/cmdline/cmdline_prompt.cc:330
#, c-format
msgid ""
"WARNING: Performing this action will probably cause your system to break!\n"
@@ -500,96 +587,99 @@
"VAROVÃNÃ: VykonanÃm tejto akcie pravdepodobne poÅ¡kodÃte systém!\n"
" Ak PRESNE neviete, Äo robÃte, NEPOKRAÄŒUJTE!\n"
-#: src/cmdline/cmdline_prompt.cc:328
+#: src/cmdline/cmdline_prompt.cc:332
msgid "I am aware that this is a very bad idea"
msgstr "Som si vedomý, že to je zlý nápad"
-#: src/cmdline/cmdline_prompt.cc:331
+#: src/cmdline/cmdline_prompt.cc:335
#, c-format
msgid "To continue, type the phrase \"%s\":\n"
msgstr "Na pokraÄovanie napÃÅ¡te frázu \"%s\":\n"
-#: src/cmdline/cmdline_prompt.cc:434
+#: src/cmdline/cmdline_prompt.cc:438
#, c-format
msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
msgstr "Nasledujúce balÃky sú DOPORUÄŒENÉ, ale NEBUDÚ inÅ¡talované:\n"
-#: src/cmdline/cmdline_prompt.cc:440
+#: src/cmdline/cmdline_prompt.cc:444
#, c-format
msgid "The following packages are SUGGESTED but will NOT be installed:\n"
msgstr "Nasledujúce balÃky sú NAVRHOVANÉ, ale NEBUDÚ inÅ¡talované:\n"
-#: src/cmdline/cmdline_prompt.cc:445
+#: src/cmdline/cmdline_prompt.cc:449
#, c-format
msgid "No packages will be installed, upgraded, or removed.\n"
msgstr "Žiadne balÃky sa nebudú inÅ¡talovaÅ¥, aktualizovaÅ¥ alebo odstraňovat.\n"
-#: src/cmdline/cmdline_prompt.cc:447
+#: src/cmdline/cmdline_prompt.cc:451
#, c-format
msgid "%lu packages upgraded, %lu newly installed, "
msgstr "%lu balÃkov aktualizovaných, %lu novo inÅ¡talovaných, "
-#: src/cmdline/cmdline_prompt.cc:451
+#: src/cmdline/cmdline_prompt.cc:455
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinštalované, "
-#: src/cmdline/cmdline_prompt.cc:453
+#: src/cmdline/cmdline_prompt.cc:457
#, c-format
msgid "%lu downgraded, "
msgstr "%lu degradované, "
-#: src/cmdline/cmdline_prompt.cc:455
+#: src/cmdline/cmdline_prompt.cc:459
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu k odstránenie a %lu neaktualizované.\n"
-#: src/cmdline/cmdline_prompt.cc:462
+#: src/cmdline/cmdline_prompt.cc:466
#, c-format
msgid "Need to get %sB/%sB of archives. "
msgstr "Potrebujem stiahnuÅ¥ %sB/%sB archÃvov. "
-#: src/cmdline/cmdline_prompt.cc:465
+#: src/cmdline/cmdline_prompt.cc:469
#, c-format
msgid "Need to get %sB of archives. "
msgstr "Potrebujem stiahnuÅ¥ %sB archÃvov. "
-#: src/cmdline/cmdline_prompt.cc:472
+#: src/cmdline/cmdline_prompt.cc:476
#, c-format
msgid "After unpacking %sB will be used.\n"
msgstr "Po rozbalenà bude použitých %sB.\n"
-#: src/cmdline/cmdline_prompt.cc:475
+#: src/cmdline/cmdline_prompt.cc:479
#, c-format
msgid "After unpacking %sB will be freed.\n"
msgstr "Po rozbalenà bude uvoľnených %sB.\n"
-#: src/cmdline/cmdline_prompt.cc:521
+#: src/cmdline/cmdline_prompt.cc:524
#, c-format
msgid "Bad action character '%c'\n"
msgstr "Chybná akcia '%c'\n"
-#: src/cmdline/cmdline_prompt.cc:596
+#: src/cmdline/cmdline_prompt.cc:595
#, c-format
msgid "No packages to show -- enter the package names on the line after 'i'.\n"
msgstr "Nie je Äo zobraziÅ¥ -- zadajte názvy balÃkov na riadok za 'i'.\n"
-#: src/cmdline/cmdline_prompt.cc:598 src/cmdline/cmdline_prompt.cc:629
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:597
msgid "Press Return to continue."
msgstr "Na pokraÄovanie stlaÄte Enter."
-#: src/cmdline/cmdline_prompt.cc:625
+#: src/cmdline/cmdline_prompt.cc:623
#, c-format
msgid "No packages found -- enter the package names on the line after 'c'.\n"
msgstr "Žiadne balÃky nenájdené -- zadajte názvy balÃkov na riadok za 'c'.\n"
-#: src/cmdline/cmdline_prompt.cc:665
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:627
+#, fuzzy
+msgid "Press Return to continue"
+msgstr "Na pokraÄovanie stlaÄte Enter."
+
+#: src/cmdline/cmdline_prompt.cc:675
msgid "Do you want to continue? [Y/n/?] "
msgstr "Chcete pokraÄovaÅ¥? [Y/n/?] "
-#: src/cmdline/cmdline_prompt.cc:690
+#: src/cmdline/cmdline_prompt.cc:700
#, c-format
msgid ""
"\n"
@@ -600,7 +690,7 @@
"Informácie o závislostiach budú zobrazené.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:692
+#: src/cmdline/cmdline_prompt.cc:702
#, c-format
msgid ""
"\n"
@@ -611,7 +701,7 @@
"Informácie o závislostiach nebudú zobrazené.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:698
+#: src/cmdline/cmdline_prompt.cc:708
#, c-format
msgid ""
"\n"
@@ -622,7 +712,7 @@
"Verzie budú zobrazené.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:700
+#: src/cmdline/cmdline_prompt.cc:710
#, c-format
msgid ""
"\n"
@@ -633,7 +723,7 @@
"Verzie nebudú zobrazené.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:705
+#: src/cmdline/cmdline_prompt.cc:715
#, c-format
msgid ""
"\n"
@@ -644,7 +734,7 @@
"Zmeny veľkostà budú zobrazené.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:717
#, c-format
msgid ""
"\n"
@@ -655,7 +745,7 @@
"Zmeny veľkostà nebudú zobrazené.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:737
#, c-format
msgid ""
"Commands:\n"
@@ -705,32 +795,83 @@
" _ : Odstránenie aj s konfiguráciou\n"
" = : Podržanie v aktuálnom stave\n"
-#: src/cmdline/cmdline_prompt.cc:751
+#: src/cmdline/cmdline_prompt.cc:761
#, c-format
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:84
+#, c-format
+msgid "y: %F%nn: %F%nq: %F%n,: %F%n.: %F%n"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:90
+msgid "accept the proposed changes"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:92
+msgid "reject the proposed changes and search for another solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:94
+#, fuzzy
+msgid "give up and quit the program"
+msgstr "UkonÄÃ program"
+
+#: src/cmdline/cmdline_resolver.cc:96
+msgid "move to the next solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:98
+msgid "move to the previous solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:131
+#, fuzzy
+msgid "The following actions will resolve these dependencies:"
+msgstr "Nasledujúce balÃky majú nesplnené závislosti:\n"
+
+#: src/cmdline/cmdline_resolver.cc:146
+msgid "Accept this solution? [Y/n/q/?]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:174
+msgid "Abandoning all efforts to resolve these dependencies."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:184
+#, fuzzy
+msgid "The following commands are available:"
+msgstr "Nasledujúce balÃky sú POÅ KODENÉ:"
+
+#: src/cmdline/cmdline_resolver.cc:188
+#, fuzzy
+msgid "Invalid response; please enter one of the following commands:"
+msgstr "Chybná odpoveÄ. Zadajte platný prÃkaz alebo '?' na pomoc.\n"
+
+#: src/cmdline/cmdline_resolver.cc:198
+msgid "No solution found within the allotted time. Try harder? [Y/n]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:226
+#, fuzzy
+msgid "Invalid response; please enter 'y' or 'n'."
+msgstr "Chybná odpoveÄ. Zadajte platný prÃkaz alebo '?' na pomoc.\n"
+
+#: src/cmdline/cmdline_resolver.cc:235
+msgid "Unable to resolve dependencies! Giving up..."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:240
+msgid "No more solutions."
+msgstr ""
+
#: src/cmdline/cmdline_search.cc:78
#, c-format
msgid "search: You must provide at least one search term\n"
msgstr "hľadanie: MusÃte zadaÅ¥ aspoň jeden hľadaný výraz\n"
-#: src/cmdline/cmdline_show_broken.cc:114
-#, c-format
-msgid ""
-"Some packages had unmet dependencies. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming.\n"
-"\n"
-msgstr ""
-"Niektoré balÃky majú nesplnené závislosti. To môže znamenaÅ¥, že požadujete\n"
-"nemožnú situáciu, alebo, ak použÃvate nestabilnú distribúciu, že\n"
-"vyžadované balÃky eÅ¡te neboli vytvorené alebo presunuté z Prichádzajúcej "
-"fronty.\n"
-"\n"
-
-#: src/cmdline/cmdline_show_broken.cc:115
+#: src/cmdline/cmdline_show_broken.cc:113
#, c-format
msgid "The following packages have unmet dependencies:\n"
msgstr "Nasledujúce balÃky majú nesplnené závislosti:\n"
@@ -928,12 +1069,12 @@
msgid "Description: "
msgstr "Popis: "
-#: src/cmdline/cmdline_simulate.cc:36
+#: src/cmdline/cmdline_simulate.cc:37
#, c-format
msgid "Would download/install/remove packages.\n"
msgstr "Teoreticky by stiahol/nainÅ¡taloval/odstránil balÃky.\n"
-#: src/cmdline/cmdline_simulate.cc:47
+#: src/cmdline/cmdline_simulate.cc:48
msgid "Internal Error, Ordering didn't finish"
msgstr "Vnútorná chyba, výber neskonÄil"
@@ -975,28 +1116,24 @@
msgid "UNAVAILABLE"
msgstr "NEDOSTUPNÃ"
-#: src/download_bar.cc:57 src/download_list.cc:265
+#: src/download_bar.cc:56 src/download_list.cc:263 src/download_screen.cc:57
#, c-format
-msgid ""
-"Please insert the following disc into the drive \"%s\":\n"
-"%s"
-msgstr ""
-"ProsÃm vložte nasledujúci disk do mechaniky \"%s\":\n"
-"%s"
+msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
+msgstr "Vložte do mechaniky \"%s\" disk nazvaný \"%s\""
-#: src/download_bar.cc:76 src/generic/acqprogress.cc:63
+#: src/download_bar.cc:77 src/generic/acqprogress.cc:63
msgid "Hit "
msgstr "Cieľ "
-#: src/download_bar.cc:89
+#: src/download_bar.cc:90
msgid "Downloading "
msgstr "SÅ¥ahujem "
-#: src/download_bar.cc:102
+#: src/download_bar.cc:103
msgid "Got "
msgstr "Mám "
-#: src/download_bar.cc:156
+#: src/download_bar.cc:157
msgid "Downloading..."
msgstr "SÅ¥ahujem ..."
@@ -1004,7 +1141,7 @@
msgid "Couldn't read list of package sources"
msgstr "Nemôžem ÄÃtaÅ¥ zoznam zo zdrojmi balÃkov"
-#: src/download.cc:104 src/download.cc:321
+#: src/download.cc:104 src/download.cc:322
msgid "Couldn't lock list directory..are you root?"
msgstr "Nemôžem zamknúť adresár zoznamu...ste root?"
@@ -1016,29 +1153,33 @@
msgid "View the progress of the package list update"
msgstr "Zobrazà priebeh aktualizácie zoznamu balÃkov"
-#: src/download.cc:159
+#: src/download.cc:113
+msgid "List Update"
+msgstr ""
+
+#: src/download.cc:160
msgid "Couldn't clean out list directories"
msgstr "Nemôžem vyÄistiÅ¥ adresáre zoznamu"
-#: src/download.cc:176 src/ui.cc:1068
+#: src/download.cc:177 src/ui.cc:1152
msgid "Deleting obsolete downloaded files"
msgstr "Vymazávam staré stiahnuté súbory"
-#: src/download.cc:181
+#: src/download.cc:182
#, c-format
msgid "Deleting obsolete downloaded files\n"
msgstr "Vymazávam staré stiahnuté súbory\n"
-#: src/download.cc:223
+#: src/download.cc:224
#, c-format
msgid "Unable to open %s to log actions"
msgstr "Nemôžem otvoriť %s na záznam akcii"
-#: src/download.cc:229
+#: src/download.cc:230
msgid "log report"
msgstr "záznam hlásenÃ"
-#: src/download.cc:230
+#: src/download.cc:231
#, c-format
msgid ""
"IMPORTANT: this log only lists intended actions; actions which fail due to\n"
@@ -1049,77 +1190,77 @@
"kvôli problémom v dpkg nemusia byÅ¥ dokonÄené.\n"
"\n"
-#: src/download.cc:231
+#: src/download.cc:232
#, c-format
msgid "Will install %li packages, and remove %li packages.\n"
msgstr "Budem inÅ¡talovaÅ¥ %li balÃkov a odstraňovaÅ¥ %li balÃkov.\n"
-#: src/download.cc:233
+#: src/download.cc:234
#, c-format
msgid "%sB of disk space will be used\n"
msgstr "%sB miesta na disku bude použitých\n"
-#: src/download.cc:236
+#: src/download.cc:237
#, c-format
msgid "%sB bytes of disk space will be freed\n"
msgstr "%sB miesta na disku bude uvoľnených\n"
-#: src/download.cc:244
+#: src/download.cc:245
#, c-format
msgid "[UPGRADE] %s %s -> %s\n"
msgstr "[AKTUALIZÃCIA] %s %s -> %s\n"
-#: src/download.cc:248
+#: src/download.cc:249
#, c-format
msgid "[DOWNGRADE] %s %s -> %s\n"
msgstr "[DEGRADÃCIA] %s %s -> %s\n"
-#: src/download.cc:258
+#: src/download.cc:259
msgid "REMOVE"
msgstr "ODSTRÃNIŤ"
-#: src/download.cc:264
+#: src/download.cc:265
msgid "INSTALL"
msgstr "INŠTALOVAŤ"
-#: src/download.cc:267
+#: src/download.cc:268
msgid "REINSTALL"
msgstr "REINŠTALOVAŤ"
-#: src/download.cc:270
+#: src/download.cc:271
msgid "HOLD"
msgstr "PODRŽAŤ"
-#: src/download.cc:273
+#: src/download.cc:274
msgid "BROKEN"
msgstr "POÅ KODENÃ"
-#: src/download.cc:276
+#: src/download.cc:277
msgid "REMOVE, NOT USED"
msgstr "ODSTRÃNIŤ, NEPOUŽÃVANÃ"
-#: src/download.cc:279
+#: src/download.cc:280
msgid "REMOVE, DEPENDENCIES"
msgstr "ODSTRÃNIŤ, ZÃVISLOSTI"
-#: src/download.cc:282
+#: src/download.cc:283
msgid "INSTALL, DEPENDENCIES"
msgstr "INÅšTALOVAŤ, ZÃVISLOSTI"
-#: src/download.cc:285
+#: src/download.cc:286
msgid "HOLD, DEPENDENCIES"
msgstr "PODRŽAŤ, ZÃVISLOSTI"
-#: src/download.cc:287
+#: src/download.cc:288
msgid "????????"
msgstr "????????"
-#: src/download.cc:291
+#: src/download.cc:292
#, c-format
msgid "[%s] %s\n"
msgstr "[%s] %s\n"
-#: src/download.cc:294
+#: src/download.cc:295
#, c-format
msgid ""
"===============================================================================\n"
@@ -1130,32 +1271,37 @@
"\n"
"Záznam kompletný.\n"
-#: src/download.cc:329
+#: src/download.cc:330
msgid "Downloading packages"
msgstr "SÅ¥ahujem balÃky"
-#: src/download.cc:330
+#: src/download.cc:331
msgid "View the progress of the package download"
msgstr "Zobrazà priebeh sÅ¥ahovania balÃkov"
-#: src/download.cc:352
+#: src/download.cc:332
+#, fuzzy
+msgid "Package Download"
+msgstr "BalÃk: "
+
+#: src/download.cc:354
msgid "Internal error: couldn't generate list of packages to download"
msgstr "Vnútorná chyba: nemôžem vytvoriÅ¥ zoznam balÃkov na stiahnutie"
-#: src/download.cc:413
+#: src/download.cc:415
msgid "Unable to correct for unavailable packages"
msgstr "Nemôžem opraviÅ¥ kvôli nedostupným balÃkom"
-#: src/download.cc:465
+#: src/download.cc:467
msgid ""
"Ack! Something bad happened while installing packages. Trying to recover:"
msgstr "PoÄas inÅ¡talácie balÃkov sa stalo nieÄo zlého. Skúšam obnoviÅ¥:"
-#: src/download.cc:475 src/pkg_item.cc:413
+#: src/download.cc:477 src/pkg_item.cc:432
msgid "Press return to continue.\n"
msgstr "Na pokraÄovanie stlaÄte enter.\n"
-#: src/download.cc:506
+#: src/download.cc:508
msgid ""
"Could not regain the system lock! (Perhaps another apt or dpkg is running?)"
msgstr "Nemôžem zÃskat systémový zámok! (Možno bežà ÄalÅ¡Ã apt alebo dpkg?)"
@@ -1215,11 +1361,6 @@
msgid "[ERROR]"
msgstr "[CHYBA]"
-#: src/download_screen.cc:57
-#, c-format
-msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
-msgstr "Vložte do mechaniky \"%s\" disk nazvaný \"%s\""
-
#: src/download_screen.cc:181
#, c-format
msgid "Downloaded %sB in %ss (%sB/s)."
@@ -1258,110 +1399,110 @@
msgstr ""
"Výmena média: Do mechaniky '%s' vložte disk nazvaný '%s' a stlaÄte enter\n"
-#: src/generic/aptcache.cc:245
+#: src/generic/aptcache.cc:253
msgid "Can't open Aptitude extended state file"
msgstr "Nemôžem otvoriÅ¥ rozÅ¡Ãrený stavový súbor programu Aptitude"
-#: src/generic/aptcache.cc:252 src/generic/aptcache.cc:305
-#: src/generic/aptcache.cc:307
+#: src/generic/aptcache.cc:260 src/generic/aptcache.cc:313
+#: src/generic/aptcache.cc:315
msgid "Reading extended state information"
msgstr "ÄŒÃtam rozÅ¡Ãrené stavové informácie"
-#: src/generic/aptcache.cc:313 src/generic/aptcache.cc:387
-#: src/generic/aptcache.cc:390
+#: src/generic/aptcache.cc:321 src/generic/aptcache.cc:395
+#: src/generic/aptcache.cc:398
msgid "Initializing package states"
msgstr "Inicializujem stavy balÃkov"
-#: src/generic/aptcache.cc:501
+#: src/generic/aptcache.cc:509
msgid "Cannot open Aptitude state file"
msgstr "Nemôžem otvoriť stavový súbor programu Aptitude"
-#: src/generic/aptcache.cc:505 src/generic/aptcache.cc:560
-#: src/generic/aptcache.cc:563
+#: src/generic/aptcache.cc:513 src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:571
msgid "Writing extended state information"
msgstr "Zapisujem rozÅ¡Ãrené stavové informácie"
-#: src/generic/aptcache.cc:542
+#: src/generic/aptcache.cc:550
#, 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/aptcache.cc:551
+#: src/generic/aptcache.cc:559
msgid "Couldn't write state file"
msgstr "Nemôžem zapÃsaÅ¥ stavový súbor"
-#: src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:576
msgid "Error writing state file"
msgstr "Chyba pri zápise stavového súboru"
-#: src/generic/aptcache.cc:584
+#: src/generic/aptcache.cc:592
msgid "couldn't replace old state file"
msgstr "nemôžem nahradiť starý stavový súbor"
-#: src/generic/aptcache.cc:960
+#: src/generic/aptcache.cc:1000
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/aptcache.cc:1325
+#: src/generic/aptcache.cc:1546
msgid "The list of sources could not be read."
msgstr "Nedá sa preÄÃtaÅ¥ zoznam zdrojov."
-#: src/generic/aptcache.cc:1332
+#: src/generic/aptcache.cc:1553
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/aptcache.cc:1335
+#: src/generic/aptcache.cc:1556
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"
-#: src/generic/apt.cc:141
+#: src/generic/apt.cc:142
#, c-format
msgid "Unable to open %s for writing"
msgstr "Nemôžem otvoriť %s na zápis"
-#: src/generic/apt.cc:151
+#: src/generic/apt.cc:152
#, c-format
msgid "Unable to replace %s with new configuration file"
msgstr "Nemôžem nahradiÅ¥ %s novým konfiguraÄným súborom"
-#: src/generic/apt.cc:226
+#: src/generic/apt.cc:227
msgid "Warning: could not lock the cache file. Opening in read-only mode"
msgstr ""
"Varovanie: nemožno zamknúť cache súbor. Otváram v režime iba na ÄÃtanie"
-#: src/generic/matchers.cc:780
+#: src/generic/matchers.cc:797
msgid "Unmatched '('"
msgstr "Nepárová '('"
-#: src/generic/matchers.cc:870 src/generic/matchers.cc:949
+#: src/generic/matchers.cc:887 src/generic/matchers.cc:968
#, c-format
msgid "Unknown dependency type: %s"
msgstr "Neznáma závislosť: %s"
-#: src/generic/matchers.cc:931
+#: src/generic/matchers.cc:950
#, c-format
msgid "Unknown action type: %s"
msgstr "Neznáma akcia: %s"
-#: src/generic/matchers.cc:998
+#: src/generic/matchers.cc:1017
#, c-format
msgid "Unknown priority %s"
msgstr "Neznáma priorita: %s"
-#: src/generic/matchers.cc:1020
+#: src/generic/matchers.cc:1039
#, c-format
msgid "Unknown pattern type: %c"
msgstr "Neznámy vzor: %c"
-#: src/generic/matchers.cc:1065
+#: src/generic/matchers.cc:1084
msgid "Unexpected empty expression"
msgstr "NeoÄakávaný prázdny výraz"
-#: src/generic/matchers.cc:1100
+#: src/generic/matchers.cc:1119
msgid "Badly formed expression"
msgstr "Zle zformulovaný výraz"
-#: src/generic/matchers.cc:1129
+#: src/generic/matchers.cc:1148
msgid "Unexpected ')'"
msgstr "NeoÄakávaná ')'"
@@ -1385,7 +1526,7 @@
msgid "Can't get value of $HOME, using TMPDIR (insecure)"
msgstr "Nemôžem zistit hodnotu $HOME, použÃvam TMPDIR (nebezpeÄné)"
-#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:60
+#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:61
#, c-format
msgid "ChangeLog of %s"
msgstr "Súbor zmien %s"
@@ -1588,17 +1729,17 @@
msgid "Invalid sorting policy type '%s'"
msgstr "Neplatný triediaci mechanizmus '%s'"
-#: src/main.cc:68
+#: src/main.cc:67
#, c-format
msgid "%s %s compiled at %s %s\n"
msgstr "%s %s skompilovaný %s %s\n"
-#: src/main.cc:71
+#: src/main.cc:70
#, c-format
msgid "Compiler: g++ %s\n"
msgstr "Kompilátor: g++ %s\n"
-#: src/main.cc:74
+#: src/main.cc:73
#, c-format
msgid ""
"\n"
@@ -1607,7 +1748,7 @@
"\n"
"Verzia ncurses: %s\n"
-#: src/main.cc:76
+#: src/main.cc:75
#, c-format
msgid ""
"\n"
@@ -1616,22 +1757,22 @@
"\n"
"Verzia curses: %s\n"
-#: src/main.cc:78
+#: src/main.cc:77
#, c-format
msgid "libsigc++ version: %s\n"
msgstr "verzia libsigc++: %s\n"
-#: src/main.cc:84
+#: src/main.cc:83
#, c-format
msgid "Usage: aptitude [-S fname] [-u|-i]"
msgstr "Použitie: aptitude [-S názsub] [-u|-i]"
-#: src/main.cc:86
+#: src/main.cc:85
#, c-format
msgid " aptitude [options] <action> ..."
msgstr " aptitude [voľby] <akcie> ..."
-#: src/main.cc:88
+#: src/main.cc:87
#, c-format
msgid ""
" Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -1640,42 +1781,42 @@
" Akcie (ak nie sú zadané, aptitude spustà interaktÃvny režim):\n"
"\n"
-#: src/main.cc:89
+#: src/main.cc:88
#, c-format
msgid " install - Install/upgrade packages\n"
msgstr " install - InÅ¡taluje/aktualizuje balÃky\n"
-#: src/main.cc:90
+#: src/main.cc:89
#, c-format
msgid " remove - Remove packages\n"
msgstr " remove - Odstráni balÃky\n"
-#: src/main.cc:91
+#: src/main.cc:90
#, c-format
msgid " purge - Remove packages and their configuration files\n"
msgstr " purge - Odstráni balÃky a ich konfiguraÄné súbory\n"
-#: src/main.cc:92
+#: src/main.cc:91
#, c-format
msgid " hold - Place packages on hold\n"
msgstr " hold - Ochráni balÃky pred aktualizáciou\n"
-#: src/main.cc:93
+#: src/main.cc:92
#, c-format
msgid " unhold - Cancel a hold command for a package\n"
msgstr " unhold - ZruÅ¡Ã ochranu balÃku pred aktualizáciou\n"
-#: src/main.cc:94
+#: src/main.cc:93
#, c-format
msgid " markauto - Mark packages as having been automatically installed\n"
msgstr " markauto - OznaÄà balÃky, ako že boli inÅ¡talované automaticky\n"
-#: src/main.cc:95
+#: src/main.cc:94
#, c-format
msgid " unmarkauto - Mark packages as having been manually installed\n"
msgstr " unmarkauto - OznaÄà balÃky, ako že boli inÅ¡talované ruÄne\n"
-#: src/main.cc:100
+#: src/main.cc:99
#, c-format
msgid ""
" forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -1683,17 +1824,17 @@
msgstr ""
" forbid-version - Zakáže aptitude aktualizáciu na konkrétnu verziu balÃku.\n"
-#: src/main.cc:101
+#: src/main.cc:100
#, c-format
msgid " update - Download lists of new/upgradable packages\n"
msgstr " update - Stiahne zoznamy nových/aktualizovateľných balÃkov\n"
-#: src/main.cc:102
+#: src/main.cc:101
#, c-format
msgid " upgrade - Perform a safe upgrade\n"
msgstr " upgrade - Vykoná bezpeÄnú aktualizáciu\n"
-#: src/main.cc:103
+#: src/main.cc:102
#, c-format
msgid ""
" dist-upgrade - Perform an upgrade, possibly installing and removing "
@@ -1702,76 +1843,76 @@
" dist-upgrade - Vykoná aktualizáciu, pri ktoré možno (na|od)inštaluje "
"balÃky\n"
-#: src/main.cc:104
+#: src/main.cc:103
#, c-format
msgid " forget-new - Forget what packages are \"new\"\n"
msgstr " forget-new - Zabudne, ktoré balÃky sú \"nové\"\n"
-#: src/main.cc:105
+#: src/main.cc:104
#, c-format
msgid " search - Search for a package by name and/or expression\n"
msgstr " search - Hľadá balÃky podľa mena a/alebo výrazu\n"
-#: src/main.cc:106
+#: src/main.cc:105
#, c-format
msgid " show - Display detailed information about a package\n"
msgstr " show - Zobrazà podrobné informácie o balÃku\n"
-#: src/main.cc:107
+#: src/main.cc:106
#, c-format
msgid " clean - Erase downloaded package files\n"
msgstr " clean - Vymaže stiahnuté .deb súbory balÃkov\n"
-#: src/main.cc:108
+#: src/main.cc:107
#, c-format
msgid " autoclean - Erase old downloaded package files\n"
msgstr " autoclean - Vymaže staré stiahnuté .deb súbory balÃkov\n"
-#: src/main.cc:109
+#: src/main.cc:108
#, c-format
msgid " changelog - View a package's changelog\n"
msgstr " changelog - Zobrazà zoznam zmien balÃku\n"
-#: src/main.cc:110
+#: src/main.cc:109
#, c-format
msgid " download - Download the .deb file for a package\n"
msgstr " download - Stiahne .deb súbor balÃku\n"
-#: src/main.cc:112
+#: src/main.cc:111
#, c-format
msgid " Options:\n"
msgstr " Voľby:\n"
-#: src/main.cc:113
+#: src/main.cc:112
#, c-format
msgid " -h This help text\n"
msgstr " -h Táto pomoc\n"
-#: src/main.cc:114
+#: src/main.cc:113
#, c-format
msgid " -s Simulate actions, but do not actually perform them.\n"
msgstr " -s Iba simuluje, niÄ reálne nevykonáva.\n"
-#: src/main.cc:115
+#: src/main.cc:114
#, c-format
msgid ""
" -d Only download packages, do not install or remove anything.\n"
msgstr ""
" -d Stiahne balÃky, ale niÄ neinÅ¡taluje alebo neodstraňuje.\n"
-#: src/main.cc:116
+#: src/main.cc:115
#, c-format
msgid " -P Always prompt for confirmation or actions\n"
msgstr " -P Vždy vyžaduje potvrdenie akciou\n"
-#: src/main.cc:117
+#: src/main.cc:116
#, c-format
msgid ""
" -y Assume that the answer to simple yes/no questions is 'yes'\n"
msgstr ""
" -y Na jednoduché ano/ne otázky odpovie automaticky 'ano'\n"
-#: src/main.cc:118
+#: src/main.cc:117
#, c-format
msgid ""
" -F format Specify a format for displaying search results; see the "
@@ -1779,60 +1920,60 @@
msgstr ""
" -F formát Zadajte formát na zobrazenie výsledkov hľadania; viÄ manuál\n"
-#: src/main.cc:119
+#: src/main.cc:118
#, c-format
msgid ""
" -O order Specify how search results should be sorted; see the manual\n"
msgstr ""
" -O radenie Zadajte, ako sa majú výsledky hľadania zoradiÅ¥; viÄ manuál\n"
-#: src/main.cc:120
+#: src/main.cc:119
#, c-format
msgid ""
" -w width Specify the display width for formatting search results\n"
msgstr " -w Å¡Ãrka Zadajte Å¡Ãrku zobrazenia výsledkov hľadania\n"
-#: src/main.cc:121
+#: src/main.cc:120
#, c-format
msgid " -f Aggressively try to fix broken packages.\n"
msgstr " -f AgresÃvne sa pokúsi opraviÅ¥ poÅ¡kodené balÃky.\n"
-#: src/main.cc:122
+#: src/main.cc:121
#, c-format
msgid " -V Show which versions of packages are to be installed.\n"
msgstr " -V Zobrazà verziu balÃkov, ktoré sa majú inÅ¡talovaÅ¥.\n"
-#: src/main.cc:123
+#: src/main.cc:122
#, c-format
msgid ""
" -D Show the dependencies of automatically changed packages.\n"
msgstr " -D Zobrazà závislosti automaticky zmenených balÃkov.\n"
-#: src/main.cc:124
+#: src/main.cc:123
#, c-format
msgid " -Z\t\t Show the change in installed size of each package.\n"
msgstr " -Z\t\t Zobrazà zmenu v inÅ¡talovaniej veľkosti každého balÃku.\n"
-#: src/main.cc:125
+#: src/main.cc:124
#, c-format
msgid ""
" -v Display extra information. (may be supplied multiple times)\n"
msgstr ""
" -v Zobrazà dodatoÄné informácie. (Môžete zadaÅ¥ niekoľkokrát.)\n"
-#: src/main.cc:126
+#: src/main.cc:125
#, c-format
msgid ""
" -t [release] Set the release from which packages should be installed\n"
msgstr ""
" -t [verzia] Vyberie verziu Debianu, z ktorej sa majú balÃky inÅ¡talovaÅ¥\n"
-#: src/main.cc:127
+#: src/main.cc:126
#, c-format
msgid " -o key=val Directly set the configuration option named 'key'\n"
msgstr " -o kľúÄ=hodn Nastavà konfiguraÄnú voľbu nazvanú 'kľúÄ'\n"
-#: src/main.cc:128
+#: src/main.cc:127
#, c-format
msgid ""
" --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -1841,58 +1982,66 @@
" --with(out)-recommends\tNastavÃ, Äi sa majú doporuÄené závislosti\n"
" brať ako silné závislosti\n"
-#: src/main.cc:129
+#: src/main.cc:128
#, c-format
msgid " -S fname: Read the aptitude extended status info from fname.\n"
msgstr ""
" -S menosub: NaÄÃtaÅ¥ rozÅ¡Ãrené stavové informácie zo súboru menosub.\n"
-#: src/main.cc:130
+#: src/main.cc:129
#, c-format
msgid " -u : Download new package lists on startup.\n"
msgstr " -u : Pri Å¡tarte stiahnuÅ¥ nové zoznamy balÃkov.\n"
-#: src/main.cc:131
+#: src/main.cc:130
#, c-format
msgid " -i : Perform an install run on startup.\n"
msgstr " -i : Pri štarte spustiť inštaláciu.\n"
-#: src/main.cc:133
+#: src/main.cc:132
#, c-format
msgid " This aptitude does not have Super Cow Powers.\n"
msgstr " Táto aptitude nemá schopnosti svätej kravy.\n"
-#: src/main.cc:254
+#: src/main.cc:253
#, c-format
msgid "-o requires an argument of the form key=value, got %s"
msgstr "-o vyžaduje argument v tvare kľúÄ=hodnota, zadané %s"
-#: src/main.cc:300 src/main.cc:309
+#: src/main.cc:299 src/main.cc:308
msgid "WEIRDNESS: unknown option code received\n"
msgstr "ZVLÃÅ TNE: obdržaný kód neznámej voľby\n"
-#: src/main.cc:318
+#: src/main.cc:317
msgid "Only one of -u and -i may be specified\n"
msgstr "Môžete zadať iba jednu z volieb -u a -i\n"
-#: src/main.cc:326
+#: src/main.cc:325
msgid ""
"-u and -i may not be specified in command-line mode (eg, with 'install')"
msgstr "-u a -i nemôžu byť použité v riadkovom móde (napr. s 'install')"
-#: src/main.cc:337
+#: src/main.cc:342
msgid "-u and -i may not be specified with a command"
msgstr "-u a -i nemôžu byÅ¥ použité spoloÄne s prÃkazom"
-#: src/main.cc:392
+#: src/main.cc:399
#, c-format
msgid "Unknown command \"%s\"\n"
msgstr "Neznámy prÃkaz \"%s\"\n"
-#: src/main.cc:400
+#: src/main.cc:406 src/main.cc:463
+msgid "Internal error: uncaught 'out of solutions' exception.\n"
+msgstr ""
+
+#: src/main.cc:411 src/main.cc:468
+msgid "Internal error: uncaught 'out of time' exception.\n"
+msgstr ""
+
+#: src/main.cc:418
#, c-format
-msgid "Invalid option for interactive mode: -s\n"
-msgstr "Neplatná voľba na interaktÃvny režim: -s\n"
+msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
+msgstr ""
#: src/mine/cmine.cc:93
#, c-format
@@ -1920,7 +2069,7 @@
msgid "Lost"
msgstr "Prehral"
-#: src/mine/cmine.cc:119 src/ui.cc:1005
+#: src/mine/cmine.cc:119 src/ui.cc:1089
msgid "Minesweeper"
msgstr "Hľadanie mÃn"
@@ -2096,7 +2245,7 @@
msgid "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
msgstr "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
-#: src/pkg_columnizer.cc:84 src/ui.cc:1488
+#: src/pkg_columnizer.cc:84 src/ui.cc:1638
msgid "Package"
msgstr "BalÃk"
@@ -2355,13 +2504,14 @@
" BalÃky zo sekcie 'base' sú súÄasÅ¥ou minimálnej inÅ¡talácie systému."
#: src/pkg_grouppolicy.cc:158
+#, fuzzy
msgid ""
"Programs for faxmodems and other communications devices\n"
" Packages in the 'comm' section are used to control modems and other "
"hardware communications devices. This includes software to control faxmodems "
"(for instance, PPP for dial-up internet connections and programs originally "
-"written for that purpose (zmodem/kermit), as well as software to control "
-"cellular phones, interface with FidoNet, and run a BBS."
+"written for that purpose, such as zmodem/kermit), as well as software to "
+"control cellular phones, interface with FidoNet, and run a BBS."
msgstr ""
"Programy na faxmodemy a iné komunikaÄné zariadenia\n"
" BalÃky zo sekcie 'comm' sa použÃvajú k ovládaniu modemov a ÄalÅ¡Ãch "
@@ -2797,14 +2947,15 @@
"balÃky presúvané do hlavného archÃvu v sekcii 'main'."
#: src/pkg_grouppolicy.cc:193
+#, fuzzy
msgid ""
"Programs which are not free software\n"
" Packages in the 'non-free' section are not part of Debian.\n"
" .\n"
" These packages fail to meet one or more of the requirements of the Debian "
-"Free Software Guidelines (see below) You should read the license of programs "
-"in this section to be sure that you are allowed to use them in the way you "
-"intend.\n"
+"Free Software Guidelines (see below). You should read the license of "
+"programs in this section to be sure that you are allowed to use them in the "
+"way you intend.\n"
" .\n"
" For more information about what Debian considers to be Free Software, see "
"http://www.debian.org/social_contract#guidelines"
@@ -2868,11 +3019,12 @@
" K týmto balÃkom existuje novÅ¡ia verzia."
#: src/pkg_grouppolicy.cc:320
+#, fuzzy
msgid ""
"New Packages\n"
" These packages have been added to Debian since the last time you cleared "
-"the list of \"new\" packages. (choose \"Forget new packages\" from the "
-"Actions menu to empty this list)"
+"the list of \"new\" packages (choose \"Forget new packages\" from the "
+"Actions menu to empty this list)."
msgstr ""
"Nové balÃky\n"
" Tieto balÃky boli pridané do Debianu od posledného Äistenia \"nových\" "
@@ -3120,101 +3272,121 @@
msgid "Versions"
msgstr "Verzie"
-#: src/pkg_item.cc:54
+#: src/pkg_item.cc:55
msgid "Yes, I am aware this is a very bad idea"
msgstr "Ano, viem, že je to zlý nápad"
#: src/pkg_item.cc:80
-#, c-format
+#, fuzzy, c-format
msgid ""
-"%s is an essential package!\n"
-"\n"
-"Are you sure you want to remove it?\n"
-"Type '%s' if you are."
+"%s is an essential package!%n%nAre you sure you want to remove it?%nType '%"
+"s' if you are."
msgstr ""
"%s je nutný balÃk!\n"
"\n"
"Ste si istý, že ho chcete odstrániť?\n"
"Ak ste, napÃÅ¡te '%s'."
-#: src/pkg_item.cc:219
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:625
#, c-format
msgid "Information about %s"
msgstr "Informácie o %s"
-#: src/pkg_item.cc:304
-msgid "Available versions of "
+#: src/pkg_item.cc:224 src/pkg_ver_item.cc:627
+#, c-format
+msgid "%s info"
+msgstr ""
+
+#: src/pkg_item.cc:310
+#, fuzzy, c-format
+msgid "Available versions of %s"
msgstr "Dostupné verzie"
-#: src/pkg_item.cc:312 src/pkg_ver_item.cc:648
+#: src/pkg_item.cc:313
+#, fuzzy, c-format
+msgid "%s versions"
+msgstr "Verzie"
+
+#: src/pkg_item.cc:325 src/pkg_ver_item.cc:655
#, c-format
msgid "Dependencies of %s"
msgstr "Závislosti %s"
-#: src/pkg_item.cc:322 src/pkg_ver_item.cc:657
+#: src/pkg_item.cc:327 src/pkg_ver_item.cc:657
+#, c-format
+msgid "%s deps"
+msgstr ""
+
+#: src/pkg_item.cc:338 src/pkg_ver_item.cc:667
#, c-format
msgid "Packages depending on %s"
msgstr "BalÃky závisiace na %s"
-#: src/pkg_item.cc:373 src/pkg_ver_item.cc:694
+#: src/pkg_item.cc:340 src/pkg_ver_item.cc:669
+#, c-format
+msgid "%s reverse deps"
+msgstr ""
+
+#: src/pkg_item.cc:392 src/pkg_ver_item.cc:707
#, c-format
msgid "Reporting a bug in %s:\n"
msgstr "Hlásim chybu v %s:\n"
-#: src/pkg_item.cc:395
+#: src/pkg_item.cc:414
+#, fuzzy
msgid ""
-"You are not root and I cannot find any way\n"
-"to become root. To reconfigure this package,\n"
-"install the menu package, the login package,\n"
-"or run aptitude as root."
+"You are not root and I cannot find any way to become root. To reconfigure "
+"this package, install the menu package, the login package, or run aptitude "
+"as root."
msgstr ""
"Nie ste root a nevidÃm možnosÅ¥, ako sa nÃm\n"
"stáť. Na rekonfiguráciu tohto balÃku\n"
"nainÅ¡talujte balÃky menu a login, alebo\n"
"spusťte aptitude ako root."
-#: src/pkg_item.cc:403
+#: src/pkg_item.cc:422
#, c-format
msgid "Reconfiguring %s\n"
msgstr "Prekonfigurovávám %s\n"
-#: src/pkg_item.cc:428
+#: src/pkg_item.cc:447
msgid "Hierarchy editor"
msgstr "Editor hierarchie"
+#: src/pkg_item.cc:447
+#, fuzzy
+msgid "Hierarchy Editor"
+msgstr "Editor hierarchie"
+
#: src/pkg_tree.cc:325
msgid "Search for: "
msgstr "Hľadať: "
-#: src/pkg_tree.cc:585
+#: src/pkg_tree.cc:568
msgid "All Packages"
msgstr "VÅ¡etky balÃky"
-#: src/pkg_tree.cc:598 src/pkg_tree.cc:607
+#: src/pkg_tree.cc:581 src/pkg_tree.cc:590
msgid "Building view"
msgstr "Zostavujem pohľad"
-#: src/pkg_tree.cc:649
+#: src/pkg_tree.cc:632
#, c-format
msgid "No packages matched the pattern \"%s\"."
msgstr "Žiadne balÃky nevyhovujú vzoru \"%s\"."
-#: src/pkg_tree.cc:671
+#: src/pkg_tree.cc:654
msgid "Enter the new package tree limit: "
msgstr "Obmedziť zobrazenie na: "
-#: src/pkg_tree.cc:705
+#: src/pkg_tree.cc:688
msgid "Enter the new package grouping mechanism for this display: "
msgstr "Zoskupovacà mechanizmus: "
-#: src/pkg_tree.cc:713
+#: src/pkg_tree.cc:696
msgid "Enter the new package sorting mechanism for this display: "
msgstr "Triediaci mechanizmus: "
-#: src/pkg_ver_item.cc:623
-msgid "Information about "
-msgstr "Informácie o "
-
#: src/pkg_view.cc:344
msgid "make_package_view: error in arguments -- two main widgets??"
msgstr "make_package_view: chyba v argumentoch -- dva hlavné widgety??"
@@ -3228,7 +3400,7 @@
msgid "make_package_view: bad argument!"
msgstr "make_package_view: chybný argument!"
-#: src/pkg_view.cc:492
+#: src/pkg_view.cc:495
msgid "make_package_view: no main widget found"
msgstr "make_package_view: nebol nájdený hlavný widget"
@@ -3441,6 +3613,74 @@
"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:74
+msgid "The package cache is not available."
+msgstr ""
+
+#: src/solution_dialog.cc:82
+#, fuzzy
+msgid "No packages are broken."
+msgstr "Niektoré balÃky sú poÅ¡kodené. SkúsiÅ¥ ich opraviÅ¥?"
+
+#: src/solution_dialog.cc:103
+msgid "No resolution found."
+msgstr ""
+
+#: src/solution_dialog.cc:107
+#, c-format
+msgid ""
+"Time exhausted while searching for a solution (you can select \"Next Solution"
+"\" or press %s to try harder)."
+msgstr ""
+
+#: src/solution_dialog.cc:146
+#, fuzzy
+msgid "Previous"
+msgstr "Poskytuje"
+
+#: src/solution_dialog.cc:147
+#, fuzzy
+msgid "Next"
+msgstr "ÄŽalÅ¡Ã"
+
+#: src/solution_dialog.cc:148
+msgid "Apply"
+msgstr ""
+
+#: src/solution_dialog.cc:149
+#, fuzzy
+msgid "Close"
+msgstr "Zavrieť"
+
+#: src/solution_fragment.cc:125
+#, fuzzy
+msgid "%BRemove%b the following packages:%n"
+msgstr "Nasledujúce balÃky sú POÅ KODENÉ:"
+
+#: src/solution_fragment.cc:135
+#, fuzzy
+msgid "%BInstall%b the following packages:%n"
+msgstr "Nasledujúce balÃky sú POÅ KODENÉ:"
+
+#: src/solution_fragment.cc:148
+msgid "%BKeep%b the following packages at their current version:%n"
+msgstr ""
+
+#: src/solution_fragment.cc:161
+#, fuzzy
+msgid "%BUpgrade%b the following packages:%n"
+msgstr "Nasledujúce balÃky sú POÅ KODENÉ:"
+
+#: src/solution_fragment.cc:176
+#, fuzzy
+msgid "%BDowngrade%b the following packages:%n"
+msgstr "SÅ¥ahujem balÃky"
+
+#: src/solution_fragment.cc:190
+#, c-format
+msgid "Score is %d"
+msgstr ""
+
#: src/trust.cc:17 src/trust.cc:19
msgid "WARNING"
msgstr ""
@@ -3452,52 +3692,52 @@
"system."
msgstr ""
-#: src/ui.cc:143
+#: src/ui.cc:164
msgid "Er, there aren't any errors, this shouldn't have happened.."
msgstr "Hmm, nenastali žiadne chyby; to by sa nemalo stávať.."
-#: src/ui.cc:149
+#: src/ui.cc:170
msgid "E:"
msgstr ""
-#: src/ui.cc:151
+#: src/ui.cc:172
msgid "W:"
msgstr ""
-#: src/ui.cc:172
+#: src/ui.cc:193
msgid "Search for:"
msgstr "Hľadať:"
-#: src/ui.cc:205
+#: src/ui.cc:261
msgid "You already are root!"
msgstr "Už ste root!"
-#: src/ui.cc:303
+#: src/ui.cc:359
msgid ""
"Subprocess exited with an error -- did you type your password correctly?"
msgstr "Podproces skonÄil chybou -- zadali ste správne heslo?"
-#: src/ui.cc:331
+#: src/ui.cc:387
msgid "Loading cache"
msgstr "Nahrávam cache"
-#: src/ui.cc:353
+#: src/ui.cc:409
msgid "Really quit Aptitude?"
msgstr "SkutoÄne ukonÄiÅ¥ Aptitude?"
-#: src/ui.cc:432
+#: src/ui.cc:488
msgid "Really discard your personal settings and reload the defaults?"
msgstr "SkutoÄne zahodiÅ¥ osobné nastavenie a naÄÃtaÅ¥ Å¡tandardné hodnoty?"
-#: src/ui.cc:532
+#: src/ui.cc:588 src/ui.cc:590 src/ui.cc:618 src/ui.cc:620
msgid "Packages"
msgstr "BalÃky"
-#: src/ui.cc:533 src/ui.cc:560
+#: src/ui.cc:589 src/ui.cc:619
msgid "View available packages and choose actions to perform"
msgstr "Zobrazà dostupné balÃky a akcie, ktoré s nimi môžete vykonávaÅ¥"
-#: src/ui.cc:599
+#: src/ui.cc:666
#, fuzzy
msgid ""
"%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
@@ -3513,15 +3753,15 @@
"Pomoc, 'licencia'. Toto je slobodný softvér a budeme radi, ak ho\n"
"budete Äalej Å¡ÃriÅ¥; podrobnosti viÄ 'licencia'."
-#: src/ui.cc:620
+#: src/ui.cc:687
msgid "help.txt"
msgstr "help-sk.txt"
-#: src/ui.cc:636
+#: src/ui.cc:703
msgid "README"
msgstr "README.sk"
-#: src/ui.cc:718
+#: src/ui.cc:785
msgid ""
"%C%BWARNING%b: untrusted versions of the following packages will be "
"installed!%n%nUntrusted packages could %Bcompromise your system's security%"
@@ -3529,61 +3769,71 @@
"this is what you want to do.%n%n"
msgstr ""
-#: src/ui.cc:732
+#: src/ui.cc:799
#, fuzzy
msgid "Really Continue"
msgstr "PokraÄovaÅ¥"
-#: src/ui.cc:734
+#: src/ui.cc:801
msgid "Abort Installation"
msgstr ""
-#: src/ui.cc:796
+#: src/ui.cc:862
msgid "Preview of package installation"
msgstr "Náhľad inÅ¡talácie balÃkov"
-#: src/ui.cc:797
+#: src/ui.cc:863
msgid "View and/or adjust the actions that will be performed"
msgstr "Zobrazà a/alebo upravà akcie, ktoré sa majú vykonať"
-#: src/ui.cc:837
-msgid "Some packages were broken and have been fixed"
+#: src/ui.cc:864
+#, fuzzy
+msgid "Preview"
+msgstr "^Predchádzajúce"
+
+#: src/ui.cc:900
+#, fuzzy
+msgid "Some packages were broken and have been fixed:"
msgstr "Niektoré balÃky boli poÅ¡kodené, ale podarilo sa ich opraviÅ¥"
-#: src/ui.cc:839
-msgid "Some broken packages could not be fixed!"
-msgstr "Niektoré poÅ¡kodené balÃky nemohli byÅ¥ opravené!"
+#: src/ui.cc:906
+msgid "No solution to these dependency problems exists!"
+msgstr ""
-#: src/ui.cc:847 src/ui.cc:959
-msgid "Some packages are broken. Try to fix them?"
-msgstr "Niektoré balÃky sú poÅ¡kodené. SkúsiÅ¥ ich opraviÅ¥?"
+#: src/ui.cc:912
+#, c-format
+msgid ""
+"Ran out of time while trying to resolver dependencies (press \"%s\" to try "
+"harder)"
+msgstr ""
-#: src/ui.cc:860
+#: src/ui.cc:958
+#, fuzzy
msgid ""
-"Installing/removing packages requires administrative privileges, which\n"
-"you currently do not have. Would you like to change to the root account?\n"
+"Installing/removing packages requires administrative privileges, which you "
+"currently do not have. Would you like to change to the root account?"
msgstr ""
"InÅ¡talácia/odobranie balÃkov vyžaduje administrátorské práva, ktoré\n"
"momentálne nemáte. Chcete sa prepnúť na úÄet root?\n"
-#: src/ui.cc:863 src/ui.cc:993
+#: src/ui.cc:961 src/ui.cc:1077
msgid "Become root"
msgstr "Stať sa rootom"
-#: src/ui.cc:865 src/ui.cc:995
+#: src/ui.cc:963 src/ui.cc:1079
msgid "Don't become root"
msgstr "Nestať sa rootom"
-#: src/ui.cc:870 src/ui.cc:1000
+#: src/ui.cc:968 src/ui.cc:1084
msgid "A package-list update or install run is already taking place."
msgstr "Aktualizácia zoznamu balÃkov alebo ich inÅ¡talácia už prebieha."
-#: src/ui.cc:897
+#: src/ui.cc:995
msgid "No packages are scheduled to be installed, removed, or upgraded."
msgstr ""
"Žiadne balÃky nie sú oznaÄené na inÅ¡taláciu, aktualizáciu alebo odstránenie."
-#: src/ui.cc:903
+#: src/ui.cc:1001
#, fuzzy
msgid ""
"No packages will be installed, removed or upgraded. Some packages could be "
@@ -3596,164 +3846,179 @@
"aktualizovať.\n"
"Aktualizáciu môžete pripraviť klávesou \"U\"."
-#: src/ui.cc:990
+#: src/ui.cc:1073
+#, fuzzy
msgid ""
-"Updating the package lists requires administrative privileges, which\n"
-"you currently do not have. Would you like to change to the root account?\n"
+"Updating the package lists requires administrative privileges, which you "
+"currently do not have. Would you like to change to the root account?"
msgstr ""
"Aktualizácia zoznamu balÃkov vyžaduje administrátorské práva, ktoré\n"
"momentálne nemáte. Chcete sa prepnúť na úÄet root?\n"
-#: src/ui.cc:1005 src/ui.cc:1198
+#: src/ui.cc:1089 src/ui.cc:1345
msgid "Waste time trying to find mines"
msgstr "ZabiÅ¥ Äas hľadanÃm mÃn."
-#: src/ui.cc:1012 src/ui.cc:1065
+#: src/ui.cc:1096 src/ui.cc:1149
msgid "Cleaning while a download is in progress is not allowed"
msgstr "ÄŒistenie poÄas sÅ¥ahovania nie je dovolené"
-#: src/ui.cc:1015
+#: src/ui.cc:1099
msgid "Deleting downloaded files"
msgstr "Vymazávam stiahnuté súbory"
-#: src/ui.cc:1029
+#: src/ui.cc:1113
msgid "Downloaded package files have been deleted"
msgstr "Stiahnuté balÃky boli vymazané"
-#: src/ui.cc:1090
+#: src/ui.cc:1174
#, fuzzy, c-format
msgid ""
"Obsolete downloaded package files have been deleted, freeing %sB of disk "
"space."
msgstr "Staré stiahnuté balÃky boli vymazané"
-#: src/ui.cc:1174
+#: src/ui.cc:1246
+msgid "All solutions exhausted."
+msgstr ""
+
+#: src/ui.cc:1251 src/ui.cc:1282
+#, fuzzy
+msgid "Ran out of time while trying to find a solution."
+msgstr "ZabiÅ¥ Äas hľadanÃm mÃn."
+
+#: src/ui.cc:1276
+msgid "Unable to find a solution to apply."
+msgstr ""
+
+#: src/ui.cc:1321
msgid "^Install/remove packages"
msgstr "^InÅ¡talovaÅ¥/odstrániÅ¥ balÃky"
-#: src/ui.cc:1175
+#: src/ui.cc:1322
msgid "Perform all pending installs and removals"
msgstr "Vykoná všetky nevykonané inštalácie a odstraňovania"
-#: src/ui.cc:1177
+#: src/ui.cc:1324
msgid "^Update package list"
msgstr "^AktualizovaÅ¥ zoznam balÃkov"
-#: src/ui.cc:1178
+#: src/ui.cc:1325
msgid "Check for new versions of packages"
msgstr "ZistÃ, Äi nie sú k dispozÃcii novÅ¡ie verzie balÃkov"
-#: src/ui.cc:1181
+#: src/ui.cc:1328
msgid "^Forget new packages"
msgstr "^Zabudnúť nové balÃky"
-#: src/ui.cc:1182
+#: src/ui.cc:1329
msgid "Forget which packages are \"new\""
msgstr "Zabudne, ktoré balÃky sú \"nové\""
-#: src/ui.cc:1185
+#: src/ui.cc:1332
msgid "^Clean package cache"
msgstr "VyÄistiÅ¥ ^cache s balÃkmi"
-#: src/ui.cc:1186
+#: src/ui.cc:1333
msgid "Delete package files which were previously downloaded"
msgstr "Vymaže stiahnuté súbory (balÃky) z /var/cache/apt"
-#: src/ui.cc:1189
+#: src/ui.cc:1336
msgid "Clean ^obsolete files"
msgstr "VyÄistiÅ¥ staré súb^ory"
-#: src/ui.cc:1190
+#: src/ui.cc:1337
msgid "Delete package files which can no longer be downloaded"
msgstr "Vymaže súbory, ktoré sa už nedajú stiahnuť"
-#: src/ui.cc:1193
+#: src/ui.cc:1340
msgid "Mark ^Upgradable"
msgstr "OznaÄiÅ¥ aktualizovateľné"
-#: src/ui.cc:1194
+#: src/ui.cc:1341
msgid "Mark all upgradable packages which are not held for upgrade"
msgstr "OznaÄà vÅ¡etky aktualizovateľné balÃky, ktoré nie sú podržané"
-#: src/ui.cc:1197
+#: src/ui.cc:1344
msgid "^Play Minesweeper"
msgstr "ZahraÅ¥ si mÃnové ^pole"
-#: src/ui.cc:1200
+#: src/ui.cc:1347
msgid "^Become root"
msgstr "Stať sa rootom"
-#: src/ui.cc:1201
+#: src/ui.cc:1348
+#, fuzzy
msgid ""
-"Run 'su' to become root; this will restart the program, but your\n"
-"settings will be preserved"
+"Run 'su' to become root; this will restart the program, but your settings "
+"will be preserved"
msgstr ""
"Na prepnutie na užÃvateľa root spusÅ¥te 'su'. Tým sa program reÅ¡tartuje,\n"
"ale nastavenia budú zachované"
-#: src/ui.cc:1204
+#: src/ui.cc:1351
msgid "^Reload package cache"
msgstr "Znovu naÄÃtaÅ¥ cache"
-#: src/ui.cc:1205
+#: src/ui.cc:1352
msgid "Reload the package cache"
msgstr "Znovu naÄÃtaÅ¥ obsah cache"
-#: src/ui.cc:1211
+#: src/ui.cc:1358
msgid "^Quit"
msgstr "Koniec"
-#: src/ui.cc:1212
+#: src/ui.cc:1359
msgid "Exit the program"
msgstr "UkonÄÃ program"
-#: src/ui.cc:1218 src/ui.cc:1487
+#: src/ui.cc:1365 src/ui.cc:1637
msgid "Undo"
msgstr "Späť"
-#: src/ui.cc:1219
+#: src/ui.cc:1366
msgid "Undo the last package operation or group of operations"
msgstr "Vrátà späť poslednà operaci alebo skupinu operácià s balÃky"
-#: src/ui.cc:1226
+#: src/ui.cc:1373
msgid "^Install"
msgstr "^Inštalovať"
-#: src/ui.cc:1227
+#: src/ui.cc:1374
msgid "Flag the currently selected package for installation or upgrade"
msgstr "OznaÄà aktuálny vybraný balÃk na inÅ¡taláciu alebo aktualizáciu"
-#: src/ui.cc:1230
+#: src/ui.cc:1377
msgid "^Remove"
msgstr "Odst^rániť"
-#: src/ui.cc:1231
+#: src/ui.cc:1378
msgid "Flag the currently selected package for removal"
msgstr "OznaÄà aktuálny vybraný balÃk na odstránenie"
-#: src/ui.cc:1234
+#: src/ui.cc:1381
msgid "^Purge"
msgstr "VyÄistiÅ¥"
-#: src/ui.cc:1235
+#: src/ui.cc:1382
msgid ""
"Flag the currently selected package and its configuration files for removal"
msgstr ""
"OznaÄà aktuálny vybraný balÃk na odstránenie vrátane konfiguraÄných súborov"
-#: src/ui.cc:1238
+#: src/ui.cc:1385
msgid "^Keep"
msgstr "Ponechať"
-#: src/ui.cc:1239
+#: src/ui.cc:1386
msgid "Cancel any action on the selected package"
msgstr "Na vybranom balÃku zruÅ¡Ã vÅ¡etky akcie"
-#: src/ui.cc:1242
+#: src/ui.cc:1389
msgid "^Hold"
msgstr "Podržať"
-#: src/ui.cc:1243
+#: src/ui.cc:1390
msgid ""
"Cancel any action on the selected package, and protect it from future "
"upgrades"
@@ -3761,250 +4026,254 @@
"Na vybranom balÃku zruÅ¡Ã vÅ¡etky akcie a ochráni ho pred budúcimi "
"aktualizáciami."
-#: src/ui.cc:1246
+#: src/ui.cc:1393
msgid "Mark ^Auto"
msgstr "OznaÄiÅ¥ ^automaticky"
-#: src/ui.cc:1247
+#: src/ui.cc:1394
+#, fuzzy
msgid ""
-"Mark the selected package as having been automatically installed;\n"
-"it will automatically be removed if no other packages depend on it"
+"Mark the selected package as having been automatically installed; it will "
+"automatically be removed if no other packages depend on it"
msgstr ""
"OznaÄà vybraný balÃk, ako inÅ¡talovaný automaticky;\n"
"ak na ňom nebudú závisieÅ¥ iné balÃky, bude automaticky odstránený."
-#: src/ui.cc:1250
+#: src/ui.cc:1397
msgid "Mark ^Manual"
msgstr "OznaÄiÅ¥ ruÄne"
-#: src/ui.cc:1251
+#: src/ui.cc:1398
+#, fuzzy
msgid ""
-"Mark the selected package as having been manually installed;\n"
-"it will not be removed unless you manually remove it"
+"Mark the selected package as having been manually installed; it will not be "
+"removed unless you manually remove it"
msgstr ""
"OznaÄà vybraný balÃk, ako by bol nainÅ¡talovaný ruÄne;\n"
"a nebude odstránený, pokiaľ ho neodstránite sami"
-#: src/ui.cc:1254
+#: src/ui.cc:1401
msgid "^Forbid Version"
msgstr "Zakázať ^verziu"
-#: src/ui.cc:1255
+#: src/ui.cc:1402
+#, fuzzy
msgid ""
-"Forbid the candidate version of the selected package from being installed;\n"
+"Forbid the candidate version of the selected package from being installed; "
"newer versions of the package will be installed as usual"
msgstr ""
"Zakáže, aby sa nainÅ¡talovala kandidátska verzia balÃku;\n"
"novÅ¡ie verzie balÃku sa budú inÅ¡talovaÅ¥ ako zvyÄajne"
-#: src/ui.cc:1259
+#: src/ui.cc:1406
msgid "I^nformation"
msgstr "I^nformácie"
-#: src/ui.cc:1260
+#: src/ui.cc:1407
msgid "Display more information about the selected package"
msgstr "Na vybraný balÃk zobrazà ÄalÅ¡ie informácie"
-#: src/ui.cc:1263
+#: src/ui.cc:1410
msgid "^Changelog"
msgstr "^Changelog"
-#: src/ui.cc:1264
+#: src/ui.cc:1411
msgid "Display the Debian changelog of the selected package"
msgstr "U vybraného balÃku zobrazà zoznam zmien vykonaných správcom balÃku"
-#: src/ui.cc:1271
+#: src/ui.cc:1418
msgid "^Find"
msgstr "Hľadať"
-#: src/ui.cc:1272
+#: src/ui.cc:1419
msgid "Search for a package"
msgstr "Hľadá balÃk"
-#: src/ui.cc:1275
+#: src/ui.cc:1422
msgid "Find ^Again"
msgstr "Hľadať znova"
-#: src/ui.cc:1276
+#: src/ui.cc:1423
msgid "Repeat the last search"
msgstr "Zopakuje posledné hľadanie"
-#: src/ui.cc:1280
+#: src/ui.cc:1427
msgid "^Limit Display"
msgstr "Obmedziť zobrazenie"
-#: src/ui.cc:1281
+#: src/ui.cc:1428
msgid "Apply a filter to the package list"
msgstr "Na zoznam balÃkov aplikuje výberový filter"
-#: src/ui.cc:1284
+#: src/ui.cc:1431
msgid "^Un-Limit Display"
msgstr "Zrušiť obmedzenie"
-#: src/ui.cc:1285
+#: src/ui.cc:1432
msgid "Remove the filter from the package list"
msgstr "Odstráni filter aplikovaný na zoznam balÃkov"
-#: src/ui.cc:1289
+#: src/ui.cc:1436
msgid "Find ^Broken"
msgstr "Hľadať porušené"
-#: src/ui.cc:1290
+#: src/ui.cc:1437
msgid "Find the next package with unsatisfied dependencies"
msgstr "Hľadá ÄalÅ¡Ã balÃk s nesplnenými závislosÅ¥ami"
-#: src/ui.cc:1297
+#: src/ui.cc:1444
msgid "^UI options"
msgstr "Nastavenie zobrazenia"
-#: src/ui.cc:1298
+#: src/ui.cc:1445
msgid "Change the settings which affect the user interface"
msgstr "Zmenà nastavenia, ktoré ovplyvňujú užÃvateľské rozhranie"
-#: src/ui.cc:1301
+#: src/ui.cc:1448
msgid "^Dependency handling"
msgstr "Správa závislostÃ"
-#: src/ui.cc:1302
+#: src/ui.cc:1449
msgid "Change the settings which affect how package dependencies are handled"
msgstr "Zmenà nastavenia, ktoré ovplyvňujú spôsob rieÅ¡enia závislostÃ"
-#: src/ui.cc:1305
+#: src/ui.cc:1452
msgid "^Miscellaneous"
msgstr "Rôzne"
-#: src/ui.cc:1306
+#: src/ui.cc:1453
msgid "Change miscellaneous program settings"
msgstr "Zmenà rôzne nastavenia programu"
-#: src/ui.cc:1311
+#: src/ui.cc:1458
msgid "^Revert options"
msgstr "Pôvodné nastavenia"
-#: src/ui.cc:1312
+#: src/ui.cc:1459
msgid "Reset all settings to the system defaults"
msgstr "Vráti všetky nastavenia do pôvodného stavu"
-#: src/ui.cc:1323
+#: src/ui.cc:1470
msgid "^Next"
msgstr "ÄŽalÅ¡Ã"
-#: src/ui.cc:1324
+#: src/ui.cc:1471
msgid "View next display"
msgstr "Zobrazà ÄalÅ¡Ã pohľad"
-#: src/ui.cc:1327
+#: src/ui.cc:1474
msgid "^Prev"
msgstr "^Predchádzajúce"
-#: src/ui.cc:1328
+#: src/ui.cc:1475
msgid "View previous display"
msgstr "Zobrazà predchádzajúci pohľad"
-#: src/ui.cc:1331
+#: src/ui.cc:1478
msgid "^Close"
msgstr "Zavrieť"
-#: src/ui.cc:1332
+#: src/ui.cc:1479
msgid "Close this display"
msgstr "Zavrie tento pohľad"
-#: src/ui.cc:1337
+#: src/ui.cc:1484
msgid "New Package ^View"
msgstr "No^vý pohľad na balÃky"
-#: src/ui.cc:1338
+#: src/ui.cc:1485
msgid "Create a new default package view"
msgstr "Vytvorà nový Å¡tandardný pohľad na balÃky"
-#: src/ui.cc:1341
+#: src/ui.cc:1488
msgid "New Categorical ^Browser"
msgstr "Nový prehliadaÄ kategoriÃ"
-#: src/ui.cc:1343
+#: src/ui.cc:1490
msgid "Browse packages by category"
msgstr "Prehliada balÃky podľa kategoriÃ"
-#: src/ui.cc:1351
+#: src/ui.cc:1498
msgid "^About"
msgstr "O progr^ame"
-#: src/ui.cc:1352
+#: src/ui.cc:1499
msgid "View information about this program"
msgstr "Zobrazà informácie o programe"
-#: src/ui.cc:1355
+#: src/ui.cc:1502
msgid "^Help"
msgstr "Pomoc"
-#: src/ui.cc:1356
+#: src/ui.cc:1503
msgid "View the on-line help"
msgstr "Zobrazà on-line pomoc"
-#: src/ui.cc:1358
+#: src/ui.cc:1505
msgid "User's ^Manual"
msgstr "UžÃvatelský ^manuál"
-#: src/ui.cc:1359
+#: src/ui.cc:1506
msgid "View the detailed program manual"
msgstr "Zobrazà podrobný manuál tohto programu"
-#: src/ui.cc:1362
+#: src/ui.cc:1509
msgid "^FAQ"
msgstr "^FAQ"
-#: src/ui.cc:1363
+#: src/ui.cc:1510
msgid "View a list of frequently asked questions"
msgstr "Zobrazà zoznam Äasto kladených otázok"
-#: src/ui.cc:1366
-msgid "^ChangeLog"
-msgstr "^ChangeLog"
+#: src/ui.cc:1513
+msgid "^NEWS"
+msgstr ""
-#: src/ui.cc:1367
-msgid "View the important changes made in each version of the program"
+#: src/ui.cc:1514
+#, fuzzy
+msgid "View the important changes made in each version of "
msgstr "Zobrazà dôležité zmeny medzi jednotlivými verziami programu"
-#: src/ui.cc:1370
+#: src/ui.cc:1517
msgid "^License"
msgstr "^Licencia"
-#: src/ui.cc:1371
+#: src/ui.cc:1518
msgid "View the terms under which you may copy the program"
msgstr "Zobrazà podmienky, za ktorých môžete program Å¡ÃriÅ¥"
-#: src/ui.cc:1486
+#: src/ui.cc:1636
msgid "Actions"
msgstr "Akcie"
-#: src/ui.cc:1489
+#: src/ui.cc:1639
msgid "Search"
msgstr "Hľadat"
-#: src/ui.cc:1490
+#: src/ui.cc:1640
msgid "Options"
msgstr "Voľby"
-#: src/ui.cc:1491
+#: src/ui.cc:1641
msgid "Views"
msgstr "Pohľady"
-#: src/ui.cc:1492
+#: src/ui.cc:1642
msgid "Help"
msgstr "Pomoc"
-#: src/ui.cc:1537
+#: src/ui.cc:1699
#, c-format
msgid ""
"%s: Menu %s: Help %s: Quit %s: Update %s: Download/Install/Remove Pkgs"
msgstr ""
"%s: Menu %s: Pomoc %s: Koniec %s Aktualizácia %s Stiahnutie/Inštalácia"
-#: src/ui.cc:1799 src/vscreen/vscreen.cc:281
+#: src/ui.cc:1968 src/vscreen/vscreen.cc:281
msgid "yes_key"
msgstr "ano_key"
-#: src/ui.cc:1800 src/vscreen/vscreen.cc:282
+#: src/ui.cc:1969 src/vscreen/vscreen.cc:282
msgid "no_key"
msgstr "ne_key"
@@ -4016,6 +4285,16 @@
msgid "Downloading Changelog"
msgstr "SÅ¥ahujem Changelog"
+#: src/view_changelog.cc:54
+#, fuzzy
+msgid "Download Changelog"
+msgstr "SÅ¥ahujem Changelog"
+
+#: src/view_changelog.cc:63
+#, c-format
+msgid "%s changes"
+msgstr ""
+
#: src/vscreen/vscreen.cc:119
#, c-format
msgid "Ouch! Got SIGTERM, dying..\n"
@@ -4044,6 +4323,39 @@
msgid "No"
msgstr "Nie"
+#~ msgid ""
+#~ "Some packages had unmet dependencies. This may mean that you have\n"
+#~ "requested an impossible situation or if you are using the unstable\n"
+#~ "distribution that some required packages have not yet been created\n"
+#~ "or been moved out of Incoming.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Niektoré balÃky majú nesplnené závislosti. To môže znamenaÅ¥, že "
+#~ "požadujete\n"
+#~ "nemožnú situáciu, alebo, ak použÃvate nestabilnú distribúciu, že\n"
+#~ "vyžadované balÃky eÅ¡te neboli vytvorené alebo presunuté z Prichádzajúcej "
+#~ "fronty.\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Please insert the following disc into the drive \"%s\":\n"
+#~ "%s"
+#~ msgstr ""
+#~ "ProsÃm vložte nasledujúci disk do mechaniky \"%s\":\n"
+#~ "%s"
+
+#~ msgid "Invalid option for interactive mode: -s\n"
+#~ msgstr "Neplatná voľba na interaktÃvny režim: -s\n"
+
+#~ msgid "Information about "
+#~ msgstr "Informácie o "
+
+#~ msgid "Some broken packages could not be fixed!"
+#~ msgstr "Niektoré poÅ¡kodené balÃky nemohli byÅ¥ opravené!"
+
+#~ msgid "^ChangeLog"
+#~ msgstr "^ChangeLog"
+
#~ msgid "Go away, I'm trying to think.\n"
#~ msgstr "Bež preÄ, skúšam premýšľaÅ¥.\n"
Modified: branches/aptitude-0.3/aptitude/po/tr.po
==============================================================================
--- branches/aptitude-0.3/aptitude/po/tr.po (original)
+++ branches/aptitude-0.3/aptitude/po/tr.po Sat Apr 30 13:41:32 2005
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: aptitude\n"
"Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-01-10 16:26-0800\n"
+"POT-Creation-Date: 2005-04-29 18:11-0400\n"
"PO-Revision-Date: 2004-11-06 18:58+0200\n"
"Last-Translator: Erçin EKER <ercin.eker at linux.org.tr>\n"
"Language-Team: Turkish <debian-l10n-turkish at lists.debian.org>\n"
@@ -155,16 +155,103 @@
msgstr "Kullanılmayan paketleri bu filtreye uyarak otomatik olarak kaldır"
#: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:184 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
-#: src/vscreen/vs_util.cc:329
+#: src/ui.cc:218 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
+#: src/vscreen/vs_util.cc:328
msgid "Ok"
msgstr "Tamam"
#: src/apt_options.cc:242 src/download_list.cc:71 src/mine/cmine.cc:257
-#: src/mine/cmine.cc:330 src/vscreen/vs_util.cc:329
+#: src/mine/cmine.cc:330 src/vscreen/vs_util.cc:328
msgid "Cancel"
msgstr "Ä°ptal"
+#: src/broken_indicator.cc:106 src/solution_dialog.cc:97
+msgid "Internal error: unexpected null solution."
+msgstr ""
+
+#: src/broken_indicator.cc:158
+#, fuzzy
+msgid "Suggest "
+msgstr "Teklif edilenler"
+
+#: src/broken_indicator.cc:164
+#, fuzzy, c-format
+msgid "%d installs"
+msgstr "kur"
+
+#: src/broken_indicator.cc:169
+#, fuzzy
+msgid "1 install"
+msgstr "kur"
+
+#: src/broken_indicator.cc:173
+#, c-format
+msgid "%d removals"
+msgstr ""
+
+#: src/broken_indicator.cc:178
+msgid "1 removal"
+msgstr ""
+
+#: src/broken_indicator.cc:182
+#, c-format
+msgid "%d keeps"
+msgstr ""
+
+#: src/broken_indicator.cc:187
+msgid "1 keep"
+msgstr ""
+
+#: src/broken_indicator.cc:191
+#, fuzzy, c-format
+msgid "%d upgrades"
+msgstr "güncelle"
+
+#: src/broken_indicator.cc:196
+#, fuzzy
+msgid "1 upgrade"
+msgstr "güncelle"
+
+#: src/broken_indicator.cc:200
+#, fuzzy, c-format
+msgid "%d downgrades"
+msgstr "eski sürümü kurulursa"
+
+#: src/broken_indicator.cc:205
+#, fuzzy
+msgid "1 downgrade"
+msgstr "eski sürümü kurulursa"
+
+#: src/broken_indicator.cc:214
+#, c-format
+msgid "%s: Examine"
+msgstr ""
+
+#: src/broken_indicator.cc:216
+#, c-format
+msgid "%s: Apply"
+msgstr ""
+
+#: src/broken_indicator.cc:218
+#, fuzzy, c-format
+msgid "%s: Next"
+msgstr "^Sonraki"
+
+#: src/broken_indicator.cc:220
+#, c-format
+msgid "%s: Previous"
+msgstr ""
+
+#: src/broken_indicator.cc:233
+#, c-format
+msgid "%CSolution search failed. %s: try harder"
+msgstr ""
+
+#: src/broken_indicator.cc:239
+#, c-format
+msgid "%CUnable to resolve dependencies."
+msgstr ""
+
#: src/cmdline/cmdline_action.cc:36
#, c-format
msgid ""
@@ -236,22 +323,22 @@
msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
msgstr "%s paketi yükseltilemez, bu nedenle yükseltilmesi engellenemez\n"
-#: src/cmdline/cmdline_action.cc:213
+#: src/cmdline/cmdline_action.cc:198
#, c-format
msgid "Note: selecting the task \"%s: %s\" for installation\n"
msgstr "Not: \"%s: %s\" görevi kurulum için seçildi\n"
-#: src/cmdline/cmdline_action.cc:240
+#: src/cmdline/cmdline_action.cc:225
#, c-format
msgid "You can only specify a package version with an 'install' command.\n"
msgstr "'kur' komutu için yalnızca sürüm belirtebilirsiniz\n"
-#: src/cmdline/cmdline_action.cc:246
+#: src/cmdline/cmdline_action.cc:231
#, c-format
msgid "You can only specify a package archive with an 'install' command.\n"
msgstr "'kur' komutu için yalnızca bir paket arşivi belirtebilirsiniz\n"
-#: src/cmdline/cmdline_action.cc:280
+#: src/cmdline/cmdline_action.cc:265
#, c-format
msgid ""
"Couldn't find package \"%s\", and more than 40\n"
@@ -260,7 +347,7 @@
"\"%s\" paketi bulunamadı, ve 40'tan fazla\n"
"paket \"%s\" 'i isimlerinde içermekte.\n"
-#: src/cmdline/cmdline_action.cc:283
+#: src/cmdline/cmdline_action.cc:268
#, c-format
msgid ""
"Couldn't find package \"%s\". However, the following\n"
@@ -269,12 +356,12 @@
"\"%s\" paketi bulunamadı. Bununla beraber aşağıdaki\n"
"paketler \"%s\" 'i isimlerinde içermekte:\n"
-#: src/cmdline/cmdline_action.cc:307
+#: src/cmdline/cmdline_action.cc:292
#, c-format
msgid "Couldn't find any package whose name or description matched \"%s\"\n"
msgstr "Adında ya da tanımında \"%s\" içeren hiçbir paket bulunamadı\n"
-#: src/cmdline/cmdline_action.cc:309
+#: src/cmdline/cmdline_action.cc:294
#, c-format
msgid ""
"Couldn't find any package matching \"%s\", and more than 40\n"
@@ -283,7 +370,7 @@
"\"%s\" paketi bulunamadı, ve 40'tan fazla\n"
"paket \"%s\" 'i tanımlarında içermekte.\n"
-#: src/cmdline/cmdline_action.cc:312
+#: src/cmdline/cmdline_action.cc:297
#, c-format
msgid ""
"Couldn't find any package matching \"%s\". However, the following\n"
@@ -326,13 +413,13 @@
msgid "Freed %sB of disk space\n"
msgstr "%sB disk alanı boşaltılacak"
-#: src/cmdline/cmdline_do_action.cc:67
+#: src/cmdline/cmdline_do_action.cc:71
#, c-format
msgid "Invalid operation %s"
msgstr "Geçersiz işlem %s"
-#: src/cmdline/cmdline_do_action.cc:206 src/cmdline/cmdline_simulate.cc:30
-#: src/cmdline/cmdline_upgrade.cc:89
+#: src/cmdline/cmdline_do_action.cc:201 src/cmdline/cmdline_simulate.cc:31
+#: src/cmdline/cmdline_upgrade.cc:91
#, c-format
msgid "Abort.\n"
msgstr "Ä°ptal.\n"
@@ -342,7 +429,7 @@
msgid "download: you must specify at least one package to download\n"
msgstr "İndirme: Indirmek için en az bir paket belirtmelisiniz\n"
-#: src/cmdline/cmdline_download.cc:43 src/download.cc:342
+#: src/cmdline/cmdline_download.cc:43 src/download.cc:344
msgid "Couldn't read source list"
msgstr "Kaynak listesi okunamıyor"
@@ -406,95 +493,95 @@
msgid "What is it? It's an elephant being eaten by a snake, of course.\n"
msgstr "Bu da ne? Yılan tarafından yenen bir fil, tabii ki.\n"
-#: src/cmdline/cmdline_prompt.cc:44
+#: src/cmdline/cmdline_prompt.cc:45
msgid "Couldn't read list of sources"
msgstr "Kaynak listesi okunamıyor"
-#: src/cmdline/cmdline_prompt.cc:219 src/cmdline/cmdline_show_broken.cc:73
+#: src/cmdline/cmdline_prompt.cc:220 src/cmdline/cmdline_show_broken.cc:73
#, c-format
msgid "but %s is to be installed."
msgstr "fakat %s kurulacak."
-#: src/cmdline/cmdline_prompt.cc:222 src/cmdline/cmdline_show_broken.cc:76
+#: src/cmdline/cmdline_prompt.cc:223 src/cmdline/cmdline_show_broken.cc:76
#, c-format
msgid "but %s is installed and it is kept back."
msgstr "fakat %s kurulu ve tutulacak."
-#: src/cmdline/cmdline_prompt.cc:225 src/cmdline/cmdline_show_broken.cc:79
+#: src/cmdline/cmdline_prompt.cc:226 src/cmdline/cmdline_show_broken.cc:79
#, c-format
msgid "but %s is installed."
msgstr "fakat %s kurulu."
-#: src/cmdline/cmdline_prompt.cc:229 src/cmdline/cmdline_show_broken.cc:83
+#: src/cmdline/cmdline_prompt.cc:230 src/cmdline/cmdline_show_broken.cc:83
#, c-format
msgid "but it is not installable"
msgstr "fakat kurulabilir deÄŸil"
-#: src/cmdline/cmdline_prompt.cc:233 src/cmdline/cmdline_show_broken.cc:87
+#: src/cmdline/cmdline_prompt.cc:234 src/cmdline/cmdline_show_broken.cc:87
#, c-format
msgid " which is a virtual package."
msgstr " sanal bir paket."
-#: src/cmdline/cmdline_prompt.cc:236 src/cmdline/cmdline_show_broken.cc:90
+#: src/cmdline/cmdline_prompt.cc:237 src/cmdline/cmdline_show_broken.cc:90
#, c-format
msgid " or"
msgstr " ya da"
-#: src/cmdline/cmdline_prompt.cc:248
+#: src/cmdline/cmdline_prompt.cc:249
msgid "The following packages are BROKEN:"
msgstr "Aşağıdaki paketler BOZUK:"
-#: src/cmdline/cmdline_prompt.cc:249
+#: src/cmdline/cmdline_prompt.cc:250
msgid "The following packages are unused and will be REMOVED:"
msgstr "Aşağıdaki paketler kullanılmıyor ve KALDIRILACAK:"
-#: src/cmdline/cmdline_prompt.cc:250
+#: src/cmdline/cmdline_prompt.cc:251
msgid "The following packages have been automatically kept back:"
msgstr "Aşağıdaki paketler otomatik olarak korunacak:"
-#: src/cmdline/cmdline_prompt.cc:251
+#: src/cmdline/cmdline_prompt.cc:252
msgid "The following NEW packages will be automatically installed:"
msgstr "Aşağıdaki YENİ paketler otomatik olarak kurulacak:"
-#: src/cmdline/cmdline_prompt.cc:252
+#: src/cmdline/cmdline_prompt.cc:253
msgid "The following packages will be automatically REMOVED:"
msgstr "Aşağıdaki paketler otomatik olarak KALDIRILACAK:"
-#: src/cmdline/cmdline_prompt.cc:253
+#: src/cmdline/cmdline_prompt.cc:254
msgid "The following packages will be DOWNGRADED:"
msgstr "Aşağıdaki paketlerin ÖNCEKI SURUMLERI yüklenecek: "
-#: src/cmdline/cmdline_prompt.cc:254
+#: src/cmdline/cmdline_prompt.cc:255
msgid "The following packages have been kept back:"
msgstr "Aşağıdaki paketler otomatik olarak korundu:"
-#: src/cmdline/cmdline_prompt.cc:255
+#: src/cmdline/cmdline_prompt.cc:256
msgid "The following packages will be REINSTALLED:"
msgstr "Aşağıdaki paketler otomatik olarak YENIDEN KURULDU:"
-#: src/cmdline/cmdline_prompt.cc:256
+#: src/cmdline/cmdline_prompt.cc:257
msgid "The following NEW packages will be installed:"
msgstr "Aşağıdaki YENI paketler otomatik olarak kurulacak:"
-#: src/cmdline/cmdline_prompt.cc:257
+#: src/cmdline/cmdline_prompt.cc:258
msgid "The following packages will be REMOVED:"
msgstr "Aşağıdaki paketler KALDIRILACAK:"
-#: src/cmdline/cmdline_prompt.cc:258
+#: src/cmdline/cmdline_prompt.cc:259
msgid "The following packages will be upgraded:"
msgstr "Aşağıdaki paketler yükseltilecek:"
-#: src/cmdline/cmdline_prompt.cc:307
+#: src/cmdline/cmdline_prompt.cc:311
#, c-format
msgid "The following ESSENTIAL packages will be REMOVED!\n"
msgstr "Aşağıdaki TEMEL paketler KALDIRILACAK!\n"
-#: src/cmdline/cmdline_prompt.cc:316
+#: src/cmdline/cmdline_prompt.cc:320
#, c-format
msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
msgstr "Bu işlem aşağıdaki TEMEL paketleri BOZACAK:\n"
-#: src/cmdline/cmdline_prompt.cc:326
+#: src/cmdline/cmdline_prompt.cc:330
#, c-format
msgid ""
"WARNING: Performing this action will probably cause your system to break!\n"
@@ -503,100 +590,103 @@
"UYARI: Bu işlemi gerçekleştirmek sisteminize zarar verebilir!\n"
" TAM OLARAK ne yaptığınızdan emin olmadan DEVAM ETMEYIN!\n"
-#: src/cmdline/cmdline_prompt.cc:328
+#: src/cmdline/cmdline_prompt.cc:332
msgid "I am aware that this is a very bad idea"
msgstr "Bunun kötü bir fikir olduğunun farkındayım"
-#: src/cmdline/cmdline_prompt.cc:331
+#: src/cmdline/cmdline_prompt.cc:335
#, c-format
msgid "To continue, type the phrase \"%s\":\n"
msgstr "Devam etmek için, \"%s\" ifadesini girin :\n"
-#: src/cmdline/cmdline_prompt.cc:434
+#: src/cmdline/cmdline_prompt.cc:438
#, c-format
msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
msgstr "Aşağıdaki paketlerin kurulması ÖNERİLDİ, fakat KURULMAYACAK:\n"
-#: src/cmdline/cmdline_prompt.cc:440
+#: src/cmdline/cmdline_prompt.cc:444
#, c-format
msgid "The following packages are SUGGESTED but will NOT be installed:\n"
msgstr "Aşağıdaki paketlerin kurulması TEKLİF EDİLDİ, fakat kurulmayacak:\n"
-#: src/cmdline/cmdline_prompt.cc:445
+#: src/cmdline/cmdline_prompt.cc:449
#, c-format
msgid "No packages will be installed, upgraded, or removed.\n"
msgstr "Hiçbir paket kurulmayacak, yükseltilmeyecek ya da kaldırılmayacak.\n"
-#: src/cmdline/cmdline_prompt.cc:447
+#: src/cmdline/cmdline_prompt.cc:451
#, c-format
msgid "%lu packages upgraded, %lu newly installed, "
msgstr "%lu paket yükseltildi, %lu yeni kuruldu, "
-#: src/cmdline/cmdline_prompt.cc:451
+#: src/cmdline/cmdline_prompt.cc:455
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu yeniden kuruldu, "
-#: src/cmdline/cmdline_prompt.cc:453
+#: src/cmdline/cmdline_prompt.cc:457
#, c-format
msgid "%lu downgraded, "
msgstr "%lu eski sürümü yüklendi,"
-#: src/cmdline/cmdline_prompt.cc:455
+#: src/cmdline/cmdline_prompt.cc:459
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu kaldırıldı, %lu yükseltilmedi.\n"
-#: src/cmdline/cmdline_prompt.cc:462
+#: src/cmdline/cmdline_prompt.cc:466
#, c-format
msgid "Need to get %sB/%sB of archives. "
msgstr "Arşivden %sB/%sB alınacak."
-#: src/cmdline/cmdline_prompt.cc:465
+#: src/cmdline/cmdline_prompt.cc:469
#, c-format
msgid "Need to get %sB of archives. "
msgstr "Arşivlerden %sB veri alınacak."
-#: src/cmdline/cmdline_prompt.cc:472
+#: src/cmdline/cmdline_prompt.cc:476
#, c-format
msgid "After unpacking %sB will be used.\n"
msgstr "Paketler açıldıktan sonra %sB yer kullanılacak.\n"
-#: src/cmdline/cmdline_prompt.cc:475
+#: src/cmdline/cmdline_prompt.cc:479
#, c-format
msgid "After unpacking %sB will be freed.\n"
msgstr "Paketler açıldıktan sonra %sB serbest kalacak.\n"
-#: src/cmdline/cmdline_prompt.cc:521
+#: src/cmdline/cmdline_prompt.cc:524
#, c-format
msgid "Bad action character '%c'\n"
msgstr "Kötü eylem karakteri '%c'\n"
-#: src/cmdline/cmdline_prompt.cc:596
+#: src/cmdline/cmdline_prompt.cc:595
#, c-format
msgid "No packages to show -- enter the package names on the line after 'i'.\n"
msgstr ""
"Gösterilecek paket yok -- 'i'ye bastıktan sonra çıkan satıra paket "
"isimlerini girin.\n"
-#: src/cmdline/cmdline_prompt.cc:598 src/cmdline/cmdline_prompt.cc:629
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:597
msgid "Press Return to continue."
msgstr "Devam etmek için Enter tuşuna basın."
-#: src/cmdline/cmdline_prompt.cc:625
+#: src/cmdline/cmdline_prompt.cc:623
#, c-format
msgid "No packages found -- enter the package names on the line after 'c'.\n"
msgstr ""
"Paket bulunamadı -- 'c'ye bastıktan sonra çıkan satıra paket isimlerini "
"girin.\n"
-#: src/cmdline/cmdline_prompt.cc:665
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:627
+#, fuzzy
+msgid "Press Return to continue"
+msgstr "Devam etmek için Enter tuşuna basın."
+
+#: src/cmdline/cmdline_prompt.cc:675
msgid "Do you want to continue? [Y/n/?] "
msgstr "Devam etmek istiyor musunuz? [Y/n/?]"
-#: src/cmdline/cmdline_prompt.cc:690
+#: src/cmdline/cmdline_prompt.cc:700
#, c-format
msgid ""
"\n"
@@ -607,7 +697,7 @@
"Bağımlılık bilgisi gösterilecek.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:692
+#: src/cmdline/cmdline_prompt.cc:702
#, c-format
msgid ""
"\n"
@@ -618,7 +708,7 @@
"Bağımlılık bilgisi gösterilmeyecek.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:698
+#: src/cmdline/cmdline_prompt.cc:708
#, c-format
msgid ""
"\n"
@@ -629,7 +719,7 @@
"Sürümler gösterilecek.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:700
+#: src/cmdline/cmdline_prompt.cc:710
#, c-format
msgid ""
"\n"
@@ -640,7 +730,7 @@
"Sürümler gösterilmeyecek.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:705
+#: src/cmdline/cmdline_prompt.cc:715
#, c-format
msgid ""
"\n"
@@ -651,7 +741,7 @@
"Boyut değişiklikleri gösterilecek.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:717
#, c-format
msgid ""
"\n"
@@ -662,7 +752,7 @@
"Boyut değişiklikleri gösterilmeyecek.\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:737
#, c-format
msgid ""
"Commands:\n"
@@ -713,32 +803,83 @@
" _ : Temizle\n"
" = : Tut\n"
-#: src/cmdline/cmdline_prompt.cc:751
+#: src/cmdline/cmdline_prompt.cc:761
#, c-format
msgid "Invalid response. Please enter a valid command or '?' for help.\n"
msgstr "Yanlış cevap. Lütfen geçerli bir komut girin ya da yardım için '?'.\n"
+#: src/cmdline/cmdline_resolver.cc:84
+#, c-format
+msgid "y: %F%nn: %F%nq: %F%n,: %F%n.: %F%n"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:90
+msgid "accept the proposed changes"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:92
+msgid "reject the proposed changes and search for another solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:94
+#, fuzzy
+msgid "give up and quit the program"
+msgstr "Programdan çıkar"
+
+#: src/cmdline/cmdline_resolver.cc:96
+msgid "move to the next solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:98
+msgid "move to the previous solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:131
+#, fuzzy
+msgid "The following actions will resolve these dependencies:"
+msgstr "Aşağıdaki paketler bağımlılıkları karşılamıyor:\n"
+
+#: src/cmdline/cmdline_resolver.cc:146
+msgid "Accept this solution? [Y/n/q/?]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:174
+msgid "Abandoning all efforts to resolve these dependencies."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:184
+#, fuzzy
+msgid "The following commands are available:"
+msgstr "Aşağıdaki paketler BOZUK:"
+
+#: src/cmdline/cmdline_resolver.cc:188
+#, fuzzy
+msgid "Invalid response; please enter one of the following commands:"
+msgstr "Yanlış cevap. Lütfen geçerli bir komut girin ya da yardım için '?'.\n"
+
+#: src/cmdline/cmdline_resolver.cc:198
+msgid "No solution found within the allotted time. Try harder? [Y/n]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:226
+#, fuzzy
+msgid "Invalid response; please enter 'y' or 'n'."
+msgstr "Yanlış cevap. Lütfen geçerli bir komut girin ya da yardım için '?'.\n"
+
+#: src/cmdline/cmdline_resolver.cc:235
+msgid "Unable to resolve dependencies! Giving up..."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:240
+msgid "No more solutions."
+msgstr ""
+
#: src/cmdline/cmdline_search.cc:78
#, c-format
msgid "search: You must provide at least one search term\n"
msgstr "Arama: En az bir arama terimi sağlamalısınız\n"
-#: src/cmdline/cmdline_show_broken.cc:114
-#, c-format
-msgid ""
-"Some packages had unmet dependencies. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming.\n"
-"\n"
-msgstr ""
-"Bazı paketler bağımlılıkları karşılamıyor. Bu şu anlama gelebilir\n"
-"Ya mümkün olmayan birşey için istekte bulundunuz ya da kararsız\n"
-"(unstable) dağıtımı kullanıyorsanız bazı gerekli paketler henüz\n"
-"arşivdeki yerini almamış.\n"
-"\n"
-
-#: src/cmdline/cmdline_show_broken.cc:115
+#: src/cmdline/cmdline_show_broken.cc:113
#, c-format
msgid "The following packages have unmet dependencies:\n"
msgstr "Aşağıdaki paketler bağımlılıkları karşılamıyor:\n"
@@ -937,12 +1078,12 @@
msgid "Description: "
msgstr "Tanım: "
-#: src/cmdline/cmdline_simulate.cc:36
+#: src/cmdline/cmdline_simulate.cc:37
#, c-format
msgid "Would download/install/remove packages.\n"
msgstr "paketleri indir/kur/kaldır.\n"
-#: src/cmdline/cmdline_simulate.cc:47
+#: src/cmdline/cmdline_simulate.cc:48
msgid "Internal Error, Ordering didn't finish"
msgstr "İç hata, istek bitirilemedi"
@@ -984,28 +1125,24 @@
msgid "UNAVAILABLE"
msgstr "MEVCUT DEĞİL"
-#: src/download_bar.cc:57 src/download_list.cc:265
+#: src/download_bar.cc:56 src/download_list.cc:263 src/download_screen.cc:57
#, c-format
-msgid ""
-"Please insert the following disc into the drive \"%s\":\n"
-"%s"
-msgstr ""
-"Lütfen aşağıdaki CD'yi sürücüye yerleştirin \"%s\":\n"
-"%s"
+msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
+msgstr "Lütfen \"%2$s\" sürücüsüne \"%1$s\" diskini yerleştirin"
-#: src/download_bar.cc:76 src/generic/acqprogress.cc:63
+#: src/download_bar.cc:77 src/generic/acqprogress.cc:63
msgid "Hit "
msgstr "Ä°sabet "
-#: src/download_bar.cc:89
+#: src/download_bar.cc:90
msgid "Downloading "
msgstr "Ä°ndiriliyor "
-#: src/download_bar.cc:102
+#: src/download_bar.cc:103
msgid "Got "
msgstr "Alındı "
-#: src/download_bar.cc:156
+#: src/download_bar.cc:157
msgid "Downloading..."
msgstr "Indiriliyor..."
@@ -1013,7 +1150,7 @@
msgid "Couldn't read list of package sources"
msgstr "Paket kaynakları listesi okunamıyor"
-#: src/download.cc:104 src/download.cc:321
+#: src/download.cc:104 src/download.cc:322
msgid "Couldn't lock list directory..are you root?"
msgstr "Liste klasörü kilitlenemiyor.. root kullanıcısı mısınız?"
@@ -1025,29 +1162,33 @@
msgid "View the progress of the package list update"
msgstr "Paket listesi güncelleme durum bilgisi göster"
-#: src/download.cc:159
+#: src/download.cc:113
+msgid "List Update"
+msgstr ""
+
+#: src/download.cc:160
msgid "Couldn't clean out list directories"
msgstr "Liste klasörü temizlenemiyor"
-#: src/download.cc:176 src/ui.cc:1068
+#: src/download.cc:177 src/ui.cc:1152
msgid "Deleting obsolete downloaded files"
msgstr "EskimiÅŸ indirilmiÅŸ dosyalar siliniyor"
-#: src/download.cc:181
+#: src/download.cc:182
#, c-format
msgid "Deleting obsolete downloaded files\n"
msgstr "EskimiÅŸ indirilmiÅŸ dosyalar siliniyor\n"
-#: src/download.cc:223
+#: src/download.cc:224
#, c-format
msgid "Unable to open %s to log actions"
msgstr "Günlük eylemleri için %s açılamıyor"
-#: src/download.cc:229
+#: src/download.cc:230
msgid "log report"
msgstr "Günlük raporu"
-#: src/download.cc:230
+#: src/download.cc:231
#, c-format
msgid ""
"IMPORTANT: this log only lists intended actions; actions which fail due to\n"
@@ -1057,77 +1198,77 @@
"ÖNEMLI: Bu günlük yalnızca denenmiş eylemleri listeler; dpkg sorunlarından "
"dolayı yerine getirilmemiş eylemler.\n"
-#: src/download.cc:231
+#: src/download.cc:232
#, c-format
msgid "Will install %li packages, and remove %li packages.\n"
msgstr "%li paket kurulacak, ve %li paket kaldırılacak.\n"
-#: src/download.cc:233
+#: src/download.cc:234
#, c-format
msgid "%sB of disk space will be used\n"
msgstr "%sB disk alanı kullanılacak\n"
-#: src/download.cc:236
+#: src/download.cc:237
#, c-format
msgid "%sB bytes of disk space will be freed\n"
msgstr "%sB disk alanı serbest kalacak\n"
-#: src/download.cc:244
+#: src/download.cc:245
#, c-format
msgid "[UPGRADE] %s %s -> %s\n"
msgstr "[YÃœKSELTME] %s %s -> %s\n"
-#: src/download.cc:248
+#: src/download.cc:249
#, c-format
msgid "[DOWNGRADE] %s %s -> %s\n"
msgstr "[Ä°NDÄ°RGEME] %s %s -> %s\n"
-#: src/download.cc:258
+#: src/download.cc:259
msgid "REMOVE"
msgstr "KALDIR"
-#: src/download.cc:264
+#: src/download.cc:265
msgid "INSTALL"
msgstr "KUR"
-#: src/download.cc:267
+#: src/download.cc:268
msgid "REINSTALL"
msgstr "YENIDEN KUR"
-#: src/download.cc:270
+#: src/download.cc:271
msgid "HOLD"
msgstr "TUT"
-#: src/download.cc:273
+#: src/download.cc:274
msgid "BROKEN"
msgstr "KIRIK"
-#: src/download.cc:276
+#: src/download.cc:277
msgid "REMOVE, NOT USED"
msgstr "KALDIR, KULLANILMAYAN"
-#: src/download.cc:279
+#: src/download.cc:280
msgid "REMOVE, DEPENDENCIES"
msgstr "KALDIR, BAÄžIMLILIKLAR"
-#: src/download.cc:282
+#: src/download.cc:283
msgid "INSTALL, DEPENDENCIES"
msgstr "KUR, BAÄžIMLILIKLAR"
-#: src/download.cc:285
+#: src/download.cc:286
msgid "HOLD, DEPENDENCIES"
msgstr "TUT, BAÄžIMLILIKLAR"
-#: src/download.cc:287
+#: src/download.cc:288
msgid "????????"
msgstr "????????"
-#: src/download.cc:291
+#: src/download.cc:292
#, c-format
msgid "[%s] %s\n"
msgstr "[%s] %s\n"
-#: src/download.cc:294
+#: src/download.cc:295
#, c-format
msgid ""
"===============================================================================\n"
@@ -1138,34 +1279,39 @@
"\n"
"Günlük tamamlandı.\n"
-#: src/download.cc:329
+#: src/download.cc:330
msgid "Downloading packages"
msgstr "Paketler indiriliyor"
-#: src/download.cc:330
+#: src/download.cc:331
msgid "View the progress of the package download"
msgstr "Paket indirme işlemi için ilerleme durumunu göster"
-#: src/download.cc:352
+#: src/download.cc:332
+#, fuzzy
+msgid "Package Download"
+msgstr "Paket:"
+
+#: src/download.cc:354
msgid "Internal error: couldn't generate list of packages to download"
msgstr "İç hata: İndirilecek paketlerin listesi oluşturulamıyor"
-#: src/download.cc:413
+#: src/download.cc:415
msgid "Unable to correct for unavailable packages"
msgstr "Mevcut olmayan paketler için düzeltme yapılamıyor"
-#: src/download.cc:465
+#: src/download.cc:467
msgid ""
"Ack! Something bad happened while installing packages. Trying to recover:"
msgstr ""
"Bilgi! ..Paketler kurulurken bazı şeyler yolunda gitmedi. Geri almaya "
"çalışılıyor:"
-#: src/download.cc:475 src/pkg_item.cc:413
+#: src/download.cc:477 src/pkg_item.cc:432
msgid "Press return to continue.\n"
msgstr "Devam etmek için enter tuşuna basın.\n"
-#: src/download.cc:506
+#: src/download.cc:508
msgid ""
"Could not regain the system lock! (Perhaps another apt or dpkg is running?)"
msgstr ""
@@ -1226,11 +1372,6 @@
msgid "[ERROR]"
msgstr "[HATA]"
-#: src/download_screen.cc:57
-#, c-format
-msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
-msgstr "Lütfen \"%2$s\" sürücüsüne \"%1$s\" diskini yerleştirin"
-
#: src/download_screen.cc:181
#, c-format
msgid "Downloaded %sB in %ss (%sB/s)."
@@ -1270,109 +1411,109 @@
"Disk değiştirme: Lütfen '%s' diskini '%s' sürücüsüne yerleştirin ve enter "
"tuşuna basın\n"
-#: src/generic/aptcache.cc:245
+#: src/generic/aptcache.cc:253
msgid "Can't open Aptitude extended state file"
msgstr "Aptitude geniş durum dosyası açılamıyor"
-#: src/generic/aptcache.cc:252 src/generic/aptcache.cc:305
-#: src/generic/aptcache.cc:307
+#: src/generic/aptcache.cc:260 src/generic/aptcache.cc:313
+#: src/generic/aptcache.cc:315
msgid "Reading extended state information"
msgstr "GeniÅŸ durum bilgisi okunuyor"
-#: src/generic/aptcache.cc:313 src/generic/aptcache.cc:387
-#: src/generic/aptcache.cc:390
+#: src/generic/aptcache.cc:321 src/generic/aptcache.cc:395
+#: src/generic/aptcache.cc:398
msgid "Initializing package states"
msgstr "Paketlerin durumu güncelleniyor"
-#: src/generic/aptcache.cc:501
+#: src/generic/aptcache.cc:509
msgid "Cannot open Aptitude state file"
msgstr "Aptitude durum dosyası açılamıyor"
-#: src/generic/aptcache.cc:505 src/generic/aptcache.cc:560
-#: src/generic/aptcache.cc:563
+#: src/generic/aptcache.cc:513 src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:571
msgid "Writing extended state information"
msgstr "Geniş durum bilgisi yazılıyor"
-#: src/generic/aptcache.cc:542
+#: src/generic/aptcache.cc:550
#, 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/aptcache.cc:551
+#: src/generic/aptcache.cc:559
msgid "Couldn't write state file"
msgstr "Durum dosyası yazılamıyor"
-#: src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:576
msgid "Error writing state file"
msgstr "Durum dosyası yazma hatası"
-#: src/generic/aptcache.cc:584
+#: src/generic/aptcache.cc:592
msgid "couldn't replace old state file"
msgstr "Eski durum dosyası değiştirilemiyor"
-#: src/generic/aptcache.cc:960
+#: src/generic/aptcache.cc:1000
msgid "Unable to correct dependencies, some packages cannot be installed"
msgstr "Bağımlılıklar sağlanamıyor, bazı paketler kurulamıyor"
-#: src/generic/aptcache.cc:1325
+#: src/generic/aptcache.cc:1546
msgid "The list of sources could not be read."
msgstr "Kaynak listesi okunamıyor"
-#: src/generic/aptcache.cc:1332
+#: src/generic/aptcache.cc:1553
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/aptcache.cc:1335
+#: src/generic/aptcache.cc:1556
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"
-#: src/generic/apt.cc:141
+#: src/generic/apt.cc:142
#, c-format
msgid "Unable to open %s for writing"
msgstr "%s yazmak için açılamıyor"
-#: src/generic/apt.cc:151
+#: src/generic/apt.cc:152
#, c-format
msgid "Unable to replace %s with new configuration file"
msgstr "%s yeni yapılandırma dosyası ile değiştirilemiyor"
-#: src/generic/apt.cc:226
+#: src/generic/apt.cc:227
msgid "Warning: could not lock the cache file. Opening in read-only mode"
msgstr "Dikkat: Geçici dosya kilitlenemedi. Yalnızca okuma modunda açılıyor"
-#: src/generic/matchers.cc:780
+#: src/generic/matchers.cc:797
msgid "Unmatched '('"
msgstr "EÅŸleÅŸtirilemeyen '('"
-#: src/generic/matchers.cc:870 src/generic/matchers.cc:949
+#: src/generic/matchers.cc:887 src/generic/matchers.cc:968
#, c-format
msgid "Unknown dependency type: %s"
msgstr "Bilinmeye bağımlılık tipi: %s"
-#: src/generic/matchers.cc:931
+#: src/generic/matchers.cc:950
#, c-format
msgid "Unknown action type: %s"
msgstr "Bilinmeye eylem tipi: %s"
-#: src/generic/matchers.cc:998
+#: src/generic/matchers.cc:1017
#, c-format
msgid "Unknown priority %s"
msgstr "Bilinmeyen öncelik: %s"
-#: src/generic/matchers.cc:1020
+#: src/generic/matchers.cc:1039
#, c-format
msgid "Unknown pattern type: %c"
msgstr "Bilinmeye desen tipi: %c"
-#: src/generic/matchers.cc:1065
+#: src/generic/matchers.cc:1084
msgid "Unexpected empty expression"
msgstr "Beklenmeye boÅŸ ifade"
-#: src/generic/matchers.cc:1100
+#: src/generic/matchers.cc:1119
msgid "Badly formed expression"
msgstr "Kötü biçimli ifade"
-#: src/generic/matchers.cc:1129
+#: src/generic/matchers.cc:1148
msgid "Unexpected ')'"
msgstr "Beklenmeyen ')'"
@@ -1397,7 +1538,7 @@
msgid "Can't get value of $HOME, using TMPDIR (insecure)"
msgstr "$HOME değeri alınamadı, TMPDIR kullanılıyor (güvensiz)"
-#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:60
+#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:61
#, c-format
msgid "ChangeLog of %s"
msgstr "%s için Değişim Günlüğü"
@@ -1598,17 +1739,17 @@
msgid "Invalid sorting policy type '%s'"
msgstr "Geçersiz sıralama kural tipi '%s'"
-#: src/main.cc:68
+#: src/main.cc:67
#, c-format
msgid "%s %s compiled at %s %s\n"
msgstr "%s %s derlendi %s %s\n"
-#: src/main.cc:71
+#: src/main.cc:70
#, c-format
msgid "Compiler: g++ %s\n"
msgstr "Derleyici: g++ %s\n"
-#: src/main.cc:74
+#: src/main.cc:73
#, c-format
msgid ""
"\n"
@@ -1617,7 +1758,7 @@
"\n"
"NCurses versiyon: %s\n"
-#: src/main.cc:76
+#: src/main.cc:75
#, c-format
msgid ""
"\n"
@@ -1626,22 +1767,22 @@
"\n"
"Curses versiyon: %s\n"
-#: src/main.cc:78
+#: src/main.cc:77
#, c-format
msgid "libsigc++ version: %s\n"
msgstr "libsigc++ versiyon: %s\n"
-#: src/main.cc:84
+#: src/main.cc:83
#, c-format
msgid "Usage: aptitude [-S fname] [-u|-i]"
msgstr "Kullanım: aptitude [-S dosyaadı [-u|-i]"
-#: src/main.cc:86
+#: src/main.cc:85
#, c-format
msgid " aptitude [options] <action> ..."
msgstr " aptitude [seçenekler] <eylem> ..."
-#: src/main.cc:88
+#: src/main.cc:87
#, c-format
msgid ""
" Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -1650,43 +1791,43 @@
" Eylemler (Eğer seçilmemişse, aptitude etkileşimli moda girer):\n"
"\n"
-#: src/main.cc:89
+#: src/main.cc:88
#, c-format
msgid " install - Install/upgrade packages\n"
msgstr "install - Paketleri kur/güncelle\n"
-#: src/main.cc:90
+#: src/main.cc:89
#, c-format
msgid " remove - Remove packages\n"
msgstr " remove - Paketleri kaldır\n"
-#: src/main.cc:91
+#: src/main.cc:90
#, c-format
msgid " purge - Remove packages and their configuration files\n"
msgstr " purge - Paketleri ve onlara ait ayar dosyalarını kaldır\n"
-#: src/main.cc:92
+#: src/main.cc:91
#, c-format
msgid " hold - Place packages on hold\n"
msgstr " hold - Paketleri tut\n"
-#: src/main.cc:93
+#: src/main.cc:92
#, c-format
msgid " unhold - Cancel a hold command for a package\n"
msgstr " unhold - Bir paket için hold(tut) komutunu iptal et\n"
-#: src/main.cc:94
+#: src/main.cc:93
#, c-format
msgid " markauto - Mark packages as having been automatically installed\n"
msgstr ""
"markauto - Paketler otomatik olarak kurulacak ÅŸekilde iÅŸaretlenir\n"
-#: src/main.cc:95
+#: src/main.cc:94
#, c-format
msgid " unmarkauto - Mark packages as having been manually installed\n"
msgstr " unmarkauto - Paketler elle kurulacak ÅŸekilde iÅŸaretlenir\n"
-#: src/main.cc:100
+#: src/main.cc:99
#, c-format
msgid ""
" forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -1695,17 +1836,17 @@
" forbid-version - Aptitude'un belirli bir paket sürümüne yükseltmesini "
"engelle.\n"
-#: src/main.cc:101
+#: src/main.cc:100
#, c-format
msgid " update - Download lists of new/upgradable packages\n"
msgstr " update - Yeni/güncellenebilir paketlerin listesini indir\n"
-#: src/main.cc:102
+#: src/main.cc:101
#, c-format
msgid " upgrade - Perform a safe upgrade\n"
msgstr " upgrade - Güvenli bir güncelleme uygula\n"
-#: src/main.cc:103
+#: src/main.cc:102
#, c-format
msgid ""
" dist-upgrade - Perform an upgrade, possibly installing and removing "
@@ -1714,69 +1855,69 @@
" dist-upgrade Güncelleme uygula, mümkün olduğunca paketleri kurma ve "
"kaldırma\n"
-#: src/main.cc:104
+#: src/main.cc:103
#, c-format
msgid " forget-new - Forget what packages are \"new\"\n"
msgstr "forget-new Hangi paketlerin \"yeni\" olduÄŸunu unut\n"
-#: src/main.cc:105
+#: src/main.cc:104
#, c-format
msgid " search - Search for a package by name and/or expression\n"
msgstr " search - Paketleri ismine ve/veya tanımlara göre ara\n"
-#: src/main.cc:106
+#: src/main.cc:105
#, c-format
msgid " show - Display detailed information about a package\n"
msgstr " show - Bir paket hakkında detaylı bilgi göster\n"
-#: src/main.cc:107
+#: src/main.cc:106
#, c-format
msgid " clean - Erase downloaded package files\n"
msgstr " clean - İndirilmiş paket dosyalarını sil\n"
-#: src/main.cc:108
+#: src/main.cc:107
#, c-format
msgid " autoclean - Erase old downloaded package files\n"
msgstr " autoclean - Eski indirilmiş paket dosyalarını sil\n"
-#: src/main.cc:109
+#: src/main.cc:108
#, c-format
msgid " changelog - View a package's changelog\n"
msgstr " changelog - Paketin değişiklik güncesini göster\n"
-#: src/main.cc:110
+#: src/main.cc:109
#, c-format
msgid " download - Download the .deb file for a package\n"
msgstr " download - Bir paket için.deb dosyasını indir\n"
-#: src/main.cc:112
+#: src/main.cc:111
#, c-format
msgid " Options:\n"
msgstr " Seçenekler:\n"
-#: src/main.cc:113
+#: src/main.cc:112
#, c-format
msgid " -h This help text\n"
msgstr " -h Bu yardım metni\n"
-#: src/main.cc:114
+#: src/main.cc:113
#, c-format
msgid " -s Simulate actions, but do not actually perform them.\n"
msgstr " -s Eylemi simule et, fakat işlemi gerçekleştirme.\n"
-#: src/main.cc:115
+#: src/main.cc:114
#, c-format
msgid ""
" -d Only download packages, do not install or remove anything.\n"
msgstr ""
" -d Sadece paketleri indir, hiç bir şey kurma ya da kaldırma\n"
-#: src/main.cc:116
+#: src/main.cc:115
#, c-format
msgid " -P Always prompt for confirmation or actions\n"
msgstr " -p Her zaman onay için ya da eylem için sor\n"
-#: src/main.cc:117
+#: src/main.cc:116
#, c-format
msgid ""
" -y Assume that the answer to simple yes/no questions is 'yes'\n"
@@ -1784,7 +1925,7 @@
" -y Sadece evet/hayır şeklindeki sorulara onaya gerek kalmadan "
"'evet' de\n"
-#: src/main.cc:118
+#: src/main.cc:117
#, c-format
msgid ""
" -F format Specify a format for displaying search results; see the "
@@ -1793,7 +1934,7 @@
" -F format Arama sonuçlarını göstermek için bir format belirle; "
"kılavuza bakınız\n"
-#: src/main.cc:119
+#: src/main.cc:118
#, c-format
msgid ""
" -O order Specify how search results should be sorted; see the manual\n"
@@ -1801,55 +1942,55 @@
" -O düzen Arama sonuçlarının nasıl sıralanacağını belirt; kılavuza "
"bakınız\n"
-#: src/main.cc:120
+#: src/main.cc:119
#, c-format
msgid ""
" -w width Specify the display width for formatting search results\n"
msgstr " -w genişlik Arama sonuçları için gösterme genişliği belirt\n"
-#: src/main.cc:121
+#: src/main.cc:120
#, c-format
msgid " -f Aggressively try to fix broken packages.\n"
msgstr " -f Kırık paketleri zorla düzeltmeye çalış.\n"
-#: src/main.cc:122
+#: src/main.cc:121
#, c-format
msgid " -V Show which versions of packages are to be installed.\n"
msgstr ""
" -V Paketlerin hangi versiyonlarının kurulacağını göster.\n"
-#: src/main.cc:123
+#: src/main.cc:122
#, c-format
msgid ""
" -D Show the dependencies of automatically changed packages.\n"
msgstr ""
" -D Otomatik olarak değişecek bağımlılık dosyalarını göster.\n"
-#: src/main.cc:124
+#: src/main.cc:123
#, c-format
msgid " -Z\t\t Show the change in installed size of each package.\n"
msgstr ""
" -Z\t\t Her bir paketin kurulduktan sonraki büyüklük değişikliğini "
"göster.\n"
-#: src/main.cc:125
+#: src/main.cc:124
#, c-format
msgid ""
" -v Display extra information. (may be supplied multiple times)\n"
msgstr " -v Ekstra bilgi göster. (birden fazla desteklenebilir)\n"
-#: src/main.cc:126
+#: src/main.cc:125
#, c-format
msgid ""
" -t [release] Set the release from which packages should be installed\n"
msgstr " -t [sürüm] Paketlerin kurulacağı sürümü ayarla\n"
-#: src/main.cc:127
+#: src/main.cc:126
#, c-format
msgid " -o key=val Directly set the configuration option named 'key'\n"
msgstr " -o key=değ 'key' yapılandırma seçeneğini doğrudan değiştir\n"
-#: src/main.cc:128
+#: src/main.cc:127
#, c-format
msgid ""
" --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -1859,57 +2000,65 @@
"olarak\n"
" var sayılıp sayılmayacağını belirler.\n"
-#: src/main.cc:129
+#: src/main.cc:128
#, c-format
msgid " -S fname: Read the aptitude extended status info from fname.\n"
msgstr " -S dosyaadi: aptitude geliÅŸmiÅŸ durum bilgisini dosyaadi'ndan oku.\n"
-#: src/main.cc:130
+#: src/main.cc:129
#, c-format
msgid " -u : Download new package lists on startup.\n"
msgstr " -u : Başlangıçta yeni paket listelerini indir.\n"
-#: src/main.cc:131
+#: src/main.cc:130
#, c-format
msgid " -i : Perform an install run on startup.\n"
msgstr " -i : Bir kurulum yap ve başlangıçta çalıştır.\n"
-#: src/main.cc:133
+#: src/main.cc:132
#, c-format
msgid " This aptitude does not have Super Cow Powers.\n"
msgstr " Bu yetenek Süper İnek Güçlerine sahip değil.\n"
-#: src/main.cc:254
+#: src/main.cc:253
#, c-format
msgid "-o requires an argument of the form key=value, got %s"
msgstr "-o key=değer şeklinde bir seçenek gerekiyor, %s elde edildi"
-#: src/main.cc:300 src/main.cc:309
+#: src/main.cc:299 src/main.cc:308
msgid "WEIRDNESS: unknown option code received\n"
msgstr "TUHAFLIK: bilinmeyen seçenek kodu alındı\n"
-#: src/main.cc:318
+#: src/main.cc:317
msgid "Only one of -u and -i may be specified\n"
msgstr "Yalnızca -u ve -i den biri belirtilmeli\n"
-#: src/main.cc:326
+#: src/main.cc:325
msgid ""
"-u and -i may not be specified in command-line mode (eg, with 'install')"
msgstr "-u ve -i komut satırı modunda belirtilemez ('install' ile, gibi)"
-#: src/main.cc:337
+#: src/main.cc:342
msgid "-u and -i may not be specified with a command"
msgstr "-u ve -i bir komutla birlikte kullanılamaz"
-#: src/main.cc:392
+#: src/main.cc:399
#, c-format
msgid "Unknown command \"%s\"\n"
msgstr "Bilinmeyen komut \"%s\"\n"
-#: src/main.cc:400
+#: src/main.cc:406 src/main.cc:463
+msgid "Internal error: uncaught 'out of solutions' exception.\n"
+msgstr ""
+
+#: src/main.cc:411 src/main.cc:468
+msgid "Internal error: uncaught 'out of time' exception.\n"
+msgstr ""
+
+#: src/main.cc:418
#, c-format
-msgid "Invalid option for interactive mode: -s\n"
-msgstr "Etkileşimli mod için geçersiz seçenek: -s\n"
+msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
+msgstr ""
#: src/mine/cmine.cc:93
#, c-format
@@ -1937,7 +2086,7 @@
msgid "Lost"
msgstr "Kaybettin"
-#: src/mine/cmine.cc:119 src/ui.cc:1005
+#: src/mine/cmine.cc:119 src/ui.cc:1089
msgid "Minesweeper"
msgstr "Mayın tarlası"
@@ -2111,7 +2260,7 @@
msgid "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
msgstr "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
-#: src/pkg_columnizer.cc:84 src/ui.cc:1488
+#: src/pkg_columnizer.cc:84 src/ui.cc:1638
msgid "Package"
msgstr "Paket"
@@ -2370,13 +2519,14 @@
"'temel' bölümünde başlangıçtaki sistem kurulumunun bir parçasıdır"
#: src/pkg_grouppolicy.cc:158
+#, fuzzy
msgid ""
"Programs for faxmodems and other communications devices\n"
" Packages in the 'comm' section are used to control modems and other "
"hardware communications devices. This includes software to control faxmodems "
"(for instance, PPP for dial-up internet connections and programs originally "
-"written for that purpose (zmodem/kermit), as well as software to control "
-"cellular phones, interface with FidoNet, and run a BBS."
+"written for that purpose, such as zmodem/kermit), as well as software to "
+"control cellular phones, interface with FidoNet, and run a BBS."
msgstr ""
"faxmodem ve diğer haberleşme cihazları için programlar\n"
"'comm' bölümündeki paketler modem ve diğer haberleşme cihazlarının "
@@ -2825,14 +2975,15 @@
"'main' arşivi içerisinde yer alıyor."
#: src/pkg_grouppolicy.cc:193
+#, fuzzy
msgid ""
"Programs which are not free software\n"
" Packages in the 'non-free' section are not part of Debian.\n"
" .\n"
" These packages fail to meet one or more of the requirements of the Debian "
-"Free Software Guidelines (see below) You should read the license of programs "
-"in this section to be sure that you are allowed to use them in the way you "
-"intend.\n"
+"Free Software Guidelines (see below). You should read the license of "
+"programs in this section to be sure that you are allowed to use them in the "
+"way you intend.\n"
" .\n"
" For more information about what Debian considers to be Free Software, see "
"http://www.debian.org/social_contract#guidelines"
@@ -2897,11 +3048,12 @@
" Bu paketlerin daha güncel sürümleri mevcut."
#: src/pkg_grouppolicy.cc:320
+#, fuzzy
msgid ""
"New Packages\n"
" These packages have been added to Debian since the last time you cleared "
-"the list of \"new\" packages. (choose \"Forget new packages\" from the "
-"Actions menu to empty this list)"
+"the list of \"new\" packages (choose \"Forget new packages\" from the "
+"Actions menu to empty this list)."
msgstr ""
"Yeni Paketler\n"
" Bu paketler siz \"yeni paket listesi\"ni son temizlediÄŸinizden beri "
@@ -3154,53 +3306,72 @@
msgid "Versions"
msgstr "Sürümler"
-#: src/pkg_item.cc:54
+#: src/pkg_item.cc:55
msgid "Yes, I am aware this is a very bad idea"
msgstr "Evet, bunun çok kötü bir fikir olduğunun bilincindeyim"
#: src/pkg_item.cc:80
-#, c-format
+#, fuzzy, c-format
msgid ""
-"%s is an essential package!\n"
-"\n"
-"Are you sure you want to remove it?\n"
-"Type '%s' if you are."
+"%s is an essential package!%n%nAre you sure you want to remove it?%nType '%"
+"s' if you are."
msgstr ""
"%s önemli bir pakettir!\n"
"\n"
"Bu paketi kaldırmak istediğinizden emin misiniz?\n"
"Eğer eminseniz '%s' yazın."
-#: src/pkg_item.cc:219
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:625
#, c-format
msgid "Information about %s"
msgstr "%s hakkında bilgi"
-#: src/pkg_item.cc:304
-msgid "Available versions of "
+#: src/pkg_item.cc:224 src/pkg_ver_item.cc:627
+#, c-format
+msgid "%s info"
+msgstr ""
+
+#: src/pkg_item.cc:310
+#, fuzzy, c-format
+msgid "Available versions of %s"
msgstr "Kullanılabilir sürümleri "
-#: src/pkg_item.cc:312 src/pkg_ver_item.cc:648
+#: src/pkg_item.cc:313
+#, fuzzy, c-format
+msgid "%s versions"
+msgstr "Sürümler"
+
+#: src/pkg_item.cc:325 src/pkg_ver_item.cc:655
#, c-format
msgid "Dependencies of %s"
msgstr "%s paketinin bağımlılıkları"
-#: src/pkg_item.cc:322 src/pkg_ver_item.cc:657
+#: src/pkg_item.cc:327 src/pkg_ver_item.cc:657
+#, c-format
+msgid "%s deps"
+msgstr ""
+
+#: src/pkg_item.cc:338 src/pkg_ver_item.cc:667
#, c-format
msgid "Packages depending on %s"
msgstr "%s paketine bağımlı paketler"
-#: src/pkg_item.cc:373 src/pkg_ver_item.cc:694
+#: src/pkg_item.cc:340 src/pkg_ver_item.cc:669
+#, c-format
+msgid "%s reverse deps"
+msgstr ""
+
+#: src/pkg_item.cc:392 src/pkg_ver_item.cc:707
#, c-format
msgid "Reporting a bug in %s:\n"
msgstr "%s ile ilgili hata bildirimi:\n"
-#: src/pkg_item.cc:395
+#: src/pkg_item.cc:414
+#, fuzzy
msgid ""
-"You are not root and I cannot find any way\n"
-"to become root. To reconfigure this package,\n"
-"install the menu package, the login package,\n"
-"or run aptitude as root."
+"You are not root and I cannot find any way to become root. To reconfigure "
+"this package, install the menu package, the login package, or run aptitude "
+"as root."
msgstr ""
"Root yetkisine sahip deÄŸilsiniz ve size bu\n"
"yetkiyi sağlayabilmek için uygun bir yol bulunamadı.\n"
@@ -3208,48 +3379,49 @@
"'login' paketlerinden birini kurun veya aptitude \n"
"programını root yetkisiyle çalıştırın."
-#: src/pkg_item.cc:403
+#: src/pkg_item.cc:422
#, c-format
msgid "Reconfiguring %s\n"
msgstr "%s paketi yeniden yapılandırılıyor\n"
-#: src/pkg_item.cc:428
+#: src/pkg_item.cc:447
msgid "Hierarchy editor"
msgstr "Hiyerarşi düzenleyici"
+#: src/pkg_item.cc:447
+#, fuzzy
+msgid "Hierarchy Editor"
+msgstr "Hiyerarşi düzenleyici"
+
#: src/pkg_tree.cc:325
msgid "Search for: "
msgstr "Ara: "
-#: src/pkg_tree.cc:585
+#: src/pkg_tree.cc:568
msgid "All Packages"
msgstr "Tüm Paketler"
-#: src/pkg_tree.cc:598 src/pkg_tree.cc:607
+#: src/pkg_tree.cc:581 src/pkg_tree.cc:590
msgid "Building view"
msgstr "Görüntü oluşturuluyor"
-#: src/pkg_tree.cc:649
+#: src/pkg_tree.cc:632
#, c-format
msgid "No packages matched the pattern \"%s\"."
msgstr "\"%s\" kalıbına uygun paket yok."
-#: src/pkg_tree.cc:671
+#: src/pkg_tree.cc:654
msgid "Enter the new package tree limit: "
msgstr "Yeni paket ağacı sınırını girin: "
-#: src/pkg_tree.cc:705
+#: src/pkg_tree.cc:688
msgid "Enter the new package grouping mechanism for this display: "
msgstr "Bu ekran için yeni paket gruplama mekanizmasını girin: "
-#: src/pkg_tree.cc:713
+#: src/pkg_tree.cc:696
msgid "Enter the new package sorting mechanism for this display: "
msgstr "Bu ekran için yeni paket sıralama mekanizmasını girin: "
-#: src/pkg_ver_item.cc:623
-msgid "Information about "
-msgstr "Hakkında bilgi"
-
#: src/pkg_view.cc:344
msgid "make_package_view: error in arguments -- two main widgets??"
msgstr "make_package_view: ifadelerde hata -- iki ana pencere mi olacak??"
@@ -3264,7 +3436,7 @@
msgid "make_package_view: bad argument!"
msgstr "make_package_view: hatalı ifade!"
-#: src/pkg_view.cc:492
+#: src/pkg_view.cc:495
msgid "make_package_view: no main widget found"
msgstr "make_package_view: Ana nesne bulunamadı"
@@ -3480,6 +3652,74 @@
"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:74
+msgid "The package cache is not available."
+msgstr ""
+
+#: src/solution_dialog.cc:82
+#, fuzzy
+msgid "No packages are broken."
+msgstr "Bazı paket bağımlılıkları kırık. Düzeltme denensin mi?"
+
+#: src/solution_dialog.cc:103
+msgid "No resolution found."
+msgstr ""
+
+#: src/solution_dialog.cc:107
+#, c-format
+msgid ""
+"Time exhausted while searching for a solution (you can select \"Next Solution"
+"\" or press %s to try harder)."
+msgstr ""
+
+#: src/solution_dialog.cc:146
+#, fuzzy
+msgid "Previous"
+msgstr "Sağladığı"
+
+#: src/solution_dialog.cc:147
+#, fuzzy
+msgid "Next"
+msgstr "^Sonraki"
+
+#: src/solution_dialog.cc:148
+msgid "Apply"
+msgstr ""
+
+#: src/solution_dialog.cc:149
+#, fuzzy
+msgid "Close"
+msgstr "^Kapat"
+
+#: src/solution_fragment.cc:125
+#, fuzzy
+msgid "%BRemove%b the following packages:%n"
+msgstr "Aşağıdaki paketler BOZUK:"
+
+#: src/solution_fragment.cc:135
+#, fuzzy
+msgid "%BInstall%b the following packages:%n"
+msgstr "Aşağıdaki paketler BOZUK:"
+
+#: src/solution_fragment.cc:148
+msgid "%BKeep%b the following packages at their current version:%n"
+msgstr ""
+
+#: src/solution_fragment.cc:161
+#, fuzzy
+msgid "%BUpgrade%b the following packages:%n"
+msgstr "Aşağıdaki paketler BOZUK:"
+
+#: src/solution_fragment.cc:176
+#, fuzzy
+msgid "%BDowngrade%b the following packages:%n"
+msgstr "Paketler indiriliyor"
+
+#: src/solution_fragment.cc:190
+#, c-format
+msgid "Score is %d"
+msgstr ""
+
#: src/trust.cc:17 src/trust.cc:19
msgid "WARNING"
msgstr ""
@@ -3491,52 +3731,52 @@
"system."
msgstr ""
-#: src/ui.cc:143
+#: src/ui.cc:164
msgid "Er, there aren't any errors, this shouldn't have happened.."
msgstr "Herhangi bir hata yok, bu gerçekleşmemeliydi..."
-#: src/ui.cc:149
+#: src/ui.cc:170
msgid "E:"
msgstr ""
-#: src/ui.cc:151
+#: src/ui.cc:172
msgid "W:"
msgstr ""
-#: src/ui.cc:172
+#: src/ui.cc:193
msgid "Search for:"
msgstr "Ara: "
-#: src/ui.cc:205
+#: src/ui.cc:261
msgid "You already are root!"
msgstr "Zaten root yetkiniz var!"
-#: src/ui.cc:303
+#: src/ui.cc:359
msgid ""
"Subprocess exited with an error -- did you type your password correctly?"
msgstr "Altsüreç bir hata ile sonlandı -- parolanızı doğru girdiniz mi?"
-#: src/ui.cc:331
+#: src/ui.cc:387
msgid "Loading cache"
msgstr "Önbellek yükleniyor"
-#: src/ui.cc:353
+#: src/ui.cc:409
msgid "Really quit Aptitude?"
msgstr "Aptitude'dan çıkılsın mı?"
-#: src/ui.cc:432
+#: src/ui.cc:488
msgid "Really discard your personal settings and reload the defaults?"
msgstr "Kişisel tercihleriniz unutulup öntanımlı ayarlar yüklensin mi?"
-#: src/ui.cc:532
+#: src/ui.cc:588 src/ui.cc:590 src/ui.cc:618 src/ui.cc:620
msgid "Packages"
msgstr "Paketler"
-#: src/ui.cc:533 src/ui.cc:560
+#: src/ui.cc:589 src/ui.cc:619
msgid "View available packages and choose actions to perform"
msgstr "Kullanılabilir paketleri gösterir ve bir eylem seçmenizi sağlar"
-#: src/ui.cc:599
+#: src/ui.cc:666
#, fuzzy
msgid ""
"%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
@@ -3552,15 +3792,15 @@
"menüsündeki 'Lisans' seçeneğine bakabilirsiniz. Bu bir Özgür Yazılım'dır, "
"ve belirli koşullar altında dağıtılabilir."
-#: src/ui.cc:620
+#: src/ui.cc:687
msgid "help.txt"
msgstr "yardım.txt"
-#: src/ui.cc:636
+#: src/ui.cc:703
msgid "README"
msgstr "BENÄ°OKU"
-#: src/ui.cc:718
+#: src/ui.cc:785
msgid ""
"%C%BWARNING%b: untrusted versions of the following packages will be "
"installed!%n%nUntrusted packages could %Bcompromise your system's security%"
@@ -3568,60 +3808,70 @@
"this is what you want to do.%n%n"
msgstr ""
-#: src/ui.cc:732
+#: src/ui.cc:799
#, fuzzy
msgid "Really Continue"
msgstr "Devam"
-#: src/ui.cc:734
+#: src/ui.cc:801
msgid "Abort Installation"
msgstr ""
-#: src/ui.cc:796
+#: src/ui.cc:862
msgid "Preview of package installation"
msgstr "Paket kurulumu önizlemesi"
-#: src/ui.cc:797
+#: src/ui.cc:863
msgid "View and/or adjust the actions that will be performed"
msgstr "Yapılacak değişiklikleri görüntüle ve/veya değiştir"
-#: src/ui.cc:837
-msgid "Some packages were broken and have been fixed"
+#: src/ui.cc:864
+#, fuzzy
+msgid "Preview"
+msgstr "Ön^ceki"
+
+#: src/ui.cc:900
+#, fuzzy
+msgid "Some packages were broken and have been fixed:"
msgstr "Bazı paket bağımlılıkları kırıktı ve düzeltildi."
-#: src/ui.cc:839
-msgid "Some broken packages could not be fixed!"
-msgstr "Bazı kırık paket bağımlılıkları düzeltilemedi!"
+#: src/ui.cc:906
+msgid "No solution to these dependency problems exists!"
+msgstr ""
-#: src/ui.cc:847 src/ui.cc:959
-msgid "Some packages are broken. Try to fix them?"
-msgstr "Bazı paket bağımlılıkları kırık. Düzeltme denensin mi?"
+#: src/ui.cc:912
+#, c-format
+msgid ""
+"Ran out of time while trying to resolver dependencies (press \"%s\" to try "
+"harder)"
+msgstr ""
-#: src/ui.cc:860
+#: src/ui.cc:958
+#, fuzzy
msgid ""
-"Installing/removing packages requires administrative privileges, which\n"
-"you currently do not have. Would you like to change to the root account?\n"
+"Installing/removing packages requires administrative privileges, which you "
+"currently do not have. Would you like to change to the root account?"
msgstr ""
"Paket kurma/kaldırma işlemi şu anda sahip olmadığınız yönetici yetkilerini\n"
"gerektirir. Root kullanıcı hesabına geçmek ister misiniz?\n"
-#: src/ui.cc:863 src/ui.cc:993
+#: src/ui.cc:961 src/ui.cc:1077
msgid "Become root"
msgstr "Root ol"
-#: src/ui.cc:865 src/ui.cc:995
+#: src/ui.cc:963 src/ui.cc:1079
msgid "Don't become root"
msgstr "Root olma"
-#: src/ui.cc:870 src/ui.cc:1000
+#: src/ui.cc:968 src/ui.cc:1084
msgid "A package-list update or install run is already taking place."
msgstr "Paket listesi güncellemesi veya kurulum işlemi zaten sürüyor."
-#: src/ui.cc:897
+#: src/ui.cc:995
msgid "No packages are scheduled to be installed, removed, or upgraded."
msgstr "Hiçbir paket kurulmayacak, yükseltilmeyecek ya da kaldırılmayacak."
-#: src/ui.cc:903
+#: src/ui.cc:1001
#, fuzzy
msgid ""
"No packages will be installed, removed or upgraded. Some packages could be "
@@ -3633,166 +3883,181 @@
"Bazı paketler yükseltilebilir, ama onları yükseltmeyi seçmediniz.\n"
"Yükseltme için \"U\" tuşuna basın."
-#: src/ui.cc:990
+#: src/ui.cc:1073
+#, fuzzy
msgid ""
-"Updating the package lists requires administrative privileges, which\n"
-"you currently do not have. Would you like to change to the root account?\n"
+"Updating the package lists requires administrative privileges, which you "
+"currently do not have. Would you like to change to the root account?"
msgstr ""
"Paket listesi güncelleme işlemi şu anda sahip olmadığınız yönetici\n"
"yetkilerini gerektirir. Root kullanıcı hesabına geçmek ister misiniz?\n"
-#: src/ui.cc:1005 src/ui.cc:1198
+#: src/ui.cc:1089 src/ui.cc:1345
msgid "Waste time trying to find mines"
msgstr "Mayınları bulmaya çalışırken zamanı boşa harcayın"
-#: src/ui.cc:1012 src/ui.cc:1065
+#: src/ui.cc:1096 src/ui.cc:1149
msgid "Cleaning while a download is in progress is not allowed"
msgstr "İndirme işlemi sürerken temizlemeye izin verilmez."
-#: src/ui.cc:1015
+#: src/ui.cc:1099
msgid "Deleting downloaded files"
msgstr "Ä°ndirilmiÅŸ dosyalar siliniyor"
-#: src/ui.cc:1029
+#: src/ui.cc:1113
msgid "Downloaded package files have been deleted"
msgstr "Ä°ndirilmiÅŸ paketler silindi."
-#: src/ui.cc:1090
+#: src/ui.cc:1174
#, fuzzy, c-format
msgid ""
"Obsolete downloaded package files have been deleted, freeing %sB of disk "
"space."
msgstr "Ä°ndirilmiÅŸ eski paketler temizlendi."
-#: src/ui.cc:1174
+#: src/ui.cc:1246
+msgid "All solutions exhausted."
+msgstr ""
+
+#: src/ui.cc:1251 src/ui.cc:1282
+#, fuzzy
+msgid "Ran out of time while trying to find a solution."
+msgstr "Mayınları bulmaya çalışırken zamanı boşa harcayın"
+
+#: src/ui.cc:1276
+msgid "Unable to find a solution to apply."
+msgstr ""
+
+#: src/ui.cc:1321
msgid "^Install/remove packages"
msgstr "^Paketleri kur/kaldır"
-#: src/ui.cc:1175
+#: src/ui.cc:1322
msgid "Perform all pending installs and removals"
msgstr "Bekleyen tüm kurulum ve kaldırma işlemlerini gerçekleştirir"
-#: src/ui.cc:1177
+#: src/ui.cc:1324
msgid "^Update package list"
msgstr "Paket listesini ^güncelle"
-#: src/ui.cc:1178
+#: src/ui.cc:1325
msgid "Check for new versions of packages"
msgstr "Paketleri yeni sürümleri için denetler"
-#: src/ui.cc:1181
+#: src/ui.cc:1328
msgid "^Forget new packages"
msgstr "Yeni paketleri ^unut"
-#: src/ui.cc:1182
+#: src/ui.cc:1329
msgid "Forget which packages are \"new\""
msgstr "Yeni paketleri unutur"
-#: src/ui.cc:1185
+#: src/ui.cc:1332
msgid "^Clean package cache"
msgstr "Paket ön^belleğini temizle"
-#: src/ui.cc:1186
+#: src/ui.cc:1333
msgid "Delete package files which were previously downloaded"
msgstr "Daha önce indirilmiş paket dosyalarını siler"
-#: src/ui.cc:1189
+#: src/ui.cc:1336
msgid "Clean ^obsolete files"
msgstr "Eski d^osyaları temizle"
-#: src/ui.cc:1190
+#: src/ui.cc:1337
msgid "Delete package files which can no longer be downloaded"
msgstr "Artık indirilemeyecek olan (eski) paket dosyalarını siler"
-#: src/ui.cc:1193
+#: src/ui.cc:1340
msgid "Mark ^Upgradable"
msgstr "^Güncellenebilir işaretle"
-#: src/ui.cc:1194
+#: src/ui.cc:1341
msgid "Mark all upgradable packages which are not held for upgrade"
msgstr ""
"Güncellenmemek üzere tutulan paketler dışındaki tüm paketleri güncellemek "
"için işaretler"
-#: src/ui.cc:1197
+#: src/ui.cc:1344
msgid "^Play Minesweeper"
msgstr "Mayın tarlası ^oyna"
-#: src/ui.cc:1200
+#: src/ui.cc:1347
msgid "^Become root"
msgstr "Root o^l"
-#: src/ui.cc:1201
+#: src/ui.cc:1348
+#, fuzzy
msgid ""
-"Run 'su' to become root; this will restart the program, but your\n"
-"settings will be preserved"
+"Run 'su' to become root; this will restart the program, but your settings "
+"will be preserved"
msgstr ""
"Root olmak için 'su' komutunu çalıştır; bu işlem programı yeniden\n"
"başlatır ama ayarlarınız korunacak"
-#: src/ui.cc:1204
+#: src/ui.cc:1351
msgid "^Reload package cache"
msgstr "Paket arabelleÄŸini ^yenile"
-#: src/ui.cc:1205
+#: src/ui.cc:1352
msgid "Reload the package cache"
msgstr "Paket önbelleğini yeniden yükle"
-#: src/ui.cc:1211
+#: src/ui.cc:1358
msgid "^Quit"
msgstr "Çı^k"
-#: src/ui.cc:1212
+#: src/ui.cc:1359
msgid "Exit the program"
msgstr "Programdan çıkar"
-#: src/ui.cc:1218 src/ui.cc:1487
+#: src/ui.cc:1365 src/ui.cc:1637
msgid "Undo"
msgstr "Geri al"
-#: src/ui.cc:1219
+#: src/ui.cc:1366
msgid "Undo the last package operation or group of operations"
msgstr "Son yapılan paket işlemini veya işlem grubunu geri alır"
-#: src/ui.cc:1226
+#: src/ui.cc:1373
msgid "^Install"
msgstr "^Kur"
-#: src/ui.cc:1227
+#: src/ui.cc:1374
msgid "Flag the currently selected package for installation or upgrade"
msgstr "Şu an seçili paketi kurma ya da yükseltme işlemi için işaretle"
-#: src/ui.cc:1230
+#: src/ui.cc:1377
msgid "^Remove"
msgstr "^Kaldır"
-#: src/ui.cc:1231
+#: src/ui.cc:1378
msgid "Flag the currently selected package for removal"
msgstr "Şu an seçili paketi kaldırma işlemi için işaretle"
-#: src/ui.cc:1234
+#: src/ui.cc:1381
msgid "^Purge"
msgstr "^Temizle"
-#: src/ui.cc:1235
+#: src/ui.cc:1382
msgid ""
"Flag the currently selected package and its configuration files for removal"
msgstr ""
"Seçili olan paketi ve yapılandırma dosyalarını kaldırma işlemi için işaretle"
-#: src/ui.cc:1238
+#: src/ui.cc:1385
msgid "^Keep"
msgstr "^Koru"
-#: src/ui.cc:1239
+#: src/ui.cc:1386
msgid "Cancel any action on the selected package"
msgstr "Seçili paket ile ilgili herhangi bir işlemi iptal et"
-#: src/ui.cc:1242
+#: src/ui.cc:1389
msgid "^Hold"
msgstr "^Tut"
-#: src/ui.cc:1243
+#: src/ui.cc:1390
msgid ""
"Cancel any action on the selected package, and protect it from future "
"upgrades"
@@ -3800,250 +4065,254 @@
"Seçili paket ile ilgili herhangi bir işlemi iptal et ve daha sonra "
"yapılacakyükseltmelerden koru"
-#: src/ui.cc:1246
+#: src/ui.cc:1393
msgid "Mark ^Auto"
msgstr "^Otom. Ä°ÅŸaretle"
-#: src/ui.cc:1247
+#: src/ui.cc:1394
+#, fuzzy
msgid ""
-"Mark the selected package as having been automatically installed;\n"
-"it will automatically be removed if no other packages depend on it"
+"Mark the selected package as having been automatically installed; it will "
+"automatically be removed if no other packages depend on it"
msgstr ""
"Paketi otomatik kurulmuÅŸ olarak iÅŸaretle; daha sonra bu pakete\n"
"bağımlı paket kalmazsa otomatik olarak kaldır"
-#: src/ui.cc:1250
+#: src/ui.cc:1397
msgid "Mark ^Manual"
msgstr "Elle ^Ä°ÅŸaretle"
-#: src/ui.cc:1251
+#: src/ui.cc:1398
+#, fuzzy
msgid ""
-"Mark the selected package as having been manually installed;\n"
-"it will not be removed unless you manually remove it"
+"Mark the selected package as having been manually installed; it will not be "
+"removed unless you manually remove it"
msgstr ""
"Paketi el ile kurulmuÅŸ olarak iÅŸaretle; siz silmek istemediÄŸiniz\n"
"sürece kurulu kalacaktır"
-#: src/ui.cc:1254
+#: src/ui.cc:1401
msgid "^Forbid Version"
msgstr "Sürümü ^Engelle"
-#: src/ui.cc:1255
+#: src/ui.cc:1402
+#, fuzzy
msgid ""
-"Forbid the candidate version of the selected package from being installed;\n"
+"Forbid the candidate version of the selected package from being installed; "
"newer versions of the package will be installed as usual"
msgstr ""
"Şu anda seçili paketin kurulacak sürümünün kurulumunu engelle;\n"
"paketin daha yeni sürümleri alışıldık şekilde kurulacaktır"
-#: src/ui.cc:1259
+#: src/ui.cc:1406
msgid "I^nformation"
msgstr "^Bilgi"
-#: src/ui.cc:1260
+#: src/ui.cc:1407
msgid "Display more information about the selected package"
msgstr "Seçilen paket hakkında daha detaylı bilgi göster"
-#: src/ui.cc:1263
+#: src/ui.cc:1410
msgid "^Changelog"
msgstr "^Changelog"
-#: src/ui.cc:1264
+#: src/ui.cc:1411
msgid "Display the Debian changelog of the selected package"
msgstr "Seçili paketin Debian değişiklik güncesini göster"
-#: src/ui.cc:1271
+#: src/ui.cc:1418
msgid "^Find"
msgstr "^Bul"
-#: src/ui.cc:1272
+#: src/ui.cc:1419
msgid "Search for a package"
msgstr "Paket ara"
-#: src/ui.cc:1275
+#: src/ui.cc:1422
msgid "Find ^Again"
msgstr "^Tekrar Bul"
-#: src/ui.cc:1276
+#: src/ui.cc:1423
msgid "Repeat the last search"
msgstr "Son aramayı tekrarla"
-#: src/ui.cc:1280
+#: src/ui.cc:1427
msgid "^Limit Display"
msgstr "Görünümü ^Kısıtla"
-#: src/ui.cc:1281
+#: src/ui.cc:1428
msgid "Apply a filter to the package list"
msgstr "Paket listesini filtrele"
-#: src/ui.cc:1284
+#: src/ui.cc:1431
msgid "^Un-Limit Display"
msgstr "Görünümü Kısıtla^ma"
-#: src/ui.cc:1285
+#: src/ui.cc:1432
msgid "Remove the filter from the package list"
msgstr "Paket listesine uygulanan filtreyi kaldır"
-#: src/ui.cc:1289
+#: src/ui.cc:1436
msgid "Find ^Broken"
msgstr "^Bozukları Bul"
-#: src/ui.cc:1290
+#: src/ui.cc:1437
msgid "Find the next package with unsatisfied dependencies"
msgstr "Paket bağımlılığı karşılanamayan sonraki paketi bul"
-#: src/ui.cc:1297
+#: src/ui.cc:1444
msgid "^UI options"
msgstr "^Arayüz seçenekleri"
-#: src/ui.cc:1298
+#: src/ui.cc:1445
msgid "Change the settings which affect the user interface"
msgstr "Kullanıcı arayüzünü etkileyen ayarları değiştirir"
-#: src/ui.cc:1301
+#: src/ui.cc:1448
msgid "^Dependency handling"
msgstr "^Bağımlılık işleme"
-#: src/ui.cc:1302
+#: src/ui.cc:1449
msgid "Change the settings which affect how package dependencies are handled"
msgstr "Paket bağımlılıklarının işlenmesini etkileyen ayarları değiştirir"
-#: src/ui.cc:1305
+#: src/ui.cc:1452
msgid "^Miscellaneous"
msgstr "^Çeşitli"
-#: src/ui.cc:1306
+#: src/ui.cc:1453
msgid "Change miscellaneous program settings"
msgstr "Programın çeşitli ayarlarını değiştirir"
-#: src/ui.cc:1311
+#: src/ui.cc:1458
msgid "^Revert options"
msgstr "^Seçenekleri sıfırla"
-#: src/ui.cc:1312
+#: src/ui.cc:1459
msgid "Reset all settings to the system defaults"
msgstr "Tüm ayarları sistem öntanımlı biçimlerine getirir"
-#: src/ui.cc:1323
+#: src/ui.cc:1470
msgid "^Next"
msgstr "^Sonraki"
-#: src/ui.cc:1324
+#: src/ui.cc:1471
msgid "View next display"
msgstr "Sonraki ekranı görüntüle"
-#: src/ui.cc:1327
+#: src/ui.cc:1474
msgid "^Prev"
msgstr "Ön^ceki"
-#: src/ui.cc:1328
+#: src/ui.cc:1475
msgid "View previous display"
msgstr "Önceki ekranı görüntüle"
-#: src/ui.cc:1331
+#: src/ui.cc:1478
msgid "^Close"
msgstr "^Kapat"
-#: src/ui.cc:1332
+#: src/ui.cc:1479
msgid "Close this display"
msgstr "Bu ekranı kapat"
-#: src/ui.cc:1337
+#: src/ui.cc:1484
msgid "New Package ^View"
msgstr "Yeni paket gö^rünümü"
-#: src/ui.cc:1338
+#: src/ui.cc:1485
msgid "Create a new default package view"
msgstr "Yeni bir öntanımlı paket görünümü oluştur"
-#: src/ui.cc:1341
+#: src/ui.cc:1488
msgid "New Categorical ^Browser"
msgstr "Yeni kategorik ^gezgin"
-#: src/ui.cc:1343
+#: src/ui.cc:1490
msgid "Browse packages by category"
msgstr "Paketlere kategoriye göre gözat"
-#: src/ui.cc:1351
+#: src/ui.cc:1498
msgid "^About"
msgstr "^Hakkında"
-#: src/ui.cc:1352
+#: src/ui.cc:1499
msgid "View information about this program"
msgstr "Bu program hakkındaki bilgileri görüntüler"
-#: src/ui.cc:1355
+#: src/ui.cc:1502
msgid "^Help"
msgstr "^Yardım"
-#: src/ui.cc:1356
+#: src/ui.cc:1503
msgid "View the on-line help"
msgstr "Çevrimiçi yardımı görüntüler"
-#: src/ui.cc:1358
+#: src/ui.cc:1505
msgid "User's ^Manual"
msgstr "Kulla^nıcı Elkitabı"
-#: src/ui.cc:1359
+#: src/ui.cc:1506
msgid "View the detailed program manual"
msgstr "Programın detaylı elkitabını görüntüler"
-#: src/ui.cc:1362
+#: src/ui.cc:1509
msgid "^FAQ"
msgstr "^SSS"
-#: src/ui.cc:1363
+#: src/ui.cc:1510
msgid "View a list of frequently asked questions"
msgstr "Sık sorulan soruların bir listesini görüntüler"
-#: src/ui.cc:1366
-msgid "^ChangeLog"
-msgstr "^ChangeLog"
+#: src/ui.cc:1513
+msgid "^NEWS"
+msgstr ""
-#: src/ui.cc:1367
-msgid "View the important changes made in each version of the program"
+#: src/ui.cc:1514
+#, fuzzy
+msgid "View the important changes made in each version of "
msgstr "Programın her sürümünde yapılmış önemli değişiklikleri görüntüler"
-#: src/ui.cc:1370
+#: src/ui.cc:1517
msgid "^License"
msgstr "^Lisans"
-#: src/ui.cc:1371
+#: src/ui.cc:1518
msgid "View the terms under which you may copy the program"
msgstr "Programı kopyalayabileceğiniz koşulları görüntüler"
-#: src/ui.cc:1486
+#: src/ui.cc:1636
msgid "Actions"
msgstr "Eylemler"
-#: src/ui.cc:1489
+#: src/ui.cc:1639
msgid "Search"
msgstr "Ara"
-#: src/ui.cc:1490
+#: src/ui.cc:1640
msgid "Options"
msgstr "Seçenekler"
-#: src/ui.cc:1491
+#: src/ui.cc:1641
msgid "Views"
msgstr "Görünümler"
-#: src/ui.cc:1492
+#: src/ui.cc:1642
msgid "Help"
msgstr "Yardım"
-#: src/ui.cc:1537
+#: src/ui.cc:1699
#, c-format
msgid ""
"%s: Menu %s: Help %s: Quit %s: Update %s: Download/Install/Remove Pkgs"
msgstr ""
"%s: Menü %s: Yardım %s: Çık %s: Güncelle %s: Paketleri İndir/Kur/Kaldır"
-#: src/ui.cc:1799 src/vscreen/vscreen.cc:281
+#: src/ui.cc:1968 src/vscreen/vscreen.cc:281
msgid "yes_key"
msgstr "evet_anahtarı"
-#: src/ui.cc:1800 src/vscreen/vscreen.cc:282
+#: src/ui.cc:1969 src/vscreen/vscreen.cc:282
msgid "no_key"
msgstr "anahtar_yok"
@@ -4055,6 +4324,16 @@
msgid "Downloading Changelog"
msgstr "Changelog Ä°ndiriliyor"
+#: src/view_changelog.cc:54
+#, fuzzy
+msgid "Download Changelog"
+msgstr "Changelog Ä°ndiriliyor"
+
+#: src/view_changelog.cc:63
+#, c-format
+msgid "%s changes"
+msgstr ""
+
#: src/vscreen/vscreen.cc:119
#, c-format
msgid "Ouch! Got SIGTERM, dying..\n"
@@ -4083,6 +4362,38 @@
msgid "No"
msgstr "Hayır"
+#~ msgid ""
+#~ "Some packages had unmet dependencies. This may mean that you have\n"
+#~ "requested an impossible situation or if you are using the unstable\n"
+#~ "distribution that some required packages have not yet been created\n"
+#~ "or been moved out of Incoming.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Bazı paketler bağımlılıkları karşılamıyor. Bu şu anlama gelebilir\n"
+#~ "Ya mümkün olmayan birşey için istekte bulundunuz ya da kararsız\n"
+#~ "(unstable) dağıtımı kullanıyorsanız bazı gerekli paketler henüz\n"
+#~ "arşivdeki yerini almamış.\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Please insert the following disc into the drive \"%s\":\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Lütfen aşağıdaki CD'yi sürücüye yerleştirin \"%s\":\n"
+#~ "%s"
+
+#~ msgid "Invalid option for interactive mode: -s\n"
+#~ msgstr "Etkileşimli mod için geçersiz seçenek: -s\n"
+
+#~ msgid "Information about "
+#~ msgstr "Hakkında bilgi"
+
+#~ msgid "Some broken packages could not be fixed!"
+#~ msgstr "Bazı kırık paket bağımlılıkları düzeltilemedi!"
+
+#~ msgid "^ChangeLog"
+#~ msgstr "^ChangeLog"
+
#~ msgid "Install Suggested packages automatically"
#~ msgstr "Teklif edilen paketleri otomatik olarak kur"
Modified: branches/aptitude-0.3/aptitude/po/zh_CN.po
==============================================================================
--- branches/aptitude-0.3/aptitude/po/zh_CN.po (original)
+++ branches/aptitude-0.3/aptitude/po/zh_CN.po Sat Apr 30 13:41:32 2005
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: aptitude 0.2.13\n"
"Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-01-10 16:26-0800\n"
+"POT-Creation-Date: 2005-04-29 18:11-0400\n"
"PO-Revision-Date: 2004-10-11 09:15+0200\n"
"Last-Translator: Yongtao Yang <yongtao.yang at telia.com>\n"
"Language-Team: zh_CN <i18n-translation at lists.linux.net.cn>\n"
@@ -148,16 +148,103 @@
msgstr "自动å¸è½½åŒ¹é…该过滤器的未用软件包"
#: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:184 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
-#: src/vscreen/vs_util.cc:329
+#: src/ui.cc:218 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
+#: src/vscreen/vs_util.cc:328
msgid "Ok"
msgstr "确定"
#: src/apt_options.cc:242 src/download_list.cc:71 src/mine/cmine.cc:257
-#: src/mine/cmine.cc:330 src/vscreen/vs_util.cc:329
+#: src/mine/cmine.cc:330 src/vscreen/vs_util.cc:328
msgid "Cancel"
msgstr "å–消"
+#: src/broken_indicator.cc:106 src/solution_dialog.cc:97
+msgid "Internal error: unexpected null solution."
+msgstr ""
+
+#: src/broken_indicator.cc:158
+#, fuzzy
+msgid "Suggest "
+msgstr "建议"
+
+#: src/broken_indicator.cc:164
+#, fuzzy, c-format
+msgid "%d installs"
+msgstr "安装"
+
+#: src/broken_indicator.cc:169
+#, fuzzy
+msgid "1 install"
+msgstr "安装"
+
+#: src/broken_indicator.cc:173
+#, c-format
+msgid "%d removals"
+msgstr ""
+
+#: src/broken_indicator.cc:178
+msgid "1 removal"
+msgstr ""
+
+#: src/broken_indicator.cc:182
+#, c-format
+msgid "%d keeps"
+msgstr ""
+
+#: src/broken_indicator.cc:187
+msgid "1 keep"
+msgstr ""
+
+#: src/broken_indicator.cc:191
+#, fuzzy, c-format
+msgid "%d upgrades"
+msgstr "å‡çº§"
+
+#: src/broken_indicator.cc:196
+#, fuzzy
+msgid "1 upgrade"
+msgstr "å‡çº§"
+
+#: src/broken_indicator.cc:200
+#, fuzzy, c-format
+msgid "%d downgrades"
+msgstr "已下载"
+
+#: src/broken_indicator.cc:205
+#, fuzzy
+msgid "1 downgrade"
+msgstr "已下载"
+
+#: src/broken_indicator.cc:214
+#, c-format
+msgid "%s: Examine"
+msgstr ""
+
+#: src/broken_indicator.cc:216
+#, c-format
+msgid "%s: Apply"
+msgstr ""
+
+#: src/broken_indicator.cc:218
+#, fuzzy, c-format
+msgid "%s: Next"
+msgstr "下一个(^N)"
+
+#: src/broken_indicator.cc:220
+#, c-format
+msgid "%s: Previous"
+msgstr ""
+
+#: src/broken_indicator.cc:233
+#, c-format
+msgid "%CSolution search failed. %s: try harder"
+msgstr ""
+
+#: src/broken_indicator.cc:239
+#, c-format
+msgid "%CUnable to resolve dependencies."
+msgstr ""
+
#: src/cmdline/cmdline_action.cc:36
#, c-format
msgid ""
@@ -227,22 +314,22 @@
msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
msgstr "软件包 %s 是ä¸å¯å‡çº§çš„，ä¸èƒ½è®¾ä¸ºç¦æ¢å‡çº§\n"
-#: src/cmdline/cmdline_action.cc:213
+#: src/cmdline/cmdline_action.cc:198
#, c-format
msgid "Note: selecting the task \"%s: %s\" for installation\n"
msgstr "注æ„：选择任务 “%s：%sâ€å®‰è£…\n"
-#: src/cmdline/cmdline_action.cc:240
+#: src/cmdline/cmdline_action.cc:225
#, c-format
msgid "You can only specify a package version with an 'install' command.\n"
msgstr "在“安装â€å‘½ä»¤ä¸æ‚¨åªèƒ½æŒ‡å®šä¸€ä¸ªè½¯ä»¶åŒ…çš„å˜æ¡£\n"
-#: src/cmdline/cmdline_action.cc:246
+#: src/cmdline/cmdline_action.cc:231
#, c-format
msgid "You can only specify a package archive with an 'install' command.\n"
msgstr "在“安装â€å‘½ä»¤ä¸æ‚¨åªèƒ½æŒ‡å®šä¸€ä¸ªè½¯ä»¶åŒ…çš„å˜æ¡£\n"
-#: src/cmdline/cmdline_action.cc:280
+#: src/cmdline/cmdline_action.cc:265
#, c-format
msgid ""
"Couldn't find package \"%s\", and more than 40\n"
@@ -251,7 +338,7 @@
"æ— æ³•æ‰¾åˆ°è½¯ä»¶åŒ…â€œ%sâ€ï¼ŒåŒæ—¶æœ‰è¶…过40个软件包å称\n"
"ä¸åŒ…å«â€œ%sâ€ã€‚\n"
-#: src/cmdline/cmdline_action.cc:283
+#: src/cmdline/cmdline_action.cc:268
#, c-format
msgid ""
"Couldn't find package \"%s\". However, the following\n"
@@ -260,12 +347,12 @@
"æ— æ³•æ‰¾åˆ°è½¯ä»¶åŒ…â€œ%sâ€ã€‚然而下列软件包å称ä¸\n"
"包å«â€œ%sâ€ã€‚\n"
-#: src/cmdline/cmdline_action.cc:307
+#: src/cmdline/cmdline_action.cc:292
#, c-format
msgid "Couldn't find any package whose name or description matched \"%s\"\n"
msgstr "æ— æ³•æ‰¾åˆ°ä»»ä½•å称或者æè¿°ä¸åŒ¹é…“%sâ€çš„软件包\n"
-#: src/cmdline/cmdline_action.cc:309
+#: src/cmdline/cmdline_action.cc:294
#, c-format
msgid ""
"Couldn't find any package matching \"%s\", and more than 40\n"
@@ -274,7 +361,7 @@
"æ— æ³•æ‰¾åˆ°ä»»ä½•è½¯ä»¶åŒ…åŒ¹é…“%sâ€ï¼ŒåŒæ—¶æœ‰è¶…过40个软件包\n"
"å…¶æè¿°ä¸åŒ…å«â€œ%sâ€ã€‚\n"
-#: src/cmdline/cmdline_action.cc:312
+#: src/cmdline/cmdline_action.cc:297
#, c-format
msgid ""
"Couldn't find any package matching \"%s\". However, the following\n"
@@ -317,13 +404,13 @@
msgid "Freed %sB of disk space\n"
msgstr "将释放 %sB ç£ç›˜ç©ºé—´"
-#: src/cmdline/cmdline_do_action.cc:67
+#: src/cmdline/cmdline_do_action.cc:71
#, c-format
msgid "Invalid operation %s"
msgstr "æ— æ•ˆçš„æ“作 %s"
-#: src/cmdline/cmdline_do_action.cc:206 src/cmdline/cmdline_simulate.cc:30
-#: src/cmdline/cmdline_upgrade.cc:89
+#: src/cmdline/cmdline_do_action.cc:201 src/cmdline/cmdline_simulate.cc:31
+#: src/cmdline/cmdline_upgrade.cc:91
#, c-format
msgid "Abort.\n"
msgstr "放弃。\n"
@@ -333,7 +420,7 @@
msgid "download: you must specify at least one package to download\n"
msgstr "下载：您必须指定至少一个è¦ä¸‹è½½çš„软件包\n"
-#: src/cmdline/cmdline_download.cc:43 src/download.cc:342
+#: src/cmdline/cmdline_download.cc:43 src/download.cc:344
msgid "Couldn't read source list"
msgstr "æ— æ³•è¯»å–æºåˆ—表文件"
@@ -395,95 +482,95 @@
msgid "What is it? It's an elephant being eaten by a snake, of course.\n"
msgstr "这是什么？ 这当然是一åªå¤§è±¡è¢«ä¸€æ¡è›‡åžåƒäº†ã€‚\n"
-#: src/cmdline/cmdline_prompt.cc:44
+#: src/cmdline/cmdline_prompt.cc:45
msgid "Couldn't read list of sources"
msgstr "æ— æ³•è¯»å–软件包æºåˆ—表"
-#: src/cmdline/cmdline_prompt.cc:219 src/cmdline/cmdline_show_broken.cc:73
+#: src/cmdline/cmdline_prompt.cc:220 src/cmdline/cmdline_show_broken.cc:73
#, c-format
msgid "but %s is to be installed."
msgstr "但是 %s 将被安装。"
-#: src/cmdline/cmdline_prompt.cc:222 src/cmdline/cmdline_show_broken.cc:76
+#: src/cmdline/cmdline_prompt.cc:223 src/cmdline/cmdline_show_broken.cc:76
#, c-format
msgid "but %s is installed and it is kept back."
msgstr "但是 %s 已被安装并且被"
-#: src/cmdline/cmdline_prompt.cc:225 src/cmdline/cmdline_show_broken.cc:79
+#: src/cmdline/cmdline_prompt.cc:226 src/cmdline/cmdline_show_broken.cc:79
#, c-format
msgid "but %s is installed."
msgstr "但是 %s 已安装"
-#: src/cmdline/cmdline_prompt.cc:229 src/cmdline/cmdline_show_broken.cc:83
+#: src/cmdline/cmdline_prompt.cc:230 src/cmdline/cmdline_show_broken.cc:83
#, c-format
msgid "but it is not installable"
msgstr "但是它ä¸æ˜¯å¯å®‰è£…çš„"
-#: src/cmdline/cmdline_prompt.cc:233 src/cmdline/cmdline_show_broken.cc:87
+#: src/cmdline/cmdline_prompt.cc:234 src/cmdline/cmdline_show_broken.cc:87
#, c-format
msgid " which is a virtual package."
msgstr " 这是一个虚拟软件包。"
-#: src/cmdline/cmdline_prompt.cc:236 src/cmdline/cmdline_show_broken.cc:90
+#: src/cmdline/cmdline_prompt.cc:237 src/cmdline/cmdline_show_broken.cc:90
#, c-format
msgid " or"
msgstr " 或者"
-#: src/cmdline/cmdline_prompt.cc:248
+#: src/cmdline/cmdline_prompt.cc:249
msgid "The following packages are BROKEN:"
msgstr "ä¸‹åˆ—è½¯ä»¶åŒ…æ˜¯â€œç ´æŸâ€çš„："
-#: src/cmdline/cmdline_prompt.cc:249
+#: src/cmdline/cmdline_prompt.cc:250
msgid "The following packages are unused and will be REMOVED:"
msgstr "ä¸‹åˆ—è½¯ä»¶åŒ…æœªè¢«ä½¿ç”¨ï¼Œå°†è¢«â€œåˆ é™¤â€ï¼š"
-#: src/cmdline/cmdline_prompt.cc:250
+#: src/cmdline/cmdline_prompt.cc:251
msgid "The following packages have been automatically kept back:"
msgstr "下列软件包已ç»è¢«è‡ªåŠ¨é˜»æ¢å‡çº§ï¼š"
-#: src/cmdline/cmdline_prompt.cc:251
+#: src/cmdline/cmdline_prompt.cc:252
msgid "The following NEW packages will be automatically installed:"
msgstr "下列软件包将被自动安装："
-#: src/cmdline/cmdline_prompt.cc:252
+#: src/cmdline/cmdline_prompt.cc:253
msgid "The following packages will be automatically REMOVED:"
msgstr "ä¸‹åˆ—è½¯ä»¶åŒ…å°†è¢«è‡ªåŠ¨â€œåˆ é™¤â€ï¼š"
-#: src/cmdline/cmdline_prompt.cc:253
+#: src/cmdline/cmdline_prompt.cc:254
msgid "The following packages will be DOWNGRADED:"
msgstr "下列软件包将被“é™çº§â€ï¼š"
-#: src/cmdline/cmdline_prompt.cc:254
+#: src/cmdline/cmdline_prompt.cc:255
msgid "The following packages have been kept back:"
msgstr "下列软件包已ç»è¢«é˜»æ¢å‡çº§ï¼š"
-#: src/cmdline/cmdline_prompt.cc:255
+#: src/cmdline/cmdline_prompt.cc:256
msgid "The following packages will be REINSTALLED:"
msgstr "下列软件包将被“é‡æ–°å®‰è£…â€ï¼š"
-#: src/cmdline/cmdline_prompt.cc:256
+#: src/cmdline/cmdline_prompt.cc:257
msgid "The following NEW packages will be installed:"
msgstr "下列“新â€è½¯ä»¶åŒ…将被安装。"
-#: src/cmdline/cmdline_prompt.cc:257
+#: src/cmdline/cmdline_prompt.cc:258
msgid "The following packages will be REMOVED:"
msgstr "ä¸‹åˆ—è½¯ä»¶åŒ…å°†è¢«â€œåˆ é™¤â€ï¼š"
-#: src/cmdline/cmdline_prompt.cc:258
+#: src/cmdline/cmdline_prompt.cc:259
msgid "The following packages will be upgraded:"
msgstr "下列软件包将被å‡çº§ï¼š"
-#: src/cmdline/cmdline_prompt.cc:307
+#: src/cmdline/cmdline_prompt.cc:311
#, c-format
msgid "The following ESSENTIAL packages will be REMOVED!\n"
msgstr "下列“基本â€è½¯ä»¶åŒ…å°†è¢«â€œåˆ é™¤â€ï¼\n"
-#: src/cmdline/cmdline_prompt.cc:316
+#: src/cmdline/cmdline_prompt.cc:320
#, c-format
msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
msgstr "该动作将使下列“基本â€è½¯ä»¶åŒ…â€œç ´æŸâ€ï¼š\n"
-#: src/cmdline/cmdline_prompt.cc:326
+#: src/cmdline/cmdline_prompt.cc:330
#, c-format
msgid ""
"WARNING: Performing this action will probably cause your system to break!\n"
@@ -492,96 +579,99 @@
"è¦å‘Šï¼šæ‰§è¡Œè¯¥åŠ¨ä½œæœ‰å¯èƒ½å¯¼è‡´æ‚¨çš„系统æŸåï¼\n"
" “ä¸è¦â€ç»§ç»ï¼Œé™¤éžæ‚¨â€œå®Œå…¨â€äº†è§£æ‚¨æ£åœ¨åšä»€ä¹ˆï¼\n"
-#: src/cmdline/cmdline_prompt.cc:328
+#: src/cmdline/cmdline_prompt.cc:332
msgid "I am aware that this is a very bad idea"
msgstr "我知é“这是一个éžå¸¸ç³Ÿç³•çš„主æ„"
-#: src/cmdline/cmdline_prompt.cc:331
+#: src/cmdline/cmdline_prompt.cc:335
#, c-format
msgid "To continue, type the phrase \"%s\":\n"
msgstr "è¦ç»§ç»çš„è¯ï¼Œé”®å…¥è¯ç»„ “%sâ€ï¼š\n"
-#: src/cmdline/cmdline_prompt.cc:434
+#: src/cmdline/cmdline_prompt.cc:438
#, c-format
msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
msgstr "下列软件包被“推èâ€å®‰è£…但是将“ä¸ä¼šâ€è¢«å®‰è£…：\n"
-#: src/cmdline/cmdline_prompt.cc:440
+#: src/cmdline/cmdline_prompt.cc:444
#, c-format
msgid "The following packages are SUGGESTED but will NOT be installed:\n"
msgstr "下列软件包被“建议â€å®‰è£…但是将“ä¸ä¼šâ€è¢«å®‰è£…：\n"
-#: src/cmdline/cmdline_prompt.cc:445
+#: src/cmdline/cmdline_prompt.cc:449
#, c-format
msgid "No packages will be installed, upgraded, or removed.\n"
msgstr "å°†ä¸ä¼šå®‰è£…，å‡çº§æˆ–è€…åˆ é™¤ä»»ä½•è½¯ä»¶åŒ…ã€‚\n"
-#: src/cmdline/cmdline_prompt.cc:447
+#: src/cmdline/cmdline_prompt.cc:451
#, c-format
msgid "%lu packages upgraded, %lu newly installed, "
msgstr "%lu 个软件包被å‡çº§ï¼Œæ–°å®‰è£…%lu 个，"
-#: src/cmdline/cmdline_prompt.cc:451
+#: src/cmdline/cmdline_prompt.cc:455
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu 个é‡æ–°å®‰è£…，"
-#: src/cmdline/cmdline_prompt.cc:453
+#: src/cmdline/cmdline_prompt.cc:457
#, c-format
msgid "%lu downgraded, "
msgstr "%lu 个被é™çº§ï¼Œ"
-#: src/cmdline/cmdline_prompt.cc:455
+#: src/cmdline/cmdline_prompt.cc:459
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu ä¸ªå°†è¢«åˆ é™¤ï¼Œ åŒæ—¶ %lu 个将ä¸å‡çº§ã€‚\n"
-#: src/cmdline/cmdline_prompt.cc:462
+#: src/cmdline/cmdline_prompt.cc:466
#, c-format
msgid "Need to get %sB/%sB of archives. "
msgstr "需è¦èŽ·å– %sB/%sB çš„å˜æ¡£ã€‚"
-#: src/cmdline/cmdline_prompt.cc:465
+#: src/cmdline/cmdline_prompt.cc:469
#, c-format
msgid "Need to get %sB of archives. "
msgstr "需è¦èŽ·å– %sB çš„å˜æ¡£ã€‚"
-#: src/cmdline/cmdline_prompt.cc:472
+#: src/cmdline/cmdline_prompt.cc:476
#, c-format
msgid "After unpacking %sB will be used.\n"
msgstr "解包åŽå°†è¦ä½¿ç”¨ %sB。\n"
-#: src/cmdline/cmdline_prompt.cc:475
+#: src/cmdline/cmdline_prompt.cc:479
#, c-format
msgid "After unpacking %sB will be freed.\n"
msgstr "解包åŽå°†é‡Šæ”¾ %sB。\n"
-#: src/cmdline/cmdline_prompt.cc:521
+#: src/cmdline/cmdline_prompt.cc:524
#, c-format
msgid "Bad action character '%c'\n"
msgstr "éžæ³•çš„动作å—符‘%c’\n"
-#: src/cmdline/cmdline_prompt.cc:596
+#: src/cmdline/cmdline_prompt.cc:595
#, c-format
msgid "No packages to show -- enter the package names on the line after 'i'.\n"
msgstr "æ— å¯æ˜¾ç¤ºçš„软件包 -- 请在 ‘i’ 之åŽçš„那一行输入软件包å称。\n"
-#: src/cmdline/cmdline_prompt.cc:598 src/cmdline/cmdline_prompt.cc:629
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:597
msgid "Press Return to continue."
msgstr "按回车继ç»ã€‚"
-#: src/cmdline/cmdline_prompt.cc:625
+#: src/cmdline/cmdline_prompt.cc:623
#, c-format
msgid "No packages found -- enter the package names on the line after 'c'.\n"
msgstr "未å‘现软件包 -- 请在 ‘c’ 之åŽçš„那一行输入软件包å称。\n"
-#: src/cmdline/cmdline_prompt.cc:665
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:627
+#, fuzzy
+msgid "Press Return to continue"
+msgstr "按回车继ç»ã€‚"
+
+#: src/cmdline/cmdline_prompt.cc:675
msgid "Do you want to continue? [Y/n/?] "
msgstr "您è¦ç»§ç»å—？[Y/n/?] "
-#: src/cmdline/cmdline_prompt.cc:690
+#: src/cmdline/cmdline_prompt.cc:700
#, c-format
msgid ""
"\n"
@@ -592,7 +682,7 @@
"将显示ä¾èµ–关系信æ¯ã€‚\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:692
+#: src/cmdline/cmdline_prompt.cc:702
#, c-format
msgid ""
"\n"
@@ -603,7 +693,7 @@
"å°†ä¸æ˜¾ç¤ºä¾èµ–关系信æ¯ã€‚\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:698
+#: src/cmdline/cmdline_prompt.cc:708
#, c-format
msgid ""
"\n"
@@ -614,7 +704,7 @@
"å°†ä¸æ˜¾ç¤ºä¾èµ–关系信æ¯ã€‚\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:700
+#: src/cmdline/cmdline_prompt.cc:710
#, c-format
msgid ""
"\n"
@@ -625,7 +715,7 @@
"å°†ä¸æ˜¾ç¤ºç‰ˆæœ¬å·ã€‚\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:705
+#: src/cmdline/cmdline_prompt.cc:715
#, c-format
msgid ""
"\n"
@@ -636,7 +726,7 @@
"尺寸å˜åŒ–将被显示。\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:717
#, c-format
msgid ""
"\n"
@@ -647,7 +737,7 @@
"尺寸å˜åŒ–å°†ä¸è¢«æ˜¾ç¤ºã€‚\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:737
#, c-format
msgid ""
"Commands:\n"
@@ -696,30 +786,83 @@
" _ : 清除\n"
" = : ä¿æŒ\n"
-#: src/cmdline/cmdline_prompt.cc:751
+#: src/cmdline/cmdline_prompt.cc:761
#, c-format
msgid "Invalid response. Please enter a valid command or '?' for help.\n"
msgstr "éžæ³•å“应。请输入一个åˆæ³•å‘½ä»¤æˆ–者‘?’请求帮助。\n"
+#: src/cmdline/cmdline_resolver.cc:84
+#, c-format
+msgid "y: %F%nn: %F%nq: %F%n,: %F%n.: %F%n"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:90
+msgid "accept the proposed changes"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:92
+msgid "reject the proposed changes and search for another solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:94
+#, fuzzy
+msgid "give up and quit the program"
+msgstr "退出æ¤ç¨‹åº"
+
+#: src/cmdline/cmdline_resolver.cc:96
+msgid "move to the next solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:98
+msgid "move to the previous solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:131
+#, fuzzy
+msgid "The following actions will resolve these dependencies:"
+msgstr "下列软件包å˜åœ¨æœªæ»¡è¶³çš„ä¾èµ–关系：\n"
+
+#: src/cmdline/cmdline_resolver.cc:146
+msgid "Accept this solution? [Y/n/q/?]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:174
+msgid "Abandoning all efforts to resolve these dependencies."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:184
+#, fuzzy
+msgid "The following commands are available:"
+msgstr "ä¸‹åˆ—è½¯ä»¶åŒ…æ˜¯â€œç ´æŸâ€çš„："
+
+#: src/cmdline/cmdline_resolver.cc:188
+#, fuzzy
+msgid "Invalid response; please enter one of the following commands:"
+msgstr "éžæ³•å“应。请输入一个åˆæ³•å‘½ä»¤æˆ–者‘?’请求帮助。\n"
+
+#: src/cmdline/cmdline_resolver.cc:198
+msgid "No solution found within the allotted time. Try harder? [Y/n]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:226
+#, fuzzy
+msgid "Invalid response; please enter 'y' or 'n'."
+msgstr "éžæ³•å“应。请输入一个åˆæ³•å‘½ä»¤æˆ–者‘?’请求帮助。\n"
+
+#: src/cmdline/cmdline_resolver.cc:235
+msgid "Unable to resolve dependencies! Giving up..."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:240
+msgid "No more solutions."
+msgstr ""
+
#: src/cmdline/cmdline_search.cc:78
#, c-format
msgid "search: You must provide at least one search term\n"
msgstr "查找：您必须æ供至少一个查找项\n"
-#: src/cmdline/cmdline_show_broken.cc:114
-#, c-format
-msgid ""
-"Some packages had unmet dependencies. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming.\n"
-"\n"
-msgstr ""
-"一些软件包å˜åœ¨æœªæ»¡è¶³çš„ä¾èµ–关系。这å¯èƒ½è¡¨æ˜Žæ‚¨çš„请求ä¸å¯èƒ½å®žçŽ°\n"
-"或者您æ£åœ¨ä½¿ç”¨ unstable å‘行版，其ä¸æ‰€éœ€çš„æŸäº›è½¯ä»¶åŒ…尚未创建\n"
-"或者已ç»ä»Ž Incoming ä¸è¢«ç§»èµ°ã€‚\n"
-
-#: src/cmdline/cmdline_show_broken.cc:115
+#: src/cmdline/cmdline_show_broken.cc:113
#, c-format
msgid "The following packages have unmet dependencies:\n"
msgstr "下列软件包å˜åœ¨æœªæ»¡è¶³çš„ä¾èµ–关系：\n"
@@ -917,12 +1060,12 @@
msgid "Description: "
msgstr "æ述："
-#: src/cmdline/cmdline_simulate.cc:36
+#: src/cmdline/cmdline_simulate.cc:37
#, c-format
msgid "Would download/install/remove packages.\n"
msgstr "å°†è¦ä¸‹è½½/安装/å¸è½½è½¯ä»¶åŒ…。\n"
-#: src/cmdline/cmdline_simulate.cc:47
+#: src/cmdline/cmdline_simulate.cc:48
msgid "Internal Error, Ordering didn't finish"
msgstr "内部错误，排åºæœªå®Œæˆ"
@@ -964,28 +1107,24 @@
msgid "UNAVAILABLE"
msgstr "ä¸å¯ç”¨"
-#: src/download_bar.cc:57 src/download_list.cc:265
+#: src/download_bar.cc:56 src/download_list.cc:263 src/download_screen.cc:57
#, c-format
-msgid ""
-"Please insert the following disc into the drive \"%s\":\n"
-"%s"
-msgstr ""
-"请将以下盘æ’入驱动器“%sâ€ï¼š\n"
-"%s"
+msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
+msgstr "è¯·å°†æ ‡å·ä¸ºâ€œ%sâ€çš„ç£ç›˜æ’入驱动器“%sâ€"
-#: src/download_bar.cc:76 src/generic/acqprogress.cc:63
+#: src/download_bar.cc:77 src/generic/acqprogress.cc:63
msgid "Hit "
msgstr "å‘½ä¸ "
-#: src/download_bar.cc:89
+#: src/download_bar.cc:90
msgid "Downloading "
msgstr "æ£åœ¨ä¸‹è½½ "
-#: src/download_bar.cc:102
+#: src/download_bar.cc:103
msgid "Got "
msgstr "å·²å–å¾— "
-#: src/download_bar.cc:156
+#: src/download_bar.cc:157
msgid "Downloading..."
msgstr "æ£åœ¨ä¸‹è½½..."
@@ -993,7 +1132,7 @@
msgid "Couldn't read list of package sources"
msgstr "æ— æ³•è¯»å–软件包æºåˆ—表"
-#: src/download.cc:104 src/download.cc:321
+#: src/download.cc:104 src/download.cc:322
msgid "Couldn't lock list directory..are you root?"
msgstr "æ— æ³•é”定列表目录..您是 root å—？"
@@ -1005,29 +1144,33 @@
msgid "View the progress of the package list update"
msgstr "查看软件包列表更新的进程"
-#: src/download.cc:159
+#: src/download.cc:113
+msgid "List Update"
+msgstr ""
+
+#: src/download.cc:160
msgid "Couldn't clean out list directories"
msgstr "æ— æ³•æ¸…ç©ºåˆ—è¡¨ç›®å½•"
-#: src/download.cc:176 src/ui.cc:1068
+#: src/download.cc:177 src/ui.cc:1152
msgid "Deleting obsolete downloaded files"
msgstr "åˆ é™¤è¿‡æœŸçš„ä¸‹è½½æ–‡ä»¶"
-#: src/download.cc:181
+#: src/download.cc:182
#, c-format
msgid "Deleting obsolete downloaded files\n"
msgstr "åˆ é™¤è¿‡æœŸçš„å·²ä¸‹è½½æ–‡ä»¶\n"
-#: src/download.cc:223
+#: src/download.cc:224
#, c-format
msgid "Unable to open %s to log actions"
msgstr "æ— æ³•æ‰“å¼€ %s æ¥è®°å½•åŠ¨ä½œ"
-#: src/download.cc:229
+#: src/download.cc:230
msgid "log report"
msgstr "日志报告"
-#: src/download.cc:230
+#: src/download.cc:231
#, c-format
msgid ""
"IMPORTANT: this log only lists intended actions; actions which fail due to\n"
@@ -1037,77 +1180,77 @@
"é‡è¦ï¼šè¯¥æ—¥å¿—åªè®°å½•é¢„期动作；由于 dpkg 问题而出错的动作å¯èƒ½å°šæœªå®Œæˆã€‚\n"
"\n"
-#: src/download.cc:231
+#: src/download.cc:232
#, c-format
msgid "Will install %li packages, and remove %li packages.\n"
msgstr "å°†è¦å®‰è£… %li 个软件包，å¸è½½ %li 个软件包。\n"
-#: src/download.cc:233
+#: src/download.cc:234
#, c-format
msgid "%sB of disk space will be used\n"
msgstr "å°†è¦å 用 %sB çš„ç£ç›˜ç©ºé—´\n"
-#: src/download.cc:236
+#: src/download.cc:237
#, c-format
msgid "%sB bytes of disk space will be freed\n"
msgstr "å°†è¦é‡Šæ”¾ %sB çš„ç£ç›˜ç©ºé—´\n"
-#: src/download.cc:244
+#: src/download.cc:245
#, c-format
msgid "[UPGRADE] %s %s -> %s\n"
msgstr "[å‡çº§] %s %s -> %s\n"
-#: src/download.cc:248
+#: src/download.cc:249
#, c-format
msgid "[DOWNGRADE] %s %s -> %s\n"
msgstr "[é™çº§] %s %s -> %s\n"
-#: src/download.cc:258
+#: src/download.cc:259
msgid "REMOVE"
msgstr "å¸è½½"
-#: src/download.cc:264
+#: src/download.cc:265
msgid "INSTALL"
msgstr "安装"
-#: src/download.cc:267
+#: src/download.cc:268
msgid "REINSTALL"
msgstr "é‡æ–°å®‰è£…"
-#: src/download.cc:270
+#: src/download.cc:271
msgid "HOLD"
msgstr "ä¿æŒ"
-#: src/download.cc:273
+#: src/download.cc:274
msgid "BROKEN"
msgstr "æŸå"
-#: src/download.cc:276
+#: src/download.cc:277
msgid "REMOVE, NOT USED"
msgstr "å¸è½½, 未用"
-#: src/download.cc:279
+#: src/download.cc:280
msgid "REMOVE, DEPENDENCIES"
msgstr "å¸è½½, ä¾èµ–关系"
-#: src/download.cc:282
+#: src/download.cc:283
msgid "INSTALL, DEPENDENCIES"
msgstr "安装, ä¾èµ–关系"
-#: src/download.cc:285
+#: src/download.cc:286
msgid "HOLD, DEPENDENCIES"
msgstr "ä¿æŒ, ä¾èµ–关系"
-#: src/download.cc:287
+#: src/download.cc:288
msgid "????????"
msgstr "????????"
-#: src/download.cc:291
+#: src/download.cc:292
#, c-format
msgid "[%s] %s\n"
msgstr "[%s] %s\n"
-#: src/download.cc:294
+#: src/download.cc:295
#, c-format
msgid ""
"===============================================================================\n"
@@ -1118,32 +1261,37 @@
"\n"
"日志完æˆã€‚\n"
-#: src/download.cc:329
+#: src/download.cc:330
msgid "Downloading packages"
msgstr "æ£åœ¨ä¸‹è½½è½¯ä»¶åŒ…"
-#: src/download.cc:330
+#: src/download.cc:331
msgid "View the progress of the package download"
msgstr "查看软件包下载的进程"
-#: src/download.cc:352
+#: src/download.cc:332
+#, fuzzy
+msgid "Package Download"
+msgstr "软件包："
+
+#: src/download.cc:354
msgid "Internal error: couldn't generate list of packages to download"
msgstr "å†…éƒ¨é”™è¯¯ï¼šæ— æ³•ç”Ÿæˆä¸‹è½½è½¯ä»¶åŒ…列表"
-#: src/download.cc:413
+#: src/download.cc:415
msgid "Unable to correct for unavailable packages"
msgstr "æ— æ³•ä¿®æ£ä¸å¯ç”¨çš„软件包"
-#: src/download.cc:465
+#: src/download.cc:467
msgid ""
"Ack! Something bad happened while installing packages. Trying to recover:"
msgstr "å•Šï¼å®‰è£…软件包时出现æŸäº›å情况。æ£åœ¨è¯•å›¾æ¢å¤ï¼š"
-#: src/download.cc:475 src/pkg_item.cc:413
+#: src/download.cc:477 src/pkg_item.cc:432
msgid "Press return to continue.\n"
msgstr "按回车继ç»ã€‚\n"
-#: src/download.cc:506
+#: src/download.cc:508
msgid ""
"Could not regain the system lock! (Perhaps another apt or dpkg is running?)"
msgstr "æ— æ³•é‡æ–°èŽ·å¾—系统é”ï¼(也许å¦ä¸€ä¸ª apt 或 dpkg æ£åœ¨è¿è¡Œï¼Ÿ)"
@@ -1203,11 +1351,6 @@
msgid "[ERROR]"
msgstr "[错误]"
-#: src/download_screen.cc:57
-#, c-format
-msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
-msgstr "è¯·å°†æ ‡å·ä¸ºâ€œ%sâ€çš„ç£ç›˜æ’入驱动器“%sâ€"
-
#: src/download_screen.cc:181
#, c-format
msgid "Downloaded %sB in %ss (%sB/s)."
@@ -1245,109 +1388,109 @@
"press enter\n"
msgstr "æ›´æ¢ä»‹è´¨ï¼šè¯·å°†æ ‡å·ä¸ºâ€œ%sâ€çš„ç£ç›˜æ’入驱动器“%sâ€å¹¶æŒ‰å›žè½¦(enter)\n"
-#: src/generic/aptcache.cc:245
+#: src/generic/aptcache.cc:253
msgid "Can't open Aptitude extended state file"
msgstr "æ— æ³•æ‰“å¼€ Aptitude 扩展状æ€æ–‡ä»¶"
-#: src/generic/aptcache.cc:252 src/generic/aptcache.cc:305
-#: src/generic/aptcache.cc:307
+#: src/generic/aptcache.cc:260 src/generic/aptcache.cc:313
+#: src/generic/aptcache.cc:315
msgid "Reading extended state information"
msgstr "æ£åœ¨è¯»å–扩展状æ€æ–‡ä»¶"
-#: src/generic/aptcache.cc:313 src/generic/aptcache.cc:387
-#: src/generic/aptcache.cc:390
+#: src/generic/aptcache.cc:321 src/generic/aptcache.cc:395
+#: src/generic/aptcache.cc:398
msgid "Initializing package states"
msgstr "æ£åœ¨åˆå§‹åŒ–软件包状æ€"
-#: src/generic/aptcache.cc:501
+#: src/generic/aptcache.cc:509
msgid "Cannot open Aptitude state file"
msgstr "æ— æ³•æ‰“å¼€ Aptitude 扩展状æ€æ–‡ä»¶"
-#: src/generic/aptcache.cc:505 src/generic/aptcache.cc:560
-#: src/generic/aptcache.cc:563
+#: src/generic/aptcache.cc:513 src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:571
msgid "Writing extended state information"
msgstr "æ£åœ¨ç¼–辑扩展状æ€ä¿¡æ¯"
-#: src/generic/aptcache.cc:542
+#: src/generic/aptcache.cc:550
#, c-format
msgid "Internal buffer overflow on package \"%s\" while writing state file"
msgstr "写入状æ€æ–‡ä»¶æ—¶åŒ…“%sâ€å‘生内部缓冲溢出"
-#: src/generic/aptcache.cc:551
+#: src/generic/aptcache.cc:559
msgid "Couldn't write state file"
msgstr "ä¸èƒ½å†™å…¥çŠ¶æ€æ–‡ä»¶"
-#: src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:576
msgid "Error writing state file"
msgstr "写入状æ€æ–‡ä»¶æ—¶å‘生错误"
-#: src/generic/aptcache.cc:584
+#: src/generic/aptcache.cc:592
msgid "couldn't replace old state file"
msgstr "æ— æ³•æ›¿ä»£æ—§çš„çŠ¶æ€æ–‡ä»¶"
-#: src/generic/aptcache.cc:960
+#: src/generic/aptcache.cc:1000
msgid "Unable to correct dependencies, some packages cannot be installed"
msgstr "æ— æ³•ä¿®æ£ä¾èµ–å…³ç³»ï¼Œä¸€äº›åŒ…æ— æ³•å®‰è£…"
-#: src/generic/aptcache.cc:1325
+#: src/generic/aptcache.cc:1546
msgid "The list of sources could not be read."
msgstr "æ— æ³•è¯»å–软件æºåˆ—表。"
-#: src/generic/aptcache.cc:1332
+#: src/generic/aptcache.cc:1553
msgid "The package lists or status file could not be parsed or opened."
msgstr "æ— æ³•è§£æžæˆ–打开软件包列表文件或状æ€æ–‡ä»¶ã€‚"
-#: src/generic/aptcache.cc:1335
+#: src/generic/aptcache.cc:1556
msgid "You may want to update the package lists to correct these missing files"
msgstr "您å¯èƒ½éœ€è¦æ›´æ–°è½¯ä»¶åŒ…列表æ¥è§£å†³ç¼ºå°‘这些文件的问题"
-#: src/generic/apt.cc:141
+#: src/generic/apt.cc:142
#, c-format
msgid "Unable to open %s for writing"
msgstr "æ— æ³•æ‰“å¼€ %s 以写入"
-#: src/generic/apt.cc:151
+#: src/generic/apt.cc:152
#, c-format
msgid "Unable to replace %s with new configuration file"
msgstr "æ— æ³•ç”¨æ–°çš„é…置文件代替 %s"
-#: src/generic/apt.cc:226
+#: src/generic/apt.cc:227
msgid "Warning: could not lock the cache file. Opening in read-only mode"
msgstr "è¦å‘Šï¼šæ— 法é”定缓å˜æ–‡ä»¶ã€‚以åªè¯»æ–¹å¼æ‰“å¼€"
-#: src/generic/matchers.cc:780
+#: src/generic/matchers.cc:797
msgid "Unmatched '('"
msgstr "ä¸åŒ¹é…“(â€"
-#: src/generic/matchers.cc:870 src/generic/matchers.cc:949
+#: src/generic/matchers.cc:887 src/generic/matchers.cc:968
#, c-format
msgid "Unknown dependency type: %s"
msgstr "未知ä¾èµ–类型：%s"
-#: src/generic/matchers.cc:931
+#: src/generic/matchers.cc:950
#, c-format
msgid "Unknown action type: %s"
msgstr "未知的æ“作类型：%s"
-#: src/generic/matchers.cc:998
+#: src/generic/matchers.cc:1017
#, c-format
msgid "Unknown priority %s"
msgstr "未知的优先级：%s"
-#: src/generic/matchers.cc:1020
+#: src/generic/matchers.cc:1039
#, c-format
msgid "Unknown pattern type: %c"
msgstr "未知的模å¼ç±»åž‹ï¼š%c"
-#: src/generic/matchers.cc:1065
+#: src/generic/matchers.cc:1084
msgid "Unexpected empty expression"
msgstr "æ„外的空表达å¼"
-#: src/generic/matchers.cc:1100
+#: src/generic/matchers.cc:1119
msgid "Badly formed expression"
msgstr "é”™è¯¯æ ¼å¼çš„表达å¼"
-#: src/generic/matchers.cc:1129
+#: src/generic/matchers.cc:1148
msgid "Unexpected ')'"
msgstr "æ„外的“)â€"
@@ -1370,7 +1513,7 @@
msgid "Can't get value of $HOME, using TMPDIR (insecure)"
msgstr "æ— æ³•èŽ·å– $HOME 的值，使用 TMPDIR (ä¸å®‰å…¨)"
-#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:60
+#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:61
#, c-format
msgid "ChangeLog of %s"
msgstr "%s çš„å˜æ›´æ—¥å¿—"
@@ -1570,17 +1713,17 @@
msgid "Invalid sorting policy type '%s'"
msgstr "æ— æ•ˆçš„æŽ’åºç–略类型“%sâ€"
-#: src/main.cc:68
+#: src/main.cc:67
#, c-format
msgid "%s %s compiled at %s %s\n"
msgstr "%s %s 编译于 %s %s\n"
-#: src/main.cc:71
+#: src/main.cc:70
#, c-format
msgid "Compiler: g++ %s\n"
msgstr "编译器：g++ %s\n"
-#: src/main.cc:74
+#: src/main.cc:73
#, c-format
msgid ""
"\n"
@@ -1589,7 +1732,7 @@
"\n"
"NCurses 版本：%s\n"
-#: src/main.cc:76
+#: src/main.cc:75
#, c-format
msgid ""
"\n"
@@ -1598,22 +1741,22 @@
"\n"
"Curses 版本：%s\n"
-#: src/main.cc:78
+#: src/main.cc:77
#, c-format
msgid "libsigc++ version: %s\n"
msgstr "libsigc++ 版本：%s\n"
-#: src/main.cc:84
+#: src/main.cc:83
#, c-format
msgid "Usage: aptitude [-S fname] [-u|-i]"
msgstr "用法： aptitude [-s 文件å] [-u|-i]"
-#: src/main.cc:86
+#: src/main.cc:85
#, c-format
msgid " aptitude [options] <action> ..."
msgstr " aptitude [选项] <动作> ..."
-#: src/main.cc:88
+#: src/main.cc:87
#, c-format
msgid ""
" Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -1622,190 +1765,190 @@
" 动作 (如果未指定，aptitude 将进入交互模å¼)：\n"
"\n"
-#: src/main.cc:89
+#: src/main.cc:88
#, c-format
msgid " install - Install/upgrade packages\n"
msgstr " install - 安装/å‡çº§è½¯ä»¶åŒ…\n"
-#: src/main.cc:90
+#: src/main.cc:89
#, c-format
msgid " remove - Remove packages\n"
msgstr " remove - å¸è½½è½¯ä»¶åŒ…\n"
-#: src/main.cc:91
+#: src/main.cc:90
#, c-format
msgid " purge - Remove packages and their configuration files\n"
msgstr " purge - å¸è½½è½¯ä»¶åŒ…å¹¶åˆ é™¤å…¶é…置文件\n"
-#: src/main.cc:92
+#: src/main.cc:91
#, c-format
msgid " hold - Place packages on hold\n"
msgstr " hold - 将软件包置于ä¿æŒçŠ¶æ€\n"
-#: src/main.cc:93
+#: src/main.cc:92
#, c-format
msgid " unhold - Cancel a hold command for a package\n"
msgstr " unhold - å–消对一个软件包的ä¿æŒå‘½ä»¤\n"
-#: src/main.cc:94
+#: src/main.cc:93
#, c-format
msgid " markauto - Mark packages as having been automatically installed\n"
msgstr " markauto - å°†è½¯ä»¶åŒ…æ ‡è®°ä¸ºè‡ªåŠ¨å®‰è£…\n"
-#: src/main.cc:95
+#: src/main.cc:94
#, c-format
msgid " unmarkauto - Mark packages as having been manually installed\n"
msgstr " unmarkauto - å°†è½¯ä»¶åŒ…æ ‡è®°ä¸ºæ‰‹åŠ¨å®‰è£…\n"
-#: src/main.cc:100
+#: src/main.cc:99
#, c-format
msgid ""
" forbid-version - Forbid aptitude from upgrading to a specific package "
"version.\n"
msgstr " ç¦æ¢ç‰ˆæœ¬ - ç¦æ¢ aptitude å‡çº§åˆ°æŸä¸€ç‰¹å®šç‰ˆæœ¬çš„软件包。\n"
-#: src/main.cc:101
+#: src/main.cc:100
#, c-format
msgid " update - Download lists of new/upgradable packages\n"
msgstr " update - 下载新/å¯å‡çº§è½¯ä»¶åŒ…列表\n"
-#: src/main.cc:102
+#: src/main.cc:101
#, c-format
msgid " upgrade - Perform a safe upgrade\n"
msgstr " upgrade - 执行一次安全的å‡çº§\n"
-#: src/main.cc:103
+#: src/main.cc:102
#, c-format
msgid ""
" dist-upgrade - Perform an upgrade, possibly installing and removing "
"packages\n"
msgstr " dist-upgrade - 执行å‡çº§ï¼Œå¯èƒ½ä¼šå®‰è£…å’Œå¸è½½è½¯ä»¶åŒ…\n"
-#: src/main.cc:104
+#: src/main.cc:103
#, c-format
msgid " forget-new - Forget what packages are \"new\"\n"
msgstr " forget-new - 忘记哪些软件包是“新â€çš„\n"
-#: src/main.cc:105
+#: src/main.cc:104
#, c-format
msgid " search - Search for a package by name and/or expression\n"
msgstr " search - 按å称 å’Œ/或 表达å¼æœç´¢è½¯ä»¶åŒ…\n"
-#: src/main.cc:106
+#: src/main.cc:105
#, c-format
msgid " show - Display detailed information about a package\n"
msgstr " show - 显示一个软件包的详细信æ¯\n"
-#: src/main.cc:107
+#: src/main.cc:106
#, c-format
msgid " clean - Erase downloaded package files\n"
msgstr " clean - åˆ é™¤å·²ä¸‹è½½çš„è½¯ä»¶åŒ…æ–‡ä»¶\n"
-#: src/main.cc:108
+#: src/main.cc:107
#, c-format
msgid " autoclean - Erase old downloaded package files\n"
msgstr " autoclean - åˆ é™¤æ—§çš„å·²ä¸‹è½½è½¯ä»¶åŒ…æ–‡ä»¶\n"
-#: src/main.cc:109
+#: src/main.cc:108
#, c-format
msgid " changelog - View a package's changelog\n"
msgstr " changelog - 查看一个软件包的å˜æ›´æ—¥å¿—\n"
-#: src/main.cc:110
+#: src/main.cc:109
#, c-format
msgid " download - Download the .deb file for a package\n"
msgstr " download - 下载软件包的 .deb 文件\n"
-#: src/main.cc:112
+#: src/main.cc:111
#, c-format
msgid " Options:\n"
msgstr " 选项：\n"
-#: src/main.cc:113
+#: src/main.cc:112
#, c-format
msgid " -h This help text\n"
msgstr " -h æ¤å¸®åŠ©æ–‡æœ¬\n"
-#: src/main.cc:114
+#: src/main.cc:113
#, c-format
msgid " -s Simulate actions, but do not actually perform them.\n"
msgstr " -s 模拟动作，但是并ä¸çœŸæ£æ‰§è¡Œã€‚\n"
-#: src/main.cc:115
+#: src/main.cc:114
#, c-format
msgid ""
" -d Only download packages, do not install or remove anything.\n"
msgstr " -d 仅仅下载软件包，ä¸å®‰è£…或者å¸è½½ä»»ä½•ä¸œè¥¿ã€‚\n"
-#: src/main.cc:116
+#: src/main.cc:115
#, c-format
msgid " -P Always prompt for confirmation or actions\n"
msgstr " -P 总是æ示确认执行动作\n"
-#: src/main.cc:117
+#: src/main.cc:116
#, c-format
msgid ""
" -y Assume that the answer to simple yes/no questions is 'yes'\n"
msgstr " -y å‡è®¾å¯¹ç®€å•çš„ 是/å¦ é—®é¢˜å›žç”“是â€\n"
-#: src/main.cc:118
+#: src/main.cc:117
#, c-format
msgid ""
" -F format Specify a format for displaying search results; see the "
"manual\n"
msgstr " -F æ ¼å¼ æŒ‡å®šæ˜¾ç¤ºæœç´¢ç»“æžœçš„æ ¼å¼ï¼›å‚è§æ‰‹å†Œ\n"
-#: src/main.cc:119
+#: src/main.cc:118
#, c-format
msgid ""
" -O order Specify how search results should be sorted; see the manual\n"
msgstr " -O æ¬¡åº æŒ‡å®šå¦‚ä½•æŽ’åˆ—æ˜¾ç¤ºæœç´¢ç»“果；å‚è§æ‰‹å†Œ\n"
-#: src/main.cc:120
+#: src/main.cc:119
#, c-format
msgid ""
" -w width Specify the display width for formatting search results\n"
msgstr " -w 宽度 指定显示æœç´¢ç»“æžœçš„æ ¼å¼å®½åº¦\n"
-#: src/main.cc:121
+#: src/main.cc:120
#, c-format
msgid " -f Aggressively try to fix broken packages.\n"
msgstr " -f 积æžåœ°å°è¯•ä¿®å¤æŸå的软件包。\n"
-#: src/main.cc:122
+#: src/main.cc:121
#, c-format
msgid " -V Show which versions of packages are to be installed.\n"
msgstr " -V 显示就è¦å®‰è£…的软件包版本。\n"
-#: src/main.cc:123
+#: src/main.cc:122
#, c-format
msgid ""
" -D Show the dependencies of automatically changed packages.\n"
msgstr " -D 显示自动改å˜çš„软件包的ä¾èµ–关系\n"
-#: src/main.cc:124
+#: src/main.cc:123
#, c-format
msgid " -Z\t\t Show the change in installed size of each package.\n"
msgstr " -Z\t\t 显示æ¯ä¸ªè½¯ä»¶åŒ…的安装尺寸的å˜åŒ–。\n"
-#: src/main.cc:125
+#: src/main.cc:124
#, c-format
msgid ""
" -v Display extra information. (may be supplied multiple times)\n"
msgstr " -v æ˜¾ç¤ºé™„åŠ ä¿¡æ¯ã€‚(å¯èƒ½ä¼šæ供多次) \n"
-#: src/main.cc:126
+#: src/main.cc:125
#, c-format
msgid ""
" -t [release] Set the release from which packages should be installed\n"
msgstr " -t [release] 设置将è¦å®‰è£…的软件包的å‘布版本\n"
-#: src/main.cc:127
+#: src/main.cc:126
#, c-format
msgid " -o key=val Directly set the configuration option named 'key'\n"
msgstr " -o key=val 直接设置å为“keyâ€çš„é…置选项\n"
-#: src/main.cc:128
+#: src/main.cc:127
#, c-format
msgid ""
" --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -1814,57 +1957,65 @@
" --with(out)-recommends\t指定是å¦å°†æŽ¨è(建议)处ç†ä¸º\n"
" 强ä¾èµ–关系。\n"
-#: src/main.cc:129
+#: src/main.cc:128
#, c-format
msgid " -S fname: Read the aptitude extended status info from fname.\n"
msgstr " -S fname: 从文件åä¸è¯»å–aptitude的扩展状æ€ä¿¡æ¯ã€‚\n"
-#: src/main.cc:130
+#: src/main.cc:129
#, c-format
msgid " -u : Download new package lists on startup.\n"
msgstr " -u : 开始è¿è¡Œæ—¶ä¸‹è½½æ–°çš„软件包列表。\n"
-#: src/main.cc:131
+#: src/main.cc:130
#, c-format
msgid " -i : Perform an install run on startup.\n"
msgstr " -i : 开始è¿è¡Œæ—¶æ‰§è¡Œå®‰è£…。\n"
-#: src/main.cc:133
+#: src/main.cc:132
#, c-format
msgid " This aptitude does not have Super Cow Powers.\n"
msgstr " 这个 aptitude 没有超级牛力。\n"
-#: src/main.cc:254
+#: src/main.cc:253
#, c-format
msgid "-o requires an argument of the form key=value, got %s"
msgstr "-o è¦æ±‚å‚æ•°æ ¼å¼ä¸º key=val，接å—到 %s"
-#: src/main.cc:300 src/main.cc:309
+#: src/main.cc:299 src/main.cc:308
msgid "WEIRDNESS: unknown option code received\n"
msgstr "“诡异â€ï¼šæ”¶åˆ°æœªçŸ¥çš„选项代ç \n"
-#: src/main.cc:318
+#: src/main.cc:317
msgid "Only one of -u and -i may be specified\n"
msgstr "选项 -u å’Œ -i åªèƒ½æŒ‡å®šä¸€ä¸ª\n"
-#: src/main.cc:326
+#: src/main.cc:325
msgid ""
"-u and -i may not be specified in command-line mode (eg, with 'install')"
msgstr "选项 -u å’Œ -i ä¸èƒ½åœ¨å‘½ä»¤è¡Œæ¨¡å¼ä¸æŒ‡å®š (例如，和“installâ€ä¸€èµ·)"
-#: src/main.cc:337
+#: src/main.cc:342
msgid "-u and -i may not be specified with a command"
msgstr "选项 -u å’Œ -i ä¸èƒ½åœ¨å’Œä¸€ä¸ªå‘½ä»¤ä¸€èµ·æŒ‡å®š "
-#: src/main.cc:392
+#: src/main.cc:399
#, c-format
msgid "Unknown command \"%s\"\n"
msgstr "未知的命令“%sâ€\n"
-#: src/main.cc:400
+#: src/main.cc:406 src/main.cc:463
+msgid "Internal error: uncaught 'out of solutions' exception.\n"
+msgstr ""
+
+#: src/main.cc:411 src/main.cc:468
+msgid "Internal error: uncaught 'out of time' exception.\n"
+msgstr ""
+
+#: src/main.cc:418
#, c-format
-msgid "Invalid option for interactive mode: -s\n"
-msgstr "交互模å¼çš„æ— æ•ˆé€‰é¡¹ï¼š-s\n"
+msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
+msgstr ""
#: src/mine/cmine.cc:93
#, c-format
@@ -1892,7 +2043,7 @@
msgid "Lost"
msgstr "输"
-#: src/mine/cmine.cc:119 src/ui.cc:1005
+#: src/mine/cmine.cc:119 src/ui.cc:1089
msgid "Minesweeper"
msgstr "扫雷"
@@ -2066,7 +2217,7 @@
msgid "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
msgstr "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
-#: src/pkg_columnizer.cc:84 src/ui.cc:1488
+#: src/pkg_columnizer.cc:84 src/ui.cc:1638
msgid "Package"
msgstr "软件包"
@@ -2321,13 +2472,14 @@
" “基本â€éƒ¨åˆ†çš„软件包是åˆå§‹ç³»ç»Ÿå®‰è£…的一部分。"
#: src/pkg_grouppolicy.cc:158
+#, fuzzy
msgid ""
"Programs for faxmodems and other communications devices\n"
" Packages in the 'comm' section are used to control modems and other "
"hardware communications devices. This includes software to control faxmodems "
"(for instance, PPP for dial-up internet connections and programs originally "
-"written for that purpose (zmodem/kermit), as well as software to control "
-"cellular phones, interface with FidoNet, and run a BBS."
+"written for that purpose, such as zmodem/kermit), as well as software to "
+"control cellular phones, interface with FidoNet, and run a BBS."
msgstr ""
"ç”¨äºŽä¼ çœŸè°ƒåˆ¶è§£è°ƒå™¨å’Œå…¶å®ƒé€šè®¯è®¾å¤‡çš„ç¨‹åº\n"
" “通讯â€éƒ¨åˆ†çš„è½¯ä»¶åŒ…ç”¨äºŽæŽ§åˆ¶è°ƒåˆ¶è§£è°ƒå™¨å’Œå…¶å®ƒç¡¬ä»¶é€šè®¯è®¾å¤‡ã€‚åŒ…æ‹¬æŽ§åˆ¶ä¼ çœŸè°ƒåˆ¶è§£è°ƒ"
@@ -2734,14 +2886,15 @@
"在“主è¦â€éƒ¨åˆ†ä¸ã€‚"
#: src/pkg_grouppolicy.cc:193
+#, fuzzy
msgid ""
"Programs which are not free software\n"
" Packages in the 'non-free' section are not part of Debian.\n"
" .\n"
" These packages fail to meet one or more of the requirements of the Debian "
-"Free Software Guidelines (see below) You should read the license of programs "
-"in this section to be sure that you are allowed to use them in the way you "
-"intend.\n"
+"Free Software Guidelines (see below). You should read the license of "
+"programs in this section to be sure that you are allowed to use them in the "
+"way you intend.\n"
" .\n"
" For more information about what Debian considers to be Free Software, see "
"http://www.debian.org/social_contract#guidelines"
@@ -2801,11 +2954,12 @@
" 这些软件包有新版本å¯ç”¨ã€‚"
#: src/pkg_grouppolicy.cc:320
+#, fuzzy
msgid ""
"New Packages\n"
" These packages have been added to Debian since the last time you cleared "
-"the list of \"new\" packages. (choose \"Forget new packages\" from the "
-"Actions menu to empty this list)"
+"the list of \"new\" packages (choose \"Forget new packages\" from the "
+"Actions menu to empty this list)."
msgstr ""
"新软件包\n"
" 这些软件包在您上次清空“新â€è½¯ä»¶åŒ…列表之åŽæ·»åŠ 到 Debian ä¸ã€‚(从动作èœå•ä¸é€‰"
@@ -3046,101 +3200,121 @@
msgid "Versions"
msgstr "版本å·"
-#: src/pkg_item.cc:54
+#: src/pkg_item.cc:55
msgid "Yes, I am aware this is a very bad idea"
msgstr "是的，我知é“这是一个éžå¸¸ç³Ÿç³•çš„主æ„"
#: src/pkg_item.cc:80
-#, c-format
+#, fuzzy, c-format
msgid ""
-"%s is an essential package!\n"
-"\n"
-"Are you sure you want to remove it?\n"
-"Type '%s' if you are."
+"%s is an essential package!%n%nAre you sure you want to remove it?%nType '%"
+"s' if you are."
msgstr ""
"%s æ˜¯ä¸€ä¸ªæ ¸å¿ƒè½¯ä»¶åŒ…ï¼\n"
"\n"
"您确定您è¦å¸è½½å®ƒå—？\n"
"如果您确定的è¯è¾“入“%sâ€ã€‚"
-#: src/pkg_item.cc:219
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:625
#, c-format
msgid "Information about %s"
msgstr "关于 %s çš„ä¿¡æ¯"
-#: src/pkg_item.cc:304
-msgid "Available versions of "
+#: src/pkg_item.cc:224 src/pkg_ver_item.cc:627
+#, c-format
+msgid "%s info"
+msgstr ""
+
+#: src/pkg_item.cc:310
+#, fuzzy, c-format
+msgid "Available versions of %s"
msgstr "å¯ç”¨çš„版本 "
-#: src/pkg_item.cc:312 src/pkg_ver_item.cc:648
+#: src/pkg_item.cc:313
+#, fuzzy, c-format
+msgid "%s versions"
+msgstr "版本å·"
+
+#: src/pkg_item.cc:325 src/pkg_ver_item.cc:655
#, c-format
msgid "Dependencies of %s"
msgstr "%s çš„ä¾èµ–关系"
-#: src/pkg_item.cc:322 src/pkg_ver_item.cc:657
+#: src/pkg_item.cc:327 src/pkg_ver_item.cc:657
+#, c-format
+msgid "%s deps"
+msgstr ""
+
+#: src/pkg_item.cc:338 src/pkg_ver_item.cc:667
#, c-format
msgid "Packages depending on %s"
msgstr "ä¾èµ–于 %s 的软件包"
-#: src/pkg_item.cc:373 src/pkg_ver_item.cc:694
+#: src/pkg_item.cc:340 src/pkg_ver_item.cc:669
+#, c-format
+msgid "%s reverse deps"
+msgstr ""
+
+#: src/pkg_item.cc:392 src/pkg_ver_item.cc:707
#, c-format
msgid "Reporting a bug in %s:\n"
msgstr "报告 %s ä¸çš„错误\n"
-#: src/pkg_item.cc:395
+#: src/pkg_item.cc:414
+#, fuzzy
msgid ""
-"You are not root and I cannot find any way\n"
-"to become root. To reconfigure this package,\n"
-"install the menu package, the login package,\n"
-"or run aptitude as root."
+"You are not root and I cannot find any way to become root. To reconfigure "
+"this package, install the menu package, the login package, or run aptitude "
+"as root."
msgstr ""
"您ä¸æ˜¯ root，而且我没有å‘现任何方法\n"
"æ¥å˜æˆ root。è¦é‡æ–°é…置这个软件包，\n"
"请安装 menu 软件包，login 软件包，\n"
"或者以 root 身份è¿è¡Œ aptitude 。"
-#: src/pkg_item.cc:403
+#: src/pkg_item.cc:422
#, c-format
msgid "Reconfiguring %s\n"
msgstr "é‡æ–°é…ç½® %s \n"
-#: src/pkg_item.cc:428
+#: src/pkg_item.cc:447
msgid "Hierarchy editor"
msgstr "层次编辑器"
+#: src/pkg_item.cc:447
+#, fuzzy
+msgid "Hierarchy Editor"
+msgstr "层次编辑器"
+
#: src/pkg_tree.cc:325
msgid "Search for: "
msgstr "æœç´¢ï¼š"
-#: src/pkg_tree.cc:585
+#: src/pkg_tree.cc:568
msgid "All Packages"
msgstr "全部包"
-#: src/pkg_tree.cc:598 src/pkg_tree.cc:607
+#: src/pkg_tree.cc:581 src/pkg_tree.cc:590
msgid "Building view"
msgstr "编译视图"
-#: src/pkg_tree.cc:649
+#: src/pkg_tree.cc:632
#, c-format
msgid "No packages matched the pattern \"%s\"."
msgstr "没有软件包匹é…æ¨¡å¼ â€œ%sâ€ã€‚"
-#: src/pkg_tree.cc:671
+#: src/pkg_tree.cc:654
msgid "Enter the new package tree limit: "
msgstr "è¾“å…¥æ–°çš„è½¯ä»¶åŒ…æ ‘çŠ¶é™åˆ¶ï¼š"
-#: src/pkg_tree.cc:705
+#: src/pkg_tree.cc:688
msgid "Enter the new package grouping mechanism for this display: "
msgstr "为æ¤æ˜¾ç¤ºè¾“入新的软件包分组机制："
-#: src/pkg_tree.cc:713
+#: src/pkg_tree.cc:696
msgid "Enter the new package sorting mechanism for this display: "
msgstr "为æ¤æ˜¾ç¤ºè¾“入新的软件包排åºæœºåˆ¶ï¼š"
-#: src/pkg_ver_item.cc:623
-msgid "Information about "
-msgstr "ä¿¡æ¯å…³äºŽ"
-
#: src/pkg_view.cc:344
msgid "make_package_view: error in arguments -- two main widgets??"
msgstr "make_package_view: å‚数错误 -- 两个主è¦éƒ¨ä»¶ï¼Ÿ "
@@ -3154,7 +3328,7 @@
msgid "make_package_view: bad argument!"
msgstr "make_package_view: å‚数错误ï¼"
-#: src/pkg_view.cc:492
+#: src/pkg_view.cc:495
msgid "make_package_view: no main widget found"
msgstr "make_package_view: 未å‘现主è¦éƒ¨ä»¶"
@@ -3347,6 +3521,74 @@
"broken if it is %s."
msgstr "下列软件包ä¾èµ–于版本 %B%s%b çš„ %B%s%b ï¼Œå¹¶ä¸”å°†ä¼šç ´æŸå¦‚果它是 %s。"
+#: src/solution_dialog.cc:74
+msgid "The package cache is not available."
+msgstr ""
+
+#: src/solution_dialog.cc:82
+#, fuzzy
+msgid "No packages are broken."
+msgstr "æŸäº›åŒ…å·²ç ´æŸã€‚试图修补它们å—？"
+
+#: src/solution_dialog.cc:103
+msgid "No resolution found."
+msgstr ""
+
+#: src/solution_dialog.cc:107
+#, c-format
+msgid ""
+"Time exhausted while searching for a solution (you can select \"Next Solution"
+"\" or press %s to try harder)."
+msgstr ""
+
+#: src/solution_dialog.cc:146
+#, fuzzy
+msgid "Previous"
+msgstr "æä¾›"
+
+#: src/solution_dialog.cc:147
+#, fuzzy
+msgid "Next"
+msgstr "下一个(^N)"
+
+#: src/solution_dialog.cc:148
+msgid "Apply"
+msgstr ""
+
+#: src/solution_dialog.cc:149
+#, fuzzy
+msgid "Close"
+msgstr "å…³é—(^C)"
+
+#: src/solution_fragment.cc:125
+#, fuzzy
+msgid "%BRemove%b the following packages:%n"
+msgstr "ä¸‹åˆ—è½¯ä»¶åŒ…æ˜¯â€œç ´æŸâ€çš„："
+
+#: src/solution_fragment.cc:135
+#, fuzzy
+msgid "%BInstall%b the following packages:%n"
+msgstr "ä¸‹åˆ—è½¯ä»¶åŒ…æ˜¯â€œç ´æŸâ€çš„："
+
+#: src/solution_fragment.cc:148
+msgid "%BKeep%b the following packages at their current version:%n"
+msgstr ""
+
+#: src/solution_fragment.cc:161
+#, fuzzy
+msgid "%BUpgrade%b the following packages:%n"
+msgstr "ä¸‹åˆ—è½¯ä»¶åŒ…æ˜¯â€œç ´æŸâ€çš„："
+
+#: src/solution_fragment.cc:176
+#, fuzzy
+msgid "%BDowngrade%b the following packages:%n"
+msgstr "æ£åœ¨ä¸‹è½½è½¯ä»¶åŒ…"
+
+#: src/solution_fragment.cc:190
+#, c-format
+msgid "Score is %d"
+msgstr ""
+
#: src/trust.cc:17 src/trust.cc:19
msgid "WARNING"
msgstr ""
@@ -3358,52 +3600,52 @@
"system."
msgstr ""
-#: src/ui.cc:143
+#: src/ui.cc:164
msgid "Er, there aren't any errors, this shouldn't have happened.."
msgstr "æ©ï¼Œæ²¡æœ‰ä»»ä½•é”™è¯¯ï¼Œè¿™ä¸åº”该å‘生.."
-#: src/ui.cc:149
+#: src/ui.cc:170
msgid "E:"
msgstr ""
-#: src/ui.cc:151
+#: src/ui.cc:172
msgid "W:"
msgstr ""
-#: src/ui.cc:172
+#: src/ui.cc:193
msgid "Search for:"
msgstr "æœç´¢ï¼š"
-#: src/ui.cc:205
+#: src/ui.cc:261
msgid "You already are root!"
msgstr "您已ç»æ˜¯ root 了ï¼"
-#: src/ui.cc:303
+#: src/ui.cc:359
msgid ""
"Subprocess exited with an error -- did you type your password correctly?"
msgstr "å进程返回一个错误 -- 您输入的密ç æ£ç¡®å—？"
-#: src/ui.cc:331
+#: src/ui.cc:387
msgid "Loading cache"
msgstr "载入缓å˜"
-#: src/ui.cc:353
+#: src/ui.cc:409
msgid "Really quit Aptitude?"
msgstr "真的è¦é€€å‡º Aptitude å—？"
-#: src/ui.cc:432
+#: src/ui.cc:488
msgid "Really discard your personal settings and reload the defaults?"
msgstr "真的è¦æ”¾å¼ƒæ‚¨çš„个人设置并载入默认值å—？"
-#: src/ui.cc:532
+#: src/ui.cc:588 src/ui.cc:590 src/ui.cc:618 src/ui.cc:620
msgid "Packages"
msgstr "软件包"
-#: src/ui.cc:533 src/ui.cc:560
+#: src/ui.cc:589 src/ui.cc:619
msgid "View available packages and choose actions to perform"
msgstr "查看å¯é€‰è½¯ä»¶åŒ…以åŠé€‰æ‹©è¦æ‰§è¡Œçš„动作"
-#: src/ui.cc:599
+#: src/ui.cc:666
#, fuzzy
msgid ""
"%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
@@ -3418,15 +3660,15 @@
"使用 Aptitude è½¯ä»¶æ— ä»»ä½•æ‹…ä¿ï¼›ç»†èŠ‚请查阅帮助èœå•çš„ 'license' 项。\n"
"该软件是自由软件，欢迎您éµç…§æŸäº›æ¡æ¬¾åˆ†å‘该软件；细节请查阅 'license' 文件"
-#: src/ui.cc:620
+#: src/ui.cc:687
msgid "help.txt"
msgstr "help-zh_CN.txt"
-#: src/ui.cc:636
+#: src/ui.cc:703
msgid "README"
msgstr "README"
-#: src/ui.cc:718
+#: src/ui.cc:785
msgid ""
"%C%BWARNING%b: untrusted versions of the following packages will be "
"installed!%n%nUntrusted packages could %Bcompromise your system's security%"
@@ -3434,60 +3676,70 @@
"this is what you want to do.%n%n"
msgstr ""
-#: src/ui.cc:732
+#: src/ui.cc:799
#, fuzzy
msgid "Really Continue"
msgstr "继ç»"
-#: src/ui.cc:734
+#: src/ui.cc:801
msgid "Abort Installation"
msgstr ""
-#: src/ui.cc:796
+#: src/ui.cc:862
msgid "Preview of package installation"
msgstr "预览软件包安装"
-#: src/ui.cc:797
+#: src/ui.cc:863
msgid "View and/or adjust the actions that will be performed"
msgstr "查看以åŠ/或者调整将è¦è¢«æ‰§è¡Œçš„动作"
-#: src/ui.cc:837
-msgid "Some packages were broken and have been fixed"
+#: src/ui.cc:864
+#, fuzzy
+msgid "Preview"
+msgstr "上一个(^P)"
+
+#: src/ui.cc:900
+#, fuzzy
+msgid "Some packages were broken and have been fixed:"
msgstr "æŸäº›ç ´æŸçš„包已ç»è¢«ä¿®è¡¥ï¼"
-#: src/ui.cc:839
-msgid "Some broken packages could not be fixed!"
-msgstr "æŸäº›ç ´æŸçš„åŒ…æ— æ³•ä¿®è¡¥ï¼"
+#: src/ui.cc:906
+msgid "No solution to these dependency problems exists!"
+msgstr ""
-#: src/ui.cc:847 src/ui.cc:959
-msgid "Some packages are broken. Try to fix them?"
-msgstr "æŸäº›åŒ…å·²ç ´æŸã€‚试图修补它们å—？"
+#: src/ui.cc:912
+#, c-format
+msgid ""
+"Ran out of time while trying to resolver dependencies (press \"%s\" to try "
+"harder)"
+msgstr ""
-#: src/ui.cc:860
+#: src/ui.cc:958
+#, fuzzy
msgid ""
-"Installing/removing packages requires administrative privileges, which\n"
-"you currently do not have. Would you like to change to the root account?\n"
+"Installing/removing packages requires administrative privileges, which you "
+"currently do not have. Would you like to change to the root account?"
msgstr ""
"安装/åˆ é™¤è½¯ä»¶åŒ…éœ€è¦ç®¡ç†å‘˜æƒé™ï¼Œè€Œæ‚¨çŽ°åœ¨\n"
"没有这ç§æƒé™ã€‚您想è¦è¿›å…¥ root å¸å·å—？\n"
-#: src/ui.cc:863 src/ui.cc:993
+#: src/ui.cc:961 src/ui.cc:1077
msgid "Become root"
msgstr "å˜æˆ root"
-#: src/ui.cc:865 src/ui.cc:995
+#: src/ui.cc:963 src/ui.cc:1079
msgid "Don't become root"
msgstr "ä¸å˜æˆ root"
-#: src/ui.cc:870 src/ui.cc:1000
+#: src/ui.cc:968 src/ui.cc:1084
msgid "A package-list update or install run is already taking place."
msgstr "å·²ç»å¼€å§‹äº†ä¸€ä¸ªè½¯ä»¶åŒ…列表更新或者安装的动作。"
-#: src/ui.cc:897
+#: src/ui.cc:995
msgid "No packages are scheduled to be installed, removed, or upgraded."
msgstr "æ²¡æœ‰ä»»ä½•è½¯ä»¶åŒ…è¢«è®¾å®šä¸ºå®‰è£…ï¼Œåˆ é™¤æˆ–è€…å‡çº§ã€‚"
-#: src/ui.cc:903
+#: src/ui.cc:1001
#, fuzzy
msgid ""
"No packages will be installed, removed or upgraded. Some packages could be "
@@ -3499,411 +3751,430 @@
"æŸäº›è½¯ä»¶åŒ…å¯ä»¥è¢«å‡çº§ï¼Œä½†æ˜¯æ‚¨å¹¶æœªé€‰æ‹©å‡çº§å®ƒä»¬ã€‚\n"
"输入 “Uâ€æ¥å‡†å¤‡å‡çº§ã€‚"
-#: src/ui.cc:990
+#: src/ui.cc:1073
+#, fuzzy
msgid ""
-"Updating the package lists requires administrative privileges, which\n"
-"you currently do not have. Would you like to change to the root account?\n"
+"Updating the package lists requires administrative privileges, which you "
+"currently do not have. Would you like to change to the root account?"
msgstr ""
"更新软件包列表需è¦ç®¡ç†å‘˜æƒé™ï¼Œè€Œæ‚¨çŽ°åœ¨\n"
"没有这ç§æƒé™ã€‚您想è¦è¿›å…¥ root å¸å·å—？\n"
-#: src/ui.cc:1005 src/ui.cc:1198
+#: src/ui.cc:1089 src/ui.cc:1345
msgid "Waste time trying to find mines"
msgstr "通过找地雷æ¥æ¶ˆç£¨æ—¶é—´"
-#: src/ui.cc:1012 src/ui.cc:1065
+#: src/ui.cc:1096 src/ui.cc:1149
msgid "Cleaning while a download is in progress is not allowed"
msgstr "在下载进行过程ä¸ä¸å…许执行清除"
-#: src/ui.cc:1015
+#: src/ui.cc:1099
msgid "Deleting downloaded files"
msgstr "åˆ é™¤ä¸‹è½½çš„æ–‡ä»¶"
-#: src/ui.cc:1029
+#: src/ui.cc:1113
msgid "Downloaded package files have been deleted"
msgstr "下载的文件已ç»è¢«åˆ 除"
-#: src/ui.cc:1090
+#: src/ui.cc:1174
#, fuzzy, c-format
msgid ""
"Obsolete downloaded package files have been deleted, freeing %sB of disk "
"space."
msgstr "过期的下载文件已ç»è¢«åˆ 除"
-#: src/ui.cc:1174
+#: src/ui.cc:1246
+msgid "All solutions exhausted."
+msgstr ""
+
+#: src/ui.cc:1251 src/ui.cc:1282
+#, fuzzy
+msgid "Ran out of time while trying to find a solution."
+msgstr "通过找地雷æ¥æ¶ˆç£¨æ—¶é—´"
+
+#: src/ui.cc:1276
+msgid "Unable to find a solution to apply."
+msgstr ""
+
+#: src/ui.cc:1321
msgid "^Install/remove packages"
msgstr "安装/å¸è½½è½¯ä»¶åŒ…(^I)"
-#: src/ui.cc:1175
+#: src/ui.cc:1322
msgid "Perform all pending installs and removals"
msgstr "执行所有ç‰å¾…执行的安装和å¸è½½ä»»åŠ¡"
-#: src/ui.cc:1177
+#: src/ui.cc:1324
msgid "^Update package list"
msgstr "更新软件包列表(^U)"
-#: src/ui.cc:1178
+#: src/ui.cc:1325
msgid "Check for new versions of packages"
msgstr "æ£åœ¨æ£€æŸ¥æ–°ç‰ˆæœ¬çš„软件包"
-#: src/ui.cc:1181
+#: src/ui.cc:1328
msgid "^Forget new packages"
msgstr "忘记新软件包(^F)"
-#: src/ui.cc:1182
+#: src/ui.cc:1329
msgid "Forget which packages are \"new\""
msgstr "忘记哪些软件包是“新â€çš„"
-#: src/ui.cc:1185
+#: src/ui.cc:1332
msgid "^Clean package cache"
msgstr "清除软件包缓å˜(^C)"
-#: src/ui.cc:1186
+#: src/ui.cc:1333
msgid "Delete package files which were previously downloaded"
msgstr "åˆ é™¤ä»¥å‰ä¸‹è½½çš„软件包文件"
-#: src/ui.cc:1189
+#: src/ui.cc:1336
msgid "Clean ^obsolete files"
msgstr "å…³é—过期文件(^O)"
-#: src/ui.cc:1190
+#: src/ui.cc:1337
msgid "Delete package files which can no longer be downloaded"
msgstr "åˆ é™¤æ— æ³•å†ä¸‹è½½çš„软件包文件"
-#: src/ui.cc:1193
+#: src/ui.cc:1340
msgid "Mark ^Upgradable"
msgstr "æ ‡è®°å¯å‡çº§çš„(^U)"
-#: src/ui.cc:1194
+#: src/ui.cc:1341
msgid "Mark all upgradable packages which are not held for upgrade"
msgstr "为所有未被ä¿æŒçŽ°çŠ¶çš„è½¯ä»¶åŒ…åŠ ä¸Šå‡çº§æ ‡è®°"
-#: src/ui.cc:1197
+#: src/ui.cc:1344
msgid "^Play Minesweeper"
msgstr "玩扫雷游æˆ(^P)"
-#: src/ui.cc:1200
+#: src/ui.cc:1347
msgid "^Become root"
msgstr "å˜æˆ root(^B)"
-#: src/ui.cc:1201
+#: src/ui.cc:1348
+#, fuzzy
msgid ""
-"Run 'su' to become root; this will restart the program, but your\n"
-"settings will be preserved"
+"Run 'su' to become root; this will restart the program, but your settings "
+"will be preserved"
msgstr ""
"è¿è¡Œâ€œsuâ€æˆä¸º root。这将é‡æ–°å¯åŠ¨ç¨‹åºï¼Œä½†æ˜¯æ‚¨çš„\n"
"设置将会被ä¿å˜ä¸‹æ¥ã€‚"
-#: src/ui.cc:1204
+#: src/ui.cc:1351
msgid "^Reload package cache"
msgstr "é‡æ–°è½½å…¥è½¯ä»¶åŒ…缓å˜(^R)"
-#: src/ui.cc:1205
+#: src/ui.cc:1352
msgid "Reload the package cache"
msgstr "é‡æ–°è½½å…¥è½¯ä»¶åŒ…缓å˜"
-#: src/ui.cc:1211
+#: src/ui.cc:1358
msgid "^Quit"
msgstr "退出(^Q)"
-#: src/ui.cc:1212
+#: src/ui.cc:1359
msgid "Exit the program"
msgstr "退出æ¤ç¨‹åº"
-#: src/ui.cc:1218 src/ui.cc:1487
+#: src/ui.cc:1365 src/ui.cc:1637
msgid "Undo"
msgstr "撤消"
-#: src/ui.cc:1219
+#: src/ui.cc:1366
msgid "Undo the last package operation or group of operations"
msgstr "撤销最近一次或者一组软件包æ“作"
-#: src/ui.cc:1226
+#: src/ui.cc:1373
msgid "^Install"
msgstr "安装(^I)"
-#: src/ui.cc:1227
+#: src/ui.cc:1374
msgid "Flag the currently selected package for installation or upgrade"
msgstr "æ ‡è®°å½“å‰é€‰æ‹©çš„软件包以安装或者å‡çº§"
-#: src/ui.cc:1230
+#: src/ui.cc:1377
msgid "^Remove"
msgstr "åˆ é™¤(^R)"
-#: src/ui.cc:1231
+#: src/ui.cc:1378
msgid "Flag the currently selected package for removal"
msgstr "æ ‡è®°å½“å‰é€‰æ‹©çš„è½¯ä»¶åŒ…ä»¥åˆ é™¤"
-#: src/ui.cc:1234
+#: src/ui.cc:1381
msgid "^Purge"
msgstr "清除(^P)"
-#: src/ui.cc:1235
+#: src/ui.cc:1382
msgid ""
"Flag the currently selected package and its configuration files for removal"
msgstr "æ ‡è®°å½“å‰é€‰æ‹©çš„软件包和它的é…ç½®æ–‡ä»¶ä»¥åˆ é™¤"
-#: src/ui.cc:1238
+#: src/ui.cc:1385
msgid "^Keep"
msgstr "ä¿æŒ(^K)"
-#: src/ui.cc:1239
+#: src/ui.cc:1386
msgid "Cancel any action on the selected package"
msgstr "å–消选定软件包上的任何动作"
-#: src/ui.cc:1242
+#: src/ui.cc:1389
msgid "^Hold"
msgstr "ä¿æŒ(^H)"
-#: src/ui.cc:1243
+#: src/ui.cc:1390
msgid ""
"Cancel any action on the selected package, and protect it from future "
"upgrades"
msgstr "å–消选定软件包上的任何动作，并且ä¿æŠ¤å®ƒå…于以åŽè¢«å‡çº§"
-#: src/ui.cc:1246
+#: src/ui.cc:1393
msgid "Mark ^Auto"
msgstr "æ ‡è®°ä¸ºè‡ªåŠ¨å®‰è£…(^A)"
-#: src/ui.cc:1247
+#: src/ui.cc:1394
+#, fuzzy
msgid ""
-"Mark the selected package as having been automatically installed;\n"
-"it will automatically be removed if no other packages depend on it"
+"Mark the selected package as having been automatically installed; it will "
+"automatically be removed if no other packages depend on it"
msgstr ""
"å°†æ‰€é€‰å®šçš„è½¯ä»¶åŒ…æ ‡è®°ä¸ºè‡ªåŠ¨å®‰è£…ï¼›\n"
"如果没有其它软件包ä¾èµ–äºŽå®ƒï¼Œå®ƒå°†ä¼šè¢«è‡ªåŠ¨åˆ é™¤"
-#: src/ui.cc:1250
+#: src/ui.cc:1397
msgid "Mark ^Manual"
msgstr "æ ‡è®°ä¸ºæ‰‹åŠ¨å®‰è£…(^M)"
-#: src/ui.cc:1251
+#: src/ui.cc:1398
+#, fuzzy
msgid ""
-"Mark the selected package as having been manually installed;\n"
-"it will not be removed unless you manually remove it"
+"Mark the selected package as having been manually installed; it will not be "
+"removed unless you manually remove it"
msgstr ""
"å°†æ‰€é€‰å®šçš„è½¯ä»¶åŒ…æ ‡è®°ä¸ºæ‰‹åŠ¨å®‰è£…ï¼›\n"
"除éžæ‚¨æ‰‹åŠ¨åˆ 除该软件包，å¦åˆ™å®ƒå°†ä¸ä¼šè¢«åˆ 除"
-#: src/ui.cc:1254
+#: src/ui.cc:1401
msgid "^Forbid Version"
msgstr "ç¦æ¢ç‰ˆæœ¬(^F)"
-#: src/ui.cc:1255
+#: src/ui.cc:1402
+#, fuzzy
msgid ""
-"Forbid the candidate version of the selected package from being installed;\n"
+"Forbid the candidate version of the selected package from being installed; "
"newer versions of the package will be installed as usual"
msgstr ""
"ç¦æ¢å®‰è£…选定软件包的候选版本；\n"
"该软件包的新版本将å¯ä»¥æ£å¸¸å®‰è£…"
-#: src/ui.cc:1259
+#: src/ui.cc:1406
msgid "I^nformation"
msgstr "ä¿¡æ¯(^N)"
-#: src/ui.cc:1260
+#: src/ui.cc:1407
msgid "Display more information about the selected package"
msgstr "显示关于选定软件包上的更多信æ¯"
-#: src/ui.cc:1263
+#: src/ui.cc:1410
msgid "^Changelog"
msgstr "å˜æ›´æ—¥å¿—(^C)"
-#: src/ui.cc:1264
+#: src/ui.cc:1411
msgid "Display the Debian changelog of the selected package"
msgstr "显示选定软件包上的å˜æ›´æ—¥å¿—"
-#: src/ui.cc:1271
+#: src/ui.cc:1418
msgid "^Find"
msgstr "查找(^F)"
-#: src/ui.cc:1272
+#: src/ui.cc:1419
msgid "Search for a package"
msgstr "æœç´¢ä¸€ä¸ªè½¯ä»¶åŒ…"
-#: src/ui.cc:1275
+#: src/ui.cc:1422
msgid "Find ^Again"
msgstr "继ç»æŸ¥æ‰¾(^A)"
-#: src/ui.cc:1276
+#: src/ui.cc:1423
msgid "Repeat the last search"
msgstr "é‡å¤ä¸Šä¸€æ¬¡æŸ¥æ‰¾"
-#: src/ui.cc:1280
+#: src/ui.cc:1427
msgid "^Limit Display"
msgstr "é™åˆ¶æ˜¾ç¤º(^L)"
-#: src/ui.cc:1281
+#: src/ui.cc:1428
msgid "Apply a filter to the package list"
msgstr "使用过滤器过滤软件包列表"
-#: src/ui.cc:1284
+#: src/ui.cc:1431
msgid "^Un-Limit Display"
msgstr "å–消显示é™åˆ¶(^U)"
-#: src/ui.cc:1285
+#: src/ui.cc:1432
msgid "Remove the filter from the package list"
msgstr "å–消软件包列表ä¸è¿‡æ»¤å™¨çš„效果"
-#: src/ui.cc:1289
+#: src/ui.cc:1436
msgid "Find ^Broken"
msgstr "æœå¯»æŸå(^F)"
-#: src/ui.cc:1290
+#: src/ui.cc:1437
msgid "Find the next package with unsatisfied dependencies"
msgstr "下列软件包å˜åœ¨æœªæ»¡è¶³çš„ä¾èµ–关系："
-#: src/ui.cc:1297
+#: src/ui.cc:1444
msgid "^UI options"
msgstr "用户界é¢é€‰é¡¹(^U)"
-#: src/ui.cc:1298
+#: src/ui.cc:1445
msgid "Change the settings which affect the user interface"
msgstr "修改影å“用户界é¢çš„设置"
-#: src/ui.cc:1301
+#: src/ui.cc:1448
msgid "^Dependency handling"
msgstr "处ç†ä¾èµ–关系(^D)"
-#: src/ui.cc:1302
+#: src/ui.cc:1449
msgid "Change the settings which affect how package dependencies are handled"
msgstr "改å˜å½±å“处ç†ä¾èµ–关系的设置"
-#: src/ui.cc:1305
+#: src/ui.cc:1452
msgid "^Miscellaneous"
msgstr "æ‚项(^M)"
-#: src/ui.cc:1306
+#: src/ui.cc:1453
msgid "Change miscellaneous program settings"
msgstr "改å˜ç¨‹åºçš„æ‚项设置"
-#: src/ui.cc:1311
+#: src/ui.cc:1458
msgid "^Revert options"
msgstr "还原选项(^R)"
-#: src/ui.cc:1312
+#: src/ui.cc:1459
msgid "Reset all settings to the system defaults"
msgstr "把所有项目é‡è®¾ä¸ºå®ƒä»¬çš„默认值"
-#: src/ui.cc:1323
+#: src/ui.cc:1470
msgid "^Next"
msgstr "下一个(^N)"
-#: src/ui.cc:1324
+#: src/ui.cc:1471
msgid "View next display"
msgstr "查看下一个画é¢"
-#: src/ui.cc:1327
+#: src/ui.cc:1474
msgid "^Prev"
msgstr "上一个(^P)"
-#: src/ui.cc:1328
+#: src/ui.cc:1475
msgid "View previous display"
msgstr "查看上一画é¢"
-#: src/ui.cc:1331
+#: src/ui.cc:1478
msgid "^Close"
msgstr "å…³é—(^C)"
-#: src/ui.cc:1332
+#: src/ui.cc:1479
msgid "Close this display"
msgstr "å…³é—æ¤ç”»é¢"
-#: src/ui.cc:1337
+#: src/ui.cc:1484
msgid "New Package ^View"
msgstr "新建软件包视图(^V)"
-#: src/ui.cc:1338
+#: src/ui.cc:1485
msgid "Create a new default package view"
msgstr "创建新的默认软件包视图"
-#: src/ui.cc:1341
+#: src/ui.cc:1488
msgid "New Categorical ^Browser"
msgstr "新建分类æµè§ˆå™¨(^B)"
-#: src/ui.cc:1343
+#: src/ui.cc:1490
msgid "Browse packages by category"
msgstr "分类æµè§ˆè½¯ä»¶åŒ…"
-#: src/ui.cc:1351
+#: src/ui.cc:1498
msgid "^About"
msgstr "关于(^A)"
-#: src/ui.cc:1352
+#: src/ui.cc:1499
msgid "View information about this program"
msgstr "查看关于æ¤ç¨‹åºçš„ä¿¡æ¯"
-#: src/ui.cc:1355
+#: src/ui.cc:1502
msgid "^Help"
msgstr "帮助(^H)"
-#: src/ui.cc:1356
+#: src/ui.cc:1503
msgid "View the on-line help"
msgstr "查看在线帮助"
-#: src/ui.cc:1358
+#: src/ui.cc:1505
msgid "User's ^Manual"
msgstr "用户手册(^M)"
-#: src/ui.cc:1359
+#: src/ui.cc:1506
msgid "View the detailed program manual"
msgstr "查看详细的程åºä½¿ç”¨æ‰‹å†Œ"
-#: src/ui.cc:1362
+#: src/ui.cc:1509
msgid "^FAQ"
msgstr "常è§é—®é¢˜å›žç”(^F)"
-#: src/ui.cc:1363
+#: src/ui.cc:1510
msgid "View a list of frequently asked questions"
msgstr "查看常è§é—®é¢˜åˆ—表"
-#: src/ui.cc:1366
-msgid "^ChangeLog"
-msgstr "å˜æ›´æ—¥å¿—(^C)"
+#: src/ui.cc:1513
+msgid "^NEWS"
+msgstr ""
-#: src/ui.cc:1367
-msgid "View the important changes made in each version of the program"
+#: src/ui.cc:1514
+#, fuzzy
+msgid "View the important changes made in each version of "
msgstr "查看该程åºæ¯ä¸€ç‰ˆæœ¬ä¸æ‰€åšçš„é‡å¤§ä¿®æ”¹"
-#: src/ui.cc:1370
+#: src/ui.cc:1517
msgid "^License"
msgstr "许å¯è¯(^L)"
-#: src/ui.cc:1371
+#: src/ui.cc:1518
msgid "View the terms under which you may copy the program"
msgstr "查看您å¯ä»¥åœ¨ä½•ç§æ¡æ¬¾ä¸‹æ‹·è´è¯¥ç¨‹åº"
-#: src/ui.cc:1486
+#: src/ui.cc:1636
msgid "Actions"
msgstr "动作"
-#: src/ui.cc:1489
+#: src/ui.cc:1639
msgid "Search"
msgstr "æœç´¢"
-#: src/ui.cc:1490
+#: src/ui.cc:1640
msgid "Options"
msgstr "选项"
-#: src/ui.cc:1491
+#: src/ui.cc:1641
msgid "Views"
msgstr "查看"
-#: src/ui.cc:1492
+#: src/ui.cc:1642
msgid "Help"
msgstr "帮助"
-#: src/ui.cc:1537
+#: src/ui.cc:1699
#, c-format
msgid ""
"%s: Menu %s: Help %s: Quit %s: Update %s: Download/Install/Remove Pkgs"
msgstr "%s：èœå• %s：帮助 %s：退出 %s：更新 %s：下载/安装包"
-#: src/ui.cc:1799 src/vscreen/vscreen.cc:281
+#: src/ui.cc:1968 src/vscreen/vscreen.cc:281
msgid "yes_key"
msgstr "是_按键"
-#: src/ui.cc:1800 src/vscreen/vscreen.cc:282
+#: src/ui.cc:1969 src/vscreen/vscreen.cc:282
msgid "no_key"
msgstr "å¦_按键"
@@ -3915,6 +4186,16 @@
msgid "Downloading Changelog"
msgstr "æ£åœ¨ä¸‹è½½ "
+#: src/view_changelog.cc:54
+#, fuzzy
+msgid "Download Changelog"
+msgstr "æ£åœ¨ä¸‹è½½ "
+
+#: src/view_changelog.cc:63
+#, c-format
+msgid "%s changes"
+msgstr ""
+
#: src/vscreen/vscreen.cc:119
#, c-format
msgid "Ouch! Got SIGTERM, dying..\n"
@@ -3943,6 +4224,36 @@
msgid "No"
msgstr "å¦"
+#~ msgid ""
+#~ "Some packages had unmet dependencies. This may mean that you have\n"
+#~ "requested an impossible situation or if you are using the unstable\n"
+#~ "distribution that some required packages have not yet been created\n"
+#~ "or been moved out of Incoming.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "一些软件包å˜åœ¨æœªæ»¡è¶³çš„ä¾èµ–关系。这å¯èƒ½è¡¨æ˜Žæ‚¨çš„请求ä¸å¯èƒ½å®žçŽ°\n"
+#~ "或者您æ£åœ¨ä½¿ç”¨ unstable å‘行版，其ä¸æ‰€éœ€çš„æŸäº›è½¯ä»¶åŒ…尚未创建\n"
+#~ "或者已ç»ä»Ž Incoming ä¸è¢«ç§»èµ°ã€‚\n"
+
+#~ msgid ""
+#~ "Please insert the following disc into the drive \"%s\":\n"
+#~ "%s"
+#~ msgstr ""
+#~ "请将以下盘æ’入驱动器“%sâ€ï¼š\n"
+#~ "%s"
+
+#~ msgid "Invalid option for interactive mode: -s\n"
+#~ msgstr "交互模å¼çš„æ— æ•ˆé€‰é¡¹ï¼š-s\n"
+
+#~ msgid "Information about "
+#~ msgstr "ä¿¡æ¯å…³äºŽ"
+
+#~ msgid "Some broken packages could not be fixed!"
+#~ msgstr "æŸäº›ç ´æŸçš„åŒ…æ— æ³•ä¿®è¡¥ï¼"
+
+#~ msgid "^ChangeLog"
+#~ msgstr "å˜æ›´æ—¥å¿—(^C)"
+
#~ msgid "Go away, I'm trying to think.\n"
#~ msgstr "走开，我æ£åœ¨è¯•å›¾æ€è€ƒã€‚\n"
Modified: branches/aptitude-0.3/aptitude/po/zh_TW.po
==============================================================================
--- branches/aptitude-0.3/aptitude/po/zh_TW.po (original)
+++ branches/aptitude-0.3/aptitude/po/zh_TW.po Sat Apr 30 13:41:32 2005
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: aptitude\n"
"Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-01-10 16:26-0800\n"
+"POT-Creation-Date: 2005-04-29 18:11-0400\n"
"PO-Revision-Date: 2004-09-30 12:40+0800\n"
"Last-Translator: Rex Tsai <chihchun at linux.org.tw>\n"
"Language-Team: Chinese/Traditional <zh-l10n at linux.org.tw>\n"
@@ -148,16 +148,103 @@
msgstr "自動移除符åˆæ¤éŽæ¿¾å™¨çš„未用套件"
#: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:184 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
-#: src/vscreen/vs_util.cc:329
+#: src/ui.cc:218 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
+#: src/vscreen/vs_util.cc:328
msgid "Ok"
msgstr "確定"
#: src/apt_options.cc:242 src/download_list.cc:71 src/mine/cmine.cc:257
-#: src/mine/cmine.cc:330 src/vscreen/vs_util.cc:329
+#: src/mine/cmine.cc:330 src/vscreen/vs_util.cc:328
msgid "Cancel"
msgstr "å–消"
+#: src/broken_indicator.cc:106 src/solution_dialog.cc:97
+msgid "Internal error: unexpected null solution."
+msgstr ""
+
+#: src/broken_indicator.cc:158
+#, fuzzy
+msgid "Suggest "
+msgstr "建è°"
+
+#: src/broken_indicator.cc:164
+#, fuzzy, c-format
+msgid "%d installs"
+msgstr "安è£"
+
+#: src/broken_indicator.cc:169
+#, fuzzy
+msgid "1 install"
+msgstr "安è£"
+
+#: src/broken_indicator.cc:173
+#, c-format
+msgid "%d removals"
+msgstr ""
+
+#: src/broken_indicator.cc:178
+msgid "1 removal"
+msgstr ""
+
+#: src/broken_indicator.cc:182
+#, c-format
+msgid "%d keeps"
+msgstr ""
+
+#: src/broken_indicator.cc:187
+msgid "1 keep"
+msgstr ""
+
+#: src/broken_indicator.cc:191
+#, fuzzy, c-format
+msgid "%d upgrades"
+msgstr "å‡ç´š"
+
+#: src/broken_indicator.cc:196
+#, fuzzy
+msgid "1 upgrade"
+msgstr "å‡ç´š"
+
+#: src/broken_indicator.cc:200
+#, fuzzy, c-format
+msgid "%d downgrades"
+msgstr "已下載"
+
+#: src/broken_indicator.cc:205
+#, fuzzy
+msgid "1 downgrade"
+msgstr "已下載"
+
+#: src/broken_indicator.cc:214
+#, c-format
+msgid "%s: Examine"
+msgstr ""
+
+#: src/broken_indicator.cc:216
+#, c-format
+msgid "%s: Apply"
+msgstr ""
+
+#: src/broken_indicator.cc:218
+#, fuzzy, c-format
+msgid "%s: Next"
+msgstr "下一個(^N)"
+
+#: src/broken_indicator.cc:220
+#, c-format
+msgid "%s: Previous"
+msgstr ""
+
+#: src/broken_indicator.cc:233
+#, c-format
+msgid "%CSolution search failed. %s: try harder"
+msgstr ""
+
+#: src/broken_indicator.cc:239
+#, c-format
+msgid "%CUnable to resolve dependencies."
+msgstr ""
+
#: src/cmdline/cmdline_action.cc:36
#, c-format
msgid ""
@@ -231,29 +318,29 @@
"Package %s å°‡ä¸æœƒå‡ç´š, 無法ç¦åˆ¶å‡ç´š\n"
"\n"
-#: src/cmdline/cmdline_action.cc:213
+#: src/cmdline/cmdline_action.cc:198
#, c-format
msgid "Note: selecting the task \"%s: %s\" for installation\n"
msgstr "附註: é¸æ“‡å®‰è£ä½œæ¥ \"%s: %s\"\n"
-#: src/cmdline/cmdline_action.cc:240
+#: src/cmdline/cmdline_action.cc:225
#, c-format
msgid "You can only specify a package version with an 'install' command.\n"
msgstr "您åªèƒ½ä½¿ç”¨ 'install' 指令指定套件版本\n"
-#: src/cmdline/cmdline_action.cc:246
+#: src/cmdline/cmdline_action.cc:231
#, c-format
msgid "You can only specify a package archive with an 'install' command.\n"
msgstr "您åªèƒ½ä½¿ç”¨ 'install' 指令指定套件æ¸æª”\n"
-#: src/cmdline/cmdline_action.cc:280
+#: src/cmdline/cmdline_action.cc:265
#, c-format
msgid ""
"Couldn't find package \"%s\", and more than 40\n"
"packages contain \"%s\" in their name.\n"
msgstr "無法找到套件 \"%s\"ï¼Œè€Œä¸”è¶…éŽ 40 å„套件å稱ä¸åŒ…å« \"%s\"。\n"
-#: src/cmdline/cmdline_action.cc:283
+#: src/cmdline/cmdline_action.cc:268
#, c-format
msgid ""
"Couldn't find package \"%s\". However, the following\n"
@@ -262,12 +349,12 @@
"無法找到套件 \"%s\"。 然而，以下\n"
"套件å稱ä¸åŒ…å« \"%s\":\n"
-#: src/cmdline/cmdline_action.cc:307
+#: src/cmdline/cmdline_action.cc:292
#, c-format
msgid "Couldn't find any package whose name or description matched \"%s\"\n"
msgstr "無法找到任何套件的å稱或敘述å«æœ‰ \"%s\"\n"
-#: src/cmdline/cmdline_action.cc:309
+#: src/cmdline/cmdline_action.cc:294
#, c-format
msgid ""
"Couldn't find any package matching \"%s\", and more than 40\n"
@@ -276,7 +363,7 @@
"無法找到任何套件å»åˆ \"%s\"ï¼Œè€Œä¸”è¶…éŽ 40 å„套件的敘述包å«\n"
"了 \"%s\"。\n"
-#: src/cmdline/cmdline_action.cc:312
+#: src/cmdline/cmdline_action.cc:297
#, c-format
msgid ""
"Couldn't find any package matching \"%s\". However, the following\n"
@@ -319,13 +406,13 @@
msgid "Freed %sB of disk space\n"
msgstr "將釋放 %sB ç£ç¢Ÿç©ºé–“"
-#: src/cmdline/cmdline_do_action.cc:67
+#: src/cmdline/cmdline_do_action.cc:71
#, c-format
msgid "Invalid operation %s"
msgstr "無效的æ“作“%sâ€"
-#: src/cmdline/cmdline_do_action.cc:206 src/cmdline/cmdline_simulate.cc:30
-#: src/cmdline/cmdline_upgrade.cc:89
+#: src/cmdline/cmdline_do_action.cc:201 src/cmdline/cmdline_simulate.cc:31
+#: src/cmdline/cmdline_upgrade.cc:91
#, c-format
msgid "Abort.\n"
msgstr "關於。\n"
@@ -335,7 +422,7 @@
msgid "download: you must specify at least one package to download\n"
msgstr "下載: ä½ å¿…é ˆè‡³å°‘æŒ‡å®šä¸€å€‹ä¸‹è¼‰å¥—ä»¶\n"
-#: src/cmdline/cmdline_download.cc:43 src/download.cc:342
+#: src/cmdline/cmdline_download.cc:43 src/download.cc:344
msgid "Couldn't read source list"
msgstr "無法讀å–æºåˆ—表檔案"
@@ -397,95 +484,95 @@
msgid "What is it? It's an elephant being eaten by a snake, of course.\n"
msgstr "這是什麼? 這當然是一隻大象被一隻蛇åžæŽ‰ã€‚\n"
-#: src/cmdline/cmdline_prompt.cc:44
+#: src/cmdline/cmdline_prompt.cc:45
msgid "Couldn't read list of sources"
msgstr "無法讀å–套件來æºåˆ—表"
-#: src/cmdline/cmdline_prompt.cc:219 src/cmdline/cmdline_show_broken.cc:73
+#: src/cmdline/cmdline_prompt.cc:220 src/cmdline/cmdline_show_broken.cc:73
#, c-format
msgid "but %s is to be installed."
msgstr "但 %s 將會安è£ã€‚"
-#: src/cmdline/cmdline_prompt.cc:222 src/cmdline/cmdline_show_broken.cc:76
+#: src/cmdline/cmdline_prompt.cc:223 src/cmdline/cmdline_show_broken.cc:76
#, c-format
msgid "but %s is installed and it is kept back."
msgstr "但 %s 已安è£ä¸”ä¿æŒç¾æœ‰ç‰ˆæœ¬ã€‚"
-#: src/cmdline/cmdline_prompt.cc:225 src/cmdline/cmdline_show_broken.cc:79
+#: src/cmdline/cmdline_prompt.cc:226 src/cmdline/cmdline_show_broken.cc:79
#, c-format
msgid "but %s is installed."
msgstr "但 %s 已安è£"
-#: src/cmdline/cmdline_prompt.cc:229 src/cmdline/cmdline_show_broken.cc:83
+#: src/cmdline/cmdline_prompt.cc:230 src/cmdline/cmdline_show_broken.cc:83
#, c-format
msgid "but it is not installable"
msgstr "但這無法安è£"
-#: src/cmdline/cmdline_prompt.cc:233 src/cmdline/cmdline_show_broken.cc:87
+#: src/cmdline/cmdline_prompt.cc:234 src/cmdline/cmdline_show_broken.cc:87
#, c-format
msgid " which is a virtual package."
msgstr " 這是虛擬套件"
-#: src/cmdline/cmdline_prompt.cc:236 src/cmdline/cmdline_show_broken.cc:90
+#: src/cmdline/cmdline_prompt.cc:237 src/cmdline/cmdline_show_broken.cc:90
#, c-format
msgid " or"
msgstr " 或"
-#: src/cmdline/cmdline_prompt.cc:248
+#: src/cmdline/cmdline_prompt.cc:249
msgid "The following packages are BROKEN:"
msgstr "以下的套件狀態為毀斷"
-#: src/cmdline/cmdline_prompt.cc:249
+#: src/cmdline/cmdline_prompt.cc:250
msgid "The following packages are unused and will be REMOVED:"
msgstr "以下未使用的套件將會移除:"
-#: src/cmdline/cmdline_prompt.cc:250
+#: src/cmdline/cmdline_prompt.cc:251
msgid "The following packages have been automatically kept back:"
msgstr "以下套件已經è¨ç‚ºè‡ªå‹•ä¿æŒç¾ç‹€:"
-#: src/cmdline/cmdline_prompt.cc:251
+#: src/cmdline/cmdline_prompt.cc:252
msgid "The following NEW packages will be automatically installed:"
msgstr "以下新套件將會自動安è£:"
-#: src/cmdline/cmdline_prompt.cc:252
+#: src/cmdline/cmdline_prompt.cc:253
msgid "The following packages will be automatically REMOVED:"
msgstr "以下套件將會自動移除:"
-#: src/cmdline/cmdline_prompt.cc:253
+#: src/cmdline/cmdline_prompt.cc:254
msgid "The following packages will be DOWNGRADED:"
msgstr "以下套件將會自動é™ç´š:"
-#: src/cmdline/cmdline_prompt.cc:254
+#: src/cmdline/cmdline_prompt.cc:255
msgid "The following packages have been kept back:"
msgstr "以下套件已經è¨ç‚ºä¿æŒç¾ç‹€:"
-#: src/cmdline/cmdline_prompt.cc:255
+#: src/cmdline/cmdline_prompt.cc:256
msgid "The following packages will be REINSTALLED:"
msgstr "以下套件將é‡æ–°å®‰è£:"
-#: src/cmdline/cmdline_prompt.cc:256
+#: src/cmdline/cmdline_prompt.cc:257
msgid "The following NEW packages will be installed:"
msgstr "以下新套件將會安è£:"
-#: src/cmdline/cmdline_prompt.cc:257
+#: src/cmdline/cmdline_prompt.cc:258
msgid "The following packages will be REMOVED:"
msgstr "以下新套件將會移除:"
-#: src/cmdline/cmdline_prompt.cc:258
+#: src/cmdline/cmdline_prompt.cc:259
msgid "The following packages will be upgraded:"
msgstr "以下套件將會å‡ç´š:"
-#: src/cmdline/cmdline_prompt.cc:307
+#: src/cmdline/cmdline_prompt.cc:311
#, c-format
msgid "The following ESSENTIAL packages will be REMOVED!\n"
msgstr "以下基本套件將會移除ï¼\n"
-#: src/cmdline/cmdline_prompt.cc:316
+#: src/cmdline/cmdline_prompt.cc:320
#, c-format
msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
msgstr "ä»¥ä¸‹åŸºæœ¬å¥—ä»¶å°‡æœƒå› æ¤å‹•ä½œè€Œæ¯€æ–·ï¼\n"
-#: src/cmdline/cmdline_prompt.cc:326
+#: src/cmdline/cmdline_prompt.cc:330
#, c-format
msgid ""
"WARNING: Performing this action will probably cause your system to break!\n"
@@ -494,96 +581,99 @@
"è¦å‘Š: 執行以下動作å¯èƒ½æœƒé€ æˆæ‚¨çš„系統毀壞ï¼\n"
" ä¸è¦æŒçºŒé€²è¡Œï¼Œç„¡éžæ‚¨å¾ˆæ¸…楚自己在åšä»€éº¼ï¼\n"
-#: src/cmdline/cmdline_prompt.cc:328
+#: src/cmdline/cmdline_prompt.cc:332
msgid "I am aware that this is a very bad idea"
msgstr "I am aware that this is a very bad idea"
-#: src/cmdline/cmdline_prompt.cc:331
+#: src/cmdline/cmdline_prompt.cc:335
#, c-format
msgid "To continue, type the phrase \"%s\":\n"
msgstr "è¦ç¹¼çºŒï¼Œè«‹è¼¸å…¥ä»¥ä¸‹è²æ˜Ž \"%s\":\n"
-#: src/cmdline/cmdline_prompt.cc:434
+#: src/cmdline/cmdline_prompt.cc:438
#, c-format
msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
msgstr "以下套件å—到推薦但是將ä¸æœƒå®‰è£:\n"
-#: src/cmdline/cmdline_prompt.cc:440
+#: src/cmdline/cmdline_prompt.cc:444
#, c-format
msgid "The following packages are SUGGESTED but will NOT be installed:\n"
msgstr "以下套件å—到建è°ä½†æ˜¯å°‡ä¸æœƒå®‰è£:\n"
-#: src/cmdline/cmdline_prompt.cc:445
+#: src/cmdline/cmdline_prompt.cc:449
#, c-format
msgid "No packages will be installed, upgraded, or removed.\n"
msgstr "沒有套件將會被安è£ã€å‡ç´šæˆ–移除。\n"
-#: src/cmdline/cmdline_prompt.cc:447
+#: src/cmdline/cmdline_prompt.cc:451
#, c-format
msgid "%lu packages upgraded, %lu newly installed, "
msgstr "%lu 個套件å‡ç´š, %lu 個新安è£, "
-#: src/cmdline/cmdline_prompt.cc:451
+#: src/cmdline/cmdline_prompt.cc:455
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu 個é‡æ–°å®‰è£, "
-#: src/cmdline/cmdline_prompt.cc:453
+#: src/cmdline/cmdline_prompt.cc:457
#, c-format
msgid "%lu downgraded, "
msgstr "%lu 個é™ç´š, "
-#: src/cmdline/cmdline_prompt.cc:455
+#: src/cmdline/cmdline_prompt.cc:459
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu 個將移除且 %lu 個ä¸æœƒå‡ç´š.\n"
-#: src/cmdline/cmdline_prompt.cc:462
+#: src/cmdline/cmdline_prompt.cc:466
#, c-format
msgid "Need to get %sB/%sB of archives. "
msgstr "需è¦ä¸‹è¼‰ %sB/%sB çš„æ¸æª”檔案. "
-#: src/cmdline/cmdline_prompt.cc:465
+#: src/cmdline/cmdline_prompt.cc:469
#, c-format
msgid "Need to get %sB of archives. "
msgstr "需è¦ä¸‹è¼‰ %sB çš„æ¸æª”檔案. "
-#: src/cmdline/cmdline_prompt.cc:472
+#: src/cmdline/cmdline_prompt.cc:476
#, c-format
msgid "After unpacking %sB will be used.\n"
msgstr "解è£å¾Œå°‡ç”¨åŽ» %sB.\n"
-#: src/cmdline/cmdline_prompt.cc:475
+#: src/cmdline/cmdline_prompt.cc:479
#, c-format
msgid "After unpacking %sB will be freed.\n"
msgstr "解è£å¾Œå°‡é‡‹å‡º %sB.\n"
-#: src/cmdline/cmdline_prompt.cc:521
+#: src/cmdline/cmdline_prompt.cc:524
#, c-format
msgid "Bad action character '%c'\n"
msgstr "éŒ¯èª¤çš„å‹•ä½œæŒ‡ä»¤éµ '%c'\n"
-#: src/cmdline/cmdline_prompt.cc:596
+#: src/cmdline/cmdline_prompt.cc:595
#, c-format
msgid "No packages to show -- enter the package names on the line after 'i'.\n"
msgstr "無顯示套件 -- 請在 'i' 之後輸入套件å稱。\n"
-#: src/cmdline/cmdline_prompt.cc:598 src/cmdline/cmdline_prompt.cc:629
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:597
msgid "Press Return to continue."
msgstr "按 Return 繼續。"
-#: src/cmdline/cmdline_prompt.cc:625
+#: src/cmdline/cmdline_prompt.cc:623
#, c-format
msgid "No packages found -- enter the package names on the line after 'c'.\n"
msgstr "未找到套件 -- 請在 'c' 之後輸入套件å稱。\n"
-#: src/cmdline/cmdline_prompt.cc:665
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:627
+#, fuzzy
+msgid "Press Return to continue"
+msgstr "按 Return 繼續。"
+
+#: src/cmdline/cmdline_prompt.cc:675
msgid "Do you want to continue? [Y/n/?] "
msgstr "您想繼續嗎? [Y/n/?] "
-#: src/cmdline/cmdline_prompt.cc:690
+#: src/cmdline/cmdline_prompt.cc:700
#, c-format
msgid ""
"\n"
@@ -594,7 +684,7 @@
"相ä¾æ€§è³‡è¨Šå°‡æœƒé¡¯ç¤ºã€‚\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:692
+#: src/cmdline/cmdline_prompt.cc:702
#, c-format
msgid ""
"\n"
@@ -605,7 +695,7 @@
"相ä¾æ€§è³‡è¨Šå°‡ä¸æœƒé¡¯ç¤ºã€‚\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:698
+#: src/cmdline/cmdline_prompt.cc:708
#, c-format
msgid ""
"\n"
@@ -616,7 +706,7 @@
"版本將會顯示。\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:700
+#: src/cmdline/cmdline_prompt.cc:710
#, c-format
msgid ""
"\n"
@@ -627,7 +717,7 @@
"版本將ä¸æœƒé¡¯ç¤º\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:705
+#: src/cmdline/cmdline_prompt.cc:715
#, c-format
msgid ""
"\n"
@@ -638,7 +728,7 @@
"變動大å°å°‡æœƒé¡¯ç¤º\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:717
#, c-format
msgid ""
"\n"
@@ -649,7 +739,7 @@
"變動大å°å°‡ä¸æœƒé¡¯ç¤º\n"
"\n"
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:737
#, c-format
msgid ""
"Commands:\n"
@@ -698,31 +788,83 @@
" _ : 清除\n"
" = : ä¿ç•™\n"
-#: src/cmdline/cmdline_prompt.cc:751
+#: src/cmdline/cmdline_prompt.cc:761
#, c-format
msgid "Invalid response. Please enter a valid command or '?' for help.\n"
msgstr "錯誤回應。請輸入一個æ£ç¢ºçš„指令或 '?' 以å–å¾—å”助。\n"
+#: src/cmdline/cmdline_resolver.cc:84
+#, c-format
+msgid "y: %F%nn: %F%nq: %F%n,: %F%n.: %F%n"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:90
+msgid "accept the proposed changes"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:92
+msgid "reject the proposed changes and search for another solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:94
+#, fuzzy
+msgid "give up and quit the program"
+msgstr "退出æ¤ç¨‹åº"
+
+#: src/cmdline/cmdline_resolver.cc:96
+msgid "move to the next solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:98
+msgid "move to the previous solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:131
+#, fuzzy
+msgid "The following actions will resolve these dependencies:"
+msgstr "以下套件å«æœ‰ç›¸ä¾æ€§:\n"
+
+#: src/cmdline/cmdline_resolver.cc:146
+msgid "Accept this solution? [Y/n/q/?]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:174
+msgid "Abandoning all efforts to resolve these dependencies."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:184
+#, fuzzy
+msgid "The following commands are available:"
+msgstr "以下的套件狀態為毀斷"
+
+#: src/cmdline/cmdline_resolver.cc:188
+#, fuzzy
+msgid "Invalid response; please enter one of the following commands:"
+msgstr "錯誤回應。請輸入一個æ£ç¢ºçš„指令或 '?' 以å–å¾—å”助。\n"
+
+#: src/cmdline/cmdline_resolver.cc:198
+msgid "No solution found within the allotted time. Try harder? [Y/n]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:226
+#, fuzzy
+msgid "Invalid response; please enter 'y' or 'n'."
+msgstr "錯誤回應。請輸入一個æ£ç¢ºçš„指令或 '?' 以å–å¾—å”助。\n"
+
+#: src/cmdline/cmdline_resolver.cc:235
+msgid "Unable to resolve dependencies! Giving up..."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:240
+msgid "No more solutions."
+msgstr ""
+
#: src/cmdline/cmdline_search.cc:78
#, c-format
msgid "search: You must provide at least one search term\n"
msgstr "æœå°‹: 您至少è¦æ供一個æœå°‹å—串\n"
-#: src/cmdline/cmdline_show_broken.cc:114
-#, c-format
-msgid ""
-"Some packages had unmet dependencies. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming.\n"
-"\n"
-msgstr ""
-"有一些套件有無解關è¯æ€§ã€‚é€™ä»£è¡¨ä½ ç¢°åˆ°ä¸€å€‹ä¸å¯èƒ½çš„è™•å¢ƒæˆ–ä½ æ£åœ¨ä½¿ç”¨ä¸ç©©å®šç‰ˆæœ¬ï¼Œ"
-"而有\n"
-"些套件尚未建立或被移出 Incoming 目錄。\n"
-"\n"
-
-#: src/cmdline/cmdline_show_broken.cc:115
+#: src/cmdline/cmdline_show_broken.cc:113
#, c-format
msgid "The following packages have unmet dependencies:\n"
msgstr "以下套件å«æœ‰ç›¸ä¾æ€§:\n"
@@ -920,12 +1062,12 @@
msgid "Description: "
msgstr "æè¿°: "
-#: src/cmdline/cmdline_simulate.cc:36
+#: src/cmdline/cmdline_simulate.cc:37
#, c-format
msgid "Would download/install/remove packages.\n"
msgstr "將下載/安è£/移除套件。\n"
-#: src/cmdline/cmdline_simulate.cc:47
+#: src/cmdline/cmdline_simulate.cc:48
msgid "Internal Error, Ordering didn't finish"
msgstr "內部錯誤, 排åºç„¡æ³•å®Œæˆ"
@@ -967,28 +1109,24 @@
msgid "UNAVAILABLE"
msgstr "ä¸å¯ç”¨"
-#: src/download_bar.cc:57 src/download_list.cc:265
+#: src/download_bar.cc:56 src/download_list.cc:263 src/download_screen.cc:57
#, c-format
-msgid ""
-"Please insert the following disc into the drive \"%s\":\n"
-"%s"
-msgstr ""
-"請將以下ç£ç¢Ÿæ’å…¥ç£ç¢Ÿå™¨â€œ%sâ€ï¼š\n"
-"%s"
+msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
+msgstr "請將標號為“%sâ€çš„ç£ç¢Ÿæ’入驅動器“%sâ€"
-#: src/download_bar.cc:76 src/generic/acqprogress.cc:63
+#: src/download_bar.cc:77 src/generic/acqprogress.cc:63
msgid "Hit "
msgstr "å‘½ä¸ "
-#: src/download_bar.cc:89
+#: src/download_bar.cc:90
msgid "Downloading "
msgstr "æ£åœ¨ä¸‹è¼‰ "
-#: src/download_bar.cc:102
+#: src/download_bar.cc:103
msgid "Got "
msgstr "å·²å–å¾— "
-#: src/download_bar.cc:156
+#: src/download_bar.cc:157
msgid "Downloading..."
msgstr "æ£åœ¨ä¸‹è¼‰..."
@@ -996,7 +1134,7 @@
msgid "Couldn't read list of package sources"
msgstr "無法讀å–套件æºåˆ—表"
-#: src/download.cc:104 src/download.cc:321
+#: src/download.cc:104 src/download.cc:322
msgid "Couldn't lock list directory..are you root?"
msgstr "無法鎖定列表目錄..您是 root 嗎？"
@@ -1008,29 +1146,33 @@
msgid "View the progress of the package list update"
msgstr "檢視套件å‡ç´šé€²åº¦"
-#: src/download.cc:159
+#: src/download.cc:113
+msgid "List Update"
+msgstr ""
+
+#: src/download.cc:160
msgid "Couldn't clean out list directories"
msgstr "無法清空列表目錄"
-#: src/download.cc:176 src/ui.cc:1068
+#: src/download.cc:177 src/ui.cc:1152
msgid "Deleting obsolete downloaded files"
msgstr "刪除éŽæœŸçš„下載檔案"
-#: src/download.cc:181
+#: src/download.cc:182
#, c-format
msgid "Deleting obsolete downloaded files\n"
msgstr "刪除éŽæœŸçš„已下載檔案\n"
-#: src/download.cc:223
+#: src/download.cc:224
#, c-format
msgid "Unable to open %s to log actions"
msgstr "無法打開 %s 來記錄動作"
-#: src/download.cc:229
+#: src/download.cc:230
msgid "log report"
msgstr "ç´€éŒ„å›žå ±"
-#: src/download.cc:230
+#: src/download.cc:231
#, c-format
msgid ""
"IMPORTANT: this log only lists intended actions; actions which fail due to\n"
@@ -1040,77 +1182,77 @@
"é‡è¦ï¼šè©²æ—¥èªŒåªè¨˜éŒ„é 期動作；由於 dpkg å•é¡Œè€Œå‡ºéŒ¯çš„動作å¯èƒ½å°šæœªå®Œæˆã€‚\n"
"\n"
-#: src/download.cc:231
+#: src/download.cc:232
#, c-format
msgid "Will install %li packages, and remove %li packages.\n"
msgstr "å°‡è¦å®‰è£ %li 個套件，移除 %li 個套件。\n"
-#: src/download.cc:233
+#: src/download.cc:234
#, c-format
msgid "%sB of disk space will be used\n"
msgstr "å°‡è¦ä½”用 %sB çš„ç£ç¢Ÿç©ºé–“\n"
-#: src/download.cc:236
+#: src/download.cc:237
#, c-format
msgid "%sB bytes of disk space will be freed\n"
msgstr "å°‡è¦é‡‹æ”¾ %sB çš„ç£ç¢Ÿç©ºé–“\n"
-#: src/download.cc:244
+#: src/download.cc:245
#, c-format
msgid "[UPGRADE] %s %s -> %s\n"
msgstr "[å‡ç´š] %s %s -> %s\n"
-#: src/download.cc:248
+#: src/download.cc:249
#, c-format
msgid "[DOWNGRADE] %s %s -> %s\n"
msgstr "[é™ç´š] %s %s -> %s\n"
-#: src/download.cc:258
+#: src/download.cc:259
msgid "REMOVE"
msgstr "移除"
-#: src/download.cc:264
+#: src/download.cc:265
msgid "INSTALL"
msgstr "安è£"
-#: src/download.cc:267
+#: src/download.cc:268
msgid "REINSTALL"
msgstr "é‡æ–°å®‰è£"
-#: src/download.cc:270
+#: src/download.cc:271
msgid "HOLD"
msgstr "ä¿æŒ"
-#: src/download.cc:273
+#: src/download.cc:274
msgid "BROKEN"
msgstr "æ壞"
-#: src/download.cc:276
+#: src/download.cc:277
msgid "REMOVE, NOT USED"
msgstr "移除, 未用"
-#: src/download.cc:279
+#: src/download.cc:280
msgid "REMOVE, DEPENDENCIES"
msgstr "移除, ä¾è³´é—œä¿‚"
-#: src/download.cc:282
+#: src/download.cc:283
msgid "INSTALL, DEPENDENCIES"
msgstr "安è£, ä¾è³´é—œä¿‚"
-#: src/download.cc:285
+#: src/download.cc:286
msgid "HOLD, DEPENDENCIES"
msgstr "ä¿æŒ, ä¾è³´é—œä¿‚"
-#: src/download.cc:287
+#: src/download.cc:288
msgid "????????"
msgstr "????????"
-#: src/download.cc:291
+#: src/download.cc:292
#, c-format
msgid "[%s] %s\n"
msgstr "[%s] %s\n"
-#: src/download.cc:294
+#: src/download.cc:295
#, c-format
msgid ""
"===============================================================================\n"
@@ -1121,32 +1263,37 @@
"\n"
"日誌完æˆã€‚\n"
-#: src/download.cc:329
+#: src/download.cc:330
msgid "Downloading packages"
msgstr "下載套件ä¸"
-#: src/download.cc:330
+#: src/download.cc:331
msgid "View the progress of the package download"
msgstr "檢視套件下載進度"
-#: src/download.cc:352
+#: src/download.cc:332
+#, fuzzy
+msgid "Package Download"
+msgstr "套件:"
+
+#: src/download.cc:354
msgid "Internal error: couldn't generate list of packages to download"
msgstr "內部錯誤：無法生æˆä¸‹è¼‰å¥—件列表"
-#: src/download.cc:413
+#: src/download.cc:415
msgid "Unable to correct for unavailable packages"
msgstr "無法修æ£ä¸å¯ç”¨çš„套件"
-#: src/download.cc:465
+#: src/download.cc:467
msgid ""
"Ack! Something bad happened while installing packages. Trying to recover:"
msgstr "å•Šï¼å®‰è£å¥—件時出ç¾æŸäº›å£žæƒ…æ³ã€‚æ£åœ¨è©¦åœ–æ¢å¾©ï¼š"
-#: src/download.cc:475 src/pkg_item.cc:413
+#: src/download.cc:477 src/pkg_item.cc:432
msgid "Press return to continue.\n"
msgstr "按 Return 繼續。\n"
-#: src/download.cc:506
+#: src/download.cc:508
msgid ""
"Could not regain the system lock! (Perhaps another apt or dpkg is running?)"
msgstr "無法é‡æ–°å–得系統鎖定ï¼(也許å¦ä¸€å€‹ apt 或 dpkg æ£åœ¨åŸ·è¡Œï¼Ÿ)"
@@ -1206,11 +1353,6 @@
msgid "[ERROR]"
msgstr "[錯誤]"
-#: src/download_screen.cc:57
-#, c-format
-msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
-msgstr "請將標號為“%sâ€çš„ç£ç¢Ÿæ’入驅動器“%sâ€"
-
#: src/download_screen.cc:181
#, c-format
msgid "Downloaded %sB in %ss (%sB/s)."
@@ -1248,109 +1390,109 @@
"press enter\n"
msgstr "媒體改變: 請將標注為“%sâ€çš„ç£ç¢Ÿæ’å…¥ç£ç¢Ÿæ©Ÿâ€œ%s†並按下 enter\n"
-#: src/generic/aptcache.cc:245
+#: src/generic/aptcache.cc:253
msgid "Can't open Aptitude extended state file"
msgstr "無法打開 Aptitude 延伸狀態檔案"
-#: src/generic/aptcache.cc:252 src/generic/aptcache.cc:305
-#: src/generic/aptcache.cc:307
+#: src/generic/aptcache.cc:260 src/generic/aptcache.cc:313
+#: src/generic/aptcache.cc:315
msgid "Reading extended state information"
msgstr "æ£åœ¨è®€å–延伸狀態檔案"
-#: src/generic/aptcache.cc:313 src/generic/aptcache.cc:387
-#: src/generic/aptcache.cc:390
+#: src/generic/aptcache.cc:321 src/generic/aptcache.cc:395
+#: src/generic/aptcache.cc:398
msgid "Initializing package states"
msgstr "åˆå§‹åŒ–套件狀態"
-#: src/generic/aptcache.cc:501
+#: src/generic/aptcache.cc:509
msgid "Cannot open Aptitude state file"
msgstr "無法打開 Aptitude 延伸狀態檔案"
-#: src/generic/aptcache.cc:505 src/generic/aptcache.cc:560
-#: src/generic/aptcache.cc:563
+#: src/generic/aptcache.cc:513 src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:571
msgid "Writing extended state information"
msgstr "æ£åœ¨ç·¨è¼¯å»¶ä¼¸ç‹€æ…‹è¨Šæ¯"
-#: src/generic/aptcache.cc:542
+#: src/generic/aptcache.cc:550
#, c-format
msgid "Internal buffer overflow on package \"%s\" while writing state file"
msgstr "寫入狀態檔案時包“%sâ€ç™¼ç”Ÿå…§éƒ¨ç·©æ²–溢出"
-#: src/generic/aptcache.cc:551
+#: src/generic/aptcache.cc:559
msgid "Couldn't write state file"
msgstr "ä¸èƒ½å¯«å…¥ç‹€æ…‹æª”案"
-#: src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:576
msgid "Error writing state file"
msgstr "寫入狀態檔案時發生錯誤"
-#: src/generic/aptcache.cc:584
+#: src/generic/aptcache.cc:592
msgid "couldn't replace old state file"
msgstr "無法替代舊的狀態檔案"
-#: src/generic/aptcache.cc:960
+#: src/generic/aptcache.cc:1000
msgid "Unable to correct dependencies, some packages cannot be installed"
msgstr "無法修æ£ä¾è³´é—œä¿‚，一些包無法安è£"
-#: src/generic/aptcache.cc:1325
+#: src/generic/aptcache.cc:1546
msgid "The list of sources could not be read."
msgstr "無法讀å–軟體æºåˆ—表。"
-#: src/generic/aptcache.cc:1332
+#: src/generic/aptcache.cc:1553
msgid "The package lists or status file could not be parsed or opened."
msgstr "無法解æžæˆ–打開套件列表檔案或狀態檔案。"
-#: src/generic/aptcache.cc:1335
+#: src/generic/aptcache.cc:1556
msgid "You may want to update the package lists to correct these missing files"
msgstr "您å¯èƒ½éœ€è¦æ›´æ–°å¥—件列表來解決缺少這些檔案的å•é¡Œ"
-#: src/generic/apt.cc:141
+#: src/generic/apt.cc:142
#, c-format
msgid "Unable to open %s for writing"
msgstr "無法打開 %s 以寫入"
-#: src/generic/apt.cc:151
+#: src/generic/apt.cc:152
#, c-format
msgid "Unable to replace %s with new configuration file"
msgstr "無法用新的é…置檔案代替 %s"
-#: src/generic/apt.cc:226
+#: src/generic/apt.cc:227
msgid "Warning: could not lock the cache file. Opening in read-only mode"
msgstr "è¦å‘Šï¼šç„¡æ³•éŽ–定快å–檔案。以åªè®€æ–¹å¼æ‰“é–‹"
-#: src/generic/matchers.cc:780
+#: src/generic/matchers.cc:797
msgid "Unmatched '('"
msgstr "ä¸åŒ¹é…“(â€"
-#: src/generic/matchers.cc:870 src/generic/matchers.cc:949
+#: src/generic/matchers.cc:887 src/generic/matchers.cc:968
#, c-format
msgid "Unknown dependency type: %s"
msgstr "未知ä¾è³´é¡žåž‹ï¼š%s"
-#: src/generic/matchers.cc:931
+#: src/generic/matchers.cc:950
#, c-format
msgid "Unknown action type: %s"
msgstr "未知的æ“作類型：%s"
-#: src/generic/matchers.cc:998
+#: src/generic/matchers.cc:1017
#, c-format
msgid "Unknown priority %s"
msgstr "未知的優先值 %s"
-#: src/generic/matchers.cc:1020
+#: src/generic/matchers.cc:1039
#, c-format
msgid "Unknown pattern type: %c"
msgstr "未知的模å¼é¡žåž‹ï¼š%c"
-#: src/generic/matchers.cc:1065
+#: src/generic/matchers.cc:1084
msgid "Unexpected empty expression"
msgstr "æ„外的空表é”å¼"
-#: src/generic/matchers.cc:1100
+#: src/generic/matchers.cc:1119
msgid "Badly formed expression"
msgstr "éŒ¯èª¤æ ¼å¼çš„表é”å¼"
-#: src/generic/matchers.cc:1129
+#: src/generic/matchers.cc:1148
msgid "Unexpected ')'"
msgstr "æ„外的“)â€"
@@ -1373,7 +1515,7 @@
msgid "Can't get value of $HOME, using TMPDIR (insecure)"
msgstr "無法å–å¾— $HOME 的值，使用 TMPDIR (ä¸å®‰å…¨)"
-#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:60
+#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:61
#, c-format
msgid "ChangeLog of %s"
msgstr "%s 的變更日誌"
@@ -1573,17 +1715,17 @@
msgid "Invalid sorting policy type '%s'"
msgstr "無效的排åºç–略類型“%sâ€"
-#: src/main.cc:68
+#: src/main.cc:67
#, c-format
msgid "%s %s compiled at %s %s\n"
msgstr "%s %s ç·¨è¯æ–¼ %s %s\n"
-#: src/main.cc:71
+#: src/main.cc:70
#, c-format
msgid "Compiler: g++ %s\n"
msgstr "ç·¨è¯å™¨ï¼šg++ %s\n"
-#: src/main.cc:74
+#: src/main.cc:73
#, c-format
msgid ""
"\n"
@@ -1592,7 +1734,7 @@
"\n"
"NCurses 版本：%s\n"
-#: src/main.cc:76
+#: src/main.cc:75
#, c-format
msgid ""
"\n"
@@ -1601,22 +1743,22 @@
"\n"
"Curses 版本：%s\n"
-#: src/main.cc:78
+#: src/main.cc:77
#, c-format
msgid "libsigc++ version: %s\n"
msgstr "libsigc++ 版本：%s\n"
-#: src/main.cc:84
+#: src/main.cc:83
#, c-format
msgid "Usage: aptitude [-S fname] [-u|-i]"
msgstr "用法： aptitude [-s 檔案å] [-u|-i]"
-#: src/main.cc:86
+#: src/main.cc:85
#, c-format
msgid " aptitude [options] <action> ..."
msgstr " aptitude [é¸é …] <動作> ..."
-#: src/main.cc:88
+#: src/main.cc:87
#, c-format
msgid ""
" Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -1625,247 +1767,255 @@
" 動作 (如果未指定，aptitude 將進入交互模å¼)：\n"
"\n"
-#: src/main.cc:89
+#: src/main.cc:88
#, c-format
msgid " install - Install/upgrade packages\n"
msgstr " install - 安è£/å‡ç´šå¥—件\n"
-#: src/main.cc:90
+#: src/main.cc:89
#, c-format
msgid " remove - Remove packages\n"
msgstr " remove - 移除套件\n"
-#: src/main.cc:91
+#: src/main.cc:90
#, c-format
msgid " purge - Remove packages and their configuration files\n"
msgstr " purge - 移除套件並刪除其é…置檔案\n"
-#: src/main.cc:92
+#: src/main.cc:91
#, c-format
msgid " hold - Place packages on hold\n"
msgstr " hold - 將套件置於ä¿æŒç‹€æ…‹\n"
-#: src/main.cc:93
+#: src/main.cc:92
#, c-format
msgid " unhold - Cancel a hold command for a package\n"
msgstr " unhold - å–消å°ä¸€å€‹å¥—件的ä¿æŒå‘½ä»¤\n"
-#: src/main.cc:94
+#: src/main.cc:93
#, c-format
msgid " markauto - Mark packages as having been automatically installed\n"
msgstr " markauto - 將套件標記為自動安è£\n"
-#: src/main.cc:95
+#: src/main.cc:94
#, c-format
msgid " unmarkauto - Mark packages as having been manually installed\n"
msgstr " unmarkauto - 將套件標記為手動安è£\n"
-#: src/main.cc:100
+#: src/main.cc:99
#, c-format
msgid ""
" forbid-version - Forbid aptitude from upgrading to a specific package "
"version.\n"
msgstr "ç¦åˆ¶ç‰ˆæœ¬ - ç¦æ¢ aptitude å‡ç´šç‰¹å®šçš„套件版本。\n"
-#: src/main.cc:101
+#: src/main.cc:100
#, c-format
msgid " update - Download lists of new/upgradable packages\n"
msgstr " update - 下載新/å¯å‡ç´šå¥—件列表\n"
-#: src/main.cc:102
+#: src/main.cc:101
#, c-format
msgid " upgrade - Perform a safe upgrade\n"
msgstr " upgrade - 執行一次安全的å‡ç´š\n"
-#: src/main.cc:103
+#: src/main.cc:102
#, c-format
msgid ""
" dist-upgrade - Perform an upgrade, possibly installing and removing "
"packages\n"
msgstr " dist-upgrade - 執行å‡ç´šï¼Œå¯èƒ½æœƒå®‰è£å’Œç§»é™¤å¥—件\n"
-#: src/main.cc:104
+#: src/main.cc:103
#, c-format
msgid " forget-new - Forget what packages are \"new\"\n"
msgstr " forget-new - 忽略哪些套件是“新â€çš„\n"
-#: src/main.cc:105
+#: src/main.cc:104
#, c-format
msgid " search - Search for a package by name and/or expression\n"
msgstr " search - 按å稱 å’Œ/或 表é”å¼æœå°‹å¥—件\n"
-#: src/main.cc:106
+#: src/main.cc:105
#, c-format
msgid " show - Display detailed information about a package\n"
msgstr " show - 顯示套件細節資訊\n"
-#: src/main.cc:107
+#: src/main.cc:106
#, c-format
msgid " clean - Erase downloaded package files\n"
msgstr " clean - 刪除已下載的套件檔案\n"
-#: src/main.cc:108
+#: src/main.cc:107
#, c-format
msgid " autoclean - Erase old downloaded package files\n"
msgstr " autoclean - 刪除舊的已下載套件檔案\n"
-#: src/main.cc:109
+#: src/main.cc:108
#, c-format
msgid " changelog - View a package's changelog\n"
msgstr " 更改紀錄 - 見è˜å¥—件的更改紀錄\n"
-#: src/main.cc:110
+#: src/main.cc:109
#, c-format
msgid " download - Download the .deb file for a package\n"
msgstr " download - 下載套件的 .deb 檔案\n"
-#: src/main.cc:112
+#: src/main.cc:111
#, c-format
msgid " Options:\n"
msgstr " é¸é …：\n"
-#: src/main.cc:113
+#: src/main.cc:112
#, c-format
msgid " -h This help text\n"
msgstr " -h æ¤æ±‚助純文å—\n"
-#: src/main.cc:114
+#: src/main.cc:113
#, c-format
msgid " -s Simulate actions, but do not actually perform them.\n"
msgstr " -s 模擬動作，但是並ä¸çœŸæ£åŸ·è¡Œã€‚\n"
-#: src/main.cc:115
+#: src/main.cc:114
#, c-format
msgid ""
" -d Only download packages, do not install or remove anything.\n"
msgstr " -d 僅僅下載套件，ä¸å®‰è£æˆ–者移除任何æ±è¥¿ã€‚\n"
-#: src/main.cc:116
+#: src/main.cc:115
#, c-format
msgid " -P Always prompt for confirmation or actions\n"
msgstr " -P 總是æ示確èªåŸ·è¡Œå‹•ä½œ\n"
-#: src/main.cc:117
+#: src/main.cc:116
#, c-format
msgid ""
" -y Assume that the answer to simple yes/no questions is 'yes'\n"
msgstr " -y å‡è¨å°ç°¡å–®çš„ 是/å¦ å•é¡Œå›žç”“是â€\n"
-#: src/main.cc:118
+#: src/main.cc:117
#, c-format
msgid ""
" -F format Specify a format for displaying search results; see the "
"manual\n"
msgstr " -F æ ¼å¼ æŒ‡å®šé¡¯ç¤ºæœå°‹çµæžœçš„æ ¼å¼ï¼›åƒè¦‹æ‰‹å†Š\n"
-#: src/main.cc:119
+#: src/main.cc:118
#, c-format
msgid ""
" -O order Specify how search results should be sorted; see the manual\n"
msgstr " -O æ¬¡åº æŒ‡å®šå¦‚ä½•æŽ’åˆ—é¡¯ç¤ºæœå°‹çµæžœï¼›åƒè¦‹æ‰‹å†Š\n"
-#: src/main.cc:120
+#: src/main.cc:119
#, c-format
msgid ""
" -w width Specify the display width for formatting search results\n"
msgstr " -w 寬度 指定顯示æœå°‹çµæžœçš„æ ¼å¼å¯¬åº¦\n"
-#: src/main.cc:121
+#: src/main.cc:120
#, c-format
msgid " -f Aggressively try to fix broken packages.\n"
msgstr " -f ç©æ¥µåœ°å˜—試修復æ壞的套件。\n"
-#: src/main.cc:122
+#: src/main.cc:121
#, c-format
msgid " -V Show which versions of packages are to be installed.\n"
msgstr " -V 顯示就è¦å®‰è£çš„套件版本。\n"
-#: src/main.cc:123
+#: src/main.cc:122
#, c-format
msgid ""
" -D Show the dependencies of automatically changed packages.\n"
msgstr " -D 顯示自動改變的套件的ä¾è³´é—œä¿‚\n"
-#: src/main.cc:124
+#: src/main.cc:123
#, c-format
msgid " -Z\t\t Show the change in installed size of each package.\n"
msgstr " -Z\t\t 顯示æ¯å€‹å¥—件的安è£å°ºå¯¸çš„變化。\n"
-#: src/main.cc:125
+#: src/main.cc:124
#, c-format
msgid ""
" -v Display extra information. (may be supplied multiple times)\n"
msgstr " -v é¡¯ç¤ºé™„åŠ è¨Šæ¯ã€‚(å¯èƒ½æœƒæ供多次) \n"
-#: src/main.cc:126
+#: src/main.cc:125
#, c-format
msgid ""
" -t [release] Set the release from which packages should be installed\n"
msgstr " -t [release] è¨ç½®å°‡è¦å®‰è£çš„套件的發布版本\n"
-#: src/main.cc:127
+#: src/main.cc:126
#, c-format
msgid " -o key=val Directly set the configuration option named 'key'\n"
msgstr " -o key=val 直接指定å稱為 'key' çš„è¨å®šé¸é …\n"
-#: src/main.cc:128
+#: src/main.cc:127
#, c-format
msgid ""
" --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
" strong dependencies\n"
msgstr " --with(out)-recommends\t指定是å¦å°‡æŽ¨è–¦(建è°)處ç†ç‚ºå¼·ä¾è³´é—œä¿‚。\n"
-#: src/main.cc:129
+#: src/main.cc:128
#, c-format
msgid " -S fname: Read the aptitude extended status info from fname.\n"
msgstr " -S fname: 從檔案åä¸è®€å– aptitude 的延伸狀態資訊。\n"
-#: src/main.cc:130
+#: src/main.cc:129
#, c-format
msgid " -u : Download new package lists on startup.\n"
msgstr " -u : 開始執行時下載新的套件列表。\n"
-#: src/main.cc:131
+#: src/main.cc:130
#, c-format
msgid " -i : Perform an install run on startup.\n"
msgstr " -i : 開始執行時執行安è£ã€‚\n"
-#: src/main.cc:133
+#: src/main.cc:132
#, c-format
msgid " This aptitude does not have Super Cow Powers.\n"
msgstr " 這個 aptitude 無超級牛力。\n"
-#: src/main.cc:254
+#: src/main.cc:253
#, c-format
msgid "-o requires an argument of the form key=value, got %s"
msgstr "-o 需è¦ä¸€å€‹åƒæ•¸å¦‚ key=value, å¾— %s"
-#: src/main.cc:300 src/main.cc:309
+#: src/main.cc:299 src/main.cc:308
msgid "WEIRDNESS: unknown option code received\n"
msgstr "è©ç•°ï¼šæ”¶åˆ°æœªçŸ¥çš„é¸é …代碼\n"
-#: src/main.cc:318
+#: src/main.cc:317
msgid "Only one of -u and -i may be specified\n"
msgstr "é¸é … -u å’Œ -i åªèƒ½æŒ‡å®šä¸€å€‹\n"
-#: src/main.cc:326
+#: src/main.cc:325
msgid ""
"-u and -i may not be specified in command-line mode (eg, with 'install')"
msgstr "é¸é … -u å’Œ -i ä¸èƒ½åœ¨å‘½ä»¤è¡Œæ¨¡å¼ä¸æŒ‡å®š (例如，和“installâ€ä¸€èµ·)"
-#: src/main.cc:337
+#: src/main.cc:342
msgid "-u and -i may not be specified with a command"
msgstr "é¸é … -u å’Œ -i ä¸èƒ½åœ¨å’Œä¸€å€‹å‘½ä»¤ä¸€èµ·æŒ‡å®š "
-#: src/main.cc:392
+#: src/main.cc:399
#, c-format
msgid "Unknown command \"%s\"\n"
msgstr "未知的命令“%sâ€\n"
-#: src/main.cc:400
+#: src/main.cc:406 src/main.cc:463
+msgid "Internal error: uncaught 'out of solutions' exception.\n"
+msgstr ""
+
+#: src/main.cc:411 src/main.cc:468
+msgid "Internal error: uncaught 'out of time' exception.\n"
+msgstr ""
+
+#: src/main.cc:418
#, c-format
-msgid "Invalid option for interactive mode: -s\n"
-msgstr "交互模å¼çš„無效é¸é …：-s\n"
+msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
+msgstr ""
#: src/mine/cmine.cc:93
#, c-format
@@ -1893,7 +2043,7 @@
msgid "Lost"
msgstr "輸"
-#: src/mine/cmine.cc:119 src/ui.cc:1005
+#: src/mine/cmine.cc:119 src/ui.cc:1089
msgid "Minesweeper"
msgstr "掃雷"
@@ -2067,7 +2217,7 @@
msgid "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
msgstr "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
-#: src/pkg_columnizer.cc:84 src/ui.cc:1488
+#: src/pkg_columnizer.cc:84 src/ui.cc:1638
msgid "Package"
msgstr "套件"
@@ -2322,13 +2472,14 @@
" 'base' 分類的套件是åˆå§‹ç³»çµ±å®‰è£çš„一部分。"
#: src/pkg_grouppolicy.cc:158
+#, fuzzy
msgid ""
"Programs for faxmodems and other communications devices\n"
" Packages in the 'comm' section are used to control modems and other "
"hardware communications devices. This includes software to control faxmodems "
"(for instance, PPP for dial-up internet connections and programs originally "
-"written for that purpose (zmodem/kermit), as well as software to control "
-"cellular phones, interface with FidoNet, and run a BBS."
+"written for that purpose, such as zmodem/kermit), as well as software to "
+"control cellular phones, interface with FidoNet, and run a BBS."
msgstr ""
"用於傳真數據機和其它通訊è¨å‚™çš„程å¼\n"
" “通訊â€åˆ†é¡žçš„套件用於控制數據機和其它硬體通訊è¨å‚™ã€‚包括控制傳真數據機的軟 é«”"
@@ -2737,14 +2888,15 @@
"都在 'main' 部分ä¸ã€‚"
#: src/pkg_grouppolicy.cc:193
+#, fuzzy
msgid ""
"Programs which are not free software\n"
" Packages in the 'non-free' section are not part of Debian.\n"
" .\n"
" These packages fail to meet one or more of the requirements of the Debian "
-"Free Software Guidelines (see below) You should read the license of programs "
-"in this section to be sure that you are allowed to use them in the way you "
-"intend.\n"
+"Free Software Guidelines (see below). You should read the license of "
+"programs in this section to be sure that you are allowed to use them in the "
+"way you intend.\n"
" .\n"
" For more information about what Debian considers to be Free Software, see "
"http://www.debian.org/social_contract#guidelines"
@@ -2804,11 +2956,12 @@
" 這些套件有更新版å¯å®‰è£ã€‚"
#: src/pkg_grouppolicy.cc:320
+#, fuzzy
msgid ""
"New Packages\n"
" These packages have been added to Debian since the last time you cleared "
-"the list of \"new\" packages. (choose \"Forget new packages\" from the "
-"Actions menu to empty this list)"
+"the list of \"new\" packages (choose \"Forget new packages\" from the "
+"Actions menu to empty this list)."
msgstr ""
"新套件\n"
" 這些套件在您上次清空 'æ–°' å¥—ä»¶åˆ—è¡¨ä¹‹å¾Œæ·»åŠ åˆ° Debian ä¸ã€‚(從動作é¸å–®ä¸é¸æ“‡ "
@@ -3048,101 +3201,121 @@
msgid "Versions"
msgstr "版本號"
-#: src/pkg_item.cc:54
+#: src/pkg_item.cc:55
msgid "Yes, I am aware this is a very bad idea"
msgstr "是的，我知é“這是一個éžå¸¸ç³Ÿç³•çš„主æ„"
#: src/pkg_item.cc:80
-#, c-format
+#, fuzzy, c-format
msgid ""
-"%s is an essential package!\n"
-"\n"
-"Are you sure you want to remove it?\n"
-"Type '%s' if you are."
+"%s is an essential package!%n%nAre you sure you want to remove it?%nType '%"
+"s' if you are."
msgstr ""
"%s 是一個基礎套件ï¼\n"
"\n"
"您確定您è¦ç§»é™¤å®ƒå—Žï¼Ÿ\n"
"如果您確定的話輸入 '%s' 。"
-#: src/pkg_item.cc:219
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:625
#, c-format
msgid "Information about %s"
msgstr "關於 %s 的訊æ¯"
-#: src/pkg_item.cc:304
-msgid "Available versions of "
+#: src/pkg_item.cc:224 src/pkg_ver_item.cc:627
+#, c-format
+msgid "%s info"
+msgstr ""
+
+#: src/pkg_item.cc:310
+#, fuzzy, c-format
+msgid "Available versions of %s"
msgstr "å¯ç”¨çš„版本 "
-#: src/pkg_item.cc:312 src/pkg_ver_item.cc:648
+#: src/pkg_item.cc:313
+#, fuzzy, c-format
+msgid "%s versions"
+msgstr "版本號"
+
+#: src/pkg_item.cc:325 src/pkg_ver_item.cc:655
#, c-format
msgid "Dependencies of %s"
msgstr "%s çš„ä¾è³´é—œä¿‚"
-#: src/pkg_item.cc:322 src/pkg_ver_item.cc:657
+#: src/pkg_item.cc:327 src/pkg_ver_item.cc:657
+#, c-format
+msgid "%s deps"
+msgstr ""
+
+#: src/pkg_item.cc:338 src/pkg_ver_item.cc:667
#, c-format
msgid "Packages depending on %s"
msgstr "ä¾è³´æ–¼ %s 的套件"
-#: src/pkg_item.cc:373 src/pkg_ver_item.cc:694
+#: src/pkg_item.cc:340 src/pkg_ver_item.cc:669
+#, c-format
+msgid "%s reverse deps"
+msgstr ""
+
+#: src/pkg_item.cc:392 src/pkg_ver_item.cc:707
#, c-format
msgid "Reporting a bug in %s:\n"
msgstr "å›žå ± %s çš„è‡èŸ²:\n"
-#: src/pkg_item.cc:395
+#: src/pkg_item.cc:414
+#, fuzzy
msgid ""
-"You are not root and I cannot find any way\n"
-"to become root. To reconfigure this package,\n"
-"install the menu package, the login package,\n"
-"or run aptitude as root."
+"You are not root and I cannot find any way to become root. To reconfigure "
+"this package, install the menu package, the login package, or run aptitude "
+"as root."
msgstr ""
"您ä¸æ˜¯ root，而且我沒有發ç¾ä»»ä½•æ–¹æ³•\n"
"ä¾†è®Šæˆ root。è¦é‡æ–°é…置這個套件，\n"
"è«‹å®‰è£ menu 套件，login 套件，\n"
"或者以 root 身份執行 aptitude 。"
-#: src/pkg_item.cc:403
+#: src/pkg_item.cc:422
#, c-format
msgid "Reconfiguring %s\n"
msgstr "é‡æ–°è¨å®š %s\n"
-#: src/pkg_item.cc:428
+#: src/pkg_item.cc:447
msgid "Hierarchy editor"
msgstr "層次編輯器"
+#: src/pkg_item.cc:447
+#, fuzzy
+msgid "Hierarchy Editor"
+msgstr "層次編輯器"
+
#: src/pkg_tree.cc:325
msgid "Search for: "
msgstr "æœå°‹ï¼š"
-#: src/pkg_tree.cc:585
+#: src/pkg_tree.cc:568
msgid "All Packages"
msgstr "全部包"
-#: src/pkg_tree.cc:598 src/pkg_tree.cc:607
+#: src/pkg_tree.cc:581 src/pkg_tree.cc:590
msgid "Building view"
msgstr "建立視望ä¸"
-#: src/pkg_tree.cc:649
+#: src/pkg_tree.cc:632
#, c-format
msgid "No packages matched the pattern \"%s\"."
msgstr "沒有套件å»åˆæ¨£å¼ \"%s\""
-#: src/pkg_tree.cc:671
+#: src/pkg_tree.cc:654
msgid "Enter the new package tree limit: "
msgstr "輸入新的套件樹狀é™åˆ¶ï¼š"
-#: src/pkg_tree.cc:705
+#: src/pkg_tree.cc:688
msgid "Enter the new package grouping mechanism for this display: "
msgstr "為æ¤é¡¯ç¤ºè¼¸å…¥æ–°çš„套件分組機制："
-#: src/pkg_tree.cc:713
+#: src/pkg_tree.cc:696
msgid "Enter the new package sorting mechanism for this display: "
msgstr "為æ¤é¡¯ç¤ºè¼¸å…¥æ–°çš„套件排åºæ©Ÿåˆ¶ï¼š"
-#: src/pkg_ver_item.cc:623
-msgid "Information about "
-msgstr "訊æ¯é—œæ–¼"
-
#: src/pkg_view.cc:344
msgid "make_package_view: error in arguments -- two main widgets??"
msgstr "make_package_view: åƒæ•¸éŒ¯èª¤ -- 兩個主è¦éƒ¨ä»¶ï¼Ÿ "
@@ -3156,7 +3329,7 @@
msgid "make_package_view: bad argument!"
msgstr "make_package_view: åƒæ•¸éŒ¯èª¤ï¼"
-#: src/pkg_view.cc:492
+#: src/pkg_view.cc:495
msgid "make_package_view: no main widget found"
msgstr "make_package_view: 未發ç¾ä¸»è¦éƒ¨ä»¶"
@@ -3346,6 +3519,74 @@
"broken if it is %s."
msgstr "以下套件相ä¾æ–¼ç‰ˆæœ¬ %B%s%b çš„ %B%s%b，使用 %s å°‡æœƒé€ æˆæ¯€æ–·ã€‚"
+#: src/solution_dialog.cc:74
+msgid "The package cache is not available."
+msgstr ""
+
+#: src/solution_dialog.cc:82
+#, fuzzy
+msgid "No packages are broken."
+msgstr "æŸäº›å¥—件已毀斷。試圖修補它們嗎？"
+
+#: src/solution_dialog.cc:103
+msgid "No resolution found."
+msgstr ""
+
+#: src/solution_dialog.cc:107
+#, c-format
+msgid ""
+"Time exhausted while searching for a solution (you can select \"Next Solution"
+"\" or press %s to try harder)."
+msgstr ""
+
+#: src/solution_dialog.cc:146
+#, fuzzy
+msgid "Previous"
+msgstr "æä¾›"
+
+#: src/solution_dialog.cc:147
+#, fuzzy
+msgid "Next"
+msgstr "下一個(^N)"
+
+#: src/solution_dialog.cc:148
+msgid "Apply"
+msgstr ""
+
+#: src/solution_dialog.cc:149
+#, fuzzy
+msgid "Close"
+msgstr "關閉(^C)"
+
+#: src/solution_fragment.cc:125
+#, fuzzy
+msgid "%BRemove%b the following packages:%n"
+msgstr "以下的套件狀態為毀斷"
+
+#: src/solution_fragment.cc:135
+#, fuzzy
+msgid "%BInstall%b the following packages:%n"
+msgstr "以下的套件狀態為毀斷"
+
+#: src/solution_fragment.cc:148
+msgid "%BKeep%b the following packages at their current version:%n"
+msgstr ""
+
+#: src/solution_fragment.cc:161
+#, fuzzy
+msgid "%BUpgrade%b the following packages:%n"
+msgstr "以下的套件狀態為毀斷"
+
+#: src/solution_fragment.cc:176
+#, fuzzy
+msgid "%BDowngrade%b the following packages:%n"
+msgstr "下載套件ä¸"
+
+#: src/solution_fragment.cc:190
+#, c-format
+msgid "Score is %d"
+msgstr ""
+
#: src/trust.cc:17 src/trust.cc:19
msgid "WARNING"
msgstr ""
@@ -3357,52 +3598,52 @@
"system."
msgstr ""
-#: src/ui.cc:143
+#: src/ui.cc:164
msgid "Er, there aren't any errors, this shouldn't have happened.."
msgstr "嗯，沒有任何錯誤，這ä¸æ‡‰è©²ç™¼ç”Ÿ.."
-#: src/ui.cc:149
+#: src/ui.cc:170
msgid "E:"
msgstr ""
-#: src/ui.cc:151
+#: src/ui.cc:172
msgid "W:"
msgstr ""
-#: src/ui.cc:172
+#: src/ui.cc:193
msgid "Search for:"
msgstr "æœå°‹ï¼š"
-#: src/ui.cc:205
+#: src/ui.cc:261
msgid "You already are root!"
msgstr "您已經是 root 了ï¼"
-#: src/ui.cc:303
+#: src/ui.cc:359
msgid ""
"Subprocess exited with an error -- did you type your password correctly?"
msgstr "å程åºè¿”回一個錯誤 -- 您輸入的密碼æ£ç¢ºå—Žï¼Ÿ"
-#: src/ui.cc:331
+#: src/ui.cc:387
msgid "Loading cache"
msgstr "載入快å–"
-#: src/ui.cc:353
+#: src/ui.cc:409
msgid "Really quit Aptitude?"
msgstr "真的è¦é€€å‡º Aptitude 嗎？"
-#: src/ui.cc:432
+#: src/ui.cc:488
msgid "Really discard your personal settings and reload the defaults?"
msgstr "真的è¦æ”¾æ£„您的個人è¨ç½®ä¸¦è¼‰å…¥é è¨å€¼å—Žï¼Ÿ"
-#: src/ui.cc:532
+#: src/ui.cc:588 src/ui.cc:590 src/ui.cc:618 src/ui.cc:620
msgid "Packages"
msgstr "套件"
-#: src/ui.cc:533 src/ui.cc:560
+#: src/ui.cc:589 src/ui.cc:619
msgid "View available packages and choose actions to perform"
msgstr "查看å¯é¸å¥—件以åŠé¸æ“‡è¦åŸ·è¡Œçš„動作"
-#: src/ui.cc:599
+#: src/ui.cc:666
#, fuzzy
msgid ""
"%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
@@ -3417,15 +3658,15 @@
"Aptitude 無任何擔ä¿ï¼›ç´°ç¯€è«‹æŸ¥é–±æ±‚助é¸å–®çš„許å¯è‰ã€‚\n"
"æ¤è»Ÿé«”是自由軟體，æ¡è¿Žæ‚¨éµç…§ç‰¹å®šæ¢æ¬¾æ•£ä½ˆæ¤è»Ÿé«”；細節請查閱許å¯è‰ã€‚"
-#: src/ui.cc:620
+#: src/ui.cc:687
msgid "help.txt"
msgstr "help.txt"
-#: src/ui.cc:636
+#: src/ui.cc:703
msgid "README"
msgstr "README"
-#: src/ui.cc:718
+#: src/ui.cc:785
msgid ""
"%C%BWARNING%b: untrusted versions of the following packages will be "
"installed!%n%nUntrusted packages could %Bcompromise your system's security%"
@@ -3433,60 +3674,70 @@
"this is what you want to do.%n%n"
msgstr ""
-#: src/ui.cc:732
+#: src/ui.cc:799
#, fuzzy
msgid "Really Continue"
msgstr "繼續"
-#: src/ui.cc:734
+#: src/ui.cc:801
msgid "Abort Installation"
msgstr ""
-#: src/ui.cc:796
+#: src/ui.cc:862
msgid "Preview of package installation"
msgstr "é 覽套件安è£"
-#: src/ui.cc:797
+#: src/ui.cc:863
msgid "View and/or adjust the actions that will be performed"
msgstr "檢視與/或調整å³å°‡åŸ·è¡Œçš„指令"
-#: src/ui.cc:837
-msgid "Some packages were broken and have been fixed"
+#: src/ui.cc:864
+#, fuzzy
+msgid "Preview"
+msgstr "上一個(^P)"
+
+#: src/ui.cc:900
+#, fuzzy
+msgid "Some packages were broken and have been fixed:"
msgstr "æŸäº›æ¯€æ–·çš„套件已經被修補ï¼"
-#: src/ui.cc:839
-msgid "Some broken packages could not be fixed!"
-msgstr "æŸäº›æ¯€æ–·çš„套件無法修補ï¼"
+#: src/ui.cc:906
+msgid "No solution to these dependency problems exists!"
+msgstr ""
-#: src/ui.cc:847 src/ui.cc:959
-msgid "Some packages are broken. Try to fix them?"
-msgstr "æŸäº›å¥—件已毀斷。試圖修補它們嗎？"
+#: src/ui.cc:912
+#, c-format
+msgid ""
+"Ran out of time while trying to resolver dependencies (press \"%s\" to try "
+"harder)"
+msgstr ""
-#: src/ui.cc:860
+#: src/ui.cc:958
+#, fuzzy
msgid ""
-"Installing/removing packages requires administrative privileges, which\n"
-"you currently do not have. Would you like to change to the root account?\n"
+"Installing/removing packages requires administrative privileges, which you "
+"currently do not have. Would you like to change to the root account?"
msgstr ""
"安è£/刪除套件需è¦ç®¡ç†å“¡æ¬Šé™ï¼Œè€Œæ‚¨ç¾åœ¨\n"
"沒有這種權é™ã€‚您想è¦é€²å…¥ root 帳號嗎？\n"
-#: src/ui.cc:863 src/ui.cc:993
+#: src/ui.cc:961 src/ui.cc:1077
msgid "Become root"
msgstr "è®Šæˆ root(^B)"
-#: src/ui.cc:865 src/ui.cc:995
+#: src/ui.cc:963 src/ui.cc:1079
msgid "Don't become root"
msgstr "ä¸è®Šæˆ root"
-#: src/ui.cc:870 src/ui.cc:1000
+#: src/ui.cc:968 src/ui.cc:1084
msgid "A package-list update or install run is already taking place."
msgstr "已經開始了一個套件列表更新或者安è£çš„動作。"
-#: src/ui.cc:897
+#: src/ui.cc:995
msgid "No packages are scheduled to be installed, removed, or upgraded."
msgstr "沒有套件被é 定安è£ã€å‡ç´šæˆ–移除。"
-#: src/ui.cc:903
+#: src/ui.cc:1001
#, fuzzy
msgid ""
"No packages will be installed, removed or upgraded. Some packages could be "
@@ -3498,411 +3749,430 @@
"æŸäº›å¥—件å¯ä»¥è¢«å‡ç´šï¼Œä½†æ˜¯æ‚¨ä¸¦æ²’有é¸æ“‡å‡ç´šå®ƒå€‘。\n"
"輸入 \"U\" 來準備å‡ç´šã€‚"
-#: src/ui.cc:990
+#: src/ui.cc:1073
+#, fuzzy
msgid ""
-"Updating the package lists requires administrative privileges, which\n"
-"you currently do not have. Would you like to change to the root account?\n"
+"Updating the package lists requires administrative privileges, which you "
+"currently do not have. Would you like to change to the root account?"
msgstr ""
"更新套件列表需è¦ç®¡ç†å“¡æ¬Šé™ï¼Œè€Œæ‚¨ç¾åœ¨\n"
"沒有這種權é™ã€‚您想è¦é€²å…¥ root 帳號嗎？\n"
-#: src/ui.cc:1005 src/ui.cc:1198
+#: src/ui.cc:1089 src/ui.cc:1345
msgid "Waste time trying to find mines"
msgstr "玩玩踩地雷來消磨時間"
-#: src/ui.cc:1012 src/ui.cc:1065
+#: src/ui.cc:1096 src/ui.cc:1149
msgid "Cleaning while a download is in progress is not allowed"
msgstr "在下載進行éŽç¨‹ä¸ä¸å…許執行清除"
-#: src/ui.cc:1015
+#: src/ui.cc:1099
msgid "Deleting downloaded files"
msgstr "刪除下載的檔案"
-#: src/ui.cc:1029
+#: src/ui.cc:1113
msgid "Downloaded package files have been deleted"
msgstr "下載的檔案已經被刪除"
-#: src/ui.cc:1090
+#: src/ui.cc:1174
#, fuzzy, c-format
msgid ""
"Obsolete downloaded package files have been deleted, freeing %sB of disk "
"space."
msgstr "éŽæœŸçš„下載檔案已經被刪除"
-#: src/ui.cc:1174
+#: src/ui.cc:1246
+msgid "All solutions exhausted."
+msgstr ""
+
+#: src/ui.cc:1251 src/ui.cc:1282
+#, fuzzy
+msgid "Ran out of time while trying to find a solution."
+msgstr "玩玩踩地雷來消磨時間"
+
+#: src/ui.cc:1276
+msgid "Unable to find a solution to apply."
+msgstr ""
+
+#: src/ui.cc:1321
msgid "^Install/remove packages"
msgstr "安è£/移除套件(^I)"
-#: src/ui.cc:1175
+#: src/ui.cc:1322
msgid "Perform all pending installs and removals"
msgstr "執行所有ç‰å¾…執行的安è£å’Œç§»é™¤ä½œæ¥"
-#: src/ui.cc:1177
+#: src/ui.cc:1324
msgid "^Update package list"
msgstr "更新套件列表(^U)"
-#: src/ui.cc:1178
+#: src/ui.cc:1325
msgid "Check for new versions of packages"
msgstr "æ£åœ¨æª¢æŸ¥æ–°ç‰ˆæœ¬çš„套件"
-#: src/ui.cc:1181
+#: src/ui.cc:1328
msgid "^Forget new packages"
msgstr "忽略新套件(^F)"
-#: src/ui.cc:1182
+#: src/ui.cc:1329
msgid "Forget which packages are \"new\""
msgstr "忽略哪些套件是 '新' 的"
-#: src/ui.cc:1185
+#: src/ui.cc:1332
msgid "^Clean package cache"
msgstr "清除套件快å–(^C)"
-#: src/ui.cc:1186
+#: src/ui.cc:1333
msgid "Delete package files which were previously downloaded"
msgstr "刪除以å‰ä¸‹è¼‰çš„套件檔案"
-#: src/ui.cc:1189
+#: src/ui.cc:1336
msgid "Clean ^obsolete files"
msgstr "關閉éŽæœŸæª”案(^O)"
-#: src/ui.cc:1190
+#: src/ui.cc:1337
msgid "Delete package files which can no longer be downloaded"
msgstr "刪除無法å†ä¸‹è¼‰çš„套件檔案"
-#: src/ui.cc:1193
+#: src/ui.cc:1340
msgid "Mark ^Upgradable"
msgstr "標記為å¯å‡ç´š(^U)"
-#: src/ui.cc:1194
+#: src/ui.cc:1341
msgid "Mark all upgradable packages which are not held for upgrade"
msgstr "為所有未被ä¿æŒç¾ç‹€çš„å¥—ä»¶åŠ ä¸Šå‡ç´šæ¨™è¨˜"
-#: src/ui.cc:1197
+#: src/ui.cc:1344
msgid "^Play Minesweeper"
msgstr "玩掃雷éŠæˆ²(^P)"
-#: src/ui.cc:1200
+#: src/ui.cc:1347
msgid "^Become root"
msgstr "è®Šæˆ root(^B)"
-#: src/ui.cc:1201
+#: src/ui.cc:1348
+#, fuzzy
msgid ""
-"Run 'su' to become root; this will restart the program, but your\n"
-"settings will be preserved"
+"Run 'su' to become root; this will restart the program, but your settings "
+"will be preserved"
msgstr ""
"執行 'su' æˆç‚º root。這將é‡æ–°å•Ÿå‹•ç¨‹å¼ï¼Œä½†æ˜¯æ‚¨çš„\n"
"è¨ç½®å°‡æœƒè¢«ä¿å˜ä¸‹ä¾†ã€‚"
-#: src/ui.cc:1204
+#: src/ui.cc:1351
msgid "^Reload package cache"
msgstr "é‡æ–°è¼‰å…¥å¥—件快å–(^R)"
-#: src/ui.cc:1205
+#: src/ui.cc:1352
msgid "Reload the package cache"
msgstr "é‡æ–°è¼‰å…¥å¥—件快å–"
-#: src/ui.cc:1211
+#: src/ui.cc:1358
msgid "^Quit"
msgstr "退出(^Q)"
-#: src/ui.cc:1212
+#: src/ui.cc:1359
msgid "Exit the program"
msgstr "退出æ¤ç¨‹åº"
-#: src/ui.cc:1218 src/ui.cc:1487
+#: src/ui.cc:1365 src/ui.cc:1637
msgid "Undo"
msgstr "復原"
-#: src/ui.cc:1219
+#: src/ui.cc:1366
msgid "Undo the last package operation or group of operations"
msgstr "復原最近一次或者一組æ“作"
-#: src/ui.cc:1226
+#: src/ui.cc:1373
msgid "^Install"
msgstr "安è£(^I)"
-#: src/ui.cc:1227
+#: src/ui.cc:1374
msgid "Flag the currently selected package for installation or upgrade"
msgstr "標示安è£æˆ–å‡ç´šç¾é¸çš„套件"
-#: src/ui.cc:1230
+#: src/ui.cc:1377
msgid "^Remove"
msgstr "移除(^R)"
-#: src/ui.cc:1231
+#: src/ui.cc:1378
msgid "Flag the currently selected package for removal"
msgstr "標示移除ç¾é¸çš„套件"
-#: src/ui.cc:1234
+#: src/ui.cc:1381
msgid "^Purge"
msgstr "清除(^P)"
-#: src/ui.cc:1235
+#: src/ui.cc:1382
msgid ""
"Flag the currently selected package and its configuration files for removal"
msgstr "標示移除ç¾é¸çš„套件與其è¨å®šæª”"
-#: src/ui.cc:1238
+#: src/ui.cc:1385
msgid "^Keep"
msgstr "ä¿ç•™(^K)"
-#: src/ui.cc:1239
+#: src/ui.cc:1386
msgid "Cancel any action on the selected package"
msgstr "å–消é¸æ“‡çš„套件上的任何動作"
-#: src/ui.cc:1242
+#: src/ui.cc:1389
msgid "^Hold"
msgstr "ä¿ç•™(^H)"
-#: src/ui.cc:1243
+#: src/ui.cc:1390
msgid ""
"Cancel any action on the selected package, and protect it from future "
"upgrades"
msgstr "å–消在é¸æ“‡å¥—件的任何指令，並ä¿è‰æœªä¾†ä¹Ÿä¸å‡ç´š"
-#: src/ui.cc:1246
+#: src/ui.cc:1393
msgid "Mark ^Auto"
msgstr "標示為自動(^A)"
-#: src/ui.cc:1247
+#: src/ui.cc:1394
+#, fuzzy
msgid ""
-"Mark the selected package as having been automatically installed;\n"
-"it will automatically be removed if no other packages depend on it"
+"Mark the selected package as having been automatically installed; it will "
+"automatically be removed if no other packages depend on it"
msgstr ""
"標示自動安è£é¸æ“‡çš„套件;\n"
"如果沒有其他套件相ä¾æ–¼ä¸Šï¼Œå®ƒå°‡æœƒè¢«è‡ªå‹•ç§»é™¤"
-#: src/ui.cc:1250
+#: src/ui.cc:1397
msgid "Mark ^Manual"
msgstr "標示為手動處ç†(^M)"
-#: src/ui.cc:1251
+#: src/ui.cc:1398
+#, fuzzy
msgid ""
-"Mark the selected package as having been manually installed;\n"
-"it will not be removed unless you manually remove it"
+"Mark the selected package as having been manually installed; it will not be "
+"removed unless you manually remove it"
msgstr ""
"標示手動安è£é¸æ“‡çš„套件;\n"
"除éžæ‚¨æ‰‹å‹•ç§»é™¤ï¼Œå¦å‰‡å®ƒå°‡ä¸æœƒè¢«ç§»é™¤"
-#: src/ui.cc:1254
+#: src/ui.cc:1401
msgid "^Forbid Version"
msgstr "ç¦åˆ¶ç‰ˆæœ¬(^F)"
-#: src/ui.cc:1255
+#: src/ui.cc:1402
+#, fuzzy
msgid ""
-"Forbid the candidate version of the selected package from being installed;\n"
+"Forbid the candidate version of the selected package from being installed; "
"newer versions of the package will be installed as usual"
msgstr ""
"ç¦åˆ¶å®‰è£é¸æ“‡å¥—件的候é¸ç‰ˆæœ¬;\n"
"新版本的套件將會åƒå¾€å¸¸ä¸€æ¨£è¢«å®‰è£"
-#: src/ui.cc:1259
+#: src/ui.cc:1406
msgid "I^nformation"
msgstr "資訊(^n)"
-#: src/ui.cc:1260
+#: src/ui.cc:1407
msgid "Display more information about the selected package"
msgstr "顯示é¸æ“‡çš„套件之細節資訊"
-#: src/ui.cc:1263
+#: src/ui.cc:1410
msgid "^Changelog"
msgstr "變更紀錄(^C)"
-#: src/ui.cc:1264
+#: src/ui.cc:1411
msgid "Display the Debian changelog of the selected package"
msgstr "顯示é¸æ“‡å¥—件的 Debian 更改紀錄"
-#: src/ui.cc:1271
+#: src/ui.cc:1418
msgid "^Find"
msgstr "尋找(^F)"
-#: src/ui.cc:1272
+#: src/ui.cc:1419
msgid "Search for a package"
msgstr "æœå°‹å¥—件"
-#: src/ui.cc:1275
+#: src/ui.cc:1422
msgid "Find ^Again"
msgstr "é‡æ–°å°‹æ‰¾(^A)"
-#: src/ui.cc:1276
+#: src/ui.cc:1423
msgid "Repeat the last search"
msgstr "é‡è¤‡æœ€å¾Œå°‹æ‰¾"
-#: src/ui.cc:1280
+#: src/ui.cc:1427
msgid "^Limit Display"
msgstr "é™åˆ¶é¡¯ç¤º(^L)"
-#: src/ui.cc:1281
+#: src/ui.cc:1428
msgid "Apply a filter to the package list"
msgstr "套用套件列表篩é¸"
-#: src/ui.cc:1284
+#: src/ui.cc:1431
msgid "^Un-Limit Display"
msgstr "ç„¡é™åˆ¶é¡¯ç¤º(^U)"
-#: src/ui.cc:1285
+#: src/ui.cc:1432
msgid "Remove the filter from the package list"
msgstr "移除套件列表的篩é¸"
-#: src/ui.cc:1289
+#: src/ui.cc:1436
msgid "Find ^Broken"
msgstr "æœå°‹æ壞套件(^B)"
-#: src/ui.cc:1290
+#: src/ui.cc:1437
msgid "Find the next package with unsatisfied dependencies"
msgstr "尋找下個未滿足相ä¾æ€§çš„套件"
-#: src/ui.cc:1297
+#: src/ui.cc:1444
msgid "^UI options"
msgstr "用戶界é¢é¸é …(^U)"
-#: src/ui.cc:1298
+#: src/ui.cc:1445
msgid "Change the settings which affect the user interface"
msgstr "修改影響用戶界é¢çš„è¨ç½®"
-#: src/ui.cc:1301
+#: src/ui.cc:1448
msgid "^Dependency handling"
msgstr "處ç†ä¾è³´é—œä¿‚(^D)"
-#: src/ui.cc:1302
+#: src/ui.cc:1449
msgid "Change the settings which affect how package dependencies are handled"
msgstr "改變影響處ç†ä¾è³´é—œä¿‚çš„è¨ç½®"
-#: src/ui.cc:1305
+#: src/ui.cc:1452
msgid "^Miscellaneous"
msgstr "é›œé …(^M)"
-#: src/ui.cc:1306
+#: src/ui.cc:1453
msgid "Change miscellaneous program settings"
msgstr "改變程åºçš„é›œé …è¨ç½®"
-#: src/ui.cc:1311
+#: src/ui.cc:1458
msgid "^Revert options"
msgstr "還原é¸é …(^R)"
-#: src/ui.cc:1312
+#: src/ui.cc:1459
msgid "Reset all settings to the system defaults"
msgstr "æŠŠæ‰€æœ‰é …ç›®é‡è¨ç‚ºå®ƒå€‘çš„é è¨å€¼"
-#: src/ui.cc:1323
+#: src/ui.cc:1470
msgid "^Next"
msgstr "下一個(^N)"
-#: src/ui.cc:1324
+#: src/ui.cc:1471
msgid "View next display"
msgstr "查看下一個畫é¢"
-#: src/ui.cc:1327
+#: src/ui.cc:1474
msgid "^Prev"
msgstr "上一個(^P)"
-#: src/ui.cc:1328
+#: src/ui.cc:1475
msgid "View previous display"
msgstr "查看上一畫é¢"
-#: src/ui.cc:1331
+#: src/ui.cc:1478
msgid "^Close"
msgstr "關閉(^C)"
-#: src/ui.cc:1332
+#: src/ui.cc:1479
msgid "Close this display"
msgstr "關閉æ¤ç•«é¢"
-#: src/ui.cc:1337
+#: src/ui.cc:1484
msgid "New Package ^View"
msgstr "新套件視野(^V)"
-#: src/ui.cc:1338
+#: src/ui.cc:1485
msgid "Create a new default package view"
msgstr "建立新的é è¨å¥—件視野"
-#: src/ui.cc:1341
+#: src/ui.cc:1488
msgid "New Categorical ^Browser"
msgstr "新分類ç€è¦½å™¨(^B)"
-#: src/ui.cc:1343
+#: src/ui.cc:1490
msgid "Browse packages by category"
msgstr "分類ç€è¦½å¥—件"
-#: src/ui.cc:1351
+#: src/ui.cc:1498
msgid "^About"
msgstr "關於(^A)"
-#: src/ui.cc:1352
+#: src/ui.cc:1499
msgid "View information about this program"
msgstr "查看關於æ¤ç¨‹å¼çš„資訊"
-#: src/ui.cc:1355
+#: src/ui.cc:1502
msgid "^Help"
msgstr "求助(^H)"
-#: src/ui.cc:1356
+#: src/ui.cc:1503
msgid "View the on-line help"
msgstr "查看線上求助"
-#: src/ui.cc:1358
+#: src/ui.cc:1505
msgid "User's ^Manual"
msgstr "用戶手冊(^M)"
-#: src/ui.cc:1359
+#: src/ui.cc:1506
msgid "View the detailed program manual"
msgstr "ç€è¦½è©³ç´°çš„使用手冊"
-#: src/ui.cc:1362
+#: src/ui.cc:1509
msgid "^FAQ"
msgstr "常見å•é¡Œ(^F)"
-#: src/ui.cc:1363
+#: src/ui.cc:1510
msgid "View a list of frequently asked questions"
msgstr "ç€è¦½å¸¸è¦‹å•é¡Œåˆ—表"
-#: src/ui.cc:1366
-msgid "^ChangeLog"
-msgstr "變更紀錄(^C)"
+#: src/ui.cc:1513
+msgid "^NEWS"
+msgstr ""
-#: src/ui.cc:1367
-msgid "View the important changes made in each version of the program"
+#: src/ui.cc:1514
+#, fuzzy
+msgid "View the important changes made in each version of "
msgstr "查看æ¤ç¨‹å¼æ¯ä¸€ç‰ˆæœ¬ä¸æ‰€åšçš„é‡å¤§ä¿®æ”¹"
-#: src/ui.cc:1370
+#: src/ui.cc:1517
msgid "^License"
msgstr "許å¯è‰(^L)"
-#: src/ui.cc:1371
+#: src/ui.cc:1518
msgid "View the terms under which you may copy the program"
msgstr "查看您å¯ä»¥åœ¨ä½•ç¨®æ¢æ¬¾ä¸‹é‡è£½è©²ç¨‹å¼"
-#: src/ui.cc:1486
+#: src/ui.cc:1636
msgid "Actions"
msgstr "動作"
-#: src/ui.cc:1489
+#: src/ui.cc:1639
msgid "Search"
msgstr "æœå°‹"
-#: src/ui.cc:1490
+#: src/ui.cc:1640
msgid "Options"
msgstr "é¸é …"
-#: src/ui.cc:1491
+#: src/ui.cc:1641
msgid "Views"
msgstr "查看"
-#: src/ui.cc:1492
+#: src/ui.cc:1642
msgid "Help"
msgstr "求助"
-#: src/ui.cc:1537
+#: src/ui.cc:1699
#, c-format
msgid ""
"%s: Menu %s: Help %s: Quit %s: Update %s: Download/Install/Remove Pkgs"
msgstr "%s：é¸å–® %s：求助 %s：退出 %s：更新 %s：下載/安è£å¥—件"
-#: src/ui.cc:1799 src/vscreen/vscreen.cc:281
+#: src/ui.cc:1968 src/vscreen/vscreen.cc:281
msgid "yes_key"
msgstr "確定éµ"
-#: src/ui.cc:1800 src/vscreen/vscreen.cc:282
+#: src/ui.cc:1969 src/vscreen/vscreen.cc:282
msgid "no_key"
msgstr "å¦å®šéµ"
@@ -3914,6 +4184,16 @@
msgid "Downloading Changelog"
msgstr "æ£åœ¨ä¸‹è¼‰æ›´æ”¹ç´€éŒ„"
+#: src/view_changelog.cc:54
+#, fuzzy
+msgid "Download Changelog"
+msgstr "æ£åœ¨ä¸‹è¼‰æ›´æ”¹ç´€éŒ„"
+
+#: src/view_changelog.cc:63
+#, c-format
+msgid "%s changes"
+msgstr ""
+
#: src/vscreen/vscreen.cc:119
#, c-format
msgid "Ouch! Got SIGTERM, dying..\n"
@@ -3942,6 +4222,37 @@
msgid "No"
msgstr "å¦(N)"
+#~ msgid ""
+#~ "Some packages had unmet dependencies. This may mean that you have\n"
+#~ "requested an impossible situation or if you are using the unstable\n"
+#~ "distribution that some required packages have not yet been created\n"
+#~ "or been moved out of Incoming.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "有一些套件有無解關è¯æ€§ã€‚é€™ä»£è¡¨ä½ ç¢°åˆ°ä¸€å€‹ä¸å¯èƒ½çš„è™•å¢ƒæˆ–ä½ æ£åœ¨ä½¿ç”¨ä¸ç©©å®šç‰ˆ"
+#~ "本，而有\n"
+#~ "些套件尚未建立或被移出 Incoming 目錄。\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Please insert the following disc into the drive \"%s\":\n"
+#~ "%s"
+#~ msgstr ""
+#~ "請將以下ç£ç¢Ÿæ’å…¥ç£ç¢Ÿå™¨â€œ%sâ€ï¼š\n"
+#~ "%s"
+
+#~ msgid "Invalid option for interactive mode: -s\n"
+#~ msgstr "交互模å¼çš„無效é¸é …：-s\n"
+
+#~ msgid "Information about "
+#~ msgstr "訊æ¯é—œæ–¼"
+
+#~ msgid "Some broken packages could not be fixed!"
+#~ msgstr "æŸäº›æ¯€æ–·çš„套件無法修補ï¼"
+
+#~ msgid "^ChangeLog"
+#~ msgstr "變更紀錄(^C)"
+
#~ msgid "Go away, I'm trying to think.\n"
#~ msgstr "走開啦，我æ£è©¦è‘—專心。\n"
More information about the Aptitude-devel
mailing list