[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 "تعذرت قراءة لاØ