[Aptitude-svn-commit] r3395 - branches/aptitude-0.3/aptitude/po

Christian Perrier bubulle at costa.debian.org
Sun Jul 17 18:24:54 UTC 2005


Author: bubulle
Date: Sun Jun 12 21:04:47 2005
New Revision: 3395

Modified:
   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/tl.po
   branches/aptitude-0.3/aptitude/po/tr.po
   branches/aptitude-0.3/aptitude/po/vi.po
   branches/aptitude-0.3/aptitude/po/zh_CN.po
   branches/aptitude-0.3/aptitude/po/zh_TW.po
Log:
Regenerate all PO files and the POT file


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	Sun Jun 12 21:04:47 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-05-01 14:08-0400\n"
+"POT-Creation-Date: 2005-06-12 22:42+0200\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"
@@ -146,14 +146,14 @@
 msgid "Automatically remove unused packages matching this filter"
 msgstr ""
 
-#: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:219 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
-#: src/vscreen/vs_util.cc:328
+#: src/apt_options.cc:240 src/mine/cmine.cc:249 src/mine/cmine.cc:312
+#: src/ui.cc:215 src/vscreen/vs_util.cc:77 src/vscreen/vs_util.cc:90
+#: src/vscreen/vs_util.cc:264 src/vscreen/vs_util.cc:298
 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:328
+#: src/apt_options.cc:241 src/download_list.cc:69 src/mine/cmine.cc:250
+#: src/mine/cmine.cc:313 src/vscreen/vs_util.cc:298
 msgid "Cancel"
 msgstr ""
 
@@ -230,14 +230,13 @@
 msgid "%s: Previous"
 msgstr ""
 
-#: src/broken_indicator.cc:233
+#: src/broken_indicator.cc:232
 #, c-format
-msgid "%CSolution search failed.  %s: try harder"
+msgid "Solution search failed.  %s: try harder"
 msgstr ""
 
-#: src/broken_indicator.cc:239
-#, c-format
-msgid "%CUnable to resolve dependencies."
+#: src/broken_indicator.cc:237
+msgid "Unable to resolve dependencies."
 msgstr ""
 
 #: src/cmdline/cmdline_action.cc:36
@@ -583,13 +582,13 @@
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
-#: src/vscreen/vs_util.cc:212
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:165
+#: src/vscreen/vs_util.cc:202
 msgid "Yes"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
-#: src/vscreen/vs_util.cc:212
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:165
+#: src/vscreen/vs_util.cc:202
 msgid "No"
 msgstr ""
 
@@ -868,7 +867,7 @@
 msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:212
+#: src/cmdline/cmdline_resolver.cc:212 src/cmdline/cmdline_resolver.cc:285
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
@@ -920,196 +919,201 @@
 msgid "The following packages have unmet dependencies:\n"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:133
+#: src/cmdline/cmdline_show.cc:119 src/cmdline/cmdline_show.cc:305
+#: src/solution_fragment.cc:65
+msgid "<NULL>"
+msgstr ""
+
+#: src/cmdline/cmdline_show.cc:138
 msgid "not installed"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:135 src/pkg_columnizer.cc:231
+#: src/cmdline/cmdline_show.cc:140 src/pkg_columnizer.cc:231
 #: src/pkg_ver_item.cc:225
 msgid "unpacked"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:137
+#: src/cmdline/cmdline_show.cc:142
 msgid "partially configured"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:139
+#: src/cmdline/cmdline_show.cc:144
 msgid "partially installed"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:141
+#: src/cmdline/cmdline_show.cc:146
 msgid "not installed (configuration files remain)"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:143 src/pkg_columnizer.cc:239
+#: src/cmdline/cmdline_show.cc:148 src/pkg_columnizer.cc:239
 #: src/pkg_ver_item.cc:233
 msgid "installed"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:152
+#: src/cmdline/cmdline_show.cc:157
 msgid "not a real package"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:165
+#: src/cmdline/cmdline_show.cc:170
 msgid " [held]"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:174
+#: src/cmdline/cmdline_show.cc:179
 #, c-format
 msgid "%s; version %s will be installed"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:178
+#: src/cmdline/cmdline_show.cc:183
 #, c-format
 msgid "%s; version %s will be installed automatically"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:184 src/cmdline/cmdline_show.cc:199
+#: src/cmdline/cmdline_show.cc:189 src/cmdline/cmdline_show.cc:204
 #, c-format
 msgid "%s; will be purged"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:197
+#: src/cmdline/cmdline_show.cc:202
 #, c-format
 msgid "%s; will be purged because nothing depends on it"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:204
+#: src/cmdline/cmdline_show.cc:209
 #, c-format
 msgid "%s; will be removed because nothing depends on it"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:206
+#: src/cmdline/cmdline_show.cc:211
 #, c-format
 msgid "%s; will be removed"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:220
+#: src/cmdline/cmdline_show.cc:225
 #, c-format
 msgid "%s%s; will be downgraded [%s -> %s]"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:223
+#: src/cmdline/cmdline_show.cc:228
 #, c-format
 msgid "%s%s; will be upgraded [%s -> %s]"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:235 src/cmdline/cmdline_show.cc:256
+#: src/cmdline/cmdline_show.cc:240 src/cmdline/cmdline_show.cc:261
 msgid "Package: "
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:236 src/cmdline/cmdline_show.cc:264
+#: src/cmdline/cmdline_show.cc:241 src/cmdline/cmdline_show.cc:269
 #: src/pkg_columnizer.cc:87
 msgid "State"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:237 src/cmdline/cmdline_show.cc:318
+#: src/cmdline/cmdline_show.cc:242 src/cmdline/cmdline_show.cc:325
 msgid "Provided by"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:258 src/pkg_info_screen.cc:105
+#: src/cmdline/cmdline_show.cc:263 src/pkg_info_screen.cc:105
 msgid "Essential: "
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:258 src/cmdline/cmdline_show.cc:262
-#: src/cmdline/cmdline_show.cc:273 src/pkg_info_screen.cc:105
+#: src/cmdline/cmdline_show.cc:263 src/cmdline/cmdline_show.cc:267
+#: src/cmdline/cmdline_show.cc:278 src/pkg_info_screen.cc:105
 msgid "yes"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:262
+#: src/cmdline/cmdline_show.cc:267
 msgid "New"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:267
+#: src/cmdline/cmdline_show.cc:272
 msgid "Forbidden version"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:271
+#: src/cmdline/cmdline_show.cc:276
 msgid "Automatically installed"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:273
+#: src/cmdline/cmdline_show.cc:278
 msgid "no"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:275
+#: src/cmdline/cmdline_show.cc:280
 msgid "Version: "
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:276 src/pkg_info_screen.cc:113
+#: src/cmdline/cmdline_show.cc:281 src/pkg_info_screen.cc:113
 msgid "Priority: "
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:277 src/cmdline/cmdline_show.cc:279
-#: src/cmdline/cmdline_show.cc:288
+#: src/cmdline/cmdline_show.cc:282 src/cmdline/cmdline_show.cc:284
+#: src/cmdline/cmdline_show.cc:293
 msgid "N/A"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:278 src/pkg_info_screen.cc:114
+#: src/cmdline/cmdline_show.cc:283 src/pkg_info_screen.cc:114
 msgid "Section: "
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:280 src/pkg_info_screen.cc:115
+#: src/cmdline/cmdline_show.cc:285 src/pkg_info_screen.cc:115
 msgid "Maintainer: "
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:283
+#: src/cmdline/cmdline_show.cc:288
 msgid "Uncompressed Size: "
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:287
+#: src/cmdline/cmdline_show.cc:292
 msgid "Architecture: "
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:289
+#: src/cmdline/cmdline_show.cc:294
 msgid "Compressed Size: "
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:291
+#: src/cmdline/cmdline_show.cc:296
 msgid "Filename: "
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:293
+#: src/cmdline/cmdline_show.cc:298
 msgid "MD5sum: "
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:297 src/cmdline/cmdline_show.cc:299
+#: src/cmdline/cmdline_show.cc:302 src/cmdline/cmdline_show.cc:305
 msgid "Archive"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:303
+#: src/cmdline/cmdline_show.cc:310
 msgid "Depends"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:305
+#: src/cmdline/cmdline_show.cc:312
 msgid "PreDepends"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:307
+#: src/cmdline/cmdline_show.cc:314
 msgid "Recommends"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:309
+#: src/cmdline/cmdline_show.cc:316
 msgid "Suggests"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:311
+#: src/cmdline/cmdline_show.cc:318
 msgid "Conflicts"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:313
+#: src/cmdline/cmdline_show.cc:320
 msgid "Replaces"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:315
+#: src/cmdline/cmdline_show.cc:322
 msgid "Obsoletes"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:317
+#: src/cmdline/cmdline_show.cc:324
 msgid "Provides"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:321 src/pkg_info_screen.cc:97
+#: src/cmdline/cmdline_show.cc:328 src/pkg_info_screen.cc:97
 msgid "Description: "
 msgstr ""
 
@@ -1152,32 +1156,32 @@
 msgid "You cannot specify both an archive and a version for a package\n"
 msgstr ""
 
-#: src/dep_item.cc:137
+#: src/dep_item.cc:139
 msgid "UNSATISFIED"
 msgstr ""
 
-#: src/dep_item.cc:137 src/reason_fragment.cc:247
+#: src/dep_item.cc:139 src/reason_fragment.cc:244
 msgid "UNAVAILABLE"
 msgstr ""
 
-#: src/download_bar.cc:56 src/download_list.cc:263 src/download_screen.cc:57
+#: src/download_bar.cc:56 src/download_list.cc:266 src/download_screen.cc:57
 #, c-format
 msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
 msgstr ""
 
-#: src/download_bar.cc:77 src/generic/acqprogress.cc:63
+#: src/download_bar.cc:75 src/generic/acqprogress.cc:63
 msgid "Hit "
 msgstr ""
 
-#: src/download_bar.cc:90
+#: src/download_bar.cc:88
 msgid "Downloading "
 msgstr ""
 
-#: src/download_bar.cc:103
+#: src/download_bar.cc:101
 msgid "Got "
 msgstr ""
 
-#: src/download_bar.cc:157
+#: src/download_bar.cc:155
 msgid "Downloading..."
 msgstr ""
 
@@ -1205,7 +1209,7 @@
 msgid "Couldn't clean out list directories"
 msgstr ""
 
-#: src/download.cc:177 src/ui.cc:1153
+#: src/download.cc:177 src/ui.cc:1147
 msgid "Deleting obsolete downloaded files"
 msgstr ""
 
@@ -1334,7 +1338,7 @@
 "Ack!  Something bad happened while installing packages.  Trying to recover:"
 msgstr ""
 
-#: src/download.cc:477 src/pkg_item.cc:432
+#: src/download.cc:477 src/pkg_item.cc:430
 msgid "Press return to continue.\n"
 msgstr ""
 
@@ -1343,17 +1347,17 @@
 "Could not regain the system lock!  (Perhaps another apt or dpkg is running?)"
 msgstr ""
 
-#: src/download_item.cc:66 src/download_item.cc:70 src/download_item.cc:100
+#: src/download_item.cc:70 src/download_item.cc:74 src/download_item.cc:104
 #: src/generic/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr ""
 
-#: src/download_item.cc:104 src/download_list.cc:283
+#: src/download_item.cc:108 src/download_list.cc:284
 msgid "[Hit]"
 msgstr ""
 
-#: src/download_item.cc:104 src/download_list.cc:303
+#: src/download_item.cc:108 src/download_list.cc:304
 msgid "[Downloaded]"
 msgstr ""
 
@@ -1367,34 +1371,34 @@
 msgid "%n%nSome files were not downloaded successfully."
 msgstr ""
 
-#: src/download_list.cc:68
+#: src/download_list.cc:66
 msgid "Continue"
 msgstr ""
 
-#: src/download_list.cc:175 src/download_screen.cc:203
+#: src/download_list.cc:178 src/download_screen.cc:203
 msgid "Total Progress: "
 msgstr ""
 
-#: src/download_list.cc:194 src/download_screen.cc:218
+#: src/download_list.cc:197 src/download_screen.cc:218
 #, c-format
 msgid " [ %i%% ] (%sB/s, %s remaining)"
 msgstr ""
 
-#: src/download_list.cc:196
+#: src/download_list.cc:199
 #, c-format
 msgid " [ %i%% ] (stalled)"
 msgstr ""
 
-#: src/download_list.cc:198
+#: src/download_list.cc:201
 #, c-format
 msgid " [ %i%% ]"
 msgstr ""
 
-#: src/download_list.cc:323
+#: src/download_list.cc:324
 msgid "[IGNORED]"
 msgstr ""
 
-#: src/download_list.cc:329
+#: src/download_list.cc:330
 msgid "[ERROR]"
 msgstr ""
 
@@ -1403,11 +1407,11 @@
 msgid "Downloaded %sB in %ss (%sB/s)."
 msgstr ""
 
-#: src/edit_pkg_hier.cc:158
+#: src/edit_pkg_hier.cc:176
 msgid "No hierarchy information to edit"
 msgstr ""
 
-#: src/edit_pkg_hier.cc:258
+#: src/edit_pkg_hier.cc:276
 msgid "Couldn't open for writing"
 msgstr ""
 
@@ -1500,39 +1504,39 @@
 msgid "Warning: could not lock the cache file.  Opening in read-only mode"
 msgstr ""
 
-#: src/generic/matchers.cc:797
+#: src/generic/matchers.cc:798
 msgid "Unmatched '('"
 msgstr ""
 
-#: src/generic/matchers.cc:887 src/generic/matchers.cc:968
+#: src/generic/matchers.cc:888 src/generic/matchers.cc:969
 #, c-format
 msgid "Unknown dependency type: %s"
 msgstr ""
 
-#: src/generic/matchers.cc:950
+#: src/generic/matchers.cc:951
 #, c-format
 msgid "Unknown action type: %s"
 msgstr ""
 
-#: src/generic/matchers.cc:1017
+#: src/generic/matchers.cc:1018
 #, c-format
 msgid "Unknown priority %s"
 msgstr ""
 
-#: src/generic/matchers.cc:1039
+#: src/generic/matchers.cc:1040
 #, c-format
 msgid "Unknown pattern type: %c"
 msgstr ""
 
-#: src/generic/matchers.cc:1084
+#: src/generic/matchers.cc:1105
 msgid "Unexpected empty expression"
 msgstr ""
 
-#: src/generic/matchers.cc:1119
+#: src/generic/matchers.cc:1143
 msgid "Badly formed expression"
 msgstr ""
 
-#: src/generic/matchers.cc:1148
+#: src/generic/matchers.cc:1175
 msgid "Unexpected ')'"
 msgstr ""
 
@@ -1553,7 +1557,7 @@
 msgid "Can't get value of $HOME, using TMPDIR (insecure)"
 msgstr ""
 
-#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:61
+#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:76
 #, c-format
 msgid "ChangeLog of %s"
 msgstr ""
@@ -1594,37 +1598,37 @@
 msgid "Reading task descriptions"
 msgstr ""
 
-#: src/load_config.cc:30
+#: src/load_config.cc:42
 #, c-format
-msgid "Invalid entry in color definition group: \"%s\""
+msgid "Unrecognized color name \"%s\""
 msgstr ""
 
-#: src/load_config.cc:32
+#: src/load_config.cc:69
 #, c-format
-msgid "Invalid tagless entry in color definition group: \"%s\""
+msgid "Unrecognized attribute name \"%s\""
 msgstr ""
 
-#: src/load_config.cc:34
+#: src/load_config.cc:106
 #, c-format
-msgid "Need exactly two colors in color definition \"%s\""
+msgid "Invalid entry in style definition group: \"%s\""
 msgstr ""
 
-#: src/load_config.cc:50
+#: src/load_config.cc:108
 #, c-format
-msgid "Can't parse foreground \"%s\"of color \"%s\""
+msgid "Invalid tagless entry in style definition group: \"%s\""
 msgstr ""
 
-#: src/load_config.cc:53
+#: src/load_config.cc:130
 #, c-format
-msgid "Can't parse background \"%s\" of color \"%s\""
+msgid "Unknown style attribute %s"
 msgstr ""
 
-#: src/load_config.cc:72 src/load_config.cc:74
+#: src/load_config.cc:153 src/load_config.cc:155
 #, c-format
 msgid "Invalid entry in keybinding group: \"%s\""
 msgstr ""
 
-#: src/load_config.cc:89
+#: src/load_config.cc:170
 #, c-format
 msgid "Ignoring invalid keybinding \"%s\" -> \"%s\""
 msgstr ""
@@ -2009,42 +2013,42 @@
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr ""
 
-#: src/main.cc:255
+#: src/main.cc:252
 #, c-format
 msgid "-o requires an argument of the form key=value, got %s"
 msgstr ""
 
-#: src/main.cc:301 src/main.cc:310
+#: src/main.cc:291 src/main.cc:300
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr ""
 
-#: src/main.cc:319
+#: src/main.cc:309
 msgid "Only one of -u and -i may be specified\n"
 msgstr ""
 
-#: src/main.cc:327
+#: src/main.cc:317
 msgid ""
 "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgstr ""
 
-#: src/main.cc:348
+#: src/main.cc:338
 msgid "-u and -i may not be specified with a command"
 msgstr ""
 
-#: src/main.cc:405
+#: src/main.cc:395
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr ""
 
-#: src/main.cc:412 src/main.cc:469
+#: src/main.cc:402 src/main.cc:450
 msgid "Internal error: uncaught 'out of solutions' exception.\n"
 msgstr ""
 
-#: src/main.cc:417 src/main.cc:474
+#: src/main.cc:407 src/main.cc:455
 msgid "Internal error: uncaught 'out of time' exception.\n"
 msgstr ""
 
-#: src/main.cc:424
+#: src/main.cc:414
 #, c-format
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
@@ -2075,7 +2079,7 @@
 msgid "Lost"
 msgstr ""
 
-#: src/mine/cmine.cc:119 src/ui.cc:1090
+#: src/mine/cmine.cc:119 src/ui.cc:1084
 msgid "Minesweeper"
 msgstr ""
 
@@ -2101,147 +2105,147 @@
 msgid "The number of mines must be a number"
 msgstr ""
 
-#: src/mine/cmine.cc:240
+#: src/mine/cmine.cc:238
 msgid "Setup custom game"
 msgstr ""
 
-#: src/mine/cmine.cc:243
+#: src/mine/cmine.cc:240
 msgid "Height of board: "
 msgstr ""
 
-#: src/mine/cmine.cc:247
+#: src/mine/cmine.cc:243
 msgid "Width of board: "
 msgstr ""
 
-#: src/mine/cmine.cc:251
+#: src/mine/cmine.cc:246
 msgid "Number of mines: "
 msgstr ""
 
-#: src/mine/cmine.cc:316
+#: src/mine/cmine.cc:305
 msgid "Choose difficulty level"
 msgstr ""
 
-#: src/mine/cmine.cc:318
+#: src/mine/cmine.cc:307
 msgid "Easy"
 msgstr ""
 
-#: src/mine/cmine.cc:319
+#: src/mine/cmine.cc:308
 msgid "Medium"
 msgstr ""
 
-#: src/mine/cmine.cc:320
+#: src/mine/cmine.cc:309
 msgid "Hard"
 msgstr ""
 
-#: src/mine/cmine.cc:321
+#: src/mine/cmine.cc:310
 msgid "Custom"
 msgstr ""
 
-#: src/mine/cmine.cc:411
+#: src/mine/cmine.cc:392
 msgid "You have won."
 msgstr ""
 
-#: src/mine/cmine.cc:414
+#: src/mine/cmine.cc:395
 msgid "You lose!"
 msgstr ""
 
-#: src/mine/cmine.cc:419
+#: src/mine/cmine.cc:400
 msgid "You die...  --More--"
 msgstr ""
 
-#: src/mine/cmine.cc:432
+#: src/mine/cmine.cc:413
 msgid "The spikes were poisoned!  The poison was deadly..  --More--"
 msgstr ""
 
-#: src/mine/cmine.cc:435
+#: src/mine/cmine.cc:416
 msgid "You land on a set of sharp iron spikes!  --More--"
 msgstr ""
 
-#: src/mine/cmine.cc:438
+#: src/mine/cmine.cc:419
 msgid "You fall into a pit!  --More--"
 msgstr ""
 
-#: src/mine/cmine.cc:441
+#: src/mine/cmine.cc:422
 msgid "KABOOM!  You step on a land mine.  --More--"
 msgstr ""
 
-#: src/mine/cmine.cc:446
+#: src/mine/cmine.cc:427
 msgid "The dart was poisoned!  The poison was deadly...  --More--"
 msgstr ""
 
-#: src/mine/cmine.cc:448
+#: src/mine/cmine.cc:429
 msgid ""
 "A little dart shoots out at you!  You are hit by a little dart!  --More--"
 msgstr ""
 
-#: src/mine/cmine.cc:452
+#: src/mine/cmine.cc:433
 msgid "You turn to stone... --More--"
 msgstr ""
 
-#: src/mine/cmine.cc:454
+#: src/mine/cmine.cc:435
 msgid "Touching the cockatrice corpse was a fatal mistake.  --More--"
 msgstr ""
 
-#: src/mine/cmine.cc:456
+#: src/mine/cmine.cc:437
 msgid "You feel here a cockatrice corpse.  --More--"
 msgstr ""
 
-#: src/mine/cmine.cc:460
+#: src/mine/cmine.cc:441
 msgid ""
 "Click!  You trigger a rolling boulder trap!  You are hit by a boulder! --"
 "More--"
 msgstr ""
 
-#: src/mine/cmine.cc:470
+#: src/mine/cmine.cc:451
 msgid "sleep"
 msgstr ""
 
-#: src/mine/cmine.cc:473
+#: src/mine/cmine.cc:454
 msgid "striking"
 msgstr ""
 
-#: src/mine/cmine.cc:476
+#: src/mine/cmine.cc:457
 msgid "death"
 msgstr ""
 
-#: src/mine/cmine.cc:479
+#: src/mine/cmine.cc:460
 msgid "polymorph"
 msgstr ""
 
-#: src/mine/cmine.cc:482
+#: src/mine/cmine.cc:463
 msgid "magic missile"
 msgstr ""
 
-#: src/mine/cmine.cc:485
+#: src/mine/cmine.cc:466
 msgid "secret door detection"
 msgstr ""
 
-#: src/mine/cmine.cc:488
+#: src/mine/cmine.cc:469
 msgid "invisibility"
 msgstr ""
 
-#: src/mine/cmine.cc:491
+#: src/mine/cmine.cc:472
 msgid "cold"
 msgstr ""
 
-#: src/mine/cmine.cc:497
+#: src/mine/cmine.cc:478
 #, c-format
 msgid "Your wand of %s breaks apart and explodes!  --More--"
 msgstr ""
 
-#: src/mine/cmine.cc:503
+#: src/mine/cmine.cc:484
 msgid "You are jolted by a surge of electricity!  --More--"
 msgstr ""
 
-#: src/mine/cmine.cc:607
+#: src/mine/cmine.cc:588
 msgid "Enter the filename to load: "
 msgstr ""
 
-#: src/mine/cmine.cc:614
+#: src/mine/cmine.cc:595
 msgid "Enter the filename to save: "
 msgstr ""
 
-#: src/mine/cmine.cc:624
+#: src/mine/cmine.cc:605
 msgid "mine-help.txt"
 msgstr ""
 
@@ -2249,7 +2253,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:1670
+#: src/pkg_columnizer.cc:84 src/ui.cc:1662
 msgid "Package"
 msgstr ""
 
@@ -3048,68 +3052,68 @@
 "s' if you are."
 msgstr ""
 
-#: src/pkg_item.cc:222 src/pkg_ver_item.cc:625
+#: src/pkg_item.cc:220 src/pkg_ver_item.cc:626
 #, c-format
 msgid "Information about %s"
 msgstr ""
 
-#: src/pkg_item.cc:224 src/pkg_ver_item.cc:627
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:628
 #, c-format
 msgid "%s info"
 msgstr ""
 
-#: src/pkg_item.cc:310
+#: src/pkg_item.cc:308
 #, c-format
 msgid "Available versions of %s"
 msgstr ""
 
-#: src/pkg_item.cc:313
+#: src/pkg_item.cc:311
 #, c-format
 msgid "%s versions"
 msgstr ""
 
-#: src/pkg_item.cc:325 src/pkg_ver_item.cc:655
+#: src/pkg_item.cc:323 src/pkg_ver_item.cc:656
 #, c-format
 msgid "Dependencies of %s"
 msgstr ""
 
-#: src/pkg_item.cc:327 src/pkg_ver_item.cc:657
+#: src/pkg_item.cc:325 src/pkg_ver_item.cc:658
 #, c-format
 msgid "%s deps"
 msgstr ""
 
-#: src/pkg_item.cc:338 src/pkg_ver_item.cc:667
+#: src/pkg_item.cc:336 src/pkg_ver_item.cc:668
 #, c-format
 msgid "Packages depending on %s"
 msgstr ""
 
-#: src/pkg_item.cc:340 src/pkg_ver_item.cc:669
+#: src/pkg_item.cc:338 src/pkg_ver_item.cc:670
 #, c-format
 msgid "%s reverse deps"
 msgstr ""
 
-#: src/pkg_item.cc:392 src/pkg_ver_item.cc:707
+#: src/pkg_item.cc:390 src/pkg_ver_item.cc:708
 #, c-format
 msgid "Reporting a bug in %s:\n"
 msgstr ""
 
-#: src/pkg_item.cc:414
+#: src/pkg_item.cc:412
 msgid ""
 "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:422
+#: src/pkg_item.cc:420
 #, c-format
 msgid "Reconfiguring %s\n"
 msgstr ""
 
-#: src/pkg_item.cc:447
+#: src/pkg_item.cc:445
 msgid "Hierarchy editor"
 msgstr ""
 
-#: src/pkg_item.cc:447
+#: src/pkg_item.cc:445
 msgid "Hierarchy Editor"
 msgstr ""
 
@@ -3142,20 +3146,20 @@
 msgid "Enter the new package sorting mechanism for this display: "
 msgstr ""
 
-#: src/pkg_view.cc:344
+#: src/pkg_view.cc:359
 msgid "make_package_view: error in arguments -- two main widgets??"
 msgstr ""
 
-#: src/pkg_view.cc:350
+#: src/pkg_view.cc:365
 msgid ""
 "make_package_view: error in arguments -- bad column list for static item"
 msgstr ""
 
-#: src/pkg_view.cc:443
+#: src/pkg_view.cc:458
 msgid "make_package_view: bad argument!"
 msgstr ""
 
-#: src/pkg_view.cc:495
+#: src/pkg_view.cc:510
 msgid "make_package_view: no main widget found"
 msgstr ""
 
@@ -3192,152 +3196,152 @@
 msgid " (provided by %F)"
 msgstr ""
 
-#: src/reason_fragment.cc:278
+#: src/reason_fragment.cc:275
 #, c-format
 msgid "%F%s %F %F"
 msgstr ""
 
-#: src/reason_fragment.cc:327
+#: src/reason_fragment.cc:324
 msgid ""
 "If you select a package, an explanation of its current state will appear in "
 "this space."
 msgstr ""
 
-#: src/reason_fragment.cc:361
+#: src/reason_fragment.cc:358
 msgid ""
 "%B%s%b was installed automatically;  it is being removed because all of the "
 "packages which depend upon it are being removed:"
 msgstr ""
 
-#: src/reason_fragment.cc:365
+#: src/reason_fragment.cc:362
 msgid "%B%s%b will be automatically removed because of dependency errors:"
 msgstr ""
 
-#: src/reason_fragment.cc:369
+#: src/reason_fragment.cc:366
 msgid ""
 "%B%s%b will be automatically installed to satisfy the following dependencies:"
 msgstr ""
 
-#: src/reason_fragment.cc:375 src/reason_fragment.cc:387
+#: src/reason_fragment.cc:372 src/reason_fragment.cc:384
 msgid ""
 "%B%s%b cannot be upgraded now, but if it could be, it would still be held at "
 "version %B%s%b."
 msgstr ""
 
-#: src/reason_fragment.cc:378
+#: src/reason_fragment.cc:375
 msgid ""
 "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the "
 "following dependencies:"
 msgstr ""
 
-#: src/reason_fragment.cc:390
+#: src/reason_fragment.cc:387
 msgid "%B%s%b is currently installed."
 msgstr ""
 
-#: src/reason_fragment.cc:396
+#: src/reason_fragment.cc:393
 msgid "%B%s%b is not currently installed."
 msgstr ""
 
-#: src/reason_fragment.cc:404
+#: src/reason_fragment.cc:401
 msgid "Some dependencies of %B%s%b are not satisfied:"
 msgstr ""
 
-#: src/reason_fragment.cc:408
+#: src/reason_fragment.cc:405
 msgid "%B%s%b will be downgraded."
 msgstr ""
 
-#: src/reason_fragment.cc:415
+#: src/reason_fragment.cc:412
 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b."
 msgstr ""
 
-#: src/reason_fragment.cc:419
+#: src/reason_fragment.cc:416
 msgid ""
 "%B%s%b could be upgraded to version %B%s%b, but it is being held at version %"
 "B%s%b."
 msgstr ""
 
-#: src/reason_fragment.cc:426
+#: src/reason_fragment.cc:423
 msgid "%B%s%b will be re-installed."
 msgstr ""
 
-#: src/reason_fragment.cc:430
+#: src/reason_fragment.cc:427
 msgid "%B%s%b will be installed."
 msgstr ""
 
-#: src/reason_fragment.cc:434
+#: src/reason_fragment.cc:431
 msgid "%B%s%b will be removed."
 msgstr ""
 
-#: src/reason_fragment.cc:439
+#: src/reason_fragment.cc:436
 msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b."
 msgstr ""
 
-#: src/reason_fragment.cc:475
+#: src/reason_fragment.cc:472
 msgid ""
 "The following packages depend on %B%s%b and will be broken by its removal:"
 msgstr ""
 
-#: src/reason_fragment.cc:478
+#: src/reason_fragment.cc:475
 msgid "The following packages depend on %B%s%b and are broken:"
 msgstr ""
 
-#: src/reason_fragment.cc:485
+#: src/reason_fragment.cc:482
 msgid ""
 "The following packages conflict with %B%s%b and will be broken by its "
 "installation:"
 msgstr ""
 
-#: src/reason_fragment.cc:518
+#: src/reason_fragment.cc:515
 msgid ""
 "The following packages depend on a version of %B%s%b other than the "
 "currently installed version of %B%s%b, or conflict with the currently "
 "installed version:"
 msgstr ""
 
-#: src/reason_fragment.cc:522
+#: src/reason_fragment.cc:519
 msgid ""
 "The following packages conflict with %B%s%b, or depend on a version of it "
 "which is not going to be installed."
 msgstr ""
 
-#: src/reason_fragment.cc:526
+#: src/reason_fragment.cc:523
 msgid "The following packages conflict with %B%s%b:"
 msgstr ""
 
-#: src/reason_fragment.cc:531
+#: src/reason_fragment.cc:528
 msgid ""
 "The following packages depend on a version of %B%s%b other than the "
 "currently installed version of %B%s%b:"
 msgstr ""
 
-#: src/reason_fragment.cc:535
+#: src/reason_fragment.cc:532
 msgid ""
 "The following packages depend on a version of %B%s%b which is not going to "
 "be installed."
 msgstr ""
 
-#: src/reason_fragment.cc:541
+#: src/reason_fragment.cc:538
 msgid "upgraded"
 msgstr ""
 
-#: src/reason_fragment.cc:541
+#: src/reason_fragment.cc:538
 msgid "downgraded"
 msgstr ""
 
-#: src/reason_fragment.cc:547
+#: src/reason_fragment.cc:544
 msgid ""
 "The following packages depend on the currently installed version of %B%s%b (%"
 "B%s%b), or conflict with the version it will be %s to (%B%s%b), and will be "
 "broken if it is %s."
 msgstr ""
 
-#: src/reason_fragment.cc:554
+#: src/reason_fragment.cc:551
 msgid ""
 "The following packages conflict with version %B%s%b of %B%s%b, and will be "
 "broken if it is %s."
 msgstr ""
 
-#: src/reason_fragment.cc:559
+#: src/reason_fragment.cc:556
 msgid ""
 "The following packages depend on version %B%s%b of %B%s%b, and will be "
 "broken if it is %s."
@@ -3378,27 +3382,31 @@
 msgid "Close"
 msgstr ""
 
-#: src/solution_fragment.cc:125
+#: src/solution_fragment.cc:134
 msgid "%BRemove%b the following packages:%n"
 msgstr ""
 
-#: src/solution_fragment.cc:135
+#: src/solution_fragment.cc:144
 msgid "%BInstall%b the following packages:%n"
 msgstr ""
 
-#: src/solution_fragment.cc:148
+#: src/solution_fragment.cc:157
 msgid "%BKeep%b the following packages at their current version:%n"
 msgstr ""
 
-#: src/solution_fragment.cc:161
+#: src/solution_fragment.cc:164
+msgid "Not Installed"
+msgstr ""
+
+#: src/solution_fragment.cc:177
 msgid "%BUpgrade%b the following packages:%n"
 msgstr ""
 
-#: src/solution_fragment.cc:176
+#: src/solution_fragment.cc:192
 msgid "%BDowngrade%b the following packages:%n"
 msgstr ""
 
-#: src/solution_fragment.cc:190
+#: src/solution_fragment.cc:206
 #, c-format
 msgid "Score is %d"
 msgstr ""
@@ -3426,563 +3434,567 @@
 msgid "W:"
 msgstr ""
 
-#: src/ui.cc:194
+#: src/ui.cc:193
 msgid "Search for:"
 msgstr ""
 
-#: src/ui.cc:262
+#: src/ui.cc:258
 msgid "You already are root!"
 msgstr ""
 
-#: src/ui.cc:360
+#: src/ui.cc:356
 msgid ""
 "Subprocess exited with an error -- did you type your password correctly?"
 msgstr ""
 
-#: src/ui.cc:388
+#: src/ui.cc:384
 msgid "Loading cache"
 msgstr ""
 
-#: src/ui.cc:410
+#: src/ui.cc:406
 msgid "Really quit Aptitude?"
 msgstr ""
 
-#: src/ui.cc:489
+#: src/ui.cc:485
 msgid "Really discard your personal settings and reload the defaults?"
 msgstr ""
 
-#: src/ui.cc:589 src/ui.cc:591 src/ui.cc:619 src/ui.cc:621
+#: src/ui.cc:585 src/ui.cc:587 src/ui.cc:615 src/ui.cc:617
 msgid "Packages"
 msgstr ""
 
-#: src/ui.cc:590 src/ui.cc:620
+#: src/ui.cc:586 src/ui.cc:616
 msgid "View available packages and choose actions to perform"
 msgstr ""
 
-#: src/ui.cc:667
+#: src/ui.cc:663
 msgid ""
-"%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
+"Aptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
 "BABSOLUTELY NO WARRANTY%b; for details see 'license' in the Help menu.  This "
 "is free software, and you are welcome to redistribute it under certain "
 "conditions; see 'license' for details."
 msgstr ""
 
-#: src/ui.cc:688
+#: src/ui.cc:684
 msgid "help.txt"
 msgstr ""
 
-#: src/ui.cc:704
+#: src/ui.cc:700
 msgid "README"
 msgstr ""
 
-#: src/ui.cc:786
+#: src/ui.cc:782
 msgid ""
-"%C%BWARNING%b: untrusted versions of the following packages will be "
-"installed!%n%nUntrusted packages could %Bcompromise your system's security%"
-"b.  You should only proceed with the installation if you are certain that "
-"this is what you want to do.%n%n"
+"%BWARNING%b: untrusted versions of the following packages will be installed!%"
+"n%nUntrusted packages could %Bcompromise your system's security%b.  You "
+"should only proceed with the installation if you are certain that this is "
+"what you want to do.%n%n"
+msgstr ""
+
+#: src/ui.cc:788
+msgid "  %S*%N %s [version %s]%n"
 msgstr ""
 
-#: src/ui.cc:800
+#: src/ui.cc:795
 msgid "Really Continue"
 msgstr ""
 
-#: src/ui.cc:802
+#: src/ui.cc:797
 msgid "Abort Installation"
 msgstr ""
 
-#: src/ui.cc:863
+#: src/ui.cc:858
 msgid "Preview of package installation"
 msgstr ""
 
-#: src/ui.cc:864
+#: src/ui.cc:859
 msgid "View and/or adjust the actions that will be performed"
 msgstr ""
 
-#: src/ui.cc:865
+#: src/ui.cc:860
 msgid "Preview"
 msgstr ""
 
-#: src/ui.cc:901
+#: src/ui.cc:896
 msgid "Some packages were broken and have been fixed:"
 msgstr ""
 
-#: src/ui.cc:907
+#: src/ui.cc:902
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:913
+#: src/ui.cc:908
 #, c-format
 msgid ""
-"Ran out of time while trying to resolver dependencies (press \"%s\" to try "
+"Ran out of time while trying to resolve dependencies (press \"%s\" to try "
 "harder)"
 msgstr ""
 
-#: src/ui.cc:959
+#: src/ui.cc:954
 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:962 src/ui.cc:1078
+#: src/ui.cc:957 src/ui.cc:1072
 msgid "Become root"
 msgstr ""
 
-#: src/ui.cc:964 src/ui.cc:1080
+#: src/ui.cc:959 src/ui.cc:1074
 msgid "Don't become root"
 msgstr ""
 
-#: src/ui.cc:969 src/ui.cc:1085
+#: src/ui.cc:964 src/ui.cc:1079
 msgid "A package-list update or install run is already taking place."
 msgstr ""
 
-#: src/ui.cc:996
+#: src/ui.cc:991
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr ""
 
-#: src/ui.cc:1002
+#: src/ui.cc:997
 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:1074
+#: src/ui.cc:1069
 msgid ""
 "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:1090 src/ui.cc:1377
+#: src/ui.cc:1084 src/ui.cc:1371
 msgid "Waste time trying to find mines"
 msgstr ""
 
-#: src/ui.cc:1097 src/ui.cc:1150
+#: src/ui.cc:1091 src/ui.cc:1144
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr ""
 
-#: src/ui.cc:1100
+#: src/ui.cc:1094
 msgid "Deleting downloaded files"
 msgstr ""
 
-#: src/ui.cc:1114
+#: src/ui.cc:1108
 msgid "Downloaded package files have been deleted"
 msgstr ""
 
-#: src/ui.cc:1175
+#: src/ui.cc:1169
 #, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr ""
 
-#: src/ui.cc:1247
+#: src/ui.cc:1241
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1252 src/ui.cc:1283
+#: src/ui.cc:1246 src/ui.cc:1277
 msgid "Ran out of time while trying to find a solution."
 msgstr ""
 
-#: src/ui.cc:1277
+#: src/ui.cc:1271
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1307
+#: src/ui.cc:1301
 #, c-format
 msgid "Unable to open %s"
 msgstr ""
 
-#: src/ui.cc:1313
+#: src/ui.cc:1307
 msgid "Error while dumping resolver state"
 msgstr ""
 
-#: src/ui.cc:1323
+#: src/ui.cc:1317
 msgid "File to which the resolver state should be dumped:"
 msgstr ""
 
-#: src/ui.cc:1353
+#: src/ui.cc:1347
 msgid "^Install/remove packages"
 msgstr ""
 
-#: src/ui.cc:1354
+#: src/ui.cc:1348
 msgid "Perform all pending installs and removals"
 msgstr ""
 
-#: src/ui.cc:1356
+#: src/ui.cc:1350
 msgid "^Update package list"
 msgstr ""
 
-#: src/ui.cc:1357
+#: src/ui.cc:1351
 msgid "Check for new versions of packages"
 msgstr ""
 
-#: src/ui.cc:1360
+#: src/ui.cc:1354
 msgid "^Forget new packages"
 msgstr ""
 
-#: src/ui.cc:1361
+#: src/ui.cc:1355
 msgid "Forget which packages are \"new\""
 msgstr ""
 
-#: src/ui.cc:1364
+#: src/ui.cc:1358
 msgid "^Clean package cache"
 msgstr ""
 
-#: src/ui.cc:1365
+#: src/ui.cc:1359
 msgid "Delete package files which were previously downloaded"
 msgstr ""
 
-#: src/ui.cc:1368
+#: src/ui.cc:1362
 msgid "Clean ^obsolete files"
 msgstr ""
 
-#: src/ui.cc:1369
+#: src/ui.cc:1363
 msgid "Delete package files which can no longer be downloaded"
 msgstr ""
 
-#: src/ui.cc:1372
+#: src/ui.cc:1366
 msgid "Mark ^Upgradable"
 msgstr ""
 
-#: src/ui.cc:1373
+#: src/ui.cc:1367
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr ""
 
-#: src/ui.cc:1376
+#: src/ui.cc:1370
 msgid "^Play Minesweeper"
 msgstr ""
 
-#: src/ui.cc:1379
+#: src/ui.cc:1373
 msgid "^Become root"
 msgstr ""
 
-#: src/ui.cc:1380
+#: src/ui.cc:1374
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
 "will be preserved"
 msgstr ""
 
-#: src/ui.cc:1383
+#: src/ui.cc:1377
 msgid "^Reload package cache"
 msgstr ""
 
-#: src/ui.cc:1384
+#: src/ui.cc:1378
 msgid "Reload the package cache"
 msgstr ""
 
-#: src/ui.cc:1390
+#: src/ui.cc:1384
 msgid "^Quit"
 msgstr ""
 
-#: src/ui.cc:1391
+#: src/ui.cc:1385
 msgid "Exit the program"
 msgstr ""
 
-#: src/ui.cc:1397 src/ui.cc:1669
+#: src/ui.cc:1391 src/ui.cc:1661
 msgid "Undo"
 msgstr ""
 
-#: src/ui.cc:1398
+#: src/ui.cc:1392
 msgid "Undo the last package operation or group of operations"
 msgstr ""
 
-#: src/ui.cc:1405
+#: src/ui.cc:1399
 msgid "^Install"
 msgstr ""
 
-#: src/ui.cc:1406
+#: src/ui.cc:1400
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr ""
 
-#: src/ui.cc:1409
+#: src/ui.cc:1403
 msgid "^Remove"
 msgstr ""
 
-#: src/ui.cc:1410
+#: src/ui.cc:1404
 msgid "Flag the currently selected package for removal"
 msgstr ""
 
-#: src/ui.cc:1413
+#: src/ui.cc:1407
 msgid "^Purge"
 msgstr ""
 
-#: src/ui.cc:1414
+#: src/ui.cc:1408
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr ""
 
-#: src/ui.cc:1417
+#: src/ui.cc:1411
 msgid "^Keep"
 msgstr ""
 
-#: src/ui.cc:1418
+#: src/ui.cc:1412
 msgid "Cancel any action on the selected package"
 msgstr ""
 
-#: src/ui.cc:1421
+#: src/ui.cc:1415
 msgid "^Hold"
 msgstr ""
 
-#: src/ui.cc:1422
+#: src/ui.cc:1416
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
 msgstr ""
 
-#: src/ui.cc:1425
+#: src/ui.cc:1419
 msgid "Mark ^Auto"
 msgstr ""
 
-#: src/ui.cc:1426
+#: src/ui.cc:1420
 msgid ""
 "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:1429
+#: src/ui.cc:1423
 msgid "Mark ^Manual"
 msgstr ""
 
-#: src/ui.cc:1430
+#: src/ui.cc:1424
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
 "removed unless you manually remove it"
 msgstr ""
 
-#: src/ui.cc:1433
+#: src/ui.cc:1427
 msgid "^Forbid Version"
 msgstr ""
 
-#: src/ui.cc:1434
+#: src/ui.cc:1428
 msgid ""
 "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:1438
+#: src/ui.cc:1432
 msgid "I^nformation"
 msgstr ""
 
-#: src/ui.cc:1439
+#: src/ui.cc:1433
 msgid "Display more information about the selected package"
 msgstr ""
 
-#: src/ui.cc:1442
+#: src/ui.cc:1436
 msgid "^Changelog"
 msgstr ""
 
-#: src/ui.cc:1443
+#: src/ui.cc:1437
 msgid "Display the Debian changelog of the selected package"
 msgstr ""
 
-#: src/ui.cc:1450
+#: src/ui.cc:1444
 msgid "^Find"
 msgstr ""
 
-#: src/ui.cc:1451
+#: src/ui.cc:1445
 msgid "Search for a package"
 msgstr ""
 
-#: src/ui.cc:1454
+#: src/ui.cc:1448
 msgid "Find ^Again"
 msgstr ""
 
-#: src/ui.cc:1455
+#: src/ui.cc:1449
 msgid "Repeat the last search"
 msgstr ""
 
-#: src/ui.cc:1459
+#: src/ui.cc:1453
 msgid "^Limit Display"
 msgstr ""
 
-#: src/ui.cc:1460
+#: src/ui.cc:1454
 msgid "Apply a filter to the package list"
 msgstr ""
 
-#: src/ui.cc:1463
+#: src/ui.cc:1457
 msgid "^Un-Limit Display"
 msgstr ""
 
-#: src/ui.cc:1464
+#: src/ui.cc:1458
 msgid "Remove the filter from the package list"
 msgstr ""
 
-#: src/ui.cc:1468
+#: src/ui.cc:1462
 msgid "Find ^Broken"
 msgstr ""
 
-#: src/ui.cc:1469
+#: src/ui.cc:1463
 msgid "Find the next package with unsatisfied dependencies"
 msgstr ""
 
-#: src/ui.cc:1476
+#: src/ui.cc:1470
 msgid "^UI options"
 msgstr ""
 
-#: src/ui.cc:1477
+#: src/ui.cc:1471
 msgid "Change the settings which affect the user interface"
 msgstr ""
 
-#: src/ui.cc:1480
+#: src/ui.cc:1474
 msgid "^Dependency handling"
 msgstr ""
 
-#: src/ui.cc:1481
+#: src/ui.cc:1475
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr ""
 
-#: src/ui.cc:1484
+#: src/ui.cc:1478
 msgid "^Miscellaneous"
 msgstr ""
 
-#: src/ui.cc:1485
+#: src/ui.cc:1479
 msgid "Change miscellaneous program settings"
 msgstr ""
 
-#: src/ui.cc:1490
+#: src/ui.cc:1484
 msgid "^Revert options"
 msgstr ""
 
-#: src/ui.cc:1491
+#: src/ui.cc:1485
 msgid "Reset all settings to the system defaults"
 msgstr ""
 
-#: src/ui.cc:1502
+#: src/ui.cc:1496
 msgid "^Next"
 msgstr ""
 
-#: src/ui.cc:1503
+#: src/ui.cc:1497
 msgid "View next display"
 msgstr ""
 
-#: src/ui.cc:1506
+#: src/ui.cc:1500
 msgid "^Prev"
 msgstr ""
 
-#: src/ui.cc:1507
+#: src/ui.cc:1501
 msgid "View previous display"
 msgstr ""
 
-#: src/ui.cc:1510
+#: src/ui.cc:1504
 msgid "^Close"
 msgstr ""
 
-#: src/ui.cc:1511
+#: src/ui.cc:1505
 msgid "Close this display"
 msgstr ""
 
-#: src/ui.cc:1516
+#: src/ui.cc:1510
 msgid "New Package ^View"
 msgstr ""
 
-#: src/ui.cc:1517
+#: src/ui.cc:1511
 msgid "Create a new default package view"
 msgstr ""
 
-#: src/ui.cc:1520
+#: src/ui.cc:1514
 msgid "New Categorical ^Browser"
 msgstr ""
 
-#: src/ui.cc:1522
+#: src/ui.cc:1516
 msgid "Browse packages by category"
 msgstr ""
 
-#: src/ui.cc:1530
+#: src/ui.cc:1524
 msgid "^About"
 msgstr ""
 
-#: src/ui.cc:1531
+#: src/ui.cc:1525
 msgid "View information about this program"
 msgstr ""
 
-#: src/ui.cc:1534
+#: src/ui.cc:1528
 msgid "^Help"
 msgstr ""
 
-#: src/ui.cc:1535
+#: src/ui.cc:1529
 msgid "View the on-line help"
 msgstr ""
 
-#: src/ui.cc:1537
+#: src/ui.cc:1531
 msgid "User's ^Manual"
 msgstr ""
 
-#: src/ui.cc:1538
+#: src/ui.cc:1532
 msgid "View the detailed program manual"
 msgstr ""
 
-#: src/ui.cc:1541
+#: src/ui.cc:1535
 msgid "^FAQ"
 msgstr ""
 
-#: src/ui.cc:1542
+#: src/ui.cc:1536
 msgid "View a list of frequently asked questions"
 msgstr ""
 
-#: src/ui.cc:1545
+#: src/ui.cc:1539
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1546
+#: src/ui.cc:1540
 msgid "View the important changes made in each version of "
 msgstr ""
 
-#: src/ui.cc:1549
+#: src/ui.cc:1543
 msgid "^License"
 msgstr ""
 
-#: src/ui.cc:1550
+#: src/ui.cc:1544
 msgid "View the terms under which you may copy the program"
 msgstr ""
 
-#: src/ui.cc:1668
+#: src/ui.cc:1660
 msgid "Actions"
 msgstr ""
 
-#: src/ui.cc:1671
+#: src/ui.cc:1663
 msgid "Search"
 msgstr ""
 
-#: src/ui.cc:1672
+#: src/ui.cc:1664
 msgid "Options"
 msgstr ""
 
-#: src/ui.cc:1673
+#: src/ui.cc:1665
 msgid "Views"
 msgstr ""
 
-#: src/ui.cc:1674
+#: src/ui.cc:1666
 msgid "Help"
 msgstr ""
 
-#: src/ui.cc:1734
+#: src/ui.cc:1726
 #, c-format
 msgid ""
 "%s: Menu  %s: Help  %s: Quit  %s: Update  %s: Download/Install/Remove Pkgs"
 msgstr ""
 
-#: src/ui.cc:2003 src/vscreen/vscreen.cc:281
+#: src/ui.cc:1996 src/vscreen/vscreen.cc:281
 msgid "yes_key"
 msgstr ""
 
-#: src/ui.cc:2004 src/vscreen/vscreen.cc:282
+#: src/ui.cc:1997 src/vscreen/vscreen.cc:282
 msgid "no_key"
 msgstr ""
 
-#: src/view_changelog.cc:46
+#: src/view_changelog.cc:61
 msgid "You can only view changelogs of official Debian packages."
 msgstr ""
 
-#: src/view_changelog.cc:52
+#: src/view_changelog.cc:67
 msgid "Downloading Changelog"
 msgstr ""
 
-#: src/view_changelog.cc:54
+#: src/view_changelog.cc:69
 msgid "Download Changelog"
 msgstr ""
 
-#: src/view_changelog.cc:63
+#: src/view_changelog.cc:78
 #, c-format
 msgid "%s changes"
 msgstr ""

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	Sun Jun 12 21:04:47 2005
@@ -2,14 +2,14 @@
 # translation of aptitude_po.po to Arabeyes
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
-# Ossama M. Khayat <okhayat at yahoo.com>, 2004.
+# Ossama M. Khayat <okhayat at yahoo.com>, 2004, 2005.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: aptitude_po\n"
 "Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-05-01 14:08-0400\n"
-"PO-Revision-Date: 2004-11-27 23:06+0300\n"
+"POT-Creation-Date: 2005-06-12 22:42+0200\n"
+"PO-Revision-Date: 2005-04-07 00:23+0300\n"
 "Last-Translator: Ossama M. Khayat <okhayat at yahoo.com>\n"
 "Language-Team: Arabic <support at arabeyes.org>\n"
 "MIME-Version: 1.0\n"
@@ -148,14 +148,14 @@
 msgid "Automatically remove unused packages matching this filter"
 msgstr "إزالة الحزم الغير مستخدمة والتي توافق عامل التصفية تلقائياً"
 
-#: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:219 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
-#: src/vscreen/vs_util.cc:328
+#: src/apt_options.cc:240 src/mine/cmine.cc:249 src/mine/cmine.cc:312
+#: src/ui.cc:215 src/vscreen/vs_util.cc:77 src/vscreen/vs_util.cc:90
+#: src/vscreen/vs_util.cc:264 src/vscreen/vs_util.cc:298
 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:328
+#: src/apt_options.cc:241 src/download_list.cc:69 src/mine/cmine.cc:250
+#: src/mine/cmine.cc:313 src/vscreen/vs_util.cc:298
 msgid "Cancel"
 msgstr "إلغاء"
 
@@ -236,15 +236,15 @@
 msgid "%s: Previous"
 msgstr ""
 
-#: src/broken_indicator.cc:233
+#: src/broken_indicator.cc:232
 #, c-format
-msgid "%CSolution search failed.  %s: try harder"
+msgid "Solution search failed.  %s: try harder"
 msgstr ""
 
-#: src/broken_indicator.cc:239
-#, c-format
-msgid "%CUnable to resolve dependencies."
-msgstr ""
+#: src/broken_indicator.cc:237
+#, fuzzy
+msgid "Unable to resolve dependencies."
+msgstr "تعذر فتح %s للكتابة"
 
 #: src/cmdline/cmdline_action.cc:36
 #, c-format
@@ -607,30 +607,30 @@
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
-#: src/vscreen/vs_util.cc:212
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:165
+#: src/vscreen/vs_util.cc:202
 msgid "Yes"
 msgstr "نعم"
 
-#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
-#: src/vscreen/vs_util.cc:212
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:165
+#: src/vscreen/vs_util.cc:202
 msgid "No"
 msgstr "لا"
 
 #: src/cmdline/cmdline_prompt.cc:388
 #, c-format
 msgid "Do you want to ignore this warning and proceed anyway?\n"
-msgstr ""
+msgstr "هل تريد تجاهل هذا التحذير والاستمرار على أي حال؟\n"
 
 #: src/cmdline/cmdline_prompt.cc:389
-#, fuzzy, c-format
+#, c-format
 msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
-msgstr "للاستمرار، اكتب الجملة \"%s\":\n"
+msgstr "للاستمرار، اكتب \"%s\"; للتجاهل، اكتب \"%s\": "
 
 #: src/cmdline/cmdline_prompt.cc:400
 #, c-format
 msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
-msgstr ""
+msgstr "لا يمكن التعرف على المدخلات.  أدخل إما \"%s\" أو \"%s\".\n"
 
 #: src/cmdline/cmdline_prompt.cc:499
 #, c-format
@@ -920,7 +920,7 @@
 msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:212
+#: src/cmdline/cmdline_resolver.cc:212 src/cmdline/cmdline_resolver.cc:285
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
@@ -975,196 +975,201 @@
 msgid "The following packages have unmet dependencies:\n"
 msgstr "الحزم التالية لها معتمدات غير متوفرة:\n"
 
-#: src/cmdline/cmdline_show.cc:133
+#: src/cmdline/cmdline_show.cc:119 src/cmdline/cmdline_show.cc:305
+#: src/solution_fragment.cc:65
+msgid "<NULL>"
+msgstr ""
+
+#: src/cmdline/cmdline_show.cc:138
 msgid "not installed"
 msgstr "غير مثبتة"
 
-#: src/cmdline/cmdline_show.cc:135 src/pkg_columnizer.cc:231
+#: src/cmdline/cmdline_show.cc:140 src/pkg_columnizer.cc:231
 #: src/pkg_ver_item.cc:225
 msgid "unpacked"
 msgstr "مُستخرجة"
 
-#: src/cmdline/cmdline_show.cc:137
+#: src/cmdline/cmdline_show.cc:142
 msgid "partially configured"
 msgstr "مُهيّئة جزئياً"
 
-#: src/cmdline/cmdline_show.cc:139
+#: src/cmdline/cmdline_show.cc:144
 msgid "partially installed"
 msgstr "مُثبّتة جزئياً"
 
-#: src/cmdline/cmdline_show.cc:141
+#: src/cmdline/cmdline_show.cc:146
 msgid "not installed (configuration files remain)"
 msgstr "غير مثبتة (بقيت ملفات التهيئة)"
 
-#: src/cmdline/cmdline_show.cc:143 src/pkg_columnizer.cc:239
+#: src/cmdline/cmdline_show.cc:148 src/pkg_columnizer.cc:239
 #: src/pkg_ver_item.cc:233
 msgid "installed"
 msgstr "مُثبّتة"
 
-#: src/cmdline/cmdline_show.cc:152
+#: src/cmdline/cmdline_show.cc:157
 msgid "not a real package"
 msgstr "ليست حزمة حقيقيّة"
 
-#: src/cmdline/cmdline_show.cc:165
+#: src/cmdline/cmdline_show.cc:170
 msgid " [held]"
 msgstr " [أبقيت]"
 
-#: src/cmdline/cmdline_show.cc:174
+#: src/cmdline/cmdline_show.cc:179
 #, c-format
 msgid "%s; version %s will be installed"
 msgstr "%s، النسخة %s سيتم تثبيتها"
 
-#: src/cmdline/cmdline_show.cc:178
+#: src/cmdline/cmdline_show.cc:183
 #, c-format
 msgid "%s; version %s will be installed automatically"
 msgstr "%s، النسخة %s سيتم تثبيتها تلقائياً"
 
-#: src/cmdline/cmdline_show.cc:184 src/cmdline/cmdline_show.cc:199
+#: src/cmdline/cmdline_show.cc:189 src/cmdline/cmdline_show.cc:204
 #, c-format
 msgid "%s; will be purged"
 msgstr "%s، سيتم إزالتها بالكامل"
 
-#: src/cmdline/cmdline_show.cc:197
+#: src/cmdline/cmdline_show.cc:202
 #, c-format
 msgid "%s; will be purged because nothing depends on it"
 msgstr "%s، سيتم إزالتها بالكامل لعدم اعتماد أية حزمة عليها"
 
-#: src/cmdline/cmdline_show.cc:204
+#: src/cmdline/cmdline_show.cc:209
 #, c-format
 msgid "%s; will be removed because nothing depends on it"
 msgstr "%s، ستتم إزالتها لعدم اعتماد أية حزمة عليها:"
 
-#: src/cmdline/cmdline_show.cc:206
+#: src/cmdline/cmdline_show.cc:211
 #, c-format
 msgid "%s; will be removed"
 msgstr "%s، سيتم إزالتها"
 
-#: src/cmdline/cmdline_show.cc:220
+#: src/cmdline/cmdline_show.cc:225
 #, c-format
 msgid "%s%s; will be downgraded [%s -> %s]"
 msgstr "%s%s، سيتم تثبيطها [%s -> %s]"
 
-#: src/cmdline/cmdline_show.cc:223
+#: src/cmdline/cmdline_show.cc:228
 #, c-format
 msgid "%s%s; will be upgraded [%s -> %s]"
 msgstr "%s%s، سيتم ترقيتها [%s -> %s]"
 
-#: src/cmdline/cmdline_show.cc:235 src/cmdline/cmdline_show.cc:256
+#: src/cmdline/cmdline_show.cc:240 src/cmdline/cmdline_show.cc:261
 msgid "Package: "
 msgstr "الحزمة: "
 
-#: src/cmdline/cmdline_show.cc:236 src/cmdline/cmdline_show.cc:264
+#: src/cmdline/cmdline_show.cc:241 src/cmdline/cmdline_show.cc:269
 #: src/pkg_columnizer.cc:87
 msgid "State"
-msgstr ""
+msgstr "الوضع"
 
-#: src/cmdline/cmdline_show.cc:237 src/cmdline/cmdline_show.cc:318
+#: src/cmdline/cmdline_show.cc:242 src/cmdline/cmdline_show.cc:325
 msgid "Provided by"
 msgstr "توفّرها"
 
-#: src/cmdline/cmdline_show.cc:258 src/pkg_info_screen.cc:105
+#: src/cmdline/cmdline_show.cc:263 src/pkg_info_screen.cc:105
 msgid "Essential: "
 msgstr "أساسي: "
 
-#: src/cmdline/cmdline_show.cc:258 src/cmdline/cmdline_show.cc:262
-#: src/cmdline/cmdline_show.cc:273 src/pkg_info_screen.cc:105
+#: src/cmdline/cmdline_show.cc:263 src/cmdline/cmdline_show.cc:267
+#: src/cmdline/cmdline_show.cc:278 src/pkg_info_screen.cc:105
 msgid "yes"
 msgstr "نعم"
 
-#: src/cmdline/cmdline_show.cc:262
+#: src/cmdline/cmdline_show.cc:267
 msgid "New"
 msgstr "جديدة"
 
-#: src/cmdline/cmdline_show.cc:267
+#: src/cmdline/cmdline_show.cc:272
 msgid "Forbidden version"
 msgstr "نسخة ممنوعة"
 
-#: src/cmdline/cmdline_show.cc:271
+#: src/cmdline/cmdline_show.cc:276
 msgid "Automatically installed"
 msgstr "مُثبّتة تلقائياً"
 
-#: src/cmdline/cmdline_show.cc:273
+#: src/cmdline/cmdline_show.cc:278
 msgid "no"
 msgstr "لا"
 
-#: src/cmdline/cmdline_show.cc:275
+#: src/cmdline/cmdline_show.cc:280
 msgid "Version: "
 msgstr "النسخة: "
 
-#: src/cmdline/cmdline_show.cc:276 src/pkg_info_screen.cc:113
+#: src/cmdline/cmdline_show.cc:281 src/pkg_info_screen.cc:113
 msgid "Priority: "
 msgstr "الأولوية: "
 
-#: src/cmdline/cmdline_show.cc:277 src/cmdline/cmdline_show.cc:279
-#: src/cmdline/cmdline_show.cc:288
+#: src/cmdline/cmdline_show.cc:282 src/cmdline/cmdline_show.cc:284
+#: src/cmdline/cmdline_show.cc:293
 msgid "N/A"
 msgstr "لا تنطبق"
 
-#: src/cmdline/cmdline_show.cc:278 src/pkg_info_screen.cc:114
+#: src/cmdline/cmdline_show.cc:283 src/pkg_info_screen.cc:114
 msgid "Section: "
 msgstr "المقطع: "
 
-#: src/cmdline/cmdline_show.cc:280 src/pkg_info_screen.cc:115
+#: src/cmdline/cmdline_show.cc:285 src/pkg_info_screen.cc:115
 msgid "Maintainer: "
-msgstr ""
+msgstr "المسؤول:"
 
-#: src/cmdline/cmdline_show.cc:283
+#: src/cmdline/cmdline_show.cc:288
 msgid "Uncompressed Size: "
 msgstr "الحجم الغير مرصوص: "
 
-#: src/cmdline/cmdline_show.cc:287
+#: src/cmdline/cmdline_show.cc:292
 msgid "Architecture: "
 msgstr "البنية: "
 
-#: src/cmdline/cmdline_show.cc:289
+#: src/cmdline/cmdline_show.cc:294
 msgid "Compressed Size: "
 msgstr "الحجم المرصوص: "
 
-#: src/cmdline/cmdline_show.cc:291
+#: src/cmdline/cmdline_show.cc:296
 msgid "Filename: "
 msgstr "اسم الملف: "
 
-#: src/cmdline/cmdline_show.cc:293
+#: src/cmdline/cmdline_show.cc:298
 msgid "MD5sum: "
 msgstr "MD5sum: "
 
-#: src/cmdline/cmdline_show.cc:297 src/cmdline/cmdline_show.cc:299
+#: src/cmdline/cmdline_show.cc:302 src/cmdline/cmdline_show.cc:305
 msgid "Archive"
 msgstr "أرشيف"
 
-#: src/cmdline/cmdline_show.cc:303
+#: src/cmdline/cmdline_show.cc:310
 msgid "Depends"
 msgstr "يعتمد على"
 
-#: src/cmdline/cmdline_show.cc:305
+#: src/cmdline/cmdline_show.cc:312
 msgid "PreDepends"
 msgstr "يعتمد مسبقاً على"
 
-#: src/cmdline/cmdline_show.cc:307
+#: src/cmdline/cmdline_show.cc:314
 msgid "Recommends"
 msgstr "يوصي"
 
-#: src/cmdline/cmdline_show.cc:309
+#: src/cmdline/cmdline_show.cc:316
 msgid "Suggests"
 msgstr "يقترح"
 
-#: src/cmdline/cmdline_show.cc:311
+#: src/cmdline/cmdline_show.cc:318
 msgid "Conflicts"
 msgstr "يُعارض"
 
-#: src/cmdline/cmdline_show.cc:313
+#: src/cmdline/cmdline_show.cc:320
 msgid "Replaces"
 msgstr "يستبدل"
 
-#: src/cmdline/cmdline_show.cc:315
+#: src/cmdline/cmdline_show.cc:322
 msgid "Obsoletes"
 msgstr "يُلغي"
 
-#: src/cmdline/cmdline_show.cc:317
+#: src/cmdline/cmdline_show.cc:324
 msgid "Provides"
 msgstr "يُوفّر"
 
-#: src/cmdline/cmdline_show.cc:321 src/pkg_info_screen.cc:97
+#: src/cmdline/cmdline_show.cc:328 src/pkg_info_screen.cc:97
 msgid "Description: "
 msgstr "الوصف: "
 
@@ -1174,7 +1179,6 @@
 msgstr "سيقوم بتنزيل/تثبيت/إزالة الحزم.\n"
 
 #: src/cmdline/cmdline_simulate.cc:48
-#, fuzzy
 msgid "Internal Error, Ordering didn't finish"
 msgstr "خطأ داخلي، لم ينته الترتيب"
 
@@ -1208,32 +1212,32 @@
 msgid "You cannot specify both an archive and a version for a package\n"
 msgstr "لا يمكنك تحديد كل من الأرشيف والنسخة للحزمة\n"
 
-#: src/dep_item.cc:137
+#: src/dep_item.cc:139
 msgid "UNSATISFIED"
-msgstr ""
+msgstr "غير مستوفى"
 
-#: src/dep_item.cc:137 src/reason_fragment.cc:247
+#: src/dep_item.cc:139 src/reason_fragment.cc:244
 msgid "UNAVAILABLE"
 msgstr "غير متوفر"
 
-#: src/download_bar.cc:56 src/download_list.cc:263 src/download_screen.cc:57
+#: src/download_bar.cc:56 src/download_list.cc:266 src/download_screen.cc:57
 #, c-format
 msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
 msgstr "رجاء إدخال القرص المُعنون \"%s\" في السواقة \"%s\""
 
-#: src/download_bar.cc:77 src/generic/acqprogress.cc:63
+#: src/download_bar.cc:75 src/generic/acqprogress.cc:63
 msgid "Hit "
 msgstr "زيارة "
 
-#: src/download_bar.cc:90
+#: src/download_bar.cc:88
 msgid "Downloading "
 msgstr "تحميل "
 
-#: src/download_bar.cc:103
+#: src/download_bar.cc:101
 msgid "Got "
 msgstr "حُصل على "
 
-#: src/download_bar.cc:157
+#: src/download_bar.cc:155
 msgid "Downloading..."
 msgstr "جاري التحميل..."
 
@@ -1261,7 +1265,7 @@
 msgid "Couldn't clean out list directories"
 msgstr "لم يمكن تنظيف أدلة اللوائح"
 
-#: src/download.cc:177 src/ui.cc:1153
+#: src/download.cc:177 src/ui.cc:1147
 msgid "Deleting obsolete downloaded files"
 msgstr "حذف الملفات المنزلة الملغاة"
 
@@ -1387,14 +1391,14 @@
 
 #: src/download.cc:415
 msgid "Unable to correct for unavailable packages"
-msgstr ""
+msgstr "تعذر التصحيح من أجل الحزم الغير متوفرة"
 
 #: src/download.cc:467
 msgid ""
 "Ack!  Something bad happened while installing packages.  Trying to recover:"
-msgstr ""
+msgstr "للعلم!  حدث شيء سيء أثناء تثبيت الحزم.  محاولة الاسترجاع:"
 
-#: src/download.cc:477 src/pkg_item.cc:432
+#: src/download.cc:477 src/pkg_item.cc:430
 msgid "Press return to continue.\n"
 msgstr "اضغط مفتاح الإدخال للاستمرار.\n"
 
@@ -1403,17 +1407,17 @@
 "Could not regain the system lock!  (Perhaps another apt or dpkg is running?)"
 msgstr ""
 
-#: src/download_item.cc:66 src/download_item.cc:70 src/download_item.cc:100
+#: src/download_item.cc:70 src/download_item.cc:74 src/download_item.cc:104
 #: src/generic/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr " [يعمل]"
 
-#: src/download_item.cc:104 src/download_list.cc:283
+#: src/download_item.cc:108 src/download_list.cc:284
 msgid "[Hit]"
 msgstr "[زيارة]"
 
-#: src/download_item.cc:104 src/download_list.cc:303
+#: src/download_item.cc:108 src/download_list.cc:304
 msgid "[Downloaded]"
 msgstr "[مُنزل]"
 
@@ -1427,34 +1431,34 @@
 msgid "%n%nSome files were not downloaded successfully."
 msgstr ""
 
-#: src/download_list.cc:68
+#: src/download_list.cc:66
 msgid "Continue"
 msgstr "استمرار"
 
-#: src/download_list.cc:175 src/download_screen.cc:203
+#: src/download_list.cc:178 src/download_screen.cc:203
 msgid "Total Progress: "
 msgstr "التقدّم الكلي: "
 
-#: src/download_list.cc:194 src/download_screen.cc:218
+#: src/download_list.cc:197 src/download_screen.cc:218
 #, c-format
 msgid " [ %i%% ] (%sB/s, %s remaining)"
 msgstr " [ %i%% ] (%s بايت/ثانية، %s متبقية)"
 
-#: src/download_list.cc:196
+#: src/download_list.cc:199
 #, c-format
 msgid " [ %i%% ] (stalled)"
 msgstr " [ %i%% ] (عالق)"
 
-#: src/download_list.cc:198
+#: src/download_list.cc:201
 #, c-format
 msgid " [ %i%% ]"
 msgstr " [ %i%% ]"
 
-#: src/download_list.cc:323
+#: src/download_list.cc:324
 msgid "[IGNORED]"
 msgstr "[متجاهَل]"
 
-#: src/download_list.cc:329
+#: src/download_list.cc:330
 msgid "[ERROR]"
 msgstr "[خطأ]"
 
@@ -1463,11 +1467,11 @@
 msgid "Downloaded %sB in %ss (%sB/s)."
 msgstr "تم تنزيل %s بايت خلال %ss (%s بايت/ثانية)."
 
-#: src/edit_pkg_hier.cc:158
+#: src/edit_pkg_hier.cc:176
 msgid "No hierarchy information to edit"
 msgstr "لا يوجد معلومات هيكلة لتحريرها"
 
-#: src/edit_pkg_hier.cc:258
+#: src/edit_pkg_hier.cc:276
 msgid "Couldn't open for writing"
 msgstr "لم يمكن الفتح للكتابة"
 
@@ -1508,7 +1512,7 @@
 #: src/generic/aptcache.cc:321 src/generic/aptcache.cc:395
 #: src/generic/aptcache.cc:398
 msgid "Initializing package states"
-msgstr ""
+msgstr "تمهيد أحوال الحزم"
 
 #: src/generic/aptcache.cc:509
 msgid "Cannot open Aptitude state file"
@@ -1561,39 +1565,39 @@
 msgid "Warning: could not lock the cache file.  Opening in read-only mode"
 msgstr ""
 
-#: src/generic/matchers.cc:797
+#: src/generic/matchers.cc:798
 msgid "Unmatched '('"
 msgstr "'(' غير مُطابق"
 
-#: src/generic/matchers.cc:887 src/generic/matchers.cc:968
+#: src/generic/matchers.cc:888 src/generic/matchers.cc:969
 #, c-format
 msgid "Unknown dependency type: %s"
 msgstr "نوع معتمد مجهول: %s"
 
-#: src/generic/matchers.cc:950
+#: src/generic/matchers.cc:951
 #, c-format
 msgid "Unknown action type: %s"
 msgstr "نوع عمل مجهول: %s"
 
-#: src/generic/matchers.cc:1017
+#: src/generic/matchers.cc:1018
 #, c-format
 msgid "Unknown priority %s"
 msgstr "أولوية مجهولة %s"
 
-#: src/generic/matchers.cc:1039
+#: src/generic/matchers.cc:1040
 #, c-format
 msgid "Unknown pattern type: %c"
 msgstr "نوع صيغة مجهول: %c"
 
-#: src/generic/matchers.cc:1084
+#: src/generic/matchers.cc:1105
 msgid "Unexpected empty expression"
 msgstr "صيغة فارغة غير متوقعة"
 
-#: src/generic/matchers.cc:1119
+#: src/generic/matchers.cc:1143
 msgid "Badly formed expression"
 msgstr "صيغة مشكلة بشكل سيء"
 
-#: src/generic/matchers.cc:1148
+#: src/generic/matchers.cc:1175
 msgid "Unexpected ')'"
 msgstr "')' غير متوقع"
 
@@ -1616,7 +1620,7 @@
 msgid "Can't get value of $HOME, using TMPDIR (insecure)"
 msgstr "لا يمكن الحصول على قيمة $HOME، استخدام TMPDIR (غير آمن)"
 
-#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:61
+#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:76
 #, c-format
 msgid "ChangeLog of %s"
 msgstr "سجل تغييرات %s"
@@ -1657,37 +1661,37 @@
 msgid "Reading task descriptions"
 msgstr "قراءة أوصاف المهمة"
 
-#: src/load_config.cc:30
-#, c-format
-msgid "Invalid entry in color definition group: \"%s\""
-msgstr "مُدخل غير صالح في مجموعة تعريف الألوان: \"%s\""
+#: src/load_config.cc:42
+#, fuzzy, c-format
+msgid "Unrecognized color name \"%s\""
+msgstr "مهام غير معروفة"
 
-#: src/load_config.cc:32
-#, c-format
-msgid "Invalid tagless entry in color definition group: \"%s\""
-msgstr ""
+#: src/load_config.cc:69
+#, fuzzy, c-format
+msgid "Unrecognized attribute name \"%s\""
+msgstr "مهام غير معروفة"
 
-#: src/load_config.cc:34
-#, c-format
-msgid "Need exactly two colors in color definition \"%s\""
-msgstr "بحاجة إلى لونين بالضبط في تعريف اللون \"%s\""
+#: src/load_config.cc:106
+#, fuzzy, c-format
+msgid "Invalid entry in style definition group: \"%s\""
+msgstr "مُدخل غير صالح في مجموعة تعريف الألوان: \"%s\""
 
-#: src/load_config.cc:50
-#, c-format
-msgid "Can't parse foreground \"%s\"of color \"%s\""
-msgstr "لا يمكن إعراب الواجهة \"%s\" للّون \"%s\""
+#: src/load_config.cc:108
+#, fuzzy, c-format
+msgid "Invalid tagless entry in style definition group: \"%s\""
+msgstr "مُدخل غير صالح في مجموعة تعريف الألوان: \"%s\""
 
-#: src/load_config.cc:53
-#, c-format
-msgid "Can't parse background \"%s\" of color \"%s\""
-msgstr "لا يمكن إعراب الخلفيّة \"%s\" للّون \"%s\""
+#: src/load_config.cc:130
+#, fuzzy, c-format
+msgid "Unknown style attribute %s"
+msgstr "نوع عمل مجهول: %s"
 
-#: src/load_config.cc:72 src/load_config.cc:74
+#: src/load_config.cc:153 src/load_config.cc:155
 #, c-format
 msgid "Invalid entry in keybinding group: \"%s\""
 msgstr "مُدخل غير صالح في مجموعة ربط الأحرف: \"%s\""
 
-#: src/load_config.cc:89
+#: src/load_config.cc:170
 #, c-format
 msgid "Ignoring invalid keybinding \"%s\" -> \"%s\""
 msgstr "تجاهل ربط الأحرف الغير صالح \"%s\" -> \"%s\""
@@ -2072,42 +2076,42 @@
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr ""
 
-#: src/main.cc:255
+#: src/main.cc:252
 #, c-format
 msgid "-o requires an argument of the form key=value, got %s"
 msgstr ""
 
-#: src/main.cc:301 src/main.cc:310
+#: src/main.cc:291 src/main.cc:300
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr ""
 
-#: src/main.cc:319
+#: src/main.cc:309
 msgid "Only one of -u and -i may be specified\n"
 msgstr ""
 
-#: src/main.cc:327
+#: src/main.cc:317
 msgid ""
 "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgstr ""
 
-#: src/main.cc:348
+#: src/main.cc:338
 msgid "-u and -i may not be specified with a command"
 msgstr ""
 
-#: src/main.cc:405
+#: src/main.cc:395
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr ""
 
-#: src/main.cc:412 src/main.cc:469
+#: src/main.cc:402 src/main.cc:450
 msgid "Internal error: uncaught 'out of solutions' exception.\n"
 msgstr ""
 
-#: src/main.cc:417 src/main.cc:474
+#: src/main.cc:407 src/main.cc:455
 msgid "Internal error: uncaught 'out of time' exception.\n"
 msgstr ""
 
-#: src/main.cc:424
+#: src/main.cc:414
 #, c-format
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
@@ -2138,7 +2142,7 @@
 msgid "Lost"
 msgstr ""
 
-#: src/mine/cmine.cc:119 src/ui.cc:1090
+#: src/mine/cmine.cc:119 src/ui.cc:1084
 msgid "Minesweeper"
 msgstr ""
 
@@ -2164,147 +2168,147 @@
 msgid "The number of mines must be a number"
 msgstr ""
 
-#: src/mine/cmine.cc:240
+#: src/mine/cmine.cc:238
 msgid "Setup custom game"
 msgstr ""
 
-#: src/mine/cmine.cc:243
+#: src/mine/cmine.cc:240
 msgid "Height of board: "
 msgstr "طول اللوحة: "
 
-#: src/mine/cmine.cc:247
+#: src/mine/cmine.cc:243
 msgid "Width of board: "
 msgstr "عرض اللوحة: "
 
-#: src/mine/cmine.cc:251
+#: src/mine/cmine.cc:246
 msgid "Number of mines: "
 msgstr "عدد الألغام: "
 
-#: src/mine/cmine.cc:316
+#: src/mine/cmine.cc:305
 msgid "Choose difficulty level"
 msgstr "اختيار مستوى الصعوبة"
 
-#: src/mine/cmine.cc:318
+#: src/mine/cmine.cc:307
 msgid "Easy"
 msgstr "سهل"
 
-#: src/mine/cmine.cc:319
+#: src/mine/cmine.cc:308
 msgid "Medium"
 msgstr "متوسط"
 
-#: src/mine/cmine.cc:320
+#: src/mine/cmine.cc:309
 msgid "Hard"
 msgstr "صعب"
 
-#: src/mine/cmine.cc:321
+#: src/mine/cmine.cc:310
 msgid "Custom"
-msgstr "مخصص"
+msgstr "مخصّص"
 
-#: src/mine/cmine.cc:411
+#: src/mine/cmine.cc:392
 msgid "You have won."
 msgstr "لقد فزت."
 
-#: src/mine/cmine.cc:414
+#: src/mine/cmine.cc:395
 msgid "You lose!"
 msgstr "لقد خسرت!"
 
-#: src/mine/cmine.cc:419
+#: src/mine/cmine.cc:400
 msgid "You die...  --More--"
 msgstr "لقد مت...  --المزيد--"
 
-#: src/mine/cmine.cc:432
+#: src/mine/cmine.cc:413
 msgid "The spikes were poisoned!  The poison was deadly..  --More--"
 msgstr ""
 
-#: src/mine/cmine.cc:435
+#: src/mine/cmine.cc:416
 msgid "You land on a set of sharp iron spikes!  --More--"
 msgstr ""
 
-#: src/mine/cmine.cc:438
+#: src/mine/cmine.cc:419
 msgid "You fall into a pit!  --More--"
 msgstr ""
 
-#: src/mine/cmine.cc:441
+#: src/mine/cmine.cc:422
 msgid "KABOOM!  You step on a land mine.  --More--"
 msgstr ""
 
-#: src/mine/cmine.cc:446
+#: src/mine/cmine.cc:427
 msgid "The dart was poisoned!  The poison was deadly...  --More--"
 msgstr ""
 
-#: src/mine/cmine.cc:448
+#: src/mine/cmine.cc:429
 msgid ""
 "A little dart shoots out at you!  You are hit by a little dart!  --More--"
 msgstr ""
 
-#: src/mine/cmine.cc:452
+#: src/mine/cmine.cc:433
 msgid "You turn to stone... --More--"
 msgstr "أنت تتحول إلى صخرة... --المزيد--"
 
-#: src/mine/cmine.cc:454
+#: src/mine/cmine.cc:435
 msgid "Touching the cockatrice corpse was a fatal mistake.  --More--"
 msgstr ""
 
-#: src/mine/cmine.cc:456
+#: src/mine/cmine.cc:437
 msgid "You feel here a cockatrice corpse.  --More--"
 msgstr ""
 
-#: src/mine/cmine.cc:460
+#: src/mine/cmine.cc:441
 msgid ""
 "Click!  You trigger a rolling boulder trap!  You are hit by a boulder! --"
 "More--"
 msgstr ""
 
-#: src/mine/cmine.cc:470
+#: src/mine/cmine.cc:451
 msgid "sleep"
 msgstr "النوم"
 
-#: src/mine/cmine.cc:473
+#: src/mine/cmine.cc:454
 msgid "striking"
 msgstr ""
 
-#: src/mine/cmine.cc:476
+#: src/mine/cmine.cc:457
 msgid "death"
 msgstr "الموت"
 
-#: src/mine/cmine.cc:479
+#: src/mine/cmine.cc:460
 msgid "polymorph"
 msgstr ""
 
-#: src/mine/cmine.cc:482
+#: src/mine/cmine.cc:463
 msgid "magic missile"
 msgstr ""
 
-#: src/mine/cmine.cc:485
+#: src/mine/cmine.cc:466
 msgid "secret door detection"
 msgstr "تفحّص الأبواب السرية"
 
-#: src/mine/cmine.cc:488
+#: src/mine/cmine.cc:469
 msgid "invisibility"
 msgstr "الشفافية"
 
-#: src/mine/cmine.cc:491
+#: src/mine/cmine.cc:472
 msgid "cold"
 msgstr "بارد"
 
-#: src/mine/cmine.cc:497
+#: src/mine/cmine.cc:478
 #, c-format
 msgid "Your wand of %s breaks apart and explodes!  --More--"
 msgstr ""
 
-#: src/mine/cmine.cc:503
+#: src/mine/cmine.cc:484
 msgid "You are jolted by a surge of electricity!  --More--"
 msgstr ""
 
-#: src/mine/cmine.cc:607
+#: src/mine/cmine.cc:588
 msgid "Enter the filename to load: "
 msgstr "أدخل اسم الملف لتحميله: "
 
-#: src/mine/cmine.cc:614
+#: src/mine/cmine.cc:595
 msgid "Enter the filename to save: "
 msgstr "أدخل اسم الملف لحفظه: "
 
-#: src/mine/cmine.cc:624
+#: src/mine/cmine.cc:605
 msgid "mine-help.txt"
 msgstr "mine-help.txt"
 
@@ -2312,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:1670
+#: src/pkg_columnizer.cc:84 src/ui.cc:1662
 msgid "Package"
 msgstr "حزمة"
 
@@ -2350,7 +2354,7 @@
 
 #: src/pkg_columnizer.cc:94
 msgid "Maintainer"
-msgstr ""
+msgstr "المسؤول"
 
 #: src/pkg_columnizer.cc:95
 msgid "Priority"
@@ -2512,7 +2516,7 @@
 
 #: src/pkg_columnizer.cc:480
 msgid "HN too long"
-msgstr ""
+msgstr "HN طويلة جداً"
 
 #: src/pkg_columnizer.cc:654
 msgid "Internal error: Default column string is unparsable"
@@ -2553,6 +2557,8 @@
 "The Debian base system\n"
 " Packages in the 'base' section are part of the initial system installation."
 msgstr ""
+"نظام ديبيان الأساسي\n"
+" الحزم التي في القسم 'base' هي جزء من تثبيت النظام الابتدائي."
 
 #: src/pkg_grouppolicy.cc:158
 msgid ""
@@ -2612,6 +2618,9 @@
 "environment for Linux.  Packages in the 'gnome' section are part of the "
 "GNOME environment or closely integrated into it."
 msgstr ""
+"نظام سطح المكتب جنوم\n"
+" جنوم هو مجموعة من البرامج التي توفر بيئة سطح مكتب سهل الاستخدام للينكس. "
+"الحزم التي في القسم 'gnome' هي جزء من بيئة جنوم أو تتكامل معها بشكل كبير."
 
 #: src/pkg_grouppolicy.cc:165
 msgid ""
@@ -2649,6 +2658,9 @@
 "environment for Linux.  Packages in the 'kde' section are part of the KDE "
 "environment or closely integrated into it."
 msgstr ""
+"نظام سطح المكتب كيدي\n"
+" كيدي هو مجموعة من البرامج التي توفر بيئة سطح مكتب سهل الاستخدام للينكس. "
+"الحزم التي في القسم 'kde' هي جزء من بيئة كيدي أو تتكامل معها بشكل كبير."
 
 #: src/pkg_grouppolicy.cc:170
 msgid ""
@@ -2706,6 +2718,8 @@
 "Miscellaneous software\n"
 " Packages in the 'misc' section have too unusual a function to be classified."
 msgstr ""
+"البرامج المتنوعة\n"
+" الحزم التي في القسم 'misc' لها وظائف غير اعتياديّة تماماً لذا يصعب تصنيفها."
 
 #: src/pkg_grouppolicy.cc:177
 msgid ""
@@ -2751,6 +2765,9 @@
 " Packages in the 'science' section include tools for astronomy, biology, and "
 "chemistry, as well as other science-related software."
 msgstr ""
+"برامج للأعمال العلمية\n"
+" الحزم في القسم 'science' تحتوي على أدواة لعلم الفلك، والأحياء، والكيمياء، "
+"بالإضافة إلى برامج أخرى متعلّقة بالعلوم."
 
 #: src/pkg_grouppolicy.cc:182
 msgid ""
@@ -2793,6 +2810,8 @@
 " Packages in the 'utils' section are utilities whose purpose is too unique "
 "to be classified."
 msgstr ""
+"منافع النظام المختلفة\n"
+" الحزم التي في قسم 'utils' هي منافع الغرض منها مُميّز جداً بحيث يصعب تصنيفه."
 
 #: src/pkg_grouppolicy.cc:187
 msgid ""
@@ -2834,6 +2853,12 @@
 " For more information about what Debian considers to be Free Software, see "
 "http://www.debian.org/social_contract#guidelines"
 msgstr ""
+"أرشيف ديبيان الرئيسي\n"
+" تتكوّن توزيعة ديبيان من الحزم في القسم 'main'. كل حزمة في 'main' هي برنامج "
+"حرّ.\n"
+" .\n"
+" للمزيد من المعلومات حول ما تعتبره ديبيان برامج حرّة، راجع http://www.debian."
+"org/social_contract#guidelines"
 
 #: src/pkg_grouppolicy.cc:192
 msgid ""
@@ -2944,6 +2969,9 @@
 "available from any apt source.  They may be obsolete and removed from the "
 "archive, or you may have built a private version of them yourself."
 msgstr ""
+"الحزم الملغاة والمنشأة محلياً\n"
+" هذه الحزم مثبتة حالياً على حاسبك، إلا أنها غير متوفرة من أي مصدر apt. قد "
+"تكون هذه ملغاة ومُزالة من الأرشيف، أو قد تكون قمت ببناء نسخة شخصية منها بنفسك."
 
 #: src/pkg_grouppolicy.cc:324
 msgid ""
@@ -2961,6 +2989,9 @@
 "provide full functionality in some other programs that you are installing or "
 "upgrading."
 msgstr ""
+"حزم مستحسنة من قبل حزم أخرى\n"
+" هذه الحزم غير مطلوبة بالضرورة، إلا أنها قد تكون ضرورية لتوفير الوظيفة "
+"الكاملة لبعض البرامج الأخرى التي تقوم بتثبيتها أو ترقيتها."
 
 #: src/pkg_grouppolicy.cc:491
 msgid ""
@@ -2994,6 +3025,9 @@
 "to fulfill dependencies, and the planned action will result in no installed "
 "package declaring an 'important' dependency on them.\n"
 msgstr ""
+"الحزم التي ستزال بسبب عدم استخدامها بعد الآن\n"
+" يتم حذف هذه الحزم بسبب أنها ثبّتت آلياً لاستيفاء المعتمدات، غير أن العمل "
+"المطلوب لن ينتج عنه تثبيت أية حزمة تتطلب الاعتماد على هذه الحزم.\n"
 
 #: src/pkg_grouppolicy.cc:520
 msgid ""
@@ -3162,52 +3196,52 @@
 "هل أنت متأكّد من أنك تريد إزالتها؟\n"
 "اطبع '%s' إن كنت كذلك."
 
-#: src/pkg_item.cc:222 src/pkg_ver_item.cc:625
+#: src/pkg_item.cc:220 src/pkg_ver_item.cc:626
 #, c-format
 msgid "Information about %s"
 msgstr "معلومات حول %s"
 
-#: src/pkg_item.cc:224 src/pkg_ver_item.cc:627
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:628
 #, c-format
 msgid "%s info"
 msgstr ""
 
-#: src/pkg_item.cc:310
+#: src/pkg_item.cc:308
 #, fuzzy, c-format
 msgid "Available versions of %s"
 msgstr "النسخ المتوفرة من"
 
-#: src/pkg_item.cc:313
+#: src/pkg_item.cc:311
 #, fuzzy, c-format
 msgid "%s versions"
 msgstr "النسخ"
 
-#: src/pkg_item.cc:325 src/pkg_ver_item.cc:655
+#: src/pkg_item.cc:323 src/pkg_ver_item.cc:656
 #, c-format
 msgid "Dependencies of %s"
 msgstr "معتمدات %s"
 
-#: src/pkg_item.cc:327 src/pkg_ver_item.cc:657
+#: src/pkg_item.cc:325 src/pkg_ver_item.cc:658
 #, c-format
 msgid "%s deps"
 msgstr ""
 
-#: src/pkg_item.cc:338 src/pkg_ver_item.cc:667
+#: src/pkg_item.cc:336 src/pkg_ver_item.cc:668
 #, c-format
 msgid "Packages depending on %s"
 msgstr "الحزم التي تعتمد على %s"
 
-#: src/pkg_item.cc:340 src/pkg_ver_item.cc:669
+#: src/pkg_item.cc:338 src/pkg_ver_item.cc:670
 #, c-format
 msgid "%s reverse deps"
 msgstr ""
 
-#: src/pkg_item.cc:392 src/pkg_ver_item.cc:707
+#: src/pkg_item.cc:390 src/pkg_ver_item.cc:708
 #, c-format
 msgid "Reporting a bug in %s:\n"
 msgstr "جاري تقرير خليل في %s:\n"
 
-#: src/pkg_item.cc:414
+#: src/pkg_item.cc:412
 #, fuzzy
 msgid ""
 "You are not root and I cannot find any way to become root.  To reconfigure "
@@ -3219,16 +3253,16 @@
 "قم بتثبيت حزمة menu، وحزمة login،\n"
 "وقم بتشغيل aptitude كمستخدم جذر."
 
-#: src/pkg_item.cc:422
+#: src/pkg_item.cc:420
 #, c-format
 msgid "Reconfiguring %s\n"
 msgstr "إعادة تهيئة %s\n"
 
-#: src/pkg_item.cc:447
+#: src/pkg_item.cc:445
 msgid "Hierarchy editor"
 msgstr "مُحرر الهيكلة"
 
-#: src/pkg_item.cc:447
+#: src/pkg_item.cc:445
 #, fuzzy
 msgid "Hierarchy Editor"
 msgstr "مُحرر الهيكلة"
@@ -3262,25 +3296,22 @@
 msgid "Enter the new package sorting mechanism for this display: "
 msgstr "أدخل الطريقة الجديدة لفرز الحزم لهذا العرض: "
 
-#: src/pkg_view.cc:344
-#, fuzzy
+#: src/pkg_view.cc:359
 msgid "make_package_view: error in arguments -- two main widgets??"
-msgstr "make_package_view: خطأ في المعطيات -- كائنان ودجت أساسيين؟؟"
+msgstr ""
 
-#: src/pkg_view.cc:350
-#, fuzzy
+#: src/pkg_view.cc:365
 msgid ""
 "make_package_view: error in arguments -- bad column list for static item"
-msgstr "make_package_view: خطأ في المعطيات -- لائحة أعمدة غير صالحة لـstatic"
+msgstr ""
 
-#: src/pkg_view.cc:443
+#: src/pkg_view.cc:458
 msgid "make_package_view: bad argument!"
 msgstr "make_package_view: مُعطى سيّء!"
 
-#: src/pkg_view.cc:495
-#, fuzzy
+#: src/pkg_view.cc:510
 msgid "make_package_view: no main widget found"
-msgstr "make_package_view: لم يعثر على ودجت أساسيّة"
+msgstr "make_package_view: لم يعثر على widge أساسيّة"
 
 #: src/reason_fragment.cc:30
 msgid "depends on"
@@ -3315,18 +3346,18 @@
 msgid " (provided by %F)"
 msgstr " (مزوَّد من قبل %F)"
 
-#: src/reason_fragment.cc:278
+#: src/reason_fragment.cc:275
 #, c-format
 msgid "%F%s %F %F"
 msgstr "%F%s %F %F"
 
-#: src/reason_fragment.cc:327
+#: src/reason_fragment.cc:324
 msgid ""
 "If you select a package, an explanation of its current state will appear in "
 "this space."
 msgstr "إن اخترت حزمة، فإن شرحاً عن وضعها الحالي سيظهر في هذه المساحة."
 
-#: src/reason_fragment.cc:361
+#: src/reason_fragment.cc:358
 msgid ""
 "%B%s%b was installed automatically;  it is being removed because all of the "
 "packages which depend upon it are being removed:"
@@ -3334,87 +3365,87 @@
 "تم تثبيت %B%s%b تلقائياً؛  يجري إزالتها بسبب أن كل الحزم التي تعتمد عليها تتم "
 "إزالتها:"
 
-#: src/reason_fragment.cc:365
+#: src/reason_fragment.cc:362
 msgid "%B%s%b will be automatically removed because of dependency errors:"
 msgstr "ستتم إزالة %B%s%b تلقائياً بسبب أخطاء في المعتمدات:"
 
-#: src/reason_fragment.cc:369
+#: src/reason_fragment.cc:366
 msgid ""
 "%B%s%b will be automatically installed to satisfy the following dependencies:"
 msgstr "سيتم تثبيت %B%s%b تلقائياً لإرضاء المعتمدات التالية:"
 
-#: src/reason_fragment.cc:375 src/reason_fragment.cc:387
+#: src/reason_fragment.cc:372 src/reason_fragment.cc:384
 msgid ""
 "%B%s%b cannot be upgraded now, but if it could be, it would still be held at "
 "version %B%s%b."
 msgstr ""
 "لا يمكن ترقية %B%s%b الآن، وإن كان ممكناً، فسيتم إبقاءها غلى النسخة %B%s%b."
 
-#: src/reason_fragment.cc:378
+#: src/reason_fragment.cc:375
 msgid ""
 "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the "
 "following dependencies:"
 msgstr "لن تتم ترقية %B%s%b إلى النسخة %B%s%b لتفادي عطب المعتمدات التالية:"
 
-#: src/reason_fragment.cc:390
+#: src/reason_fragment.cc:387
 msgid "%B%s%b is currently installed."
 msgstr "%B%s%b مثبت حالياً."
 
-#: src/reason_fragment.cc:396
+#: src/reason_fragment.cc:393
 msgid "%B%s%b is not currently installed."
 msgstr "%B%s%b غير مثبت حالياً."
 
-#: src/reason_fragment.cc:404
+#: src/reason_fragment.cc:401
 msgid "Some dependencies of %B%s%b are not satisfied:"
 msgstr "لم يتم إرضاء بعض معتمدات %B%s%b:"
 
-#: src/reason_fragment.cc:408
+#: src/reason_fragment.cc:405
 msgid "%B%s%b will be downgraded."
 msgstr "سيتم تثبيط %B%s%b."
 
-#: src/reason_fragment.cc:415
+#: src/reason_fragment.cc:412
 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b."
 msgstr "لن تتم ترقية %B%s%b إلى النسخة المحظورة %B%s%b."
 
-#: src/reason_fragment.cc:419
+#: src/reason_fragment.cc:416
 msgid ""
 "%B%s%b could be upgraded to version %B%s%b, but it is being held at version %"
 "B%s%b."
 msgstr ""
 "يمكن ترقية %B%s%b إلى النسخة  %B%s%b، إلا أنّها مبقاة على النسخة %B%s%b."
 
-#: src/reason_fragment.cc:426
+#: src/reason_fragment.cc:423
 msgid "%B%s%b will be re-installed."
 msgstr "ستتم إعادة تثبيت %B%s%b."
 
-#: src/reason_fragment.cc:430
+#: src/reason_fragment.cc:427
 msgid "%B%s%b will be installed."
 msgstr "سيتم تثبيت %B%s%b."
 
-#: src/reason_fragment.cc:434
+#: src/reason_fragment.cc:431
 msgid "%B%s%b will be removed."
 msgstr "ستتم إزالة %B%s%b."
 
-#: src/reason_fragment.cc:439
+#: src/reason_fragment.cc:436
 msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b."
 msgstr "ستتم ترقية %B%s%b من النسخة %B%s%b إلى النسخة %B%s%b."
 
-#: src/reason_fragment.cc:475
+#: src/reason_fragment.cc:472
 msgid ""
 "The following packages depend on %B%s%b and will be broken by its removal:"
 msgstr "الحزم التالية تعتمد على %B%s%b وستعطب بإزالته:"
 
-#: src/reason_fragment.cc:478
+#: src/reason_fragment.cc:475
 msgid "The following packages depend on %B%s%b and are broken:"
 msgstr "الحزم التالية تعتمد على %B%s%b وهي معطوبة:"
 
-#: src/reason_fragment.cc:485
+#: src/reason_fragment.cc:482
 msgid ""
 "The following packages conflict with %B%s%b and will be broken by its "
 "installation:"
 msgstr "الحزم التالية تتعارض مع %B%s%b وستعطب بتثبيته:"
 
-#: src/reason_fragment.cc:518
+#: src/reason_fragment.cc:515
 msgid ""
 "The following packages depend on a version of %B%s%b other than the "
 "currently installed version of %B%s%b, or conflict with the currently "
@@ -3423,38 +3454,38 @@
 "الحزم التالية تعتمد على نسخة من %B%s%b غير النسخة %B%s%b والتي هي مثبتة "
 "حالياً، أو تتعارض مع النسخة المثبتة حالياً:"
 
-#: src/reason_fragment.cc:522
+#: src/reason_fragment.cc:519
 msgid ""
 "The following packages conflict with %B%s%b, or depend on a version of it "
 "which is not going to be installed."
 msgstr "الحزم التالية تتعارض مع %B%s%b،أو تعتمد على نسخة منه لن يتم تثبيتها."
 
-#: src/reason_fragment.cc:526
+#: src/reason_fragment.cc:523
 msgid "The following packages conflict with %B%s%b:"
 msgstr "الحزم التالية تتعارض مع %B%s%b:"
 
-#: src/reason_fragment.cc:531
+#: src/reason_fragment.cc:528
 msgid ""
 "The following packages depend on a version of %B%s%b other than the "
 "currently installed version of %B%s%b:"
 msgstr ""
 "الحزم التالية تعتمد على نسخة من %B%s%b غير %B%s%b والتي هي مثبتة حالياً:"
 
-#: src/reason_fragment.cc:535
+#: src/reason_fragment.cc:532
 msgid ""
 "The following packages depend on a version of %B%s%b which is not going to "
 "be installed."
 msgstr "الحزم التالية تعتمد على نسخة من %B%s%b والتي لن يتم تثبيتها."
 
-#: src/reason_fragment.cc:541
+#: src/reason_fragment.cc:538
 msgid "upgraded"
 msgstr "مُرقّى"
 
-#: src/reason_fragment.cc:541
+#: src/reason_fragment.cc:538
 msgid "downgraded"
 msgstr "مثبط"
 
-#: src/reason_fragment.cc:547
+#: src/reason_fragment.cc:544
 msgid ""
 "The following packages depend on the currently installed version of %B%s%b (%"
 "B%s%b), or conflict with the version it will be %s to (%B%s%b), and will be "
@@ -3463,13 +3494,13 @@
 "الحزم التالية تعتمد على النسخة المثبتة حالياً من %B%s%b (%B%s%b)، أو تتعارض "
 "مع النسخة التي سوف تكون %s إلى (%B%s%b)، وستصبح معطوبة إن كانت %s."
 
-#: src/reason_fragment.cc:554
+#: src/reason_fragment.cc:551
 msgid ""
 "The following packages conflict with version %B%s%b of %B%s%b, and will be "
 "broken if it is %s."
 msgstr "الحزم التالية تتعارض مع النسخة %B%s%b من %B%s%b، وسوف تُعطب إن كانت %s."
 
-#: src/reason_fragment.cc:559
+#: src/reason_fragment.cc:556
 msgid ""
 "The following packages depend on version %B%s%b of %B%s%b, and will be "
 "broken if it is %s."
@@ -3514,38 +3545,43 @@
 msgid "Close"
 msgstr "^إغلاق"
 
-#: src/solution_fragment.cc:125
+#: src/solution_fragment.cc:134
 #, fuzzy
 msgid "%BRemove%b the following packages:%n"
 msgstr "الحزمة التالية معطوبة:"
 
-#: src/solution_fragment.cc:135
+#: src/solution_fragment.cc:144
 #, fuzzy
 msgid "%BInstall%b the following packages:%n"
 msgstr "الحزمة التالية معطوبة:"
 
-#: src/solution_fragment.cc:148
+#: src/solution_fragment.cc:157
 msgid "%BKeep%b the following packages at their current version:%n"
 msgstr ""
 
-#: src/solution_fragment.cc:161
+#: src/solution_fragment.cc:164
+#, fuzzy
+msgid "Not Installed"
+msgstr "غير مثبتة"
+
+#: src/solution_fragment.cc:177
 #, fuzzy
 msgid "%BUpgrade%b the following packages:%n"
 msgstr "الحزمة التالية معطوبة:"
 
-#: src/solution_fragment.cc:176
+#: src/solution_fragment.cc:192
 #, fuzzy
 msgid "%BDowngrade%b the following packages:%n"
 msgstr "تنزيل الحزم"
 
-#: src/solution_fragment.cc:190
+#: src/solution_fragment.cc:206
 #, c-format
 msgid "Score is %d"
 msgstr ""
 
 #: src/trust.cc:17 src/trust.cc:19
 msgid "WARNING"
-msgstr ""
+msgstr "تحذير"
 
 #: src/trust.cc:18
 msgid ""
@@ -3566,43 +3602,43 @@
 msgid "W:"
 msgstr ""
 
-#: src/ui.cc:194
+#: src/ui.cc:193
 msgid "Search for:"
 msgstr "البحث عن:"
 
-#: src/ui.cc:262
+#: src/ui.cc:258
 msgid "You already are root!"
 msgstr "أنت الجذر مسبقا!"
 
-#: src/ui.cc:360
+#: src/ui.cc:356
 msgid ""
 "Subprocess exited with an error -- did you type your password correctly?"
 msgstr "العملية الفرعية انتهت بخطأ -- هل كتبت كلمة المرور بشكل صحيح؟"
 
-#: src/ui.cc:388
+#: src/ui.cc:384
 msgid "Loading cache"
 msgstr "تحميل المخزن"
 
-#: src/ui.cc:410
+#: src/ui.cc:406
 msgid "Really quit Aptitude?"
 msgstr "حقاً تريد الخروج من Aptitude؟"
 
-#: src/ui.cc:489
+#: src/ui.cc:485
 msgid "Really discard your personal settings and reload the defaults?"
 msgstr "حقاً تريد تجاهل إعادادات الشخصية وإعادة تحميل الافتراضيّات؟"
 
-#: src/ui.cc:589 src/ui.cc:591 src/ui.cc:619 src/ui.cc:621
+#: src/ui.cc:585 src/ui.cc:587 src/ui.cc:615 src/ui.cc:617
 msgid "Packages"
 msgstr "الحزم"
 
-#: src/ui.cc:590 src/ui.cc:620
+#: src/ui.cc:586 src/ui.cc:616
 msgid "View available packages and choose actions to perform"
 msgstr "عرض الحزم المتوفرة واختيار الأعمال للقيام بها"
 
-#: src/ui.cc:667
+#: src/ui.cc:663
 #, fuzzy
 msgid ""
-"%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
+"Aptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
 "BABSOLUTELY NO WARRANTY%b; for details see 'license' in the Help menu.  This "
 "is free software, and you are welcome to redistribute it under certain "
 "conditions; see 'license' for details."
@@ -3615,61 +3651,65 @@
 "قائمة المساعدة.  هذا برنامج حر، ونرحب بقيامك بإعادة توزيعة\n"
 "وفقاً لشروط معينة؛ راجع 'الرخصة' للتفاصيل."
 
-#: src/ui.cc:688
+#: src/ui.cc:684
 msgid "help.txt"
 msgstr "help.txt"
 
-#: src/ui.cc:704
+#: src/ui.cc:700
 msgid "README"
 msgstr "اقرأني"
 
-#: src/ui.cc:786
+#: src/ui.cc:782
 msgid ""
-"%C%BWARNING%b: untrusted versions of the following packages will be "
-"installed!%n%nUntrusted packages could %Bcompromise your system's security%"
-"b.  You should only proceed with the installation if you are certain that "
-"this is what you want to do.%n%n"
+"%BWARNING%b: untrusted versions of the following packages will be installed!%"
+"n%nUntrusted packages could %Bcompromise your system's security%b.  You "
+"should only proceed with the installation if you are certain that this is "
+"what you want to do.%n%n"
 msgstr ""
 
-#: src/ui.cc:800
+#: src/ui.cc:788
 #, fuzzy
+msgid "  %S*%N %s [version %s]%n"
+msgstr "النسخ"
+
+#: src/ui.cc:795
 msgid "Really Continue"
-msgstr "استمرار"
+msgstr "استمر بالفعل"
 
-#: src/ui.cc:802
+#: src/ui.cc:797
 msgid "Abort Installation"
-msgstr ""
+msgstr "إجهاض التثبيت"
 
-#: src/ui.cc:863
+#: src/ui.cc:858
 msgid "Preview of package installation"
 msgstr "معاينة تثبيت الحزم"
 
-#: src/ui.cc:864
+#: src/ui.cc:859
 msgid "View and/or adjust the actions that will be performed"
 msgstr "عرض و/أو تعديل الأعمال التي ستتم"
 
-#: src/ui.cc:865
+#: src/ui.cc:860
 #, fuzzy
 msgid "Preview"
 msgstr "^سابق"
 
-#: src/ui.cc:901
+#: src/ui.cc:896
 #, fuzzy
 msgid "Some packages were broken and have been fixed:"
 msgstr "بعض الحزم كانت معطوبة وتمّ إصلاحها."
 
-#: src/ui.cc:907
+#: src/ui.cc:902
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:913
-#, c-format
+#: src/ui.cc:908
+#, fuzzy, c-format
 msgid ""
-"Ran out of time while trying to resolver dependencies (press \"%s\" to try "
+"Ran out of time while trying to resolve dependencies (press \"%s\" to try "
 "harder)"
-msgstr ""
+msgstr "إضاعة الوقت بمحاولة البحث عن الألغام"
 
-#: src/ui.cc:959
+#: src/ui.cc:954
 #, fuzzy
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
@@ -3678,23 +3718,23 @@
 "تثبيت/إزالة الحزم بتطلب صلاحيات إداريّة، والتي\n"
 "لا تملكها حاليّاً.  هل تود التغيّر إلى حساب الجذر؟\n"
 
-#: src/ui.cc:962 src/ui.cc:1078
+#: src/ui.cc:957 src/ui.cc:1072
 msgid "Become root"
 msgstr "تحوُّل إلى جذر"
 
-#: src/ui.cc:964 src/ui.cc:1080
+#: src/ui.cc:959 src/ui.cc:1074
 msgid "Don't become root"
 msgstr "لا تحوّل إلى جذر"
 
-#: src/ui.cc:969 src/ui.cc:1085
+#: src/ui.cc:964 src/ui.cc:1079
 msgid "A package-list update or install run is already taking place."
 msgstr "هناك عملية تحديث أو تثبيت حزم تجري حالياً."
 
-#: src/ui.cc:996
+#: src/ui.cc:991
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "لم يتمّ جدولة تثبيت، أو إزالة أو ترقية أيّة حزم."
 
-#: src/ui.cc:1002
+#: src/ui.cc:997
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -3706,7 +3746,7 @@
 "يمكن ترقية بعض الحزم، إلا أنّك لم تختر ترقيتها.\n"
 "اكتب \"U\" كي تحضّر الترقية."
 
-#: src/ui.cc:1074
+#: src/ui.cc:1069
 #, fuzzy
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
@@ -3715,112 +3755,112 @@
 "تحديث لوائح الحزم بتطلب صلاحيات إداريّة، والتي\n"
 "لا تملكها حاليّاً.  هل تود التغيّر إلى حساب الجذر؟\n"
 
-#: src/ui.cc:1090 src/ui.cc:1377
+#: src/ui.cc:1084 src/ui.cc:1371
 msgid "Waste time trying to find mines"
 msgstr "إضاعة الوقت بمحاولة البحث عن الألغام"
 
-#: src/ui.cc:1097 src/ui.cc:1150
+#: src/ui.cc:1091 src/ui.cc:1144
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "التنظيف أثناء القيام بالتنزيل غير مسموح به"
 
-#: src/ui.cc:1100
+#: src/ui.cc:1094
 msgid "Deleting downloaded files"
 msgstr "حذف الملفات المنزلة"
 
-#: src/ui.cc:1114
+#: src/ui.cc:1108
 msgid "Downloaded package files have been deleted"
 msgstr "تم حذف ملفات الحزم المنزلة"
 
-#: src/ui.cc:1175
+#: src/ui.cc:1169
 #, fuzzy, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr "ملفات الحزم المنزلة الملغاة تم حذفها"
 
-#: src/ui.cc:1247
+#: src/ui.cc:1241
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1252 src/ui.cc:1283
+#: src/ui.cc:1246 src/ui.cc:1277
 #, fuzzy
 msgid "Ran out of time while trying to find a solution."
 msgstr "إضاعة الوقت بمحاولة البحث عن الألغام"
 
-#: src/ui.cc:1277
+#: src/ui.cc:1271
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1307
+#: src/ui.cc:1301
 #, fuzzy, c-format
 msgid "Unable to open %s"
 msgstr "تعذر فتح %s للكتابة"
 
-#: src/ui.cc:1313
+#: src/ui.cc:1307
 msgid "Error while dumping resolver state"
 msgstr ""
 
-#: src/ui.cc:1323
+#: src/ui.cc:1317
 msgid "File to which the resolver state should be dumped:"
 msgstr ""
 
-#: src/ui.cc:1353
+#: src/ui.cc:1347
 msgid "^Install/remove packages"
 msgstr "^تثبيت/إزالة الحزم"
 
-#: src/ui.cc:1354
+#: src/ui.cc:1348
 msgid "Perform all pending installs and removals"
 msgstr "إجراء كل عمليات التثبيت والإزالة المؤخَّرة"
 
-#: src/ui.cc:1356
+#: src/ui.cc:1350
 msgid "^Update package list"
 msgstr "^تحديث لائحة الحزم"
 
-#: src/ui.cc:1357
+#: src/ui.cc:1351
 msgid "Check for new versions of packages"
 msgstr "التحقق من وجود نسخ جديدة من الحزم"
 
-#: src/ui.cc:1360
+#: src/ui.cc:1354
 msgid "^Forget new packages"
 msgstr "^نسيان الحزم الجديدة"
 
-#: src/ui.cc:1361
+#: src/ui.cc:1355
 msgid "Forget which packages are \"new\""
 msgstr "نسيان أيّ الحزم هي \"جديدة\""
 
-#: src/ui.cc:1364
+#: src/ui.cc:1358
 msgid "^Clean package cache"
 msgstr "^تنظيف مخزن الحزم"
 
-#: src/ui.cc:1365
+#: src/ui.cc:1359
 msgid "Delete package files which were previously downloaded"
 msgstr "حذف ملفات الحزم التي تم تنزيلها من قبل"
 
-#: src/ui.cc:1368
+#: src/ui.cc:1362
 msgid "Clean ^obsolete files"
 msgstr "حذف الملفاة ال^ملغية"
 
-#: src/ui.cc:1369
+#: src/ui.cc:1363
 msgid "Delete package files which can no longer be downloaded"
 msgstr "حذف ملفات الحزم التي لا يمكن تنزيلها بعد الآن"
 
-#: src/ui.cc:1372
+#: src/ui.cc:1366
 msgid "Mark ^Upgradable"
 msgstr "تعليم ال^قابلة للترقية"
 
-#: src/ui.cc:1373
+#: src/ui.cc:1367
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr "تعليم كل الحزم القابلة للترقية والتي ليست مبقاة للترقية"
 
-#: src/ui.cc:1376
+#: src/ui.cc:1370
 msgid "^Play Minesweeper"
 msgstr "^لعب كانسة الألغام"
 
-#: src/ui.cc:1379
+#: src/ui.cc:1373
 msgid "^Become root"
 msgstr "^تحوّل إلى مستخدم جذر"
 
-#: src/ui.cc:1380
+#: src/ui.cc:1374
 #, fuzzy
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
@@ -3829,78 +3869,78 @@
 "استخدم 'su' كي تصبح مستخدم جذر؛ سيقوم هذا بإعادة تشغيل البرنامج، ولكن سيتم\n"
 "الإبقاء على إعداداتك"
 
-#: src/ui.cc:1383
+#: src/ui.cc:1377
 msgid "^Reload package cache"
 msgstr "^إعادة تحميل مخزن الحزم"
 
-#: src/ui.cc:1384
+#: src/ui.cc:1378
 msgid "Reload the package cache"
 msgstr "إعادة تحميل مخزن الحزم"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1384
 msgid "^Quit"
 msgstr "^خروج"
 
-#: src/ui.cc:1391
+#: src/ui.cc:1385
 msgid "Exit the program"
 msgstr "الخروج من البرنامج"
 
-#: src/ui.cc:1397 src/ui.cc:1669
+#: src/ui.cc:1391 src/ui.cc:1661
 msgid "Undo"
 msgstr "تراجع"
 
-#: src/ui.cc:1398
+#: src/ui.cc:1392
 msgid "Undo the last package operation or group of operations"
 msgstr "التراجع عن آخر عملية حزمة أو مجموعة من العمليات"
 
-#: src/ui.cc:1405
+#: src/ui.cc:1399
 msgid "^Install"
 msgstr "^تثبيت"
 
-#: src/ui.cc:1406
+#: src/ui.cc:1400
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "تعليم الحزمة المحددة حالياً للتثبيت أو الترقية"
 
-#: src/ui.cc:1409
+#: src/ui.cc:1403
 msgid "^Remove"
 msgstr "إ^زالة"
 
-#: src/ui.cc:1410
+#: src/ui.cc:1404
 msgid "Flag the currently selected package for removal"
 msgstr "تعليم الحزمة المحددة حالياً للإزالة"
 
-#: src/ui.cc:1413
+#: src/ui.cc:1407
 msgid "^Purge"
 msgstr "^إلغاء"
 
-#: src/ui.cc:1414
+#: src/ui.cc:1408
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr "تعليم الحزمة المحددة حالياً وملفات تهيئتها للإزالة"
 
-#: src/ui.cc:1417
+#: src/ui.cc:1411
 msgid "^Keep"
 msgstr "^محافظة"
 
-#: src/ui.cc:1418
+#: src/ui.cc:1412
 msgid "Cancel any action on the selected package"
 msgstr "إلغاء أيّ عمل على الحزمة المحددة"
 
-#: src/ui.cc:1421
+#: src/ui.cc:1415
 msgid "^Hold"
 msgstr "إ^بقاء"
 
-#: src/ui.cc:1422
+#: src/ui.cc:1416
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
 msgstr "إلغاء أي عمل على الحزمة المحددة، وحمايتها من الترقيات المستقبليّة"
 
-#: src/ui.cc:1425
+#: src/ui.cc:1419
 msgid "Mark ^Auto"
 msgstr "تحديد ^تلقائي"
 
-#: src/ui.cc:1426
+#: src/ui.cc:1420
 #, fuzzy
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
@@ -3909,11 +3949,11 @@
 "تحديد الحزمة المحدّدة على أنها ثُبتت تلقائيّاً؛\n"
 "سوف يتم إزالتها إن لم تعتمد عليها أية حزمة أخرى"
 
-#: src/ui.cc:1429
+#: src/ui.cc:1423
 msgid "Mark ^Manual"
 msgstr "تحديد ^يدوي"
 
-#: src/ui.cc:1430
+#: src/ui.cc:1424
 #, fuzzy
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
@@ -3922,11 +3962,11 @@
 "تحديد الحزمة المحدّدة على أنها ثُبتت يدويّاً؛\n"
 "لن يتم إزالتها إلا إن قمت بذلك"
 
-#: src/ui.cc:1433
+#: src/ui.cc:1427
 msgid "^Forbid Version"
 msgstr "^منع النسخة"
 
-#: src/ui.cc:1434
+#: src/ui.cc:1428
 #, fuzzy
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
@@ -3935,232 +3975,232 @@
 "منع تثبيت النسخة المرشحة من الحزمة المحددة؛\n"
 "أما النسخ الأجدد من الحزمة فسيتم تثبيتها كالعادة"
 
-#: src/ui.cc:1438
+#: src/ui.cc:1432
 msgid "I^nformation"
 msgstr "^معلومات"
 
-#: src/ui.cc:1439
+#: src/ui.cc:1433
 msgid "Display more information about the selected package"
 msgstr "عرض مزيد من المعلومات حول الحزمة المحدّدة"
 
-#: src/ui.cc:1442
+#: src/ui.cc:1436
 msgid "^Changelog"
 msgstr "^سجل التغيير"
 
-#: src/ui.cc:1443
+#: src/ui.cc:1437
 msgid "Display the Debian changelog of the selected package"
 msgstr "عرض سجل تغيير دبيان للحزمة المحدّدة"
 
-#: src/ui.cc:1450
+#: src/ui.cc:1444
 msgid "^Find"
 msgstr "^بحث"
 
-#: src/ui.cc:1451
+#: src/ui.cc:1445
 msgid "Search for a package"
 msgstr "البحث عن حزمة"
 
-#: src/ui.cc:1454
+#: src/ui.cc:1448
 msgid "Find ^Again"
 msgstr "البحث ^مجدّداً"
 
-#: src/ui.cc:1455
+#: src/ui.cc:1449
 msgid "Repeat the last search"
 msgstr "تكرار البحث الأخير"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1453
 msgid "^Limit Display"
 msgstr "^حدّ العرض"
 
-#: src/ui.cc:1460
+#: src/ui.cc:1454
 msgid "Apply a filter to the package list"
 msgstr "تصفية لائحة الحزم"
 
-#: src/ui.cc:1463
+#: src/ui.cc:1457
 msgid "^Un-Limit Display"
 msgstr "إ^زالة حدّ العرض"
 
-#: src/ui.cc:1464
+#: src/ui.cc:1458
 msgid "Remove the filter from the package list"
 msgstr "إزالة التصفية من لائحة الحزم"
 
-#: src/ui.cc:1468
+#: src/ui.cc:1462
 msgid "Find ^Broken"
 msgstr "عثور على ^معطوبة"
 
-#: src/ui.cc:1469
+#: src/ui.cc:1463
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "العثور على الحزمة التالية ذات المعتمدات الغير مستوفية"
 
-#: src/ui.cc:1476
+#: src/ui.cc:1470
 msgid "^UI options"
 msgstr "خيارات ^واجهة المستخدم"
 
-#: src/ui.cc:1477
+#: src/ui.cc:1471
 msgid "Change the settings which affect the user interface"
 msgstr "تغيير الإعدادات التي تؤثر على واجهة المستخدم"
 
-#: src/ui.cc:1480
+#: src/ui.cc:1474
 msgid "^Dependency handling"
 msgstr "إ^دارة المعتمدات"
 
-#: src/ui.cc:1481
+#: src/ui.cc:1475
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr "تغيير الإعدادات التي تؤثر على كيفية التعامل مع معتمدات الحزم"
 
-#: src/ui.cc:1484
+#: src/ui.cc:1478
 msgid "^Miscellaneous"
 msgstr "^متفرقات"
 
-#: src/ui.cc:1485
+#: src/ui.cc:1479
 msgid "Change miscellaneous program settings"
 msgstr "تغيير إعدادات البرنامج المختلفة"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1484
 msgid "^Revert options"
 msgstr "^استعادة الخيارات"
 
-#: src/ui.cc:1491
+#: src/ui.cc:1485
 msgid "Reset all settings to the system defaults"
 msgstr "إعادة كل الإعدادات إلى افتراضيّات النظام"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1496
 msgid "^Next"
 msgstr "^تالي"
 
-#: src/ui.cc:1503
+#: src/ui.cc:1497
 msgid "View next display"
 msgstr "عرض الشاشة التالية"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1500
 msgid "^Prev"
 msgstr "^سابق"
 
-#: src/ui.cc:1507
+#: src/ui.cc:1501
 msgid "View previous display"
 msgstr "عرض الشاشة السابقة"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1504
 msgid "^Close"
 msgstr "^إغلاق"
 
-#: src/ui.cc:1511
+#: src/ui.cc:1505
 msgid "Close this display"
 msgstr "إغلاق هذه الشاشة"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1510
 msgid "New Package ^View"
 msgstr "^عرض حزم جديد"
 
-#: src/ui.cc:1517
+#: src/ui.cc:1511
 msgid "Create a new default package view"
 msgstr "إنشاء عرض حزم افتراضي جديد"
 
-#: src/ui.cc:1520
+#: src/ui.cc:1514
 msgid "New Categorical ^Browser"
 msgstr "^مستعرض تصنيفي جديد"
 
-#: src/ui.cc:1522
+#: src/ui.cc:1516
 msgid "Browse packages by category"
 msgstr "استعراض الحزم بحسب الصنف"
 
-#: src/ui.cc:1530
+#: src/ui.cc:1524
 msgid "^About"
 msgstr "^حول"
 
-#: src/ui.cc:1531
+#: src/ui.cc:1525
 msgid "View information about this program"
 msgstr "عرض معلومات حول هذا البرنامج"
 
-#: src/ui.cc:1534
+#: src/ui.cc:1528
 msgid "^Help"
 msgstr "^مساعدة"
 
-#: src/ui.cc:1535
+#: src/ui.cc:1529
 msgid "View the on-line help"
 msgstr "عرض المساعدة الفورية"
 
-#: src/ui.cc:1537
+#: src/ui.cc:1531
 msgid "User's ^Manual"
 msgstr "دليل ال^مستخدم"
 
-#: src/ui.cc:1538
+#: src/ui.cc:1532
 msgid "View the detailed program manual"
 msgstr "عرض دليل البرنامج المفصّل"
 
-#: src/ui.cc:1541
+#: src/ui.cc:1535
 msgid "^FAQ"
 msgstr "^FAQ"
 
-#: src/ui.cc:1542
+#: src/ui.cc:1536
 msgid "View a list of frequently asked questions"
 msgstr "عرض لائحة بالأسئلة الأكثر طرحاً"
 
-#: src/ui.cc:1545
+#: src/ui.cc:1539
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1546
+#: src/ui.cc:1540
 #, fuzzy
 msgid "View the important changes made in each version of "
 msgstr "عرض التغييرات المهمة التي تمت في كل نسخة من البرنامج"
 
-#: src/ui.cc:1549
+#: src/ui.cc:1543
 msgid "^License"
 msgstr "^الرخصة"
 
-#: src/ui.cc:1550
+#: src/ui.cc:1544
 msgid "View the terms under which you may copy the program"
 msgstr "عرض الشروط التي يمكنك نسخ البرنامج ضمنها"
 
-#: src/ui.cc:1668
+#: src/ui.cc:1660
 msgid "Actions"
 msgstr "أعمال"
 
-#: src/ui.cc:1671
+#: src/ui.cc:1663
 msgid "Search"
 msgstr "بحث"
 
-#: src/ui.cc:1672
+#: src/ui.cc:1664
 msgid "Options"
 msgstr "خيارات"
 
-#: src/ui.cc:1673
+#: src/ui.cc:1665
 msgid "Views"
 msgstr "عروض"
 
-#: src/ui.cc:1674
+#: src/ui.cc:1666
 msgid "Help"
 msgstr "مساعدة"
 
-#: src/ui.cc:1734
+#: src/ui.cc:1726
 #, 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:2003 src/vscreen/vscreen.cc:281
+#: src/ui.cc:1996 src/vscreen/vscreen.cc:281
 msgid "yes_key"
 msgstr "yes_key"
 
-#: src/ui.cc:2004 src/vscreen/vscreen.cc:282
+#: src/ui.cc:1997 src/vscreen/vscreen.cc:282
 msgid "no_key"
 msgstr "no_key"
 
-#: src/view_changelog.cc:46
+#: src/view_changelog.cc:61
 msgid "You can only view changelogs of official Debian packages."
 msgstr "يمكنك عرض سجلات تغيير حزم دبيان الرسميّة فقط."
 
-#: src/view_changelog.cc:52
+#: src/view_changelog.cc:67
 msgid "Downloading Changelog"
 msgstr "تنزيل سجل التغيير"
 
-#: src/view_changelog.cc:54
+#: src/view_changelog.cc:69
 #, fuzzy
 msgid "Download Changelog"
 msgstr "تنزيل سجل التغيير"
 
-#: src/view_changelog.cc:63
+#: src/view_changelog.cc:78
 #, c-format
 msgid "%s changes"
 msgstr ""
@@ -4185,7 +4225,6 @@
 msgid "Ouch!  Got SIGQUIT, dying..\n"
 msgstr "آخ!  قابلت إشارة خروج SIGQUIT، جاري التنفيذ..\n"
 
-#, fuzzy
 #~ msgid ""
 #~ "Commands:\n"
 #~ "  y: continue with the installation\n"
@@ -4217,6 +4256,8 @@
 #~ "  n: الإجهاض والخروج\n"
 #~ "  i: إظهار المعلومات حول واحد أو أكثر من الحزم\n"
 #~ "     يجب أن تتبع أسماء الحزم الأمر 'i'.\n"
+#~ "  c: إظهار سجلات تغيير ديبيان لواحد أو أكثر من الحزم;\n"
+#~ "     يجب أن تكون أسماء الحزم بعد 'c'\n"
 #~ "  d: عكس عرض معلومات المعتمدات\n"
 #~ "  s: عكس عرض التّغيّرات في حجم الحزم\n"
 #~ "  v: عكس عرض النسخ\n"
@@ -4253,11 +4294,167 @@
 #~ "رجاء أدخل القرص التالي في السواقة \"%s\":\n"
 #~ "%s"
 
+#~ msgid "Need exactly two colors in color definition \"%s\""
+#~ msgstr "بحاجة إلى لونين بالضبط في تعريف اللون \"%s\""
+
+#~ msgid "Can't parse foreground \"%s\"of color \"%s\""
+#~ msgstr "لا يمكن إعراب الواجهة \"%s\" للّون \"%s\""
+
+#~ msgid "Can't parse background \"%s\" of color \"%s\""
+#~ msgstr "لا يمكن إعراب الخلفيّة \"%s\" للّون \"%s\""
+
+#~ 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"
+#~ " .\n"
+#~ " For more information about what Debian considers to be Free Software, "
+#~ "see http://www.debian.org/social_contract#guidelines"
+#~ msgstr ""
+#~ "البرامج التي هي غير حرّة\n"
+#~ " الحزم التي في القسم 'non-free' ليست جزءً من ديبيان.\n"
+#~ " .\n"
+#~ " لا تستوفي هذه الحزم مطلباً أو أكثر من إرشادات البرامج الحرّة لديبيان (انظر "
+#~ "أدناه) يجب قراءة ترخيص البرامج في هذا القسم للتأكّد من القدرة على "
+#~ "استخدامها بالطريقة المرغوبة.\n"
+#~ " .\n"
+#~ " للمزيد من المعلومات حول ما تعتبره ديبيان برامج حرّة، راجع http://www."
+#~ "debian.org/social_contract#guidelines"
+
+#~ 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)"
+#~ msgstr ""
+#~ "الحزم الجديدة\n"
+#~ " تمت إضافة هذه الحزمة إلى دبيان منذ المرة الأخيرة التي مسحت بها لائحة "
+#~ "الحزم \"الجديدة\". (اختر \"نسيان الحزم الجديدة\" من قائمة أعمال لإفراغ "
+#~ "هذه اللائحة)."
+
+#~ msgid ""
+#~ "%s is an essential package!\n"
+#~ "\n"
+#~ "Are you sure you want to remove it?\n"
+#~ "Type '%s' if you are."
+#~ msgstr ""
+#~ "%s هي حزمة أساسية!\n"
+#~ "\n"
+#~ "هل أنت متأكّد من أنك تريد إزالتها؟\n"
+#~ "اطبع '%s' إن كنت كذلك."
+
+#~ msgid "Available versions of "
+#~ msgstr "النسخ المتوفرة من"
+
+#~ 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."
+#~ msgstr ""
+#~ "أنت لست الجذر ولا يمكن العثور على أية طريقة\n"
+#~ "لتصبح الجذر.  كي تعيد تهيئة هذه الحزمة،\n"
+#~ "قم بتثبيت حزمة menu، وحزمة login،\n"
+#~ "وقم بتشغيل aptitude كمستخدم جذر."
+
 #~ msgid "Information about "
 #~ msgstr "معلومات حول"
 
+#~ msgid ""
+#~ "Aptitude %s\n"
+#~ "\n"
+#~ "Copyright 2000 Daniel Burrows.\n"
+#~ "\n"
+#~ "aptitude comes with ABSOLUTELY NO WARRANTY; for details see 'license' in "
+#~ "the\n"
+#~ "Help menu.  This is free software, and you are welcome to redistribute "
+#~ "it\n"
+#~ "under certain conditions; see 'license' for details."
+#~ msgstr ""
+#~ "Aptitude %s\n"
+#~ "\n"
+#~ "حقوق النسخ لسنة 2000 Daniel Burrows.\n"
+#~ "\n"
+#~ "aptitude لا يشتمل على أيّة ضمانات إطلاقاً؛ للتفاصيل راجع 'الرخصة' في\n"
+#~ "قائمة المساعدة.  هذا برنامج حر، ونرحب بقيامك بإعادة توزيعة\n"
+#~ "وفقاً لشروط معينة؛ راجع 'الرخصة' للتفاصيل."
+
+#~ msgid "Some packages were broken and have been fixed"
+#~ msgstr "بعض الحزم كانت معطوبة وتمّ إصلاحها."
+
 #~ msgid "Some broken packages could not be fixed!"
 #~ msgstr "تعذر إصلاح بعض الحزم المعطوبة!"
 
+#~ msgid "Some packages are broken.  Try to fix them?"
+#~ msgstr "بعض الحزم معطوبة.  أتريد محاولة إصلاحها؟"
+
+#~ msgid ""
+#~ "Installing/removing packages requires administrative privileges, which\n"
+#~ "you currently do not have.  Would you like to change to the root "
+#~ "account?\n"
+#~ msgstr ""
+#~ "تثبيت/إزالة الحزم بتطلب صلاحيات إداريّة، والتي\n"
+#~ "لا تملكها حاليّاً.  هل تود التغيّر إلى حساب الجذر؟\n"
+
+#~ msgid ""
+#~ "No packages will be installed, removed or upgraded.\n"
+#~ "\n"
+#~ "Some packages could be upgraded, but you have not chosen to upgrade "
+#~ "them.\n"
+#~ "Type \"U\" to prepare an upgrade."
+#~ msgstr ""
+#~ "لن يتم تثبيت، أو إزالة أو ترقية أيّة حزم.\n"
+#~ "\n"
+#~ "يمكن ترقية بعض الحزم، إلا أنّك لم تختر ترقيتها.\n"
+#~ "اكتب \"U\" كي تحضّر الترقية."
+
+#~ 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"
+#~ msgstr ""
+#~ "تحديث لوائح الحزم بتطلب صلاحيات إداريّة، والتي\n"
+#~ "لا تملكها حاليّاً.  هل تود التغيّر إلى حساب الجذر؟\n"
+
+#~ msgid "Obsolete downloaded package files have been deleted"
+#~ msgstr "ملفات الحزم المنزلة الملغاة تم حذفها"
+
+#~ msgid ""
+#~ "Run 'su' to become root; this will restart the program, but your\n"
+#~ "settings will be preserved"
+#~ msgstr ""
+#~ "استخدم 'su' كي تصبح مستخدم جذر؛ سيقوم هذا بإعادة تشغيل البرنامج، ولكن "
+#~ "سيتم\n"
+#~ "الإبقاء على إعداداتك"
+
+#~ msgid ""
+#~ "Mark the selected package as having been automatically installed;\n"
+#~ "it will automatically be removed if no other packages depend on it"
+#~ msgstr ""
+#~ "تحديد الحزمة المحدّدة على أنها ثُبتت تلقائيّاً؛\n"
+#~ "سوف يتم إزالتها إن لم تعتمد عليها أية حزمة أخرى"
+
+#~ msgid ""
+#~ "Mark the selected package as having been manually installed;\n"
+#~ "it will not be removed unless you manually remove it"
+#~ msgstr ""
+#~ "تحديد الحزمة المحدّدة على أنها ثُبتت يدويّاً؛\n"
+#~ "لن يتم إزالتها إلا إن قمت بذلك"
+
+#~ msgid ""
+#~ "Forbid the candidate version of the selected package from being "
+#~ "installed;\n"
+#~ "newer versions of the package will be installed as usual"
+#~ msgstr ""
+#~ "منع تثبيت النسخة المرشحة من الحزمة المحددة؛\n"
+#~ "أما النسخ الأجدد من الحزمة فسيتم تثبيتها كالعادة"
+
 #~ msgid "^ChangeLog"
 #~ msgstr "^سجل التغيير"
+
+#~ msgid "View the important changes made in each version of the program"
+#~ 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	Sun Jun 12 21:04:47 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-05-01 14:08-0400\n"
+"POT-Creation-Date: 2005-06-12 22:42+0200\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"
@@ -148,14 +148,14 @@
 msgid "Automatically remove unused packages matching this filter"
 msgstr ""
 
-#: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:219 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
-#: src/vscreen/vs_util.cc:328
+#: src/apt_options.cc:240 src/mine/cmine.cc:249 src/mine/cmine.cc:312
+#: src/ui.cc:215 src/vscreen/vs_util.cc:77 src/vscreen/vs_util.cc:90
+#: src/vscreen/vs_util.cc:264 src/vscreen/vs_util.cc:298
 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:328
+#: src/apt_options.cc:241 src/download_list.cc:69 src/mine/cmine.cc:250
+#: src/mine/cmine.cc:313 src/vscreen/vs_util.cc:298
 msgid "Cancel"
 msgstr "Poništi"
 
@@ -233,14 +233,13 @@
 msgid "%s: Previous"
 msgstr ""
 
-#: src/broken_indicator.cc:233
+#: src/broken_indicator.cc:232
 #, c-format
-msgid "%CSolution search failed.  %s: try harder"
+msgid "Solution search failed.  %s: try harder"
 msgstr ""
 
-#: src/broken_indicator.cc:239
-#, c-format
-msgid "%CUnable to resolve dependencies."
+#: src/broken_indicator.cc:237
+msgid "Unable to resolve dependencies."
 msgstr ""
 
 #: src/cmdline/cmdline_action.cc:36
@@ -586,13 +585,13 @@
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
-#: src/vscreen/vs_util.cc:212
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:165
+#: src/vscreen/vs_util.cc:202
 msgid "Yes"
 msgstr "Da"
 
-#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
-#: src/vscreen/vs_util.cc:212
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:165
+#: src/vscreen/vs_util.cc:202
 msgid "No"
 msgstr "Ne"
 
@@ -876,7 +875,7 @@
 msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:212
+#: src/cmdline/cmdline_resolver.cc:212 src/cmdline/cmdline_resolver.cc:285
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
@@ -929,197 +928,202 @@
 msgid "The following packages have unmet dependencies:\n"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:133
+#: src/cmdline/cmdline_show.cc:119 src/cmdline/cmdline_show.cc:305
+#: src/solution_fragment.cc:65
+msgid "<NULL>"
+msgstr ""
+
+#: src/cmdline/cmdline_show.cc:138
 msgid "not installed"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:135 src/pkg_columnizer.cc:231
+#: src/cmdline/cmdline_show.cc:140 src/pkg_columnizer.cc:231
 #: src/pkg_ver_item.cc:225
 msgid "unpacked"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:137
+#: src/cmdline/cmdline_show.cc:142
 msgid "partially configured"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:139
+#: src/cmdline/cmdline_show.cc:144
 msgid "partially installed"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:141
+#: src/cmdline/cmdline_show.cc:146
 msgid "not installed (configuration files remain)"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:143 src/pkg_columnizer.cc:239
+#: src/cmdline/cmdline_show.cc:148 src/pkg_columnizer.cc:239
 #: src/pkg_ver_item.cc:233
 msgid "installed"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:152
+#: src/cmdline/cmdline_show.cc:157
 msgid "not a real package"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:165
+#: src/cmdline/cmdline_show.cc:170
 msgid " [held]"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:174
+#: src/cmdline/cmdline_show.cc:179
 #, c-format
 msgid "%s; version %s will be installed"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:178
+#: src/cmdline/cmdline_show.cc:183
 #, c-format
 msgid "%s; version %s will be installed automatically"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:184 src/cmdline/cmdline_show.cc:199
+#: src/cmdline/cmdline_show.cc:189 src/cmdline/cmdline_show.cc:204
 #, c-format
 msgid "%s; will be purged"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:197
+#: src/cmdline/cmdline_show.cc:202
 #, c-format
 msgid "%s; will be purged because nothing depends on it"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:204
+#: src/cmdline/cmdline_show.cc:209
 #, c-format
 msgid "%s; will be removed because nothing depends on it"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:206
+#: src/cmdline/cmdline_show.cc:211
 #, c-format
 msgid "%s; will be removed"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:220
+#: src/cmdline/cmdline_show.cc:225
 #, c-format
 msgid "%s%s; will be downgraded [%s -> %s]"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:223
+#: src/cmdline/cmdline_show.cc:228
 #, c-format
 msgid "%s%s; will be upgraded [%s -> %s]"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:235 src/cmdline/cmdline_show.cc:256
+#: src/cmdline/cmdline_show.cc:240 src/cmdline/cmdline_show.cc:261
 msgid "Package: "
 msgstr "Paket:"
 
-#: src/cmdline/cmdline_show.cc:236 src/cmdline/cmdline_show.cc:264
+#: src/cmdline/cmdline_show.cc:241 src/cmdline/cmdline_show.cc:269
 #: src/pkg_columnizer.cc:87
 msgid "State"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:237 src/cmdline/cmdline_show.cc:318
+#: src/cmdline/cmdline_show.cc:242 src/cmdline/cmdline_show.cc:325
 msgid "Provided by"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:258 src/pkg_info_screen.cc:105
+#: src/cmdline/cmdline_show.cc:263 src/pkg_info_screen.cc:105
 msgid "Essential: "
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:258 src/cmdline/cmdline_show.cc:262
-#: src/cmdline/cmdline_show.cc:273 src/pkg_info_screen.cc:105
+#: src/cmdline/cmdline_show.cc:263 src/cmdline/cmdline_show.cc:267
+#: src/cmdline/cmdline_show.cc:278 src/pkg_info_screen.cc:105
 msgid "yes"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:262
+#: src/cmdline/cmdline_show.cc:267
 msgid "New"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:267
+#: src/cmdline/cmdline_show.cc:272
 msgid "Forbidden version"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:271
+#: src/cmdline/cmdline_show.cc:276
 #, fuzzy
 msgid "Automatically installed"
 msgstr "Automatski nadogradi instalirane pakete"
 
-#: src/cmdline/cmdline_show.cc:273
+#: src/cmdline/cmdline_show.cc:278
 msgid "no"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:275
+#: src/cmdline/cmdline_show.cc:280
 msgid "Version: "
 msgstr "Verzija:"
 
-#: src/cmdline/cmdline_show.cc:276 src/pkg_info_screen.cc:113
+#: src/cmdline/cmdline_show.cc:281 src/pkg_info_screen.cc:113
 msgid "Priority: "
 msgstr "Prioritet:"
 
-#: src/cmdline/cmdline_show.cc:277 src/cmdline/cmdline_show.cc:279
-#: src/cmdline/cmdline_show.cc:288
+#: src/cmdline/cmdline_show.cc:282 src/cmdline/cmdline_show.cc:284
+#: src/cmdline/cmdline_show.cc:293
 msgid "N/A"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:278 src/pkg_info_screen.cc:114
+#: src/cmdline/cmdline_show.cc:283 src/pkg_info_screen.cc:114
 msgid "Section: "
 msgstr "Sekcija:"
 
-#: src/cmdline/cmdline_show.cc:280 src/pkg_info_screen.cc:115
+#: src/cmdline/cmdline_show.cc:285 src/pkg_info_screen.cc:115
 msgid "Maintainer: "
 msgstr "Održavatelj:"
 
-#: src/cmdline/cmdline_show.cc:283
+#: src/cmdline/cmdline_show.cc:288
 msgid "Uncompressed Size: "
 msgstr "Dekompresovana veličina:"
 
-#: src/cmdline/cmdline_show.cc:287
+#: src/cmdline/cmdline_show.cc:292
 msgid "Architecture: "
 msgstr "Arhitektura:"
 
-#: src/cmdline/cmdline_show.cc:289
+#: src/cmdline/cmdline_show.cc:294
 msgid "Compressed Size: "
 msgstr "Kompresovana veličina:"
 
-#: src/cmdline/cmdline_show.cc:291
+#: src/cmdline/cmdline_show.cc:296
 msgid "Filename: "
 msgstr "Naziv datoteke:"
 
-#: src/cmdline/cmdline_show.cc:293
+#: src/cmdline/cmdline_show.cc:298
 msgid "MD5sum: "
 msgstr "MD5 zbir:"
 
-#: src/cmdline/cmdline_show.cc:297 src/cmdline/cmdline_show.cc:299
+#: src/cmdline/cmdline_show.cc:302 src/cmdline/cmdline_show.cc:305
 msgid "Archive"
 msgstr "Arhiva"
 
-#: src/cmdline/cmdline_show.cc:303
+#: src/cmdline/cmdline_show.cc:310
 msgid "Depends"
 msgstr "Zavisi"
 
-#: src/cmdline/cmdline_show.cc:305
+#: src/cmdline/cmdline_show.cc:312
 msgid "PreDepends"
 msgstr "Unaprijed zavisi"
 
-#: src/cmdline/cmdline_show.cc:307
+#: src/cmdline/cmdline_show.cc:314
 msgid "Recommends"
 msgstr "Preporučuje"
 
-#: src/cmdline/cmdline_show.cc:309
+#: src/cmdline/cmdline_show.cc:316
 msgid "Suggests"
 msgstr "Predlaže"
 
-#: src/cmdline/cmdline_show.cc:311
+#: src/cmdline/cmdline_show.cc:318
 msgid "Conflicts"
 msgstr "Sukobljava se sa"
 
-#: src/cmdline/cmdline_show.cc:313
+#: src/cmdline/cmdline_show.cc:320
 msgid "Replaces"
 msgstr "Zamjenjuje"
 
-#: src/cmdline/cmdline_show.cc:315
+#: src/cmdline/cmdline_show.cc:322
 msgid "Obsoletes"
 msgstr "Zastarijeva"
 
-#: src/cmdline/cmdline_show.cc:317
+#: src/cmdline/cmdline_show.cc:324
 msgid "Provides"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:321 src/pkg_info_screen.cc:97
+#: src/cmdline/cmdline_show.cc:328 src/pkg_info_screen.cc:97
 msgid "Description: "
 msgstr ""
 
@@ -1162,32 +1166,32 @@
 msgid "You cannot specify both an archive and a version for a package\n"
 msgstr ""
 
-#: src/dep_item.cc:137
+#: src/dep_item.cc:139
 msgid "UNSATISFIED"
 msgstr ""
 
-#: src/dep_item.cc:137 src/reason_fragment.cc:247
+#: src/dep_item.cc:139 src/reason_fragment.cc:244
 msgid "UNAVAILABLE"
 msgstr ""
 
-#: src/download_bar.cc:56 src/download_list.cc:263 src/download_screen.cc:57
+#: src/download_bar.cc:56 src/download_list.cc:266 src/download_screen.cc:57
 #, c-format
 msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
 msgstr ""
 
-#: src/download_bar.cc:77 src/generic/acqprogress.cc:63
+#: src/download_bar.cc:75 src/generic/acqprogress.cc:63
 msgid "Hit "
 msgstr ""
 
-#: src/download_bar.cc:90
+#: src/download_bar.cc:88
 msgid "Downloading "
 msgstr ""
 
-#: src/download_bar.cc:103
+#: src/download_bar.cc:101
 msgid "Got "
 msgstr ""
 
-#: src/download_bar.cc:157
+#: src/download_bar.cc:155
 msgid "Downloading..."
 msgstr ""
 
@@ -1215,7 +1219,7 @@
 msgid "Couldn't clean out list directories"
 msgstr ""
 
-#: src/download.cc:177 src/ui.cc:1153
+#: src/download.cc:177 src/ui.cc:1147
 msgid "Deleting obsolete downloaded files"
 msgstr ""
 
@@ -1345,7 +1349,7 @@
 "Ack!  Something bad happened while installing packages.  Trying to recover:"
 msgstr ""
 
-#: src/download.cc:477 src/pkg_item.cc:432
+#: src/download.cc:477 src/pkg_item.cc:430
 msgid "Press return to continue.\n"
 msgstr ""
 
@@ -1354,17 +1358,17 @@
 "Could not regain the system lock!  (Perhaps another apt or dpkg is running?)"
 msgstr ""
 
-#: src/download_item.cc:66 src/download_item.cc:70 src/download_item.cc:100
+#: src/download_item.cc:70 src/download_item.cc:74 src/download_item.cc:104
 #: src/generic/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr ""
 
-#: src/download_item.cc:104 src/download_list.cc:283
+#: src/download_item.cc:108 src/download_list.cc:284
 msgid "[Hit]"
 msgstr ""
 
-#: src/download_item.cc:104 src/download_list.cc:303
+#: src/download_item.cc:108 src/download_list.cc:304
 msgid "[Downloaded]"
 msgstr ""
 
@@ -1378,34 +1382,34 @@
 msgid "%n%nSome files were not downloaded successfully."
 msgstr ""
 
-#: src/download_list.cc:68
+#: src/download_list.cc:66
 msgid "Continue"
 msgstr ""
 
-#: src/download_list.cc:175 src/download_screen.cc:203
+#: src/download_list.cc:178 src/download_screen.cc:203
 msgid "Total Progress: "
 msgstr ""
 
-#: src/download_list.cc:194 src/download_screen.cc:218
+#: src/download_list.cc:197 src/download_screen.cc:218
 #, c-format
 msgid " [ %i%% ] (%sB/s, %s remaining)"
 msgstr ""
 
-#: src/download_list.cc:196
+#: src/download_list.cc:199
 #, c-format
 msgid " [ %i%% ] (stalled)"
 msgstr ""
 
-#: src/download_list.cc:198
+#: src/download_list.cc:201
 #, c-format
 msgid " [ %i%% ]"
 msgstr ""
 
-#: src/download_list.cc:323
+#: src/download_list.cc:324
 msgid "[IGNORED]"
 msgstr ""
 
-#: src/download_list.cc:329
+#: src/download_list.cc:330
 msgid "[ERROR]"
 msgstr ""
 
@@ -1414,11 +1418,11 @@
 msgid "Downloaded %sB in %ss (%sB/s)."
 msgstr ""
 
-#: src/edit_pkg_hier.cc:158
+#: src/edit_pkg_hier.cc:176
 msgid "No hierarchy information to edit"
 msgstr ""
 
-#: src/edit_pkg_hier.cc:258
+#: src/edit_pkg_hier.cc:276
 msgid "Couldn't open for writing"
 msgstr ""
 
@@ -1511,39 +1515,39 @@
 msgid "Warning: could not lock the cache file.  Opening in read-only mode"
 msgstr ""
 
-#: src/generic/matchers.cc:797
+#: src/generic/matchers.cc:798
 msgid "Unmatched '('"
 msgstr ""
 
-#: src/generic/matchers.cc:887 src/generic/matchers.cc:968
+#: src/generic/matchers.cc:888 src/generic/matchers.cc:969
 #, c-format
 msgid "Unknown dependency type: %s"
 msgstr ""
 
-#: src/generic/matchers.cc:950
+#: src/generic/matchers.cc:951
 #, c-format
 msgid "Unknown action type: %s"
 msgstr ""
 
-#: src/generic/matchers.cc:1017
+#: src/generic/matchers.cc:1018
 #, c-format
 msgid "Unknown priority %s"
 msgstr ""
 
-#: src/generic/matchers.cc:1039
+#: src/generic/matchers.cc:1040
 #, c-format
 msgid "Unknown pattern type: %c"
 msgstr ""
 
-#: src/generic/matchers.cc:1084
+#: src/generic/matchers.cc:1105
 msgid "Unexpected empty expression"
 msgstr ""
 
-#: src/generic/matchers.cc:1119
+#: src/generic/matchers.cc:1143
 msgid "Badly formed expression"
 msgstr ""
 
-#: src/generic/matchers.cc:1148
+#: src/generic/matchers.cc:1175
 msgid "Unexpected ')'"
 msgstr ""
 
@@ -1564,7 +1568,7 @@
 msgid "Can't get value of $HOME, using TMPDIR (insecure)"
 msgstr ""
 
-#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:61
+#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:76
 #, c-format
 msgid "ChangeLog of %s"
 msgstr ""
@@ -1605,37 +1609,37 @@
 msgid "Reading task descriptions"
 msgstr ""
 
-#: src/load_config.cc:30
+#: src/load_config.cc:42
 #, c-format
-msgid "Invalid entry in color definition group: \"%s\""
+msgid "Unrecognized color name \"%s\""
 msgstr ""
 
-#: src/load_config.cc:32
+#: src/load_config.cc:69
 #, c-format
-msgid "Invalid tagless entry in color definition group: \"%s\""
+msgid "Unrecognized attribute name \"%s\""
 msgstr ""
 
-#: src/load_config.cc:34
+#: src/load_config.cc:106
 #, c-format
-msgid "Need exactly two colors in color definition \"%s\""
+msgid "Invalid entry in style definition group: \"%s\""
 msgstr ""
 
-#: src/load_config.cc:50
+#: src/load_config.cc:108
 #, c-format
-msgid "Can't parse foreground \"%s\"of color \"%s\""
+msgid "Invalid tagless entry in style definition group: \"%s\""
 msgstr ""
 
-#: src/load_config.cc:53
+#: src/load_config.cc:130
 #, c-format
-msgid "Can't parse background \"%s\" of color \"%s\""
+msgid "Unknown style attribute %s"
 msgstr ""
 
-#: src/load_config.cc:72 src/load_config.cc:74
+#: src/load_config.cc:153 src/load_config.cc:155
 #, c-format
 msgid "Invalid entry in keybinding group: \"%s\""
 msgstr ""
 
-#: src/load_config.cc:89
+#: src/load_config.cc:170
 #, c-format
 msgid "Ignoring invalid keybinding \"%s\" -> \"%s\""
 msgstr ""
@@ -2020,42 +2024,42 @@
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr ""
 
-#: src/main.cc:255
+#: src/main.cc:252
 #, c-format
 msgid "-o requires an argument of the form key=value, got %s"
 msgstr ""
 
-#: src/main.cc:301 src/main.cc:310
+#: src/main.cc:291 src/main.cc:300
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr ""
 
-#: src/main.cc:319
+#: src/main.cc:309
 msgid "Only one of -u and -i may be specified\n"
 msgstr ""
 
-#: src/main.cc:327
+#: src/main.cc:317
 msgid ""
 "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgstr ""
 
-#: src/main.cc:348
+#: src/main.cc:338
 msgid "-u and -i may not be specified with a command"
 msgstr ""
 
-#: src/main.cc:405
+#: src/main.cc:395
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr ""
 
-#: src/main.cc:412 src/main.cc:469
+#: src/main.cc:402 src/main.cc:450
 msgid "Internal error: uncaught 'out of solutions' exception.\n"
 msgstr ""
 
-#: src/main.cc:417 src/main.cc:474
+#: src/main.cc:407 src/main.cc:455
 msgid "Internal error: uncaught 'out of time' exception.\n"
 msgstr ""
 
-#: src/main.cc:424
+#: src/main.cc:414
 #, c-format
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
@@ -2086,7 +2090,7 @@
 msgid "Lost"
 msgstr ""
 
-#: src/mine/cmine.cc:119 src/ui.cc:1090
+#: src/mine/cmine.cc:119 src/ui.cc:1084
 msgid "Minesweeper"
 msgstr ""
 
@@ -2112,147 +2116,147 @@
 msgid "The number of mines must be a number"
 msgstr ""
 
-#: src/mine/cmine.cc:240
+#: src/mine/cmine.cc:238
 msgid "Setup custom game"
 msgstr ""
 
-#: src/mine/cmine.cc:243
+#: src/mine/cmine.cc:240
 msgid "Height of board: "
 msgstr ""
 
-#: src/mine/cmine.cc:247
+#: src/mine/cmine.cc:243
 msgid "Width of board: "
 msgstr ""
 
-#: src/mine/cmine.cc:251
+#: src/mine/cmine.cc:246
 msgid "Number of mines: "
 msgstr ""
 
-#: src/mine/cmine.cc:316
+#: src/mine/cmine.cc:305
 msgid "Choose difficulty level"
 msgstr ""
 
-#: src/mine/cmine.cc:318
+#: src/mine/cmine.cc:307
 msgid "Easy"
 msgstr ""
 
-#: src/mine/cmine.cc:319
+#: src/mine/cmine.cc:308
 msgid "Medium"
 msgstr ""
 
-#: src/mine/cmine.cc:320
+#: src/mine/cmine.cc:309
 msgid "Hard"
 msgstr ""
 
-#: src/mine/cmine.cc:321
+#: src/mine/cmine.cc:310
 msgid "Custom"
 msgstr ""
 
-#: src/mine/cmine.cc:411
+#: src/mine/cmine.cc:392
 msgid "You have won."
 msgstr ""
 
-#: src/mine/cmine.cc:414
+#: src/mine/cmine.cc:395
 msgid "You lose!"
 msgstr ""
 
-#: src/mine/cmine.cc:419
+#: src/mine/cmine.cc:400
 msgid "You die...  --More--"
 msgstr ""
 
-#: src/mine/cmine.cc:432
+#: src/mine/cmine.cc:413
 msgid "The spikes were poisoned!  The poison was deadly..  --More--"
 msgstr ""
 
-#: src/mine/cmine.cc:435
+#: src/mine/cmine.cc:416
 msgid "You land on a set of sharp iron spikes!  --More--"
 msgstr ""
 
-#: src/mine/cmine.cc:438
+#: src/mine/cmine.cc:419
 msgid "You fall into a pit!  --More--"
 msgstr ""
 
-#: src/mine/cmine.cc:441
+#: src/mine/cmine.cc:422
 msgid "KABOOM!  You step on a land mine.  --More--"
 msgstr ""
 
-#: src/mine/cmine.cc:446
+#: src/mine/cmine.cc:427
 msgid "The dart was poisoned!  The poison was deadly...  --More--"
 msgstr ""
 
-#: src/mine/cmine.cc:448
+#: src/mine/cmine.cc:429
 msgid ""
 "A little dart shoots out at you!  You are hit by a little dart!  --More--"
 msgstr ""
 
-#: src/mine/cmine.cc:452
+#: src/mine/cmine.cc:433
 msgid "You turn to stone... --More--"
 msgstr ""
 
-#: src/mine/cmine.cc:454
+#: src/mine/cmine.cc:435
 msgid "Touching the cockatrice corpse was a fatal mistake.  --More--"
 msgstr ""
 
-#: src/mine/cmine.cc:456
+#: src/mine/cmine.cc:437
 msgid "You feel here a cockatrice corpse.  --More--"
 msgstr ""
 
-#: src/mine/cmine.cc:460
+#: src/mine/cmine.cc:441
 msgid ""
 "Click!  You trigger a rolling boulder trap!  You are hit by a boulder! --"
 "More--"
 msgstr ""
 
-#: src/mine/cmine.cc:470
+#: src/mine/cmine.cc:451
 msgid "sleep"
 msgstr ""
 
-#: src/mine/cmine.cc:473
+#: src/mine/cmine.cc:454
 msgid "striking"
 msgstr ""
 
-#: src/mine/cmine.cc:476
+#: src/mine/cmine.cc:457
 msgid "death"
 msgstr ""
 
-#: src/mine/cmine.cc:479
+#: src/mine/cmine.cc:460
 msgid "polymorph"
 msgstr ""
 
-#: src/mine/cmine.cc:482
+#: src/mine/cmine.cc:463
 msgid "magic missile"
 msgstr ""
 
-#: src/mine/cmine.cc:485
+#: src/mine/cmine.cc:466
 msgid "secret door detection"
 msgstr ""
 
-#: src/mine/cmine.cc:488
+#: src/mine/cmine.cc:469
 msgid "invisibility"
 msgstr ""
 
-#: src/mine/cmine.cc:491
+#: src/mine/cmine.cc:472
 msgid "cold"
 msgstr ""
 
-#: src/mine/cmine.cc:497
+#: src/mine/cmine.cc:478
 #, c-format
 msgid "Your wand of %s breaks apart and explodes!  --More--"
 msgstr ""
 
-#: src/mine/cmine.cc:503
+#: src/mine/cmine.cc:484
 msgid "You are jolted by a surge of electricity!  --More--"
 msgstr ""
 
-#: src/mine/cmine.cc:607
+#: src/mine/cmine.cc:588
 msgid "Enter the filename to load: "
 msgstr ""
 
-#: src/mine/cmine.cc:614
+#: src/mine/cmine.cc:595
 msgid "Enter the filename to save: "
 msgstr ""
 
-#: src/mine/cmine.cc:624
+#: src/mine/cmine.cc:605
 msgid "mine-help.txt"
 msgstr ""
 
@@ -2260,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 ""
 
-#: src/pkg_columnizer.cc:84 src/ui.cc:1670
+#: src/pkg_columnizer.cc:84 src/ui.cc:1662
 msgid "Package"
 msgstr ""
 
@@ -3059,68 +3063,68 @@
 "s' if you are."
 msgstr ""
 
-#: src/pkg_item.cc:222 src/pkg_ver_item.cc:625
+#: src/pkg_item.cc:220 src/pkg_ver_item.cc:626
 #, c-format
 msgid "Information about %s"
 msgstr ""
 
-#: src/pkg_item.cc:224 src/pkg_ver_item.cc:627
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:628
 #, c-format
 msgid "%s info"
 msgstr ""
 
-#: src/pkg_item.cc:310
+#: src/pkg_item.cc:308
 #, c-format
 msgid "Available versions of %s"
 msgstr ""
 
-#: src/pkg_item.cc:313
+#: src/pkg_item.cc:311
 #, fuzzy, c-format
 msgid "%s versions"
 msgstr "Verzija:"
 
-#: src/pkg_item.cc:325 src/pkg_ver_item.cc:655
+#: src/pkg_item.cc:323 src/pkg_ver_item.cc:656
 #, c-format
 msgid "Dependencies of %s"
 msgstr ""
 
-#: src/pkg_item.cc:327 src/pkg_ver_item.cc:657
+#: src/pkg_item.cc:325 src/pkg_ver_item.cc:658
 #, c-format
 msgid "%s deps"
 msgstr ""
 
-#: src/pkg_item.cc:338 src/pkg_ver_item.cc:667
+#: src/pkg_item.cc:336 src/pkg_ver_item.cc:668
 #, c-format
 msgid "Packages depending on %s"
 msgstr ""
 
-#: src/pkg_item.cc:340 src/pkg_ver_item.cc:669
+#: src/pkg_item.cc:338 src/pkg_ver_item.cc:670
 #, c-format
 msgid "%s reverse deps"
 msgstr ""
 
-#: src/pkg_item.cc:392 src/pkg_ver_item.cc:707
+#: src/pkg_item.cc:390 src/pkg_ver_item.cc:708
 #, c-format
 msgid "Reporting a bug in %s:\n"
 msgstr ""
 
-#: src/pkg_item.cc:414
+#: src/pkg_item.cc:412
 msgid ""
 "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:422
+#: src/pkg_item.cc:420
 #, c-format
 msgid "Reconfiguring %s\n"
 msgstr ""
 
-#: src/pkg_item.cc:447
+#: src/pkg_item.cc:445
 msgid "Hierarchy editor"
 msgstr ""
 
-#: src/pkg_item.cc:447
+#: src/pkg_item.cc:445
 msgid "Hierarchy Editor"
 msgstr ""
 
@@ -3153,20 +3157,20 @@
 msgid "Enter the new package sorting mechanism for this display: "
 msgstr ""
 
-#: src/pkg_view.cc:344
+#: src/pkg_view.cc:359
 msgid "make_package_view: error in arguments -- two main widgets??"
 msgstr ""
 
-#: src/pkg_view.cc:350
+#: src/pkg_view.cc:365
 msgid ""
 "make_package_view: error in arguments -- bad column list for static item"
 msgstr ""
 
-#: src/pkg_view.cc:443
+#: src/pkg_view.cc:458
 msgid "make_package_view: bad argument!"
 msgstr ""
 
-#: src/pkg_view.cc:495
+#: src/pkg_view.cc:510
 msgid "make_package_view: no main widget found"
 msgstr ""
 
@@ -3203,152 +3207,152 @@
 msgid " (provided by %F)"
 msgstr ""
 
-#: src/reason_fragment.cc:278
+#: src/reason_fragment.cc:275
 #, c-format
 msgid "%F%s %F %F"
 msgstr ""
 
-#: src/reason_fragment.cc:327
+#: src/reason_fragment.cc:324
 msgid ""
 "If you select a package, an explanation of its current state will appear in "
 "this space."
 msgstr ""
 
-#: src/reason_fragment.cc:361
+#: src/reason_fragment.cc:358
 msgid ""
 "%B%s%b was installed automatically;  it is being removed because all of the "
 "packages which depend upon it are being removed:"
 msgstr ""
 
-#: src/reason_fragment.cc:365
+#: src/reason_fragment.cc:362
 msgid "%B%s%b will be automatically removed because of dependency errors:"
 msgstr ""
 
-#: src/reason_fragment.cc:369
+#: src/reason_fragment.cc:366
 msgid ""
 "%B%s%b will be automatically installed to satisfy the following dependencies:"
 msgstr ""
 
-#: src/reason_fragment.cc:375 src/reason_fragment.cc:387
+#: src/reason_fragment.cc:372 src/reason_fragment.cc:384
 msgid ""
 "%B%s%b cannot be upgraded now, but if it could be, it would still be held at "
 "version %B%s%b."
 msgstr ""
 
-#: src/reason_fragment.cc:378
+#: src/reason_fragment.cc:375
 msgid ""
 "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the "
 "following dependencies:"
 msgstr ""
 
-#: src/reason_fragment.cc:390
+#: src/reason_fragment.cc:387
 msgid "%B%s%b is currently installed."
 msgstr ""
 
-#: src/reason_fragment.cc:396
+#: src/reason_fragment.cc:393
 msgid "%B%s%b is not currently installed."
 msgstr ""
 
-#: src/reason_fragment.cc:404
+#: src/reason_fragment.cc:401
 msgid "Some dependencies of %B%s%b are not satisfied:"
 msgstr ""
 
-#: src/reason_fragment.cc:408
+#: src/reason_fragment.cc:405
 msgid "%B%s%b will be downgraded."
 msgstr ""
 
-#: src/reason_fragment.cc:415
+#: src/reason_fragment.cc:412
 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b."
 msgstr ""
 
-#: src/reason_fragment.cc:419
+#: src/reason_fragment.cc:416
 msgid ""
 "%B%s%b could be upgraded to version %B%s%b, but it is being held at version %"
 "B%s%b."
 msgstr ""
 
-#: src/reason_fragment.cc:426
+#: src/reason_fragment.cc:423
 msgid "%B%s%b will be re-installed."
 msgstr ""
 
-#: src/reason_fragment.cc:430
+#: src/reason_fragment.cc:427
 msgid "%B%s%b will be installed."
 msgstr ""
 
-#: src/reason_fragment.cc:434
+#: src/reason_fragment.cc:431
 msgid "%B%s%b will be removed."
 msgstr ""
 
-#: src/reason_fragment.cc:439
+#: src/reason_fragment.cc:436
 msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b."
 msgstr ""
 
-#: src/reason_fragment.cc:475
+#: src/reason_fragment.cc:472
 msgid ""
 "The following packages depend on %B%s%b and will be broken by its removal:"
 msgstr ""
 
-#: src/reason_fragment.cc:478
+#: src/reason_fragment.cc:475
 msgid "The following packages depend on %B%s%b and are broken:"
 msgstr ""
 
-#: src/reason_fragment.cc:485
+#: src/reason_fragment.cc:482
 msgid ""
 "The following packages conflict with %B%s%b and will be broken by its "
 "installation:"
 msgstr ""
 
-#: src/reason_fragment.cc:518
+#: src/reason_fragment.cc:515
 msgid ""
 "The following packages depend on a version of %B%s%b other than the "
 "currently installed version of %B%s%b, or conflict with the currently "
 "installed version:"
 msgstr ""
 
-#: src/reason_fragment.cc:522
+#: src/reason_fragment.cc:519
 msgid ""
 "The following packages conflict with %B%s%b, or depend on a version of it "
 "which is not going to be installed."
 msgstr ""
 
-#: src/reason_fragment.cc:526
+#: src/reason_fragment.cc:523
 msgid "The following packages conflict with %B%s%b:"
 msgstr ""
 
-#: src/reason_fragment.cc:531
+#: src/reason_fragment.cc:528
 msgid ""
 "The following packages depend on a version of %B%s%b other than the "
 "currently installed version of %B%s%b:"
 msgstr ""
 
-#: src/reason_fragment.cc:535
+#: src/reason_fragment.cc:532
 msgid ""
 "The following packages depend on a version of %B%s%b which is not going to "
 "be installed."
 msgstr ""
 
-#: src/reason_fragment.cc:541
+#: src/reason_fragment.cc:538
 msgid "upgraded"
 msgstr ""
 
-#: src/reason_fragment.cc:541
+#: src/reason_fragment.cc:538
 msgid "downgraded"
 msgstr ""
 
-#: src/reason_fragment.cc:547
+#: src/reason_fragment.cc:544
 msgid ""
 "The following packages depend on the currently installed version of %B%s%b (%"
 "B%s%b), or conflict with the version it will be %s to (%B%s%b), and will be "
 "broken if it is %s."
 msgstr ""
 
-#: src/reason_fragment.cc:554
+#: src/reason_fragment.cc:551
 msgid ""
 "The following packages conflict with version %B%s%b of %B%s%b, and will be "
 "broken if it is %s."
 msgstr ""
 
-#: src/reason_fragment.cc:559
+#: src/reason_fragment.cc:556
 msgid ""
 "The following packages depend on version %B%s%b of %B%s%b, and will be "
 "broken if it is %s."
@@ -3390,31 +3394,36 @@
 msgid "Close"
 msgstr ""
 
-#: src/solution_fragment.cc:125
+#: src/solution_fragment.cc:134
 #, fuzzy
 msgid "%BRemove%b the following packages:%n"
 msgstr "Slijedeći paketi su OŠTEĆENI:"
 
-#: src/solution_fragment.cc:135
+#: src/solution_fragment.cc:144
 #, fuzzy
 msgid "%BInstall%b the following packages:%n"
 msgstr "Slijedeći paketi su OŠTEĆENI:"
 
-#: src/solution_fragment.cc:148
+#: src/solution_fragment.cc:157
 msgid "%BKeep%b the following packages at their current version:%n"
 msgstr ""
 
-#: src/solution_fragment.cc:161
+#: src/solution_fragment.cc:164
+#, fuzzy
+msgid "Not Installed"
+msgstr "Automatski nadogradi instalirane pakete"
+
+#: src/solution_fragment.cc:177
 #, fuzzy
 msgid "%BUpgrade%b the following packages:%n"
 msgstr "Slijedeći paketi su OŠTEĆENI:"
 
-#: src/solution_fragment.cc:176
+#: src/solution_fragment.cc:192
 #, fuzzy
 msgid "%BDowngrade%b the following packages:%n"
 msgstr "Slijedeći paketi su OŠTEĆENI:"
 
-#: src/solution_fragment.cc:190
+#: src/solution_fragment.cc:206
 #, c-format
 msgid "Score is %d"
 msgstr ""
@@ -3442,566 +3451,571 @@
 msgid "W:"
 msgstr ""
 
-#: src/ui.cc:194
+#: src/ui.cc:193
 msgid "Search for:"
 msgstr ""
 
-#: src/ui.cc:262
+#: src/ui.cc:258
 msgid "You already are root!"
 msgstr ""
 
-#: src/ui.cc:360
+#: src/ui.cc:356
 msgid ""
 "Subprocess exited with an error -- did you type your password correctly?"
 msgstr ""
 
-#: src/ui.cc:388
+#: src/ui.cc:384
 msgid "Loading cache"
 msgstr ""
 
-#: src/ui.cc:410
+#: src/ui.cc:406
 msgid "Really quit Aptitude?"
 msgstr ""
 
-#: src/ui.cc:489
+#: src/ui.cc:485
 msgid "Really discard your personal settings and reload the defaults?"
 msgstr ""
 
-#: src/ui.cc:589 src/ui.cc:591 src/ui.cc:619 src/ui.cc:621
+#: src/ui.cc:585 src/ui.cc:587 src/ui.cc:615 src/ui.cc:617
 msgid "Packages"
 msgstr ""
 
-#: src/ui.cc:590 src/ui.cc:620
+#: src/ui.cc:586 src/ui.cc:616
 msgid "View available packages and choose actions to perform"
 msgstr ""
 
-#: src/ui.cc:667
+#: src/ui.cc:663
 msgid ""
-"%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
+"Aptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
 "BABSOLUTELY NO WARRANTY%b; for details see 'license' in the Help menu.  This "
 "is free software, and you are welcome to redistribute it under certain "
 "conditions; see 'license' for details."
 msgstr ""
 
-#: src/ui.cc:688
+#: src/ui.cc:684
 msgid "help.txt"
 msgstr ""
 
-#: src/ui.cc:704
+#: src/ui.cc:700
 msgid "README"
 msgstr ""
 
-#: src/ui.cc:786
+#: src/ui.cc:782
 msgid ""
-"%C%BWARNING%b: untrusted versions of the following packages will be "
-"installed!%n%nUntrusted packages could %Bcompromise your system's security%"
-"b.  You should only proceed with the installation if you are certain that "
-"this is what you want to do.%n%n"
+"%BWARNING%b: untrusted versions of the following packages will be installed!%"
+"n%nUntrusted packages could %Bcompromise your system's security%b.  You "
+"should only proceed with the installation if you are certain that this is "
+"what you want to do.%n%n"
 msgstr ""
 
-#: src/ui.cc:800
+#: src/ui.cc:788
+#, fuzzy
+msgid "  %S*%N %s [version %s]%n"
+msgstr "Verzija:"
+
+#: src/ui.cc:795
 msgid "Really Continue"
 msgstr ""
 
-#: src/ui.cc:802
+#: src/ui.cc:797
 msgid "Abort Installation"
 msgstr ""
 
-#: src/ui.cc:863
+#: src/ui.cc:858
 msgid "Preview of package installation"
 msgstr ""
 
-#: src/ui.cc:864
+#: src/ui.cc:859
 msgid "View and/or adjust the actions that will be performed"
 msgstr ""
 
-#: src/ui.cc:865
+#: src/ui.cc:860
 msgid "Preview"
 msgstr ""
 
-#: src/ui.cc:901
+#: src/ui.cc:896
 msgid "Some packages were broken and have been fixed:"
 msgstr ""
 
-#: src/ui.cc:907
+#: src/ui.cc:902
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:913
+#: src/ui.cc:908
 #, c-format
 msgid ""
-"Ran out of time while trying to resolver dependencies (press \"%s\" to try "
+"Ran out of time while trying to resolve dependencies (press \"%s\" to try "
 "harder)"
 msgstr ""
 
-#: src/ui.cc:959
+#: src/ui.cc:954
 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:962 src/ui.cc:1078
+#: src/ui.cc:957 src/ui.cc:1072
 msgid "Become root"
 msgstr ""
 
-#: src/ui.cc:964 src/ui.cc:1080
+#: src/ui.cc:959 src/ui.cc:1074
 msgid "Don't become root"
 msgstr ""
 
-#: src/ui.cc:969 src/ui.cc:1085
+#: src/ui.cc:964 src/ui.cc:1079
 msgid "A package-list update or install run is already taking place."
 msgstr ""
 
-#: src/ui.cc:996
+#: src/ui.cc:991
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr ""
 
-#: src/ui.cc:1002
+#: src/ui.cc:997
 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:1074
+#: src/ui.cc:1069
 msgid ""
 "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:1090 src/ui.cc:1377
+#: src/ui.cc:1084 src/ui.cc:1371
 msgid "Waste time trying to find mines"
 msgstr ""
 
-#: src/ui.cc:1097 src/ui.cc:1150
+#: src/ui.cc:1091 src/ui.cc:1144
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr ""
 
-#: src/ui.cc:1100
+#: src/ui.cc:1094
 msgid "Deleting downloaded files"
 msgstr ""
 
-#: src/ui.cc:1114
+#: src/ui.cc:1108
 msgid "Downloaded package files have been deleted"
 msgstr ""
 
-#: src/ui.cc:1175
+#: src/ui.cc:1169
 #, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr ""
 
-#: src/ui.cc:1247
+#: src/ui.cc:1241
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1252 src/ui.cc:1283
+#: src/ui.cc:1246 src/ui.cc:1277
 msgid "Ran out of time while trying to find a solution."
 msgstr ""
 
-#: src/ui.cc:1277
+#: src/ui.cc:1271
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1307
+#: src/ui.cc:1301
 #, c-format
 msgid "Unable to open %s"
 msgstr ""
 
-#: src/ui.cc:1313
+#: src/ui.cc:1307
 msgid "Error while dumping resolver state"
 msgstr ""
 
-#: src/ui.cc:1323
+#: src/ui.cc:1317
 msgid "File to which the resolver state should be dumped:"
 msgstr ""
 
-#: src/ui.cc:1353
+#: src/ui.cc:1347
 msgid "^Install/remove packages"
 msgstr ""
 
-#: src/ui.cc:1354
+#: src/ui.cc:1348
 msgid "Perform all pending installs and removals"
 msgstr ""
 
-#: src/ui.cc:1356
+#: src/ui.cc:1350
 msgid "^Update package list"
 msgstr ""
 
-#: src/ui.cc:1357
+#: src/ui.cc:1351
 msgid "Check for new versions of packages"
 msgstr ""
 
-#: src/ui.cc:1360
+#: src/ui.cc:1354
 msgid "^Forget new packages"
 msgstr ""
 
-#: src/ui.cc:1361
+#: src/ui.cc:1355
 msgid "Forget which packages are \"new\""
 msgstr ""
 
-#: src/ui.cc:1364
+#: src/ui.cc:1358
 msgid "^Clean package cache"
 msgstr ""
 
-#: src/ui.cc:1365
+#: src/ui.cc:1359
 msgid "Delete package files which were previously downloaded"
 msgstr ""
 
-#: src/ui.cc:1368
+#: src/ui.cc:1362
 msgid "Clean ^obsolete files"
 msgstr ""
 
-#: src/ui.cc:1369
+#: src/ui.cc:1363
 msgid "Delete package files which can no longer be downloaded"
 msgstr ""
 
-#: src/ui.cc:1372
+#: src/ui.cc:1366
 msgid "Mark ^Upgradable"
 msgstr ""
 
-#: src/ui.cc:1373
+#: src/ui.cc:1367
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr ""
 
-#: src/ui.cc:1376
+#: src/ui.cc:1370
 msgid "^Play Minesweeper"
 msgstr ""
 
-#: src/ui.cc:1379
+#: src/ui.cc:1373
 msgid "^Become root"
 msgstr ""
 
-#: src/ui.cc:1380
+#: src/ui.cc:1374
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
 "will be preserved"
 msgstr ""
 
-#: src/ui.cc:1383
+#: src/ui.cc:1377
 msgid "^Reload package cache"
 msgstr ""
 
-#: src/ui.cc:1384
+#: src/ui.cc:1378
 msgid "Reload the package cache"
 msgstr ""
 
-#: src/ui.cc:1390
+#: src/ui.cc:1384
 msgid "^Quit"
 msgstr ""
 
-#: src/ui.cc:1391
+#: src/ui.cc:1385
 msgid "Exit the program"
 msgstr ""
 
-#: src/ui.cc:1397 src/ui.cc:1669
+#: src/ui.cc:1391 src/ui.cc:1661
 msgid "Undo"
 msgstr ""
 
-#: src/ui.cc:1398
+#: src/ui.cc:1392
 msgid "Undo the last package operation or group of operations"
 msgstr ""
 
-#: src/ui.cc:1405
+#: src/ui.cc:1399
 msgid "^Install"
 msgstr ""
 
-#: src/ui.cc:1406
+#: src/ui.cc:1400
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr ""
 
-#: src/ui.cc:1409
+#: src/ui.cc:1403
 msgid "^Remove"
 msgstr ""
 
-#: src/ui.cc:1410
+#: src/ui.cc:1404
 msgid "Flag the currently selected package for removal"
 msgstr ""
 
-#: src/ui.cc:1413
+#: src/ui.cc:1407
 msgid "^Purge"
 msgstr ""
 
-#: src/ui.cc:1414
+#: src/ui.cc:1408
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr ""
 
-#: src/ui.cc:1417
+#: src/ui.cc:1411
 msgid "^Keep"
 msgstr ""
 
-#: src/ui.cc:1418
+#: src/ui.cc:1412
 msgid "Cancel any action on the selected package"
 msgstr ""
 
-#: src/ui.cc:1421
+#: src/ui.cc:1415
 msgid "^Hold"
 msgstr ""
 
-#: src/ui.cc:1422
+#: src/ui.cc:1416
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
 msgstr ""
 
-#: src/ui.cc:1425
+#: src/ui.cc:1419
 msgid "Mark ^Auto"
 msgstr ""
 
-#: src/ui.cc:1426
+#: src/ui.cc:1420
 msgid ""
 "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:1429
+#: src/ui.cc:1423
 msgid "Mark ^Manual"
 msgstr ""
 
-#: src/ui.cc:1430
+#: src/ui.cc:1424
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
 "removed unless you manually remove it"
 msgstr ""
 
-#: src/ui.cc:1433
+#: src/ui.cc:1427
 msgid "^Forbid Version"
 msgstr ""
 
-#: src/ui.cc:1434
+#: src/ui.cc:1428
 msgid ""
 "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:1438
+#: src/ui.cc:1432
 msgid "I^nformation"
 msgstr ""
 
-#: src/ui.cc:1439
+#: src/ui.cc:1433
 msgid "Display more information about the selected package"
 msgstr ""
 
-#: src/ui.cc:1442
+#: src/ui.cc:1436
 #, fuzzy
 msgid "^Changelog"
 msgstr "Poništi"
 
-#: src/ui.cc:1443
+#: src/ui.cc:1437
 msgid "Display the Debian changelog of the selected package"
 msgstr ""
 
-#: src/ui.cc:1450
+#: src/ui.cc:1444
 msgid "^Find"
 msgstr ""
 
-#: src/ui.cc:1451
+#: src/ui.cc:1445
 msgid "Search for a package"
 msgstr ""
 
-#: src/ui.cc:1454
+#: src/ui.cc:1448
 msgid "Find ^Again"
 msgstr ""
 
-#: src/ui.cc:1455
+#: src/ui.cc:1449
 msgid "Repeat the last search"
 msgstr ""
 
-#: src/ui.cc:1459
+#: src/ui.cc:1453
 msgid "^Limit Display"
 msgstr ""
 
-#: src/ui.cc:1460
+#: src/ui.cc:1454
 msgid "Apply a filter to the package list"
 msgstr ""
 
-#: src/ui.cc:1463
+#: src/ui.cc:1457
 msgid "^Un-Limit Display"
 msgstr ""
 
-#: src/ui.cc:1464
+#: src/ui.cc:1458
 #, fuzzy
 msgid "Remove the filter from the package list"
 msgstr "Ukloni zastarjele datoteke paketa nakon preuzimanja nove liste paketa"
 
-#: src/ui.cc:1468
+#: src/ui.cc:1462
 msgid "Find ^Broken"
 msgstr ""
 
-#: src/ui.cc:1469
+#: src/ui.cc:1463
 msgid "Find the next package with unsatisfied dependencies"
 msgstr ""
 
-#: src/ui.cc:1476
+#: src/ui.cc:1470
 msgid "^UI options"
 msgstr ""
 
-#: src/ui.cc:1477
+#: src/ui.cc:1471
 msgid "Change the settings which affect the user interface"
 msgstr ""
 
-#: src/ui.cc:1480
+#: src/ui.cc:1474
 msgid "^Dependency handling"
 msgstr ""
 
-#: src/ui.cc:1481
+#: src/ui.cc:1475
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr ""
 
-#: src/ui.cc:1484
+#: src/ui.cc:1478
 msgid "^Miscellaneous"
 msgstr ""
 
-#: src/ui.cc:1485
+#: src/ui.cc:1479
 msgid "Change miscellaneous program settings"
 msgstr ""
 
-#: src/ui.cc:1490
+#: src/ui.cc:1484
 msgid "^Revert options"
 msgstr ""
 
-#: src/ui.cc:1491
+#: src/ui.cc:1485
 msgid "Reset all settings to the system defaults"
 msgstr ""
 
-#: src/ui.cc:1502
+#: src/ui.cc:1496
 msgid "^Next"
 msgstr ""
 
-#: src/ui.cc:1503
+#: src/ui.cc:1497
 msgid "View next display"
 msgstr ""
 
-#: src/ui.cc:1506
+#: src/ui.cc:1500
 msgid "^Prev"
 msgstr ""
 
-#: src/ui.cc:1507
+#: src/ui.cc:1501
 msgid "View previous display"
 msgstr ""
 
-#: src/ui.cc:1510
+#: src/ui.cc:1504
 msgid "^Close"
 msgstr ""
 
-#: src/ui.cc:1511
+#: src/ui.cc:1505
 msgid "Close this display"
 msgstr ""
 
-#: src/ui.cc:1516
+#: src/ui.cc:1510
 msgid "New Package ^View"
 msgstr ""
 
-#: src/ui.cc:1517
+#: src/ui.cc:1511
 msgid "Create a new default package view"
 msgstr ""
 
-#: src/ui.cc:1520
+#: src/ui.cc:1514
 msgid "New Categorical ^Browser"
 msgstr ""
 
-#: src/ui.cc:1522
+#: src/ui.cc:1516
 msgid "Browse packages by category"
 msgstr ""
 
-#: src/ui.cc:1530
+#: src/ui.cc:1524
 msgid "^About"
 msgstr ""
 
-#: src/ui.cc:1531
+#: src/ui.cc:1525
 msgid "View information about this program"
 msgstr ""
 
-#: src/ui.cc:1534
+#: src/ui.cc:1528
 msgid "^Help"
 msgstr ""
 
-#: src/ui.cc:1535
+#: src/ui.cc:1529
 msgid "View the on-line help"
 msgstr ""
 
-#: src/ui.cc:1537
+#: src/ui.cc:1531
 msgid "User's ^Manual"
 msgstr ""
 
-#: src/ui.cc:1538
+#: src/ui.cc:1532
 msgid "View the detailed program manual"
 msgstr ""
 
-#: src/ui.cc:1541
+#: src/ui.cc:1535
 msgid "^FAQ"
 msgstr ""
 
-#: src/ui.cc:1542
+#: src/ui.cc:1536
 msgid "View a list of frequently asked questions"
 msgstr ""
 
-#: src/ui.cc:1545
+#: src/ui.cc:1539
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1546
+#: src/ui.cc:1540
 msgid "View the important changes made in each version of "
 msgstr ""
 
-#: src/ui.cc:1549
+#: src/ui.cc:1543
 msgid "^License"
 msgstr ""
 
-#: src/ui.cc:1550
+#: src/ui.cc:1544
 msgid "View the terms under which you may copy the program"
 msgstr ""
 
-#: src/ui.cc:1668
+#: src/ui.cc:1660
 msgid "Actions"
 msgstr ""
 
-#: src/ui.cc:1671
+#: src/ui.cc:1663
 msgid "Search"
 msgstr ""
 
-#: src/ui.cc:1672
+#: src/ui.cc:1664
 msgid "Options"
 msgstr "Opcije"
 
-#: src/ui.cc:1673
+#: src/ui.cc:1665
 msgid "Views"
 msgstr ""
 
-#: src/ui.cc:1674
+#: src/ui.cc:1666
 msgid "Help"
 msgstr ""
 
-#: src/ui.cc:1734
+#: src/ui.cc:1726
 #, c-format
 msgid ""
 "%s: Menu  %s: Help  %s: Quit  %s: Update  %s: Download/Install/Remove Pkgs"
 msgstr ""
 
-#: src/ui.cc:2003 src/vscreen/vscreen.cc:281
+#: src/ui.cc:1996 src/vscreen/vscreen.cc:281
 msgid "yes_key"
 msgstr ""
 
-#: src/ui.cc:2004 src/vscreen/vscreen.cc:282
+#: src/ui.cc:1997 src/vscreen/vscreen.cc:282
 msgid "no_key"
 msgstr ""
 
-#: src/view_changelog.cc:46
+#: src/view_changelog.cc:61
 msgid "You can only view changelogs of official Debian packages."
 msgstr ""
 
-#: src/view_changelog.cc:52
+#: src/view_changelog.cc:67
 msgid "Downloading Changelog"
 msgstr "Preuzimam Changelog datoteku"
 
-#: src/view_changelog.cc:54
+#: src/view_changelog.cc:69
 #, fuzzy
 msgid "Download Changelog"
 msgstr "Preuzimam Changelog datoteku"
 
-#: src/view_changelog.cc:63
+#: src/view_changelog.cc:78
 #, c-format
 msgid "%s changes"
 msgstr ""
@@ -4034,6 +4048,10 @@
 #~ msgstr "S'utilitzaran %sB de l'espai de disc"
 
 #, fuzzy
+#~ msgid "  This will free %sB of disk space."
+#~ msgstr "S'alliberaran %sB de l'espai de disc"
+
+#, fuzzy
 #~ msgid "Essential:"
 #~ msgstr "Essencial: "
 

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	Sun Jun 12 21:04:47 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-05-01 14:08-0400\n"
+"POT-Creation-Date: 2005-06-12 22:42+0200\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"
@@ -162,14 +162,14 @@
 "Suprimeix automàticament els paquets no utilitzats que coincideixen amb "
 "aquest filtre"
 
-#: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:219 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
-#: src/vscreen/vs_util.cc:328
+#: src/apt_options.cc:240 src/mine/cmine.cc:249 src/mine/cmine.cc:312
+#: src/ui.cc:215 src/vscreen/vs_util.cc:77 src/vscreen/vs_util.cc:90
+#: src/vscreen/vs_util.cc:264 src/vscreen/vs_util.cc:298
 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:328
+#: src/apt_options.cc:241 src/download_list.cc:69 src/mine/cmine.cc:250
+#: src/mine/cmine.cc:313 src/vscreen/vs_util.cc:298
 msgid "Cancel"
 msgstr "Cancel·la"
 
@@ -250,15 +250,15 @@
 msgid "%s: Previous"
 msgstr ""
 
-#: src/broken_indicator.cc:233
+#: src/broken_indicator.cc:232
 #, c-format
-msgid "%CSolution search failed.  %s: try harder"
+msgid "Solution search failed.  %s: try harder"
 msgstr ""
 
-#: src/broken_indicator.cc:239
-#, c-format
-msgid "%CUnable to resolve dependencies."
-msgstr ""
+#: src/broken_indicator.cc:237
+#, fuzzy
+msgid "Unable to resolve dependencies."
+msgstr "No s'ha pogut obrir %s per a l'escriptura"
 
 #: src/cmdline/cmdline_action.cc:36
 #, c-format
@@ -629,13 +629,13 @@
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
-#: src/vscreen/vs_util.cc:212
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:165
+#: src/vscreen/vs_util.cc:202
 msgid "Yes"
 msgstr "Sí"
 
-#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
-#: src/vscreen/vs_util.cc:212
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:165
+#: src/vscreen/vs_util.cc:202
 msgid "No"
 msgstr "No"
 
@@ -949,7 +949,7 @@
 msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:212
+#: src/cmdline/cmdline_resolver.cc:212 src/cmdline/cmdline_resolver.cc:285
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
@@ -1006,196 +1006,201 @@
 msgid "The following packages have unmet dependencies:\n"
 msgstr "No s'han trobat les dependències del paquets següents:\n"
 
-#: src/cmdline/cmdline_show.cc:133
+#: src/cmdline/cmdline_show.cc:119 src/cmdline/cmdline_show.cc:305
+#: src/solution_fragment.cc:65
+msgid "<NULL>"
+msgstr ""
+
+#: src/cmdline/cmdline_show.cc:138
 msgid "not installed"
 msgstr "no instal·lat"
 
-#: src/cmdline/cmdline_show.cc:135 src/pkg_columnizer.cc:231
+#: src/cmdline/cmdline_show.cc:140 src/pkg_columnizer.cc:231
 #: src/pkg_ver_item.cc:225
 msgid "unpacked"
 msgstr "desempaquetats"
 
-#: src/cmdline/cmdline_show.cc:137
+#: src/cmdline/cmdline_show.cc:142
 msgid "partially configured"
 msgstr "parcialment configurat"
 
-#: src/cmdline/cmdline_show.cc:139
+#: src/cmdline/cmdline_show.cc:144
 msgid "partially installed"
 msgstr "parcialment instal·lat"
 
-#: src/cmdline/cmdline_show.cc:141
+#: src/cmdline/cmdline_show.cc:146
 msgid "not installed (configuration files remain)"
 msgstr "no instal·lat (es mantenen els fitxers de configuració)"
 
-#: src/cmdline/cmdline_show.cc:143 src/pkg_columnizer.cc:239
+#: src/cmdline/cmdline_show.cc:148 src/pkg_columnizer.cc:239
 #: src/pkg_ver_item.cc:233
 msgid "installed"
 msgstr "instal·lat"
 
-#: src/cmdline/cmdline_show.cc:152
+#: src/cmdline/cmdline_show.cc:157
 msgid "not a real package"
 msgstr "no és un paquet real"
 
-#: src/cmdline/cmdline_show.cc:165
+#: src/cmdline/cmdline_show.cc:170
 msgid " [held]"
 msgstr " [congela]"
 
-#: src/cmdline/cmdline_show.cc:174
+#: src/cmdline/cmdline_show.cc:179
 #, c-format
 msgid "%s; version %s will be installed"
 msgstr "%s; s'instal·larà la versió %s"
 
-#: src/cmdline/cmdline_show.cc:178
+#: src/cmdline/cmdline_show.cc:183
 #, c-format
 msgid "%s; version %s will be installed automatically"
 msgstr "%s; s'instal·larà automàticament la versió %s"
 
-#: src/cmdline/cmdline_show.cc:184 src/cmdline/cmdline_show.cc:199
+#: src/cmdline/cmdline_show.cc:189 src/cmdline/cmdline_show.cc:204
 #, c-format
 msgid "%s; will be purged"
 msgstr "%s; es purgarà"
 
-#: src/cmdline/cmdline_show.cc:197
+#: src/cmdline/cmdline_show.cc:202
 #, c-format
 msgid "%s; will be purged because nothing depends on it"
 msgstr "%s; es purgaran perquè no en depèn res"
 
-#: src/cmdline/cmdline_show.cc:204
+#: src/cmdline/cmdline_show.cc:209
 #, c-format
 msgid "%s; will be removed because nothing depends on it"
 msgstr "%s; se suprimirà perquè no en depèn res"
 
-#: src/cmdline/cmdline_show.cc:206
+#: src/cmdline/cmdline_show.cc:211
 #, c-format
 msgid "%s; will be removed"
 msgstr "%s; se suprimirà"
 
-#: src/cmdline/cmdline_show.cc:220
+#: src/cmdline/cmdline_show.cc:225
 #, c-format
 msgid "%s%s; will be downgraded [%s -> %s]"
 msgstr "%s%s; es desactualitzarà [%s -> %s]"
 
-#: src/cmdline/cmdline_show.cc:223
+#: src/cmdline/cmdline_show.cc:228
 #, c-format
 msgid "%s%s; will be upgraded [%s -> %s]"
 msgstr "%s%s; s'actualitzarà [%s -> %s]"
 
-#: src/cmdline/cmdline_show.cc:235 src/cmdline/cmdline_show.cc:256
+#: src/cmdline/cmdline_show.cc:240 src/cmdline/cmdline_show.cc:261
 msgid "Package: "
 msgstr "Paquet: "
 
-#: src/cmdline/cmdline_show.cc:236 src/cmdline/cmdline_show.cc:264
+#: src/cmdline/cmdline_show.cc:241 src/cmdline/cmdline_show.cc:269
 #: src/pkg_columnizer.cc:87
 msgid "State"
 msgstr "Estat"
 
-#: src/cmdline/cmdline_show.cc:237 src/cmdline/cmdline_show.cc:318
+#: src/cmdline/cmdline_show.cc:242 src/cmdline/cmdline_show.cc:325
 msgid "Provided by"
 msgstr "Proporcionat per"
 
-#: src/cmdline/cmdline_show.cc:258 src/pkg_info_screen.cc:105
+#: src/cmdline/cmdline_show.cc:263 src/pkg_info_screen.cc:105
 msgid "Essential: "
 msgstr "Essencial: "
 
-#: src/cmdline/cmdline_show.cc:258 src/cmdline/cmdline_show.cc:262
-#: src/cmdline/cmdline_show.cc:273 src/pkg_info_screen.cc:105
+#: src/cmdline/cmdline_show.cc:263 src/cmdline/cmdline_show.cc:267
+#: src/cmdline/cmdline_show.cc:278 src/pkg_info_screen.cc:105
 msgid "yes"
 msgstr "sí"
 
-#: src/cmdline/cmdline_show.cc:262
+#: src/cmdline/cmdline_show.cc:267
 msgid "New"
 msgstr "Nou"
 
-#: src/cmdline/cmdline_show.cc:267
+#: src/cmdline/cmdline_show.cc:272
 msgid "Forbidden version"
 msgstr "Versió prohibida"
 
-#: src/cmdline/cmdline_show.cc:271
+#: src/cmdline/cmdline_show.cc:276
 msgid "Automatically installed"
 msgstr "Instal·lat automàticament"
 
-#: src/cmdline/cmdline_show.cc:273
+#: src/cmdline/cmdline_show.cc:278
 msgid "no"
 msgstr "no"
 
-#: src/cmdline/cmdline_show.cc:275
+#: src/cmdline/cmdline_show.cc:280
 msgid "Version: "
 msgstr "Versió: "
 
-#: src/cmdline/cmdline_show.cc:276 src/pkg_info_screen.cc:113
+#: src/cmdline/cmdline_show.cc:281 src/pkg_info_screen.cc:113
 msgid "Priority: "
 msgstr "Prioritat: "
 
-#: src/cmdline/cmdline_show.cc:277 src/cmdline/cmdline_show.cc:279
-#: src/cmdline/cmdline_show.cc:288
+#: src/cmdline/cmdline_show.cc:282 src/cmdline/cmdline_show.cc:284
+#: src/cmdline/cmdline_show.cc:293
 msgid "N/A"
 msgstr "N/A"
 
-#: src/cmdline/cmdline_show.cc:278 src/pkg_info_screen.cc:114
+#: src/cmdline/cmdline_show.cc:283 src/pkg_info_screen.cc:114
 msgid "Section: "
 msgstr "Secció: "
 
-#: src/cmdline/cmdline_show.cc:280 src/pkg_info_screen.cc:115
+#: src/cmdline/cmdline_show.cc:285 src/pkg_info_screen.cc:115
 msgid "Maintainer: "
 msgstr "Mantenidor: "
 
-#: src/cmdline/cmdline_show.cc:283
+#: src/cmdline/cmdline_show.cc:288
 msgid "Uncompressed Size: "
 msgstr "Mida descomprimit: "
 
-#: src/cmdline/cmdline_show.cc:287
+#: src/cmdline/cmdline_show.cc:292
 msgid "Architecture: "
 msgstr "Arquitectura: "
 
-#: src/cmdline/cmdline_show.cc:289
+#: src/cmdline/cmdline_show.cc:294
 msgid "Compressed Size: "
 msgstr "Mida comprimit: "
 
-#: src/cmdline/cmdline_show.cc:291
+#: src/cmdline/cmdline_show.cc:296
 msgid "Filename: "
 msgstr "Nom del fitxer: "
 
-#: src/cmdline/cmdline_show.cc:293
+#: src/cmdline/cmdline_show.cc:298
 msgid "MD5sum: "
 msgstr "MD5sum: "
 
-#: src/cmdline/cmdline_show.cc:297 src/cmdline/cmdline_show.cc:299
+#: src/cmdline/cmdline_show.cc:302 src/cmdline/cmdline_show.cc:305
 msgid "Archive"
 msgstr "Arxiu"
 
-#: src/cmdline/cmdline_show.cc:303
+#: src/cmdline/cmdline_show.cc:310
 msgid "Depends"
 msgstr "Depèn"
 
-#: src/cmdline/cmdline_show.cc:305
+#: src/cmdline/cmdline_show.cc:312
 msgid "PreDepends"
 msgstr "PreDepèn"
 
-#: src/cmdline/cmdline_show.cc:307
+#: src/cmdline/cmdline_show.cc:314
 msgid "Recommends"
 msgstr "Recomana"
 
-#: src/cmdline/cmdline_show.cc:309
+#: src/cmdline/cmdline_show.cc:316
 msgid "Suggests"
 msgstr "Suggereix"
 
-#: src/cmdline/cmdline_show.cc:311
+#: src/cmdline/cmdline_show.cc:318
 msgid "Conflicts"
 msgstr "Entra en conflicte"
 
-#: src/cmdline/cmdline_show.cc:313
+#: src/cmdline/cmdline_show.cc:320
 msgid "Replaces"
 msgstr "Substitueix"
 
-#: src/cmdline/cmdline_show.cc:315
+#: src/cmdline/cmdline_show.cc:322
 msgid "Obsoletes"
 msgstr "Obsolet"
 
-#: src/cmdline/cmdline_show.cc:317
+#: src/cmdline/cmdline_show.cc:324
 msgid "Provides"
 msgstr "Proporciona"
 
-#: src/cmdline/cmdline_show.cc:321 src/pkg_info_screen.cc:97
+#: src/cmdline/cmdline_show.cc:328 src/pkg_info_screen.cc:97
 msgid "Description: "
 msgstr "Descripció: "
 
@@ -1240,32 +1245,32 @@
 msgid "You cannot specify both an archive and a version for a package\n"
 msgstr "No podeu especificar un arxiu i una versió per a un paquet\n"
 
-#: src/dep_item.cc:137
+#: src/dep_item.cc:139
 msgid "UNSATISFIED"
 msgstr "No resoltes"
 
-#: src/dep_item.cc:137 src/reason_fragment.cc:247
+#: src/dep_item.cc:139 src/reason_fragment.cc:244
 msgid "UNAVAILABLE"
 msgstr "No disponible"
 
-#: src/download_bar.cc:56 src/download_list.cc:263 src/download_screen.cc:57
+#: src/download_bar.cc:56 src/download_list.cc:266 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_bar.cc:77 src/generic/acqprogress.cc:63
+#: src/download_bar.cc:75 src/generic/acqprogress.cc:63
 msgid "Hit "
 msgstr "Prem"
 
-#: src/download_bar.cc:90
+#: src/download_bar.cc:88
 msgid "Downloading "
 msgstr "S'està baixant"
 
-#: src/download_bar.cc:103
+#: src/download_bar.cc:101
 msgid "Got "
 msgstr "Obtingut/s "
 
-#: src/download_bar.cc:157
+#: src/download_bar.cc:155
 msgid "Downloading..."
 msgstr "S'està baixant..."
 
@@ -1293,7 +1298,7 @@
 msgid "Couldn't clean out list directories"
 msgstr "No s'han pogut netejar els directoris de la llista"
 
-#: src/download.cc:177 src/ui.cc:1153
+#: src/download.cc:177 src/ui.cc:1147
 msgid "Deleting obsolete downloaded files"
 msgstr "S'estan suprimint els fitxers baixats obsolets"
 
@@ -1433,7 +1438,7 @@
 "S'ha produït un error en la instal·lació dels paquets. S'està intentant la "
 "recuperació:"
 
-#: src/download.cc:477 src/pkg_item.cc:432
+#: src/download.cc:477 src/pkg_item.cc:430
 msgid "Press return to continue.\n"
 msgstr "Premeu retorn per continuar.\n"
 
@@ -1444,17 +1449,17 @@
 "No s'ha pogut tornar a obtenir el candau del sistema (Potser hi ha algun "
 "altre apt o dpkg executant-se?)"
 
-#: src/download_item.cc:66 src/download_item.cc:70 src/download_item.cc:100
+#: src/download_item.cc:70 src/download_item.cc:74 src/download_item.cc:104
 #: src/generic/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr " [S'està treballant]"
 
-#: src/download_item.cc:104 src/download_list.cc:283
+#: src/download_item.cc:108 src/download_list.cc:284
 msgid "[Hit]"
 msgstr " [Marcat]"
 
-#: src/download_item.cc:104 src/download_list.cc:303
+#: src/download_item.cc:108 src/download_list.cc:304
 msgid "[Downloaded]"
 msgstr " [Baixat]"
 
@@ -1468,34 +1473,34 @@
 msgid "%n%nSome files were not downloaded successfully."
 msgstr ""
 
-#: src/download_list.cc:68
+#: src/download_list.cc:66
 msgid "Continue"
 msgstr "Continua"
 
-#: src/download_list.cc:175 src/download_screen.cc:203
+#: src/download_list.cc:178 src/download_screen.cc:203
 msgid "Total Progress: "
 msgstr "Progrés total: "
 
-#: src/download_list.cc:194 src/download_screen.cc:218
+#: src/download_list.cc:197 src/download_screen.cc:218
 #, c-format
 msgid " [ %i%% ] (%sB/s, %s remaining)"
 msgstr " [ %i%% ] (%sB/s, %s restant)"
 
-#: src/download_list.cc:196
+#: src/download_list.cc:199
 #, c-format
 msgid " [ %i%% ] (stalled)"
 msgstr " [ %i%% ] (bloquejat)"
 
-#: src/download_list.cc:198
+#: src/download_list.cc:201
 #, c-format
 msgid " [ %i%% ]"
 msgstr " [ %i%% ]"
 
-#: src/download_list.cc:323
+#: src/download_list.cc:324
 msgid "[IGNORED]"
 msgstr "[Ignorat]"
 
-#: src/download_list.cc:329
+#: src/download_list.cc:330
 msgid "[ERROR]"
 msgstr "[Error]"
 
@@ -1504,11 +1509,11 @@
 msgid "Downloaded %sB in %ss (%sB/s)."
 msgstr "Baixats %sB en %ss (%sB/s)."
 
-#: src/edit_pkg_hier.cc:158
+#: src/edit_pkg_hier.cc:176
 msgid "No hierarchy information to edit"
 msgstr "No hi ha informació de la jerarquia a editar"
 
-#: src/edit_pkg_hier.cc:258
+#: src/edit_pkg_hier.cc:276
 msgid "Couldn't open for writing"
 msgstr "No s'ha pogut obrir per a l'escriptura"
 
@@ -1612,39 +1617,39 @@
 "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:797
+#: src/generic/matchers.cc:798
 msgid "Unmatched '('"
 msgstr "'(' no està tancada"
 
-#: src/generic/matchers.cc:887 src/generic/matchers.cc:968
+#: src/generic/matchers.cc:888 src/generic/matchers.cc:969
 #, c-format
 msgid "Unknown dependency type: %s"
 msgstr "El tipus de dependència és desconegut: %s"
 
-#: src/generic/matchers.cc:950
+#: src/generic/matchers.cc:951
 #, c-format
 msgid "Unknown action type: %s"
 msgstr "El tipus d'acció és desconegut: %s"
 
-#: src/generic/matchers.cc:1017
+#: src/generic/matchers.cc:1018
 #, c-format
 msgid "Unknown priority %s"
 msgstr "La prioritat %s és desconeguda"
 
-#: src/generic/matchers.cc:1039
+#: src/generic/matchers.cc:1040
 #, c-format
 msgid "Unknown pattern type: %c"
 msgstr "El tipus de patró és desconegut: %c"
 
-#: src/generic/matchers.cc:1084
+#: src/generic/matchers.cc:1105
 msgid "Unexpected empty expression"
 msgstr "L'expressió, inesperadament, és buida"
 
-#: src/generic/matchers.cc:1119
+#: src/generic/matchers.cc:1143
 msgid "Badly formed expression"
 msgstr "L'expressió està mal formada"
 
-#: src/generic/matchers.cc:1148
+#: src/generic/matchers.cc:1175
 msgid "Unexpected ')'"
 msgstr "El ')' és inesperat"
 
@@ -1670,7 +1675,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:61
+#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:76
 #, c-format
 msgid "ChangeLog of %s"
 msgstr "El registre de canvis de %s"
@@ -1716,38 +1721,38 @@
 msgid "Reading task descriptions"
 msgstr "S'estan llegint les descripcions de les tasques"
 
-#: src/load_config.cc:30
-#, c-format
-msgid "Invalid entry in color definition group: \"%s\""
+#: src/load_config.cc:42
+#, fuzzy, c-format
+msgid "Unrecognized color name \"%s\""
+msgstr "Tasques no reconegudes"
+
+#: src/load_config.cc:69
+#, fuzzy, c-format
+msgid "Unrecognized attribute name \"%s\""
+msgstr "Tasques no reconegudes"
+
+#: src/load_config.cc:106
+#, fuzzy, c-format
+msgid "Invalid entry in style definition group: \"%s\""
 msgstr "Registre no vàlid en el grup de definició de color: \"%s\""
 
-#: src/load_config.cc:32
-#, c-format
-msgid "Invalid tagless entry in color definition group: \"%s\""
+#: src/load_config.cc:108
+#, fuzzy, c-format
+msgid "Invalid tagless entry in style definition group: \"%s\""
 msgstr ""
 "Registre sense etiqueta no vàlid en el grup de definició de color: \"%s\""
 
-#: src/load_config.cc:34
-#, c-format
-msgid "Need exactly two colors in color definition \"%s\""
-msgstr "La definició de color \"%s\" precisa de dos colors exactes"
-
-#: src/load_config.cc:50
-#, c-format
-msgid "Can't parse foreground \"%s\"of color \"%s\""
-msgstr "No es pot analitzar el primer pla \"%s\" del color \"%s\""
-
-#: src/load_config.cc:53
-#, c-format
-msgid "Can't parse background \"%s\" of color \"%s\""
-msgstr "No s'ha pogut analitzar el fons \"%s\" del color \"%s\""
+#: src/load_config.cc:130
+#, fuzzy, c-format
+msgid "Unknown style attribute %s"
+msgstr "El tipus d'acció és desconegut: %s"
 
-#: src/load_config.cc:72 src/load_config.cc:74
+#: src/load_config.cc:153 src/load_config.cc:155
 #, c-format
 msgid "Invalid entry in keybinding group: \"%s\""
 msgstr "Registre no vàlid en el grup de vinculació de tecles: \"%s\""
 
-#: src/load_config.cc:89
+#: src/load_config.cc:170
 #, c-format
 msgid "Ignoring invalid keybinding \"%s\" -> \"%s\""
 msgstr "S'ignora la vinculació de tecles no vàlida \"%s\" -> \"%s\""
@@ -2175,44 +2180,44 @@
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                  L'aptitude no té super poders bovins.\n"
 
-#: src/main.cc:255
+#: src/main.cc:252
 #, 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:301 src/main.cc:310
+#: src/main.cc:291 src/main.cc:300
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr "Rar: s'ha rebut un codi d'opció desconegut\n"
 
-#: src/main.cc:319
+#: src/main.cc:309
 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:327
+#: src/main.cc:317
 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:348
+#: src/main.cc:338
 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:405
+#: src/main.cc:395
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr "Ordre desconeguda \"%s\"\n"
 
-#: src/main.cc:412 src/main.cc:469
+#: src/main.cc:402 src/main.cc:450
 msgid "Internal error: uncaught 'out of solutions' exception.\n"
 msgstr ""
 
-#: src/main.cc:417 src/main.cc:474
+#: src/main.cc:407 src/main.cc:455
 msgid "Internal error: uncaught 'out of time' exception.\n"
 msgstr ""
 
-#: src/main.cc:424
+#: src/main.cc:414
 #, c-format
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
@@ -2243,7 +2248,7 @@
 msgid "Lost"
 msgstr "Perdut"
 
-#: src/mine/cmine.cc:119 src/ui.cc:1090
+#: src/mine/cmine.cc:119 src/ui.cc:1084
 msgid "Minesweeper"
 msgstr "Busca mines"
 
@@ -2269,92 +2274,92 @@
 msgid "The number of mines must be a number"
 msgstr "El nombre de mines ha de ser un número"
 
-#: src/mine/cmine.cc:240
+#: src/mine/cmine.cc:238
 msgid "Setup custom game"
 msgstr "Configuració la personalització del joc"
 
-#: src/mine/cmine.cc:243
+#: src/mine/cmine.cc:240
 msgid "Height of board: "
 msgstr "Alçada del tauler: "
 
-#: src/mine/cmine.cc:247
+#: src/mine/cmine.cc:243
 msgid "Width of board: "
 msgstr "Amplada del tauler: "
 
-#: src/mine/cmine.cc:251
+#: src/mine/cmine.cc:246
 msgid "Number of mines: "
 msgstr "Nombre de mines: "
 
-#: src/mine/cmine.cc:316
+#: src/mine/cmine.cc:305
 msgid "Choose difficulty level"
 msgstr "Escolliu un nivell de dificultat"
 
-#: src/mine/cmine.cc:318
+#: src/mine/cmine.cc:307
 msgid "Easy"
 msgstr "Fàcil"
 
-#: src/mine/cmine.cc:319
+#: src/mine/cmine.cc:308
 msgid "Medium"
 msgstr "Mitjà"
 
-#: src/mine/cmine.cc:320
+#: src/mine/cmine.cc:309
 msgid "Hard"
 msgstr "Difícil"
 
-#: src/mine/cmine.cc:321
+#: src/mine/cmine.cc:310
 msgid "Custom"
 msgstr "Personalitzat"
 
-#: src/mine/cmine.cc:411
+#: src/mine/cmine.cc:392
 msgid "You have won."
 msgstr "Heu guanyat."
 
-#: src/mine/cmine.cc:414
+#: src/mine/cmine.cc:395
 msgid "You lose!"
 msgstr "Heu perdut!"
 
-#: src/mine/cmine.cc:419
+#: src/mine/cmine.cc:400
 msgid "You die...  --More--"
 msgstr "Us heu mort... --Més--"
 
-#: src/mine/cmine.cc:432
+#: src/mine/cmine.cc:413
 msgid "The spikes were poisoned!  The poison was deadly..  --More--"
 msgstr "Les punxes eren verinoses!  El verí era mortal..  --Més--"
 
-#: src/mine/cmine.cc:435
+#: src/mine/cmine.cc:416
 msgid "You land on a set of sharp iron spikes!  --More--"
 msgstr "Heu aterrat sobre un terreny amb punxes de ferro afilades!  --Més--"
 
-#: src/mine/cmine.cc:438
+#: src/mine/cmine.cc:419
 msgid "You fall into a pit!  --More--"
 msgstr "Heu caigut a un forat!  --Més--"
 
-#: src/mine/cmine.cc:441
+#: src/mine/cmine.cc:422
 msgid "KABOOM!  You step on a land mine.  --More--"
 msgstr "Barrabum!  Heu trepitjat una mina.  --Més--"
 
-#: src/mine/cmine.cc:446
+#: src/mine/cmine.cc:427
 msgid "The dart was poisoned!  The poison was deadly...  --More--"
 msgstr "La fletxa era verinosa!  El verí era mortal...  --Més--"
 
-#: src/mine/cmine.cc:448
+#: src/mine/cmine.cc:429
 msgid ""
 "A little dart shoots out at you!  You are hit by a little dart!  --More--"
 msgstr "Us han disparat una fletxa!  Us han clavat una fletxa!  --Més--"
 
-#: src/mine/cmine.cc:452
+#: src/mine/cmine.cc:433
 msgid "You turn to stone... --More--"
 msgstr "Us heu convertit en una pedra... --Més--"
 
-#: src/mine/cmine.cc:454
+#: src/mine/cmine.cc:435
 msgid "Touching the cockatrice corpse was a fatal mistake.  --More--"
 msgstr "Heu comès un greu error tocant el cadàver d'un basilisc.  --Més--"
 
-#: src/mine/cmine.cc:456
+#: src/mine/cmine.cc:437
 msgid "You feel here a cockatrice corpse.  --More--"
 msgstr "Sentiu a prop el cos d'un basilisc. --Més--"
 
-#: src/mine/cmine.cc:460
+#: src/mine/cmine.cc:441
 msgid ""
 "Click!  You trigger a rolling boulder trap!  You are hit by a boulder! --"
 "More--"
@@ -2362,56 +2367,56 @@
 "Clic!  Heu disparat un trampa d'un pedra rodant!  La pedra us esclafa! --"
 "Més--"
 
-#: src/mine/cmine.cc:470
+#: src/mine/cmine.cc:451
 msgid "sleep"
 msgstr "dormir"
 
-#: src/mine/cmine.cc:473
+#: src/mine/cmine.cc:454
 msgid "striking"
 msgstr "impressionant"
 
-#: src/mine/cmine.cc:476
+#: src/mine/cmine.cc:457
 msgid "death"
 msgstr "mort"
 
-#: src/mine/cmine.cc:479
+#: src/mine/cmine.cc:460
 msgid "polymorph"
 msgstr "polimorf"
 
-#: src/mine/cmine.cc:482
+#: src/mine/cmine.cc:463
 msgid "magic missile"
 msgstr "misil màgic"
 
-#: src/mine/cmine.cc:485
+#: src/mine/cmine.cc:466
 msgid "secret door detection"
 msgstr "detecció de portes secretes"
 
-#: src/mine/cmine.cc:488
+#: src/mine/cmine.cc:469
 msgid "invisibility"
 msgstr "invisibilitat"
 
-#: src/mine/cmine.cc:491
+#: src/mine/cmine.cc:472
 msgid "cold"
 msgstr "fred"
 
-#: src/mine/cmine.cc:497
+#: src/mine/cmine.cc:478
 #, c-format
 msgid "Your wand of %s breaks apart and explodes!  --More--"
 msgstr "La vostra vareta de %s es trenca i explota!  --Més--"
 
-#: src/mine/cmine.cc:503
+#: src/mine/cmine.cc:484
 msgid "You are jolted by a surge of electricity!  --More--"
 msgstr "Us heu electrocutat!  --Més--"
 
-#: src/mine/cmine.cc:607
+#: src/mine/cmine.cc:588
 msgid "Enter the filename to load: "
 msgstr "Introduïu el nom del fitxer a carregar: "
 
-#: src/mine/cmine.cc:614
+#: src/mine/cmine.cc:595
 msgid "Enter the filename to save: "
 msgstr "Introduïu el nom del fitxer a desar: "
 
-#: src/mine/cmine.cc:624
+#: src/mine/cmine.cc:605
 msgid "mine-help.txt"
 msgstr "mine-help.txt"
 
@@ -2419,7 +2424,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:1670
+#: src/pkg_columnizer.cc:84 src/ui.cc:1662
 msgid "Package"
 msgstr "Paquet"
 
@@ -3490,52 +3495,52 @@
 "Esteu segur que el voleu suprimir?\n"
 "Si n'esteu segur introduïu '%s'."
 
-#: src/pkg_item.cc:222 src/pkg_ver_item.cc:625
+#: src/pkg_item.cc:220 src/pkg_ver_item.cc:626
 #, c-format
 msgid "Information about %s"
 msgstr "Informació quant a %s"
 
-#: src/pkg_item.cc:224 src/pkg_ver_item.cc:627
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:628
 #, c-format
 msgid "%s info"
 msgstr ""
 
-#: src/pkg_item.cc:310
+#: src/pkg_item.cc:308
 #, fuzzy, c-format
 msgid "Available versions of %s"
 msgstr "Versions disponibles de "
 
-#: src/pkg_item.cc:313
+#: src/pkg_item.cc:311
 #, fuzzy, c-format
 msgid "%s versions"
 msgstr "Versions"
 
-#: src/pkg_item.cc:325 src/pkg_ver_item.cc:655
+#: src/pkg_item.cc:323 src/pkg_ver_item.cc:656
 #, c-format
 msgid "Dependencies of %s"
 msgstr "Dependències de %s"
 
-#: src/pkg_item.cc:327 src/pkg_ver_item.cc:657
+#: src/pkg_item.cc:325 src/pkg_ver_item.cc:658
 #, c-format
 msgid "%s deps"
 msgstr ""
 
-#: src/pkg_item.cc:338 src/pkg_ver_item.cc:667
+#: src/pkg_item.cc:336 src/pkg_ver_item.cc:668
 #, c-format
 msgid "Packages depending on %s"
 msgstr "Paquets que depenen de %s"
 
-#: src/pkg_item.cc:340 src/pkg_ver_item.cc:669
+#: src/pkg_item.cc:338 src/pkg_ver_item.cc:670
 #, c-format
 msgid "%s reverse deps"
 msgstr ""
 
-#: src/pkg_item.cc:392 src/pkg_ver_item.cc:707
+#: src/pkg_item.cc:390 src/pkg_ver_item.cc:708
 #, c-format
 msgid "Reporting a bug in %s:\n"
 msgstr "S'està informant d'un error a %s:\n"
 
-#: src/pkg_item.cc:414
+#: src/pkg_item.cc:412
 #, fuzzy
 msgid ""
 "You are not root and I cannot find any way to become root.  To reconfigure "
@@ -3547,16 +3552,16 @@
 "heu d'instal·lar el paquet menú, el paquet login o\n"
 "executeu l'aptitude com a superusuari."
 
-#: src/pkg_item.cc:422
+#: src/pkg_item.cc:420
 #, c-format
 msgid "Reconfiguring %s\n"
 msgstr "S'està reconfigurant %s\n"
 
-#: src/pkg_item.cc:447
+#: src/pkg_item.cc:445
 msgid "Hierarchy editor"
 msgstr "Editor de jerarquies"
 
-#: src/pkg_item.cc:447
+#: src/pkg_item.cc:445
 #, fuzzy
 msgid "Hierarchy Editor"
 msgstr "Editor de jerarquies"
@@ -3594,24 +3599,24 @@
 "Introduïu el nou mecanisme d'ordenació de paquets per a aquesta "
 "visualització: "
 
-#: src/pkg_view.cc:344
+#: src/pkg_view.cc:359
 msgid "make_package_view: error in arguments -- two main widgets??"
 msgstr ""
 "make_package_view: s'ha produït un error en els arguments -- hi ha dos "
 "elements d'interfície gràfica principals??"
 
-#: src/pkg_view.cc:350
+#: src/pkg_view.cc:365
 msgid ""
 "make_package_view: error in arguments -- bad column list for static item"
 msgstr ""
 "make_package_view: s'ha produït un error en els arguments -- la llista de "
 "columnes per a l'element estàtic és errònia"
 
-#: src/pkg_view.cc:443
+#: src/pkg_view.cc:458
 msgid "make_package_view: bad argument!"
 msgstr "make_package_view: argument erroni."
 
-#: src/pkg_view.cc:495
+#: src/pkg_view.cc:510
 msgid "make_package_view: no main widget found"
 msgstr ""
 "make_package_view: no s'ha trobat cap element principal de la interfície "
@@ -3650,19 +3655,19 @@
 msgid " (provided by %F)"
 msgstr " (proporcionat per %F)"
 
-#: src/reason_fragment.cc:278
+#: src/reason_fragment.cc:275
 #, c-format
 msgid "%F%s %F %F"
 msgstr "%F%s %F %F"
 
-#: src/reason_fragment.cc:327
+#: src/reason_fragment.cc:324
 msgid ""
 "If you select a package, an explanation of its current state will appear in "
 "this space."
 msgstr ""
 "Si seleccioneu un paquet l'espai mostrarà una explicació de l'estat actual."
 
-#: src/reason_fragment.cc:361
+#: src/reason_fragment.cc:358
 msgid ""
 "%B%s%b was installed automatically;  it is being removed because all of the "
 "packages which depend upon it are being removed:"
@@ -3670,20 +3675,20 @@
 "El paquet %B%s%b es va instal·lar automàticament. S'està suprimint perquè "
 "tots els paquets que en depenien s'estan suprimint:"
 
-#: src/reason_fragment.cc:365
+#: src/reason_fragment.cc:362
 msgid "%B%s%b will be automatically removed because of dependency errors:"
 msgstr ""
 "El paquet %B%s%b se suprimirà automàticament perquè s'han produït errors de "
 "dependències:"
 
-#: src/reason_fragment.cc:369
+#: src/reason_fragment.cc:366
 msgid ""
 "%B%s%b will be automatically installed to satisfy the following dependencies:"
 msgstr ""
 "El paquet %B%s%b s'instal·larà automàticament per resoldre les dependències "
 "següents:"
 
-#: src/reason_fragment.cc:375 src/reason_fragment.cc:387
+#: src/reason_fragment.cc:372 src/reason_fragment.cc:384
 msgid ""
 "%B%s%b cannot be upgraded now, but if it could be, it would still be held at "
 "version %B%s%b."
@@ -3691,7 +3696,7 @@
 "El paquet %B%s%b es podria actualitzar a la versió %B%s%b, però es deixa "
 "congelat a la versió %B%s%b."
 
-#: src/reason_fragment.cc:378
+#: src/reason_fragment.cc:375
 msgid ""
 "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the "
 "following dependencies:"
@@ -3699,27 +3704,27 @@
 "El%B%s%b no s'actualitzarà a la versió %B%s%b per evitar els errors amb les "
 "dependències següents:"
 
-#: src/reason_fragment.cc:390
+#: src/reason_fragment.cc:387
 msgid "%B%s%b is currently installed."
 msgstr "El paquet %B%s%b està instal·lat."
 
-#: src/reason_fragment.cc:396
+#: src/reason_fragment.cc:393
 msgid "%B%s%b is not currently installed."
 msgstr "El paquet %B%s%b no està instal·lat."
 
-#: src/reason_fragment.cc:404
+#: src/reason_fragment.cc:401
 msgid "Some dependencies of %B%s%b are not satisfied:"
 msgstr "Algunes dependències del paquet %B%s%b no estan resoltes:"
 
-#: src/reason_fragment.cc:408
+#: src/reason_fragment.cc:405
 msgid "%B%s%b will be downgraded."
 msgstr "El paquet %B%s%b es desactualitzarà."
 
-#: src/reason_fragment.cc:415
+#: src/reason_fragment.cc:412
 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b."
 msgstr "%B%s%b no s'actualitzarà a la versió prohibida %B%s%b."
 
-#: src/reason_fragment.cc:419
+#: src/reason_fragment.cc:416
 msgid ""
 "%B%s%b could be upgraded to version %B%s%b, but it is being held at version %"
 "B%s%b."
@@ -3727,35 +3732,35 @@
 "El paquet %B%s%b es podria actualitzar a la versió %B%s%b, però es deixa "
 "congelat a la versió %B%s%b."
 
-#: src/reason_fragment.cc:426
+#: src/reason_fragment.cc:423
 msgid "%B%s%b will be re-installed."
 msgstr "Es tornarà a instal·lar el paquet %B%s%b."
 
-#: src/reason_fragment.cc:430
+#: src/reason_fragment.cc:427
 msgid "%B%s%b will be installed."
 msgstr "S'instal·larà el paquet %B%s%b."
 
-#: src/reason_fragment.cc:434
+#: src/reason_fragment.cc:431
 msgid "%B%s%b will be removed."
 msgstr "Se suprimirà el paquet %B%s%b."
 
-#: src/reason_fragment.cc:439
+#: src/reason_fragment.cc:436
 msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b."
 msgstr ""
 "S'actualitzarà el paquet %B%s%b de la versió %B%s%b a la versió %B%s%b."
 
-#: src/reason_fragment.cc:475
+#: src/reason_fragment.cc:472
 msgid ""
 "The following packages depend on %B%s%b and will be broken by its removal:"
 msgstr ""
 "El següents paquets depenen de %B%s%b i contindran errors arran de la "
 "supressió:"
 
-#: src/reason_fragment.cc:478
+#: src/reason_fragment.cc:475
 msgid "The following packages depend on %B%s%b and are broken:"
 msgstr "El següents paquets depen de %B%s%b i contenen error:"
 
-#: src/reason_fragment.cc:485
+#: src/reason_fragment.cc:482
 msgid ""
 "The following packages conflict with %B%s%b and will be broken by its "
 "installation:"
@@ -3763,7 +3768,7 @@
 "Els següents paquets entren en conflicte amb el %B%s%b i contindran errors "
 "arran de la instal·lació:"
 
-#: src/reason_fragment.cc:518
+#: src/reason_fragment.cc:515
 msgid ""
 "The following packages depend on a version of %B%s%b other than the "
 "currently installed version of %B%s%b, or conflict with the currently "
@@ -3772,7 +3777,7 @@
 "Els següents paquets depèn d'una versió del %B%s%b diferent a l'instal·lada %"
 "B%s%b o entren en conflicte amb la versió instal·lada:"
 
-#: src/reason_fragment.cc:522
+#: src/reason_fragment.cc:519
 msgid ""
 "The following packages conflict with %B%s%b, or depend on a version of it "
 "which is not going to be installed."
@@ -3780,11 +3785,11 @@
 "Els paquets següents entren en conflicte amb el %B%s%b, o en depenen d'una "
 "versió que no s'instal·larà."
 
-#: src/reason_fragment.cc:526
+#: src/reason_fragment.cc:523
 msgid "The following packages conflict with %B%s%b:"
 msgstr "El següents paquets entren en conflicte amb el %B%s%b:"
 
-#: src/reason_fragment.cc:531
+#: src/reason_fragment.cc:528
 msgid ""
 "The following packages depend on a version of %B%s%b other than the "
 "currently installed version of %B%s%b:"
@@ -3792,22 +3797,22 @@
 "Els següents paquets depenen d'una versió del %B%s%b diferent a la versió "
 "instal·lada actual del %B%s%b:"
 
-#: src/reason_fragment.cc:535
+#: src/reason_fragment.cc:532
 msgid ""
 "The following packages depend on a version of %B%s%b which is not going to "
 "be installed."
 msgstr ""
 "Els següents paquets depenen d'una versió del %B%s%b que no s'instal·larà."
 
-#: src/reason_fragment.cc:541
+#: src/reason_fragment.cc:538
 msgid "upgraded"
 msgstr "actualitzat"
 
-#: src/reason_fragment.cc:541
+#: src/reason_fragment.cc:538
 msgid "downgraded"
 msgstr "desactualitzat"
 
-#: src/reason_fragment.cc:547
+#: src/reason_fragment.cc:544
 msgid ""
 "The following packages depend on the currently installed version of %B%s%b (%"
 "B%s%b), or conflict with the version it will be %s to (%B%s%b), and will be "
@@ -3817,7 +3822,7 @@
 "instal·lada, o entren en conflicte amb la versió que es %s a (%B%s%b) i es "
 "trencarà si es %s."
 
-#: src/reason_fragment.cc:554
+#: src/reason_fragment.cc:551
 msgid ""
 "The following packages conflict with version %B%s%b of %B%s%b, and will be "
 "broken if it is %s."
@@ -3825,7 +3830,7 @@
 "Els següents paquets entren en conflicte amb la versió %B%s%b del %B%s%b i "
 "continran errors si és %s."
 
-#: src/reason_fragment.cc:559
+#: src/reason_fragment.cc:556
 msgid ""
 "The following packages depend on version %B%s%b of %B%s%b, and will be "
 "broken if it is %s."
@@ -3872,31 +3877,36 @@
 msgid "Close"
 msgstr "Tan^ca"
 
-#: src/solution_fragment.cc:125
+#: src/solution_fragment.cc:134
 #, fuzzy
 msgid "%BRemove%b the following packages:%n"
 msgstr "Els paquets següents contenen errors."
 
-#: src/solution_fragment.cc:135
+#: src/solution_fragment.cc:144
 #, fuzzy
 msgid "%BInstall%b the following packages:%n"
 msgstr "Els paquets següents contenen errors."
 
-#: src/solution_fragment.cc:148
+#: src/solution_fragment.cc:157
 msgid "%BKeep%b the following packages at their current version:%n"
 msgstr ""
 
-#: src/solution_fragment.cc:161
+#: src/solution_fragment.cc:164
+#, fuzzy
+msgid "Not Installed"
+msgstr "no instal·lat"
+
+#: src/solution_fragment.cc:177
 #, fuzzy
 msgid "%BUpgrade%b the following packages:%n"
 msgstr "Els paquets següents contenen errors."
 
-#: src/solution_fragment.cc:176
+#: src/solution_fragment.cc:192
 #, fuzzy
 msgid "%BDowngrade%b the following packages:%n"
 msgstr "S'estan baixant les paquets"
 
-#: src/solution_fragment.cc:190
+#: src/solution_fragment.cc:206
 #, c-format
 msgid "Score is %d"
 msgstr ""
@@ -3924,47 +3934,47 @@
 msgid "W:"
 msgstr ""
 
-#: src/ui.cc:194
+#: src/ui.cc:193
 msgid "Search for:"
 msgstr "Cerca:"
 
-#: src/ui.cc:262
+#: src/ui.cc:258
 msgid "You already are root!"
 msgstr "Ja sou el superusuari"
 
-#: src/ui.cc:360
+#: src/ui.cc:356
 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:388
+#: src/ui.cc:384
 msgid "Loading cache"
 msgstr "S'està carregant la memòria cau"
 
-#: src/ui.cc:410
+#: src/ui.cc:406
 msgid "Really quit Aptitude?"
 msgstr "Esteu segur de voler sortir de l'Aptitude?"
 
-#: src/ui.cc:489
+#: src/ui.cc:485
 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:589 src/ui.cc:591 src/ui.cc:619 src/ui.cc:621
+#: src/ui.cc:585 src/ui.cc:587 src/ui.cc:615 src/ui.cc:617
 msgid "Packages"
 msgstr "Paquets"
 
-#: src/ui.cc:590 src/ui.cc:620
+#: src/ui.cc:586 src/ui.cc:616
 msgid "View available packages and choose actions to perform"
 msgstr "Observeu els paquets disponibles i escolliu les accions a realitzar"
 
-#: src/ui.cc:667
+#: src/ui.cc:663
 #, fuzzy
 msgid ""
-"%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
+"Aptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
 "BABSOLUTELY NO WARRANTY%b; for details see 'license' in the Help menu.  This "
 "is free software, and you are welcome to redistribute it under certain "
 "conditions; see 'license' for details."
@@ -3979,61 +3989,66 @@
 "podeu redistribuir acceptant una seguit de termes dels quals podeu trobar "
 "més informació a 'llicència'."
 
-#: src/ui.cc:688
+#: src/ui.cc:684
 msgid "help.txt"
 msgstr "help.txt"
 
-#: src/ui.cc:704
+#: src/ui.cc:700
 msgid "README"
 msgstr "README"
 
-#: src/ui.cc:786
+#: src/ui.cc:782
 msgid ""
-"%C%BWARNING%b: untrusted versions of the following packages will be "
-"installed!%n%nUntrusted packages could %Bcompromise your system's security%"
-"b.  You should only proceed with the installation if you are certain that "
-"this is what you want to do.%n%n"
+"%BWARNING%b: untrusted versions of the following packages will be installed!%"
+"n%nUntrusted packages could %Bcompromise your system's security%b.  You "
+"should only proceed with the installation if you are certain that this is "
+"what you want to do.%n%n"
 msgstr ""
 
-#: src/ui.cc:800
+#: src/ui.cc:788
+#, fuzzy
+msgid "  %S*%N %s [version %s]%n"
+msgstr "Versions"
+
+#: src/ui.cc:795
 #, fuzzy
 msgid "Really Continue"
 msgstr "Continua"
 
-#: src/ui.cc:802
+#: src/ui.cc:797
 msgid "Abort Installation"
 msgstr ""
 
-#: src/ui.cc:863
+#: src/ui.cc:858
 msgid "Preview of package installation"
 msgstr "Previsualització de la instal·lació de paquets"
 
-#: src/ui.cc:864
+#: src/ui.cc:859
 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:865
+#: src/ui.cc:860
 #, fuzzy
 msgid "Preview"
 msgstr "^Ante"
 
-#: src/ui.cc:901
+#: src/ui.cc:896
 #, fuzzy
 msgid "Some packages were broken and have been fixed:"
 msgstr "Alguns paquets contenien errors i s'han arreglat"
 
-#: src/ui.cc:907
+#: src/ui.cc:902
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:913
-#, c-format
+#: src/ui.cc:908
+#, fuzzy, c-format
 msgid ""
-"Ran out of time while trying to resolver dependencies (press \"%s\" to try "
+"Ran out of time while trying to resolve dependencies (press \"%s\" to try "
 "harder)"
-msgstr ""
+msgstr "Perdeu el temps intentant trobar les mines"
 
-#: src/ui.cc:959
+#: src/ui.cc:954
 #, fuzzy
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
@@ -4043,23 +4058,23 @@
 "d'administrador,\n"
 "els quals actualment no teniu. Voleu canviar al compte de superusuari?\n"
 
-#: src/ui.cc:962 src/ui.cc:1078
+#: src/ui.cc:957 src/ui.cc:1072
 msgid "Become root"
 msgstr "Esdevé superusuari"
 
-#: src/ui.cc:964 src/ui.cc:1080
+#: src/ui.cc:959 src/ui.cc:1074
 msgid "Don't become root"
 msgstr "No esdevinguis superusuari"
 
-#: src/ui.cc:969 src/ui.cc:1085
+#: src/ui.cc:964 src/ui.cc:1079
 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:996
+#: src/ui.cc:991
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "No s'instal·larà, actualitzarà o suprimirà cap paquet."
 
-#: src/ui.cc:1002
+#: src/ui.cc:997
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -4071,7 +4086,7 @@
 "Alguns paquets es podrien actualitzar, però no heu escollit fer-ho.\n"
 "Premeu \"U\" per preparar-ne una actualització."
 
-#: src/ui.cc:1074
+#: src/ui.cc:1069
 #, fuzzy
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
@@ -4080,115 +4095,115 @@
 "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:1090 src/ui.cc:1377
+#: src/ui.cc:1084 src/ui.cc:1371
 msgid "Waste time trying to find mines"
 msgstr "Perdeu el temps intentant trobar les mines"
 
-#: src/ui.cc:1097 src/ui.cc:1150
+#: src/ui.cc:1091 src/ui.cc:1144
 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:1100
+#: src/ui.cc:1094
 msgid "Deleting downloaded files"
 msgstr "S'estan suprimint els fitxers baixats"
 
-#: src/ui.cc:1114
+#: src/ui.cc:1108
 msgid "Downloaded package files have been deleted"
 msgstr "S'han suprimit els fitxers dels paquets baixats"
 
-#: src/ui.cc:1175
+#: src/ui.cc:1169
 #, 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:1247
+#: src/ui.cc:1241
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1252 src/ui.cc:1283
+#: src/ui.cc:1246 src/ui.cc:1277
 #, fuzzy
 msgid "Ran out of time while trying to find a solution."
 msgstr "Perdeu el temps intentant trobar les mines"
 
-#: src/ui.cc:1277
+#: src/ui.cc:1271
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1307
+#: src/ui.cc:1301
 #, fuzzy, c-format
 msgid "Unable to open %s"
 msgstr "No s'ha pogut obrir %s per a l'escriptura"
 
-#: src/ui.cc:1313
+#: src/ui.cc:1307
 msgid "Error while dumping resolver state"
 msgstr ""
 
-#: src/ui.cc:1323
+#: src/ui.cc:1317
 msgid "File to which the resolver state should be dumped:"
 msgstr ""
 
-#: src/ui.cc:1353
+#: src/ui.cc:1347
 msgid "^Install/remove packages"
 msgstr "^Instal·la/suprimeix els paquets"
 
-#: src/ui.cc:1354
+#: src/ui.cc:1348
 msgid "Perform all pending installs and removals"
 msgstr "Realitza totes les instal·lacions i supressions pendents"
 
-#: src/ui.cc:1356
+#: src/ui.cc:1350
 msgid "^Update package list"
 msgstr "Act^ualitza la llista de paquets"
 
-#: src/ui.cc:1357
+#: src/ui.cc:1351
 msgid "Check for new versions of packages"
 msgstr "Verifica si hi ha noves versions dels paquets"
 
-#: src/ui.cc:1360
+#: src/ui.cc:1354
 msgid "^Forget new packages"
 msgstr "^Oblida els paquets nous"
 
-#: src/ui.cc:1361
+#: src/ui.cc:1355
 msgid "Forget which packages are \"new\""
 msgstr "Oblida quins paquets són \"nous\""
 
-#: src/ui.cc:1364
+#: src/ui.cc:1358
 msgid "^Clean package cache"
 msgstr "Neteja la memòria ^cau dels paquets"
 
-#: src/ui.cc:1365
+#: src/ui.cc:1359
 msgid "Delete package files which were previously downloaded"
 msgstr "Suprimeix els fitxers dels paquets prèviament baixats"
 
-#: src/ui.cc:1368
+#: src/ui.cc:1362
 msgid "Clean ^obsolete files"
 msgstr "Neteja els fitxers ^obsolets"
 
-#: src/ui.cc:1369
+#: src/ui.cc:1363
 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:1372
+#: src/ui.cc:1366
 msgid "Mark ^Upgradable"
 msgstr "Marca com a ^actualitzable"
 
-#: src/ui.cc:1373
+#: src/ui.cc:1367
 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:1376
+#: src/ui.cc:1370
 msgid "^Play Minesweeper"
 msgstr "^Juga al busca mines"
 
-#: src/ui.cc:1379
+#: src/ui.cc:1373
 msgid "^Become root"
 msgstr "^Sigues superusuari"
 
-#: src/ui.cc:1380
+#: src/ui.cc:1374
 #, fuzzy
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
@@ -4197,72 +4212,72 @@
 "Executeu l'ordre 'su' per ser superusuari. Aquesta ordre reinicia el "
 "programa però manté els paràmetres personals."
 
-#: src/ui.cc:1383
+#: src/ui.cc:1377
 msgid "^Reload package cache"
 msgstr "^Recarrega la memòria cau dels paquets"
 
-#: src/ui.cc:1384
+#: src/ui.cc:1378
 msgid "Reload the package cache"
 msgstr "Torna a carregar la memòria cau dels paquets"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1384
 msgid "^Quit"
 msgstr "Su^rt"
 
-#: src/ui.cc:1391
+#: src/ui.cc:1385
 msgid "Exit the program"
 msgstr "Surt del programa"
 
-#: src/ui.cc:1397 src/ui.cc:1669
+#: src/ui.cc:1391 src/ui.cc:1661
 msgid "Undo"
 msgstr "Desfés"
 
-#: src/ui.cc:1398
+#: src/ui.cc:1392
 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:1405
+#: src/ui.cc:1399
 msgid "^Install"
 msgstr "^Instal·la"
 
-#: src/ui.cc:1406
+#: src/ui.cc:1400
 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:1409
+#: src/ui.cc:1403
 msgid "^Remove"
 msgstr "Sup^rimeix"
 
-#: src/ui.cc:1410
+#: src/ui.cc:1404
 msgid "Flag the currently selected package for removal"
 msgstr "Senyala els paquets seleccionats per a la corresponent supressió"
 
-#: src/ui.cc:1413
+#: src/ui.cc:1407
 msgid "^Purge"
 msgstr "^Purga"
 
-#: src/ui.cc:1414
+#: src/ui.cc:1408
 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:1417
+#: src/ui.cc:1411
 msgid "^Keep"
 msgstr "Man^té"
 
-#: src/ui.cc:1418
+#: src/ui.cc:1412
 msgid "Cancel any action on the selected package"
 msgstr "Cancel·la qualsevol acció al paquet seleccionat"
 
-#: src/ui.cc:1421
+#: src/ui.cc:1415
 msgid "^Hold"
 msgstr "Con^gela"
 
-#: src/ui.cc:1422
+#: src/ui.cc:1416
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -4270,11 +4285,11 @@
 "Cancel·la qualsevol acció al paquet seleccionat i protegeix-lo de futures "
 "actualitzacions"
 
-#: src/ui.cc:1425
+#: src/ui.cc:1419
 msgid "Mark ^Auto"
 msgstr "Marca ^Automàtic"
 
-#: src/ui.cc:1426
+#: src/ui.cc:1420
 #, fuzzy
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
@@ -4283,11 +4298,11 @@
 "Marca els paquets seleccionat com a instal·lats automàticament;\n"
 "se suprimiran automàticament si cap paquet en depèn"
 
-#: src/ui.cc:1429
+#: src/ui.cc:1423
 msgid "Mark ^Manual"
 msgstr "Marca ^Manual"
 
-#: src/ui.cc:1430
+#: src/ui.cc:1424
 #, fuzzy
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
@@ -4296,11 +4311,11 @@
 "Marca els paquets seleccionats com a instal·lats manualment;\n"
 "no se suprimiran si no ho feu vosaltres manualment"
 
-#: src/ui.cc:1433
+#: src/ui.cc:1427
 msgid "^Forbid Version"
 msgstr "^Prohibeix la versió"
 
-#: src/ui.cc:1434
+#: src/ui.cc:1428
 #, fuzzy
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
@@ -4309,207 +4324,207 @@
 "Prohibeix la instal·lació de la versió candidata del paquet seleccionat;\n"
 "les noves versions del paquet s'instal·laran"
 
-#: src/ui.cc:1438
+#: src/ui.cc:1432
 msgid "I^nformation"
 msgstr "I^nformació"
 
-#: src/ui.cc:1439
+#: src/ui.cc:1433
 msgid "Display more information about the selected package"
 msgstr "Mostra més informació dels paquets seleccionats"
 
-#: src/ui.cc:1442
+#: src/ui.cc:1436
 msgid "^Changelog"
 msgstr "Registre de modifi^cacions"
 
-#: src/ui.cc:1443
+#: src/ui.cc:1437
 msgid "Display the Debian changelog of the selected package"
 msgstr ""
 "Mostra el registre de modificacions de Debian dels paquets seleccionats"
 
-#: src/ui.cc:1450
+#: src/ui.cc:1444
 msgid "^Find"
 msgstr "^Cerca"
 
-#: src/ui.cc:1451
+#: src/ui.cc:1445
 msgid "Search for a package"
 msgstr "Cerca un paquet"
 
-#: src/ui.cc:1454
+#: src/ui.cc:1448
 msgid "Find ^Again"
 msgstr "Torna a cerc^ar"
 
-#: src/ui.cc:1455
+#: src/ui.cc:1449
 msgid "Repeat the last search"
 msgstr "Repeteix l'última cerca"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1453
 msgid "^Limit Display"
 msgstr "^Limita la visualització"
 
-#: src/ui.cc:1460
+#: src/ui.cc:1454
 msgid "Apply a filter to the package list"
 msgstr "Aplica un filtre a la llista de paquets"
 
-#: src/ui.cc:1463
+#: src/ui.cc:1457
 msgid "^Un-Limit Display"
 msgstr "No limits la vis^ualització"
 
-#: src/ui.cc:1464
+#: src/ui.cc:1458
 msgid "Remove the filter from the package list"
 msgstr "Suprimeix el filtre de la llista de paquets"
 
-#: src/ui.cc:1468
+#: src/ui.cc:1462
 msgid "Find ^Broken"
 msgstr "C^erca els trencats"
 
-#: src/ui.cc:1469
+#: src/ui.cc:1463
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Cerca el següent paquet amb dependències no resoltes"
 
-#: src/ui.cc:1476
+#: src/ui.cc:1470
 msgid "^UI options"
 msgstr "Opcions de l'I^U"
 
-#: src/ui.cc:1477
+#: src/ui.cc:1471
 msgid "Change the settings which affect the user interface"
 msgstr "Canvia els paràmetres relacionats amb la interfície d'usuari"
 
-#: src/ui.cc:1480
+#: src/ui.cc:1474
 msgid "^Dependency handling"
 msgstr "Gestió de les ^dependències"
 
-#: src/ui.cc:1481
+#: src/ui.cc:1475
 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:1484
+#: src/ui.cc:1478
 msgid "^Miscellaneous"
 msgstr "^Diversos"
 
-#: src/ui.cc:1485
+#: src/ui.cc:1479
 msgid "Change miscellaneous program settings"
 msgstr "Canvia diversos paràmetres de programa"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1484
 msgid "^Revert options"
 msgstr "^Recupera les opcions"
 
-#: src/ui.cc:1491
+#: src/ui.cc:1485
 msgid "Reset all settings to the system defaults"
 msgstr "Reinicia tots els paràmetres als predeterminats del sistema"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1496
 msgid "^Next"
 msgstr "Següe^nt"
 
-#: src/ui.cc:1503
+#: src/ui.cc:1497
 msgid "View next display"
 msgstr "Mostra la visualització següent"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1500
 msgid "^Prev"
 msgstr "^Ante"
 
-#: src/ui.cc:1507
+#: src/ui.cc:1501
 msgid "View previous display"
 msgstr "Mostra la visualització anterior"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1504
 msgid "^Close"
 msgstr "Tan^ca"
 
-#: src/ui.cc:1511
+#: src/ui.cc:1505
 msgid "Close this display"
 msgstr "Tanca aquesta visualització"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1510
 msgid "New Package ^View"
 msgstr "Nova ^vista de paquets"
 
-#: src/ui.cc:1517
+#: src/ui.cc:1511
 msgid "Create a new default package view"
 msgstr "Crea una nova vista de paquets predeterminada"
 
-#: src/ui.cc:1520
+#: src/ui.cc:1514
 msgid "New Categorical ^Browser"
 msgstr "Nou na^vegador per categories"
 
-#: src/ui.cc:1522
+#: src/ui.cc:1516
 msgid "Browse packages by category"
 msgstr "Navega pels paquets per categories"
 
-#: src/ui.cc:1530
+#: src/ui.cc:1524
 msgid "^About"
 msgstr "Qu^ant a"
 
-#: src/ui.cc:1531
+#: src/ui.cc:1525
 msgid "View information about this program"
 msgstr "Mostra la informació sobre aquest programa"
 
-#: src/ui.cc:1534
+#: src/ui.cc:1528
 msgid "^Help"
 msgstr "A^juda"
 
-#: src/ui.cc:1535
+#: src/ui.cc:1529
 msgid "View the on-line help"
 msgstr "Mostra la informació en línia"
 
-#: src/ui.cc:1537
+#: src/ui.cc:1531
 msgid "User's ^Manual"
 msgstr "^Manual d'usuari"
 
-#: src/ui.cc:1538
+#: src/ui.cc:1532
 msgid "View the detailed program manual"
 msgstr "Mostra el manual detallat del programa"
 
-#: src/ui.cc:1541
+#: src/ui.cc:1535
 msgid "^FAQ"
 msgstr "PM^F"
 
-#: src/ui.cc:1542
+#: src/ui.cc:1536
 msgid "View a list of frequently asked questions"
 msgstr "Mostra una llista de les preguntes més freqüents"
 
-#: src/ui.cc:1545
+#: src/ui.cc:1539
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1546
+#: src/ui.cc:1540
 #, 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:1549
+#: src/ui.cc:1543
 msgid "^License"
 msgstr "^Llicència"
 
-#: src/ui.cc:1550
+#: src/ui.cc:1544
 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:1668
+#: src/ui.cc:1660
 msgid "Actions"
 msgstr "Accions"
 
-#: src/ui.cc:1671
+#: src/ui.cc:1663
 msgid "Search"
 msgstr "Cerca"
 
-#: src/ui.cc:1672
+#: src/ui.cc:1664
 msgid "Options"
 msgstr "Opcions"
 
-#: src/ui.cc:1673
+#: src/ui.cc:1665
 msgid "Views"
 msgstr "Vistes"
 
-#: src/ui.cc:1674
+#: src/ui.cc:1666
 msgid "Help"
 msgstr "Ajuda"
 
-#: src/ui.cc:1734
+#: src/ui.cc:1726
 #, c-format
 msgid ""
 "%s: Menu  %s: Help  %s: Quit  %s: Update  %s: Download/Install/Remove Pkgs"
@@ -4517,30 +4532,30 @@
 "%s: Menú  %s: Ajuda  %s: Surt  %s: Actualitza  %s: Baixa/Instal·la/Suprimeix "
 "Paquets"
 
-#: src/ui.cc:2003 src/vscreen/vscreen.cc:281
+#: src/ui.cc:1996 src/vscreen/vscreen.cc:281
 msgid "yes_key"
 msgstr "yes_key"
 
-#: src/ui.cc:2004 src/vscreen/vscreen.cc:282
+#: src/ui.cc:1997 src/vscreen/vscreen.cc:282
 msgid "no_key"
 msgstr "no_key"
 
-#: src/view_changelog.cc:46
+#: src/view_changelog.cc:61
 msgid "You can only view changelogs of official Debian packages."
 msgstr ""
 "Només podeu visualitzar els registres de modificacions dels paquets oficials "
 "de Debian."
 
-#: src/view_changelog.cc:52
+#: src/view_changelog.cc:67
 msgid "Downloading Changelog"
 msgstr "S'està baixant el registre de modificacions"
 
-#: src/view_changelog.cc:54
+#: src/view_changelog.cc:69
 #, fuzzy
 msgid "Download Changelog"
 msgstr "S'està baixant el registre de modificacions"
 
-#: src/view_changelog.cc:63
+#: src/view_changelog.cc:78
 #, c-format
 msgid "%s changes"
 msgstr ""
@@ -4636,18 +4651,194 @@
 #~ "Introduïu el disc següent a la unitat \"%s\":\n"
 #~ "%s"
 
+#~ msgid "Need exactly two colors in color definition \"%s\""
+#~ msgstr "La definició de color \"%s\" precisa de dos colors exactes"
+
+#~ msgid "Can't parse foreground \"%s\"of color \"%s\""
+#~ msgstr "No es pot analitzar el primer pla \"%s\" del color \"%s\""
+
+#~ msgid "Can't parse background \"%s\" of color \"%s\""
+#~ msgstr "No s'ha pogut analitzar el fons \"%s\" del color \"%s\""
+
 #~ msgid "Invalid option for interactive mode: -s\n"
 #~ msgstr "Opció invàlida pel mode interactiu: -s\n"
 
+#~ 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."
+#~ 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 "
+#~ "d'altres dispositius de comunicació. S'inclou el control dels faxmòdems "
+#~ "(per exemple, PPP per a les connexions a internet de marcatge directe i "
+#~ "programes desenvolupats inicialment amb aquest propòsit (zmodem/kermit), "
+#~ "com també programari per controlar telèfons mòbils, interfícies del "
+#~ "FidoNet i per executar una BBS."
+
+#~ 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"
+#~ " .\n"
+#~ " For more information about what Debian considers to be Free Software, "
+#~ "see http://www.debian.org/social_contract#guidelines"
+#~ msgstr ""
+#~ "Programes que no són programari lliure\n"
+#~ " Els paquets de la secció 'non-free' no són part de Debian.\n"
+#~ " .\n"
+#~ " Aquests paquets no compleixen alguns dels requisits de les pautes de "
+#~ "programari lliure de Debian (feu un cop d'ull més avall). Caldria que "
+#~ "féssiu una ullada a les llicències dels programes d'aquesta secció per a "
+#~ "assegurar-vos que els podeu utilitzar del mode que preteneu.\n"
+#~ " .\n"
+#~ " Per a més informació sobre la definició de programari lliure segons "
+#~ "Debian, feu una ullada a http://www.debian.org/social_contract#guidelines"
+
+#~ 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)"
+#~ msgstr ""
+#~ "Paquets nous\n"
+#~ " Aquesta paquets s'han afegit a Debian des de l'última vegada que vau "
+#~ "netejar la llista de paquets \"nous\". (escolliu \"Oblida els paquets nous"
+#~ "\" del menú Accions per buidar aquesta llista)"
+
+#~ msgid ""
+#~ "%s is an essential package!\n"
+#~ "\n"
+#~ "Are you sure you want to remove it?\n"
+#~ "Type '%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'."
+
+#~ msgid "Available versions of "
+#~ msgstr "Versions disponibles de "
+
+#~ 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."
+#~ 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."
+
 #~ msgid "Information about "
 #~ msgstr "Informació sobre "
 
+#~ msgid ""
+#~ "Aptitude %s\n"
+#~ "\n"
+#~ "Copyright 2000 Daniel Burrows.\n"
+#~ "\n"
+#~ "aptitude comes with ABSOLUTELY NO WARRANTY; for details see 'license' in "
+#~ "the\n"
+#~ "Help menu.  This is free software, and you are welcome to redistribute "
+#~ "it\n"
+#~ "under certain conditions; see 'license' for details."
+#~ msgstr ""
+#~ "Aptitude %s\n"
+#~ "\n"
+#~ "Copyright 2000 Daniel Burrows.\n"
+#~ "\n"
+#~ "L'aptitude es distribueix sense cap tipus de garantia, per a més "
+#~ "informació feu un cop d'ull a 'llicència' del menú Ajuda.\n"
+#~ "Aquest programari es distribueix sota llicència de programari lliure, i "
+#~ "el podeu redistribuir acceptant una seguit de termes dels quals podeu "
+#~ "trobar més informació a 'llicència'."
+
+#~ msgid "Some packages were broken and have been fixed"
+#~ msgstr "Alguns paquets contenien errors i s'han arreglat"
+
 #~ msgid "Some broken packages could not be fixed!"
 #~ msgstr "Alguns dels paquets amb errors no s'han pogut arreglar"
 
+#~ msgid "Some packages are broken.  Try to fix them?"
+#~ msgstr "Alguns paquets contenen errors. Voleu intentar arreglar-los?"
+
+#~ msgid ""
+#~ "Installing/removing packages requires administrative privileges, which\n"
+#~ "you currently do not have.  Would you like to change to the root "
+#~ "account?\n"
+#~ 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"
+
+#~ msgid ""
+#~ "No packages will be installed, removed or upgraded.\n"
+#~ "\n"
+#~ "Some packages could be upgraded, but you have not chosen to upgrade "
+#~ "them.\n"
+#~ "Type \"U\" to prepare an upgrade."
+#~ msgstr ""
+#~ "No s'instal·larà, suprimirà o actualitzarà cap paquet.\n"
+#~ "\n"
+#~ "Alguns paquets es podrien actualitzar, però no heu escollit fer-ho.\n"
+#~ "Premeu \"U\" per preparar-ne una actualització."
+
+#~ 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"
+#~ 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"
+
+#~ msgid "Obsolete downloaded package files have been deleted"
+#~ msgstr "S'han suprimit els fitxers del paquets baixats"
+
+#~ msgid ""
+#~ "Run 'su' to become root; this will restart the program, but your\n"
+#~ "settings will be preserved"
+#~ msgstr ""
+#~ "Executeu l'ordre 'su' per ser superusuari. Aquesta ordre reinicia el "
+#~ "programa però manté els paràmetres personals."
+
+#~ msgid ""
+#~ "Mark the selected package as having been automatically installed;\n"
+#~ "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"
+
+#~ msgid ""
+#~ "Mark the selected package as having been manually installed;\n"
+#~ "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"
+
+#~ msgid ""
+#~ "Forbid the candidate version of the selected package from being "
+#~ "installed;\n"
+#~ "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"
+
 #~ msgid "^ChangeLog"
 #~ msgstr "Registre de ^canvis"
 
+#~ msgid "View the important changes made in each version of the program"
+#~ msgstr "Mostra els canvis importants realitzats en cada versió del programa"
+
 #~ 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	Sun Jun 12 21:04:47 2005
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: aptitude\n"
 "Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-05-01 14:08-0400\n"
-"PO-Revision-Date: 2004-10-02 10:13+0200\n"
+"POT-Creation-Date: 2005-06-12 22:42+0200\n"
+"PO-Revision-Date: 2005-03-29 21:30+0200\n"
 "Last-Translator: Miroslav Kure <kurem at debian.cz>\n"
 "Language-Team: Czech <provoz at debian.cz>\n"
 "MIME-Version: 1.0\n"
@@ -148,14 +148,14 @@
 msgid "Automatically remove unused packages matching this filter"
 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:219 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
-#: src/vscreen/vs_util.cc:328
+#: src/apt_options.cc:240 src/mine/cmine.cc:249 src/mine/cmine.cc:312
+#: src/ui.cc:215 src/vscreen/vs_util.cc:77 src/vscreen/vs_util.cc:90
+#: src/vscreen/vs_util.cc:264 src/vscreen/vs_util.cc:298
 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:328
+#: src/apt_options.cc:241 src/download_list.cc:69 src/mine/cmine.cc:250
+#: src/mine/cmine.cc:313 src/vscreen/vs_util.cc:298
 msgid "Cancel"
 msgstr "Zrušit"
 
@@ -236,15 +236,15 @@
 msgid "%s: Previous"
 msgstr ""
 
-#: src/broken_indicator.cc:233
+#: src/broken_indicator.cc:232
 #, c-format
-msgid "%CSolution search failed.  %s: try harder"
+msgid "Solution search failed.  %s: try harder"
 msgstr ""
 
-#: src/broken_indicator.cc:239
-#, c-format
-msgid "%CUnable to resolve dependencies."
-msgstr ""
+#: src/broken_indicator.cc:237
+#, fuzzy
+msgid "Unable to resolve dependencies."
+msgstr "Nemohu otevřít %s pro zápis"
 
 #: src/cmdline/cmdline_action.cc:36
 #, c-format
@@ -609,31 +609,37 @@
 "this is what you want to do.\n"
 "\n"
 msgstr ""
+"VAROVÁNÍ: budou instalovány nedůvěryhodné verze následujících balíků!\n"
+"\n"
+"Nedůvěryhodné balíky mohou kompromitovat bezpečnost vašeho systému.\n"
+"V instalaci byste měli pokračovat pouze v případě, že jste si\n"
+"naprosto jisti, že to je to, co opravdu chcete udělat.\n"
+"\n"
 
-#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
-#: src/vscreen/vs_util.cc:212
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:165
+#: src/vscreen/vs_util.cc:202
 msgid "Yes"
 msgstr "Ano"
 
-#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
-#: src/vscreen/vs_util.cc:212
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:165
+#: src/vscreen/vs_util.cc:202
 msgid "No"
 msgstr "Ne"
 
 #: src/cmdline/cmdline_prompt.cc:388
 #, c-format
 msgid "Do you want to ignore this warning and proceed anyway?\n"
-msgstr ""
+msgstr "Chcete ignorovat toto varování a přeze vše pokračovat?\n"
 
 #: src/cmdline/cmdline_prompt.cc:389
-#, fuzzy, c-format
+#, c-format
 msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
-msgstr "Pro pokračování napište frázi \"%s\":\n"
+msgstr "Pro pokračování zadejte \"%s\", pro přerušení \"%s\": "
 
 #: src/cmdline/cmdline_prompt.cc:400
 #, c-format
 msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
-msgstr ""
+msgstr "Nerozpoznaný vstup. Zadejte buď \"%s\" nebo \"%s\".\n"
 
 #: src/cmdline/cmdline_prompt.cc:499
 #, c-format
@@ -925,7 +931,7 @@
 msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:212
+#: src/cmdline/cmdline_resolver.cc:212 src/cmdline/cmdline_resolver.cc:285
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
@@ -980,196 +986,201 @@
 msgid "The following packages have unmet dependencies:\n"
 msgstr "Následující balíky mají nesplněné závislosti:\n"
 
-#: src/cmdline/cmdline_show.cc:133
+#: src/cmdline/cmdline_show.cc:119 src/cmdline/cmdline_show.cc:305
+#: src/solution_fragment.cc:65
+msgid "<NULL>"
+msgstr ""
+
+#: src/cmdline/cmdline_show.cc:138
 msgid "not installed"
 msgstr "nenainstalovaný"
 
-#: src/cmdline/cmdline_show.cc:135 src/pkg_columnizer.cc:231
+#: src/cmdline/cmdline_show.cc:140 src/pkg_columnizer.cc:231
 #: src/pkg_ver_item.cc:225
 msgid "unpacked"
 msgstr "rozbalený"
 
-#: src/cmdline/cmdline_show.cc:137
+#: src/cmdline/cmdline_show.cc:142
 msgid "partially configured"
 msgstr "částečně zkonfigurovaný"
 
-#: src/cmdline/cmdline_show.cc:139
+#: src/cmdline/cmdline_show.cc:144
 msgid "partially installed"
 msgstr "částečně nainstalovaný"
 
-#: src/cmdline/cmdline_show.cc:141
+#: src/cmdline/cmdline_show.cc:146
 msgid "not installed (configuration files remain)"
 msgstr "nenainstalovaný (ponechány konfigurační soubory)"
 
-#: src/cmdline/cmdline_show.cc:143 src/pkg_columnizer.cc:239
+#: src/cmdline/cmdline_show.cc:148 src/pkg_columnizer.cc:239
 #: src/pkg_ver_item.cc:233
 msgid "installed"
 msgstr "nainstalovaný"
 
-#: src/cmdline/cmdline_show.cc:152
+#: src/cmdline/cmdline_show.cc:157
 msgid "not a real package"
 msgstr "není skutečný balík"
 
-#: src/cmdline/cmdline_show.cc:165
+#: src/cmdline/cmdline_show.cc:170
 msgid " [held]"
 msgstr " [podržen]"
 
-#: src/cmdline/cmdline_show.cc:174
+#: src/cmdline/cmdline_show.cc:179
 #, c-format
 msgid "%s; version %s will be installed"
 msgstr "%s; bude instalována verze %s"
 
-#: src/cmdline/cmdline_show.cc:178
+#: src/cmdline/cmdline_show.cc:183
 #, c-format
 msgid "%s; version %s will be installed automatically"
 msgstr "%s; automaticky bude instalována verze %s"
 
-#: src/cmdline/cmdline_show.cc:184 src/cmdline/cmdline_show.cc:199
+#: src/cmdline/cmdline_show.cc:189 src/cmdline/cmdline_show.cc:204
 #, c-format
 msgid "%s; will be purged"
 msgstr "%s; bude vyčištěn"
 
-#: src/cmdline/cmdline_show.cc:197
+#: src/cmdline/cmdline_show.cc:202
 #, c-format
 msgid "%s; will be purged because nothing depends on it"
 msgstr "%s; bude vyčištěn, protože na něm nic nezávisí"
 
-#: src/cmdline/cmdline_show.cc:204
+#: src/cmdline/cmdline_show.cc:209
 #, c-format
 msgid "%s; will be removed because nothing depends on it"
 msgstr "%s; bude odstraněn, protože na něm nic nezávisí"
 
-#: src/cmdline/cmdline_show.cc:206
+#: src/cmdline/cmdline_show.cc:211
 #, c-format
 msgid "%s; will be removed"
 msgstr "%s; bude odstraněn"
 
-#: src/cmdline/cmdline_show.cc:220
+#: src/cmdline/cmdline_show.cc:225
 #, c-format
 msgid "%s%s; will be downgraded [%s -> %s]"
 msgstr "%s%s; bude degradován [%s -> %s]"
 
-#: src/cmdline/cmdline_show.cc:223
+#: src/cmdline/cmdline_show.cc:228
 #, c-format
 msgid "%s%s; will be upgraded [%s -> %s]"
 msgstr "%s%s; bude aktualizován [%s -> %s]"
 
-#: src/cmdline/cmdline_show.cc:235 src/cmdline/cmdline_show.cc:256
+#: src/cmdline/cmdline_show.cc:240 src/cmdline/cmdline_show.cc:261
 msgid "Package: "
 msgstr "Balík: "
 
-#: src/cmdline/cmdline_show.cc:236 src/cmdline/cmdline_show.cc:264
+#: src/cmdline/cmdline_show.cc:241 src/cmdline/cmdline_show.cc:269
 #: src/pkg_columnizer.cc:87
 msgid "State"
 msgstr "Stav"
 
-#: src/cmdline/cmdline_show.cc:237 src/cmdline/cmdline_show.cc:318
+#: src/cmdline/cmdline_show.cc:242 src/cmdline/cmdline_show.cc:325
 msgid "Provided by"
 msgstr "Poskytován"
 
-#: src/cmdline/cmdline_show.cc:258 src/pkg_info_screen.cc:105
+#: src/cmdline/cmdline_show.cc:263 src/pkg_info_screen.cc:105
 msgid "Essential: "
 msgstr "Nezbytný: "
 
-#: src/cmdline/cmdline_show.cc:258 src/cmdline/cmdline_show.cc:262
-#: src/cmdline/cmdline_show.cc:273 src/pkg_info_screen.cc:105
+#: src/cmdline/cmdline_show.cc:263 src/cmdline/cmdline_show.cc:267
+#: src/cmdline/cmdline_show.cc:278 src/pkg_info_screen.cc:105
 msgid "yes"
 msgstr "ano"
 
-#: src/cmdline/cmdline_show.cc:262
+#: src/cmdline/cmdline_show.cc:267
 msgid "New"
 msgstr "Nový"
 
-#: src/cmdline/cmdline_show.cc:267
+#: src/cmdline/cmdline_show.cc:272
 msgid "Forbidden version"
 msgstr "Zakázaná verze"
 
-#: src/cmdline/cmdline_show.cc:271
+#: src/cmdline/cmdline_show.cc:276
 msgid "Automatically installed"
 msgstr "Automaticky instalovaný"
 
-#: src/cmdline/cmdline_show.cc:273
+#: src/cmdline/cmdline_show.cc:278
 msgid "no"
 msgstr "ne"
 
-#: src/cmdline/cmdline_show.cc:275
+#: src/cmdline/cmdline_show.cc:280
 msgid "Version: "
 msgstr "Verze: "
 
-#: src/cmdline/cmdline_show.cc:276 src/pkg_info_screen.cc:113
+#: src/cmdline/cmdline_show.cc:281 src/pkg_info_screen.cc:113
 msgid "Priority: "
 msgstr "Priorita: "
 
-#: src/cmdline/cmdline_show.cc:277 src/cmdline/cmdline_show.cc:279
-#: src/cmdline/cmdline_show.cc:288
+#: src/cmdline/cmdline_show.cc:282 src/cmdline/cmdline_show.cc:284
+#: src/cmdline/cmdline_show.cc:293
 msgid "N/A"
 msgstr "N/A"
 
-#: src/cmdline/cmdline_show.cc:278 src/pkg_info_screen.cc:114
+#: src/cmdline/cmdline_show.cc:283 src/pkg_info_screen.cc:114
 msgid "Section: "
 msgstr "Sekce: "
 
-#: src/cmdline/cmdline_show.cc:280 src/pkg_info_screen.cc:115
+#: src/cmdline/cmdline_show.cc:285 src/pkg_info_screen.cc:115
 msgid "Maintainer: "
 msgstr "Správce: "
 
-#: src/cmdline/cmdline_show.cc:283
+#: src/cmdline/cmdline_show.cc:288
 msgid "Uncompressed Size: "
 msgstr "Velikost po rozbalení: "
 
-#: src/cmdline/cmdline_show.cc:287
+#: src/cmdline/cmdline_show.cc:292
 msgid "Architecture: "
 msgstr "Architektura: "
 
-#: src/cmdline/cmdline_show.cc:289
+#: src/cmdline/cmdline_show.cc:294
 msgid "Compressed Size: "
 msgstr "Komprimovaná velikost: "
 
-#: src/cmdline/cmdline_show.cc:291
+#: src/cmdline/cmdline_show.cc:296
 msgid "Filename: "
 msgstr "Název souboru: "
 
-#: src/cmdline/cmdline_show.cc:293
+#: src/cmdline/cmdline_show.cc:298
 msgid "MD5sum: "
 msgstr "MD5 součet: "
 
-#: src/cmdline/cmdline_show.cc:297 src/cmdline/cmdline_show.cc:299
+#: src/cmdline/cmdline_show.cc:302 src/cmdline/cmdline_show.cc:305
 msgid "Archive"
 msgstr "Archiv"
 
-#: src/cmdline/cmdline_show.cc:303
+#: src/cmdline/cmdline_show.cc:310
 msgid "Depends"
 msgstr "Závisí na"
 
-#: src/cmdline/cmdline_show.cc:305
+#: src/cmdline/cmdline_show.cc:312
 msgid "PreDepends"
 msgstr "Předzávisí na"
 
-#: src/cmdline/cmdline_show.cc:307
+#: src/cmdline/cmdline_show.cc:314
 msgid "Recommends"
 msgstr "Doporučuje"
 
-#: src/cmdline/cmdline_show.cc:309
+#: src/cmdline/cmdline_show.cc:316
 msgid "Suggests"
 msgstr "Navrhuje"
 
-#: src/cmdline/cmdline_show.cc:311
+#: src/cmdline/cmdline_show.cc:318
 msgid "Conflicts"
 msgstr "Koliduje s"
 
-#: src/cmdline/cmdline_show.cc:313
+#: src/cmdline/cmdline_show.cc:320
 msgid "Replaces"
 msgstr "Nahrazuje"
 
-#: src/cmdline/cmdline_show.cc:315
+#: src/cmdline/cmdline_show.cc:322
 msgid "Obsoletes"
 msgstr "Zastarává"
 
-#: src/cmdline/cmdline_show.cc:317
+#: src/cmdline/cmdline_show.cc:324
 msgid "Provides"
 msgstr "Poskytuje"
 
-#: src/cmdline/cmdline_show.cc:321 src/pkg_info_screen.cc:97
+#: src/cmdline/cmdline_show.cc:328 src/pkg_info_screen.cc:97
 msgid "Description: "
 msgstr "Popis: "
 
@@ -1212,32 +1223,32 @@
 msgid "You cannot specify both an archive and a version for a package\n"
 msgstr "Nemůžete najednou zadat archiv a verzi balíku\n"
 
-#: src/dep_item.cc:137
+#: src/dep_item.cc:139
 msgid "UNSATISFIED"
 msgstr "NESPLNÄšNO"
 
-#: src/dep_item.cc:137 src/reason_fragment.cc:247
+#: src/dep_item.cc:139 src/reason_fragment.cc:244
 msgid "UNAVAILABLE"
 msgstr "NEDOSTUPNÝ"
 
-#: src/download_bar.cc:56 src/download_list.cc:263 src/download_screen.cc:57
+#: src/download_bar.cc:56 src/download_list.cc:266 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_bar.cc:77 src/generic/acqprogress.cc:63
+#: src/download_bar.cc:75 src/generic/acqprogress.cc:63
 msgid "Hit "
 msgstr "Cíl "
 
-#: src/download_bar.cc:90
+#: src/download_bar.cc:88
 msgid "Downloading "
 msgstr "Stahuji "
 
-#: src/download_bar.cc:103
+#: src/download_bar.cc:101
 msgid "Got "
 msgstr "Mám "
 
-#: src/download_bar.cc:157
+#: src/download_bar.cc:155
 msgid "Downloading..."
 msgstr "Stahuji..."
 
@@ -1265,7 +1276,7 @@
 msgid "Couldn't clean out list directories"
 msgstr "Nemohu vyčistit adresáře seznamů"
 
-#: src/download.cc:177 src/ui.cc:1153
+#: src/download.cc:177 src/ui.cc:1147
 msgid "Deleting obsolete downloaded files"
 msgstr "Mažu staré stažené soubory"
 
@@ -1401,7 +1412,7 @@
 "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:477 src/pkg_item.cc:432
+#: src/download.cc:477 src/pkg_item.cc:430
 msgid "Press return to continue.\n"
 msgstr "Pro pokračování stiskněte enter.\n"
 
@@ -1410,17 +1421,17 @@
 "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?)"
 
-#: src/download_item.cc:66 src/download_item.cc:70 src/download_item.cc:100
+#: src/download_item.cc:70 src/download_item.cc:74 src/download_item.cc:104
 #: src/generic/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr " [Pracuji]"
 
-#: src/download_item.cc:104 src/download_list.cc:283
+#: src/download_item.cc:108 src/download_list.cc:284
 msgid "[Hit]"
 msgstr "[Zásah]"
 
-#: src/download_item.cc:104 src/download_list.cc:303
+#: src/download_item.cc:108 src/download_list.cc:304
 msgid "[Downloaded]"
 msgstr "[Staženo]"
 
@@ -1434,34 +1445,34 @@
 msgid "%n%nSome files were not downloaded successfully."
 msgstr ""
 
-#: src/download_list.cc:68
+#: src/download_list.cc:66
 msgid "Continue"
 msgstr "Pokračovat"
 
-#: src/download_list.cc:175 src/download_screen.cc:203
+#: src/download_list.cc:178 src/download_screen.cc:203
 msgid "Total Progress: "
 msgstr "Celkový postup:"
 
-#: src/download_list.cc:194 src/download_screen.cc:218
+#: src/download_list.cc:197 src/download_screen.cc:218
 #, c-format
 msgid " [ %i%% ] (%sB/s, %s remaining)"
 msgstr " [ %i%% ] (%sB/s, %s zbývá)"
 
-#: src/download_list.cc:196
+#: src/download_list.cc:199
 #, c-format
 msgid " [ %i%% ] (stalled)"
 msgstr " [ %i%% ] (stagnuje)"
 
-#: src/download_list.cc:198
+#: src/download_list.cc:201
 #, c-format
 msgid " [ %i%% ]"
 msgstr " [ %i%% ]"
 
-#: src/download_list.cc:323
+#: src/download_list.cc:324
 msgid "[IGNORED]"
 msgstr "[IGNOROVÁN]"
 
-#: src/download_list.cc:329
+#: src/download_list.cc:330
 msgid "[ERROR]"
 msgstr "[CHYBA]"
 
@@ -1470,11 +1481,11 @@
 msgid "Downloaded %sB in %ss (%sB/s)."
 msgstr "Staženo %sB za %ss (%sB/s)."
 
-#: src/edit_pkg_hier.cc:158
+#: src/edit_pkg_hier.cc:176
 msgid "No hierarchy information to edit"
 msgstr "Neexistují žádné informace o hierarchii"
 
-#: src/edit_pkg_hier.cc:258
+#: src/edit_pkg_hier.cc:276
 msgid "Couldn't open for writing"
 msgstr "Nemohu otevřít pro zápis"
 
@@ -1569,39 +1580,39 @@
 msgstr ""
 "Varování: nelze zamknout cache soubor. Otevírám v režimu pouze pro čtení"
 
-#: src/generic/matchers.cc:797
+#: src/generic/matchers.cc:798
 msgid "Unmatched '('"
 msgstr "Nepárová '('"
 
-#: src/generic/matchers.cc:887 src/generic/matchers.cc:968
+#: src/generic/matchers.cc:888 src/generic/matchers.cc:969
 #, c-format
 msgid "Unknown dependency type: %s"
 msgstr "Neznámá závislost: %s"
 
-#: src/generic/matchers.cc:950
+#: src/generic/matchers.cc:951
 #, c-format
 msgid "Unknown action type: %s"
 msgstr "Neznámá akce: %s"
 
-#: src/generic/matchers.cc:1017
+#: src/generic/matchers.cc:1018
 #, c-format
 msgid "Unknown priority %s"
 msgstr "Neznámá priorita: %s"
 
-#: src/generic/matchers.cc:1039
+#: src/generic/matchers.cc:1040
 #, c-format
 msgid "Unknown pattern type: %c"
 msgstr "Neznámý vzor: %c"
 
-#: src/generic/matchers.cc:1084
+#: src/generic/matchers.cc:1105
 msgid "Unexpected empty expression"
 msgstr "Neočekávaný prázdný výraz"
 
-#: src/generic/matchers.cc:1119
+#: src/generic/matchers.cc:1143
 msgid "Badly formed expression"
 msgstr "Špatně zformulovaný výraz"
 
-#: src/generic/matchers.cc:1148
+#: src/generic/matchers.cc:1175
 msgid "Unexpected ')'"
 msgstr "Neočekávaná ')'"
 
@@ -1625,7 +1636,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:61
+#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:76
 #, c-format
 msgid "ChangeLog of %s"
 msgstr "Soubor změn %s"
@@ -1666,37 +1677,37 @@
 msgid "Reading task descriptions"
 msgstr "Načítám popisy úloh"
 
-#: src/load_config.cc:30
-#, c-format
-msgid "Invalid entry in color definition group: \"%s\""
-msgstr "Chybný záznam v definicích barev: \"%s\""
+#: src/load_config.cc:42
+#, fuzzy, c-format
+msgid "Unrecognized color name \"%s\""
+msgstr "Nezařazené úlohy"
 
-#: src/load_config.cc:32
-#, c-format
-msgid "Invalid tagless entry in color definition group: \"%s\""
-msgstr "Chybný neoznačený záznam v definicích barev: \"%s\""
+#: src/load_config.cc:69
+#, fuzzy, c-format
+msgid "Unrecognized attribute name \"%s\""
+msgstr "Nezařazené úlohy"
 
-#: src/load_config.cc:34
-#, c-format
-msgid "Need exactly two colors in color definition \"%s\""
-msgstr "Pro deficici barvy potřebuji přesně dvě hodnoty \"%s\""
+#: src/load_config.cc:106
+#, fuzzy, c-format
+msgid "Invalid entry in style definition group: \"%s\""
+msgstr "Chybný záznam v definicích barev: \"%s\""
 
-#: src/load_config.cc:50
-#, c-format
-msgid "Can't parse foreground \"%s\"of color \"%s\""
-msgstr "Nemohu zpracovat barvu popředí \"%s\" (\"%s\")"
+#: src/load_config.cc:108
+#, fuzzy, c-format
+msgid "Invalid tagless entry in style definition group: \"%s\""
+msgstr "Chybný neoznačený záznam v definicích barev: \"%s\""
 
-#: src/load_config.cc:53
-#, c-format
-msgid "Can't parse background \"%s\" of color \"%s\""
-msgstr "Nemohu zpracovat barvu pozadí \"%s\" (\"%s\")"
+#: src/load_config.cc:130
+#, fuzzy, c-format
+msgid "Unknown style attribute %s"
+msgstr "Neznámá akce: %s"
 
-#: src/load_config.cc:72 src/load_config.cc:74
+#: src/load_config.cc:153 src/load_config.cc:155
 #, c-format
 msgid "Invalid entry in keybinding group: \"%s\""
 msgstr "Chybný záznam v definicích kláves: \"%s\""
 
-#: src/load_config.cc:89
+#: src/load_config.cc:170
 #, c-format
 msgid "Ignoring invalid keybinding \"%s\" -> \"%s\""
 msgstr "Ignoruji neplatné vázání klávesy \"%s\" -> \"%s\""
@@ -2099,42 +2110,42 @@
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                  Tato aptitude nemá schopnosti svaté krávy.\n"
 
-#: src/main.cc:255
+#: src/main.cc:252
 #, 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:301 src/main.cc:310
+#: src/main.cc:291 src/main.cc:300
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr "PODIVNÉ: obdržen kód neznámé volby\n"
 
-#: src/main.cc:319
+#: src/main.cc:309
 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:327
+#: src/main.cc:317
 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:348
+#: src/main.cc:338
 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:405
+#: src/main.cc:395
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr "Neznámý příkaz \"%s\"\n"
 
-#: src/main.cc:412 src/main.cc:469
+#: src/main.cc:402 src/main.cc:450
 msgid "Internal error: uncaught 'out of solutions' exception.\n"
 msgstr ""
 
-#: src/main.cc:417 src/main.cc:474
+#: src/main.cc:407 src/main.cc:455
 msgid "Internal error: uncaught 'out of time' exception.\n"
 msgstr ""
 
-#: src/main.cc:424
+#: src/main.cc:414
 #, c-format
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
@@ -2165,7 +2176,7 @@
 msgid "Lost"
 msgstr "Prohrál"
 
-#: src/mine/cmine.cc:119 src/ui.cc:1090
+#: src/mine/cmine.cc:119 src/ui.cc:1084
 msgid "Minesweeper"
 msgstr "Hledání min"
 
@@ -2191,92 +2202,92 @@
 msgid "The number of mines must be a number"
 msgstr "Počet min musí být číslo"
 
-#: src/mine/cmine.cc:240
+#: src/mine/cmine.cc:238
 msgid "Setup custom game"
 msgstr "Nastavit vlastní hru"
 
-#: src/mine/cmine.cc:243
+#: src/mine/cmine.cc:240
 msgid "Height of board: "
 msgstr "Výška desky:"
 
-#: src/mine/cmine.cc:247
+#: src/mine/cmine.cc:243
 msgid "Width of board: "
 msgstr "Šířka desky:"
 
-#: src/mine/cmine.cc:251
+#: src/mine/cmine.cc:246
 msgid "Number of mines: "
 msgstr "Počet min:"
 
-#: src/mine/cmine.cc:316
+#: src/mine/cmine.cc:305
 msgid "Choose difficulty level"
 msgstr "Zvolte obtížnost"
 
-#: src/mine/cmine.cc:318
+#: src/mine/cmine.cc:307
 msgid "Easy"
 msgstr "Jednoduchá"
 
-#: src/mine/cmine.cc:319
+#: src/mine/cmine.cc:308
 msgid "Medium"
 msgstr "Normální"
 
-#: src/mine/cmine.cc:320
+#: src/mine/cmine.cc:309
 msgid "Hard"
 msgstr "Těžká"
 
-#: src/mine/cmine.cc:321
+#: src/mine/cmine.cc:310
 msgid "Custom"
 msgstr "Vlastní"
 
-#: src/mine/cmine.cc:411
+#: src/mine/cmine.cc:392
 msgid "You have won."
 msgstr "Vyhráli jste."
 
-#: src/mine/cmine.cc:414
+#: src/mine/cmine.cc:395
 msgid "You lose!"
 msgstr "Prohráli jste!"
 
-#: src/mine/cmine.cc:419
+#: src/mine/cmine.cc:400
 msgid "You die...  --More--"
 msgstr "Umíráš...  --Více--"
 
-#: src/mine/cmine.cc:432
+#: src/mine/cmine.cc:413
 msgid "The spikes were poisoned!  The poison was deadly..  --More--"
 msgstr "Bodce jsou otrávené! Otrava je smrtelná...  --Více--"
 
-#: src/mine/cmine.cc:435
+#: src/mine/cmine.cc:416
 msgid "You land on a set of sharp iron spikes!  --More--"
 msgstr "Spadl jsi na ostré železné bodce!  --Více--"
 
-#: src/mine/cmine.cc:438
+#: src/mine/cmine.cc:419
 msgid "You fall into a pit!  --More--"
 msgstr "Spadl jsi do jámy!  --Více--"
 
-#: src/mine/cmine.cc:441
+#: src/mine/cmine.cc:422
 msgid "KABOOM!  You step on a land mine.  --More--"
 msgstr "PRÁSK! Šlápl jsi na minu.  --Více--"
 
-#: src/mine/cmine.cc:446
+#: src/mine/cmine.cc:427
 msgid "The dart was poisoned!  The poison was deadly...  --More--"
 msgstr "Šipka je otrávená! Otrava je smrtelná... --Více--"
 
-#: src/mine/cmine.cc:448
+#: src/mine/cmine.cc:429
 msgid ""
 "A little dart shoots out at you!  You are hit by a little dart!  --More--"
 msgstr "Odněkud na tebe vyletěla malá šipka! Šipka tě zasáhla!  --Více--"
 
-#: src/mine/cmine.cc:452
+#: src/mine/cmine.cc:433
 msgid "You turn to stone... --More--"
 msgstr "Měníš se v kámen...  --Více--"
 
-#: src/mine/cmine.cc:454
+#: src/mine/cmine.cc:435
 msgid "Touching the cockatrice corpse was a fatal mistake.  --More--"
 msgstr "Dotknout se mýtického zvířete byla fatální chyba.  --Více--"
 
-#: src/mine/cmine.cc:456
+#: src/mine/cmine.cc:437
 msgid "You feel here a cockatrice corpse.  --More--"
 msgstr "Cítíš přítomnost mýtického zvířete.  --Více--"
 
-#: src/mine/cmine.cc:460
+#: src/mine/cmine.cc:441
 msgid ""
 "Click!  You trigger a rolling boulder trap!  You are hit by a boulder! --"
 "More--"
@@ -2284,56 +2295,56 @@
 "Cvak! Spustil jsi nějaký mechanismus! Jsi zasažen valícím se kamenem! --"
 "Více--"
 
-#: src/mine/cmine.cc:470
+#: src/mine/cmine.cc:451
 msgid "sleep"
 msgstr "spánku"
 
-#: src/mine/cmine.cc:473
+#: src/mine/cmine.cc:454
 msgid "striking"
 msgstr "úderu"
 
-#: src/mine/cmine.cc:476
+#: src/mine/cmine.cc:457
 msgid "death"
 msgstr "smrti"
 
-#: src/mine/cmine.cc:479
+#: src/mine/cmine.cc:460
 msgid "polymorph"
 msgstr "polymorfismu"
 
-#: src/mine/cmine.cc:482
+#: src/mine/cmine.cc:463
 msgid "magic missile"
 msgstr "magických střel"
 
-#: src/mine/cmine.cc:485
+#: src/mine/cmine.cc:466
 msgid "secret door detection"
 msgstr "na detekci tajných dveří"
 
-#: src/mine/cmine.cc:488
+#: src/mine/cmine.cc:469
 msgid "invisibility"
 msgstr "neviditelnosti"
 
-#: src/mine/cmine.cc:491
+#: src/mine/cmine.cc:472
 msgid "cold"
 msgstr "chladu"
 
-#: src/mine/cmine.cc:497
+#: src/mine/cmine.cc:478
 #, c-format
 msgid "Your wand of %s breaks apart and explodes!  --More--"
 msgstr "Tvá hůl %s se rozpadne a exploduje!  --Více--"
 
-#: src/mine/cmine.cc:503
+#: src/mine/cmine.cc:484
 msgid "You are jolted by a surge of electricity!  --More--"
 msgstr "Jsi otřesen vlnou elektřiny!  --Více--"
 
-#: src/mine/cmine.cc:607
+#: src/mine/cmine.cc:588
 msgid "Enter the filename to load: "
 msgstr "Zadejte jméno souboru pro načtení:"
 
-#: src/mine/cmine.cc:614
+#: src/mine/cmine.cc:595
 msgid "Enter the filename to save: "
 msgstr "Zadejte jméno souboru pro uložení:"
 
-#: src/mine/cmine.cc:624
+#: src/mine/cmine.cc:605
 msgid "mine-help.txt"
 msgstr "mine-help-cs.txt"
 
@@ -2341,7 +2352,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:1670
+#: src/pkg_columnizer.cc:84 src/ui.cc:1662
 msgid "Package"
 msgstr "Balík"
 
@@ -3383,52 +3394,52 @@
 "Jste si jisti, že jej chcete odstranit?\n"
 "Pokud jste, napište '%s'."
 
-#: src/pkg_item.cc:222 src/pkg_ver_item.cc:625
+#: src/pkg_item.cc:220 src/pkg_ver_item.cc:626
 #, c-format
 msgid "Information about %s"
 msgstr "Informace o %s"
 
-#: src/pkg_item.cc:224 src/pkg_ver_item.cc:627
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:628
 #, c-format
 msgid "%s info"
 msgstr ""
 
-#: src/pkg_item.cc:310
+#: src/pkg_item.cc:308
 #, fuzzy, c-format
 msgid "Available versions of %s"
 msgstr "Dostupné verze "
 
-#: src/pkg_item.cc:313
+#: src/pkg_item.cc:311
 #, fuzzy, c-format
 msgid "%s versions"
 msgstr "Verze"
 
-#: src/pkg_item.cc:325 src/pkg_ver_item.cc:655
+#: src/pkg_item.cc:323 src/pkg_ver_item.cc:656
 #, c-format
 msgid "Dependencies of %s"
 msgstr "Závislosti %s"
 
-#: src/pkg_item.cc:327 src/pkg_ver_item.cc:657
+#: src/pkg_item.cc:325 src/pkg_ver_item.cc:658
 #, c-format
 msgid "%s deps"
 msgstr ""
 
-#: src/pkg_item.cc:338 src/pkg_ver_item.cc:667
+#: src/pkg_item.cc:336 src/pkg_ver_item.cc:668
 #, c-format
 msgid "Packages depending on %s"
 msgstr "Balíky závisející na %s"
 
-#: src/pkg_item.cc:340 src/pkg_ver_item.cc:669
+#: src/pkg_item.cc:338 src/pkg_ver_item.cc:670
 #, c-format
 msgid "%s reverse deps"
 msgstr ""
 
-#: src/pkg_item.cc:392 src/pkg_ver_item.cc:707
+#: src/pkg_item.cc:390 src/pkg_ver_item.cc:708
 #, c-format
 msgid "Reporting a bug in %s:\n"
 msgstr "Hlásím chybu v %s:\n"
 
-#: src/pkg_item.cc:414
+#: src/pkg_item.cc:412
 #, fuzzy
 msgid ""
 "You are not root and I cannot find any way to become root.  To reconfigure "
@@ -3440,16 +3451,16 @@
 "nainstalujte balíky menu a login, nebo\n"
 "spusťte  aptitude jako root."
 
-#: src/pkg_item.cc:422
+#: src/pkg_item.cc:420
 #, c-format
 msgid "Reconfiguring %s\n"
 msgstr "Překonfigurovávám %s\n"
 
-#: src/pkg_item.cc:447
+#: src/pkg_item.cc:445
 msgid "Hierarchy editor"
 msgstr "Editor hierarchie"
 
-#: src/pkg_item.cc:447
+#: src/pkg_item.cc:445
 #, fuzzy
 msgid "Hierarchy Editor"
 msgstr "Editor hierarchie"
@@ -3483,20 +3494,20 @@
 msgid "Enter the new package sorting mechanism for this display: "
 msgstr "Třídící mechanizmus: "
 
-#: src/pkg_view.cc:344
+#: src/pkg_view.cc:359
 msgid "make_package_view: error in arguments -- two main widgets??"
 msgstr "make_package_view: chyba v argumentech -- dva hlavní widgety??"
 
-#: src/pkg_view.cc:350
+#: src/pkg_view.cc:365
 msgid ""
 "make_package_view: error in arguments -- bad column list for static item"
 msgstr "make_package_view: chyba v argumentech -- chybný seznam sloupců"
 
-#: src/pkg_view.cc:443
+#: src/pkg_view.cc:458
 msgid "make_package_view: bad argument!"
 msgstr "make_package_view: chybný argument!"
 
-#: src/pkg_view.cc:495
+#: src/pkg_view.cc:510
 msgid "make_package_view: no main widget found"
 msgstr "make_package_view: nebyl nalezen hlavní widget"
 
@@ -3533,18 +3544,18 @@
 msgid " (provided by %F)"
 msgstr " (poskytován %F)"
 
-#: src/reason_fragment.cc:278
+#: src/reason_fragment.cc:275
 #, c-format
 msgid "%F%s %F %F"
 msgstr "%F%s %F %F"
 
-#: src/reason_fragment.cc:327
+#: src/reason_fragment.cc:324
 msgid ""
 "If you select a package, an explanation of its current state will appear in "
 "this space."
 msgstr "Pokud vyberete balík, objeví se zde popis jeho aktuálního stavu."
 
-#: src/reason_fragment.cc:361
+#: src/reason_fragment.cc:358
 msgid ""
 "%B%s%b was installed automatically;  it is being removed because all of the "
 "packages which depend upon it are being removed:"
@@ -3552,17 +3563,17 @@
 "%B%s%b byl instalován automaticky;  nyní bude odstraněn, protože všechny "
 "balíky, které na něm závisely, budou odstraněny:"
 
-#: src/reason_fragment.cc:365
+#: src/reason_fragment.cc:362
 msgid "%B%s%b will be automatically removed because of dependency errors:"
 msgstr "%B%s%b bude automaticky odstraněn kvůli chybám v závislostech:"
 
-#: src/reason_fragment.cc:369
+#: src/reason_fragment.cc:366
 msgid ""
 "%B%s%b will be automatically installed to satisfy the following dependencies:"
 msgstr ""
 "%B%s%b bude instalován automaticky pro splnění následujících závislostí:"
 
-#: src/reason_fragment.cc:375 src/reason_fragment.cc:387
+#: src/reason_fragment.cc:372 src/reason_fragment.cc:384
 msgid ""
 "%B%s%b cannot be upgraded now, but if it could be, it would still be held at "
 "version %B%s%b."
@@ -3570,7 +3581,7 @@
 "%B%s%b nemůže být aktualizován, a i kdyby mohl, stejně by byl podržen ve "
 "verzi %B%s%b."
 
-#: src/reason_fragment.cc:378
+#: src/reason_fragment.cc:375
 msgid ""
 "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the "
 "following dependencies:"
@@ -3578,27 +3589,27 @@
 "%B%s%b nebude aktualizován na verzi %B%s%b, aby neporušil následující "
 "závislosti:"
 
-#: src/reason_fragment.cc:390
+#: src/reason_fragment.cc:387
 msgid "%B%s%b is currently installed."
 msgstr "%B%s%b je nainstalovaný.%n%n"
 
-#: src/reason_fragment.cc:396
+#: src/reason_fragment.cc:393
 msgid "%B%s%b is not currently installed."
 msgstr "%B%s%b není nainstalovaný."
 
-#: src/reason_fragment.cc:404
+#: src/reason_fragment.cc:401
 msgid "Some dependencies of %B%s%b are not satisfied:"
 msgstr "Některé závislosti %B%s%b nejsou splněny:"
 
-#: src/reason_fragment.cc:408
+#: src/reason_fragment.cc:405
 msgid "%B%s%b will be downgraded."
 msgstr "%B%s%b bude degradován."
 
-#: src/reason_fragment.cc:415
+#: src/reason_fragment.cc:412
 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b."
 msgstr "%B%s%b nebude aktualizován na zakázanou verzi %B%s%b."
 
-#: src/reason_fragment.cc:419
+#: src/reason_fragment.cc:416
 msgid ""
 "%B%s%b could be upgraded to version %B%s%b, but it is being held at version %"
 "B%s%b."
@@ -3606,39 +3617,39 @@
 "%B%s%b by mohl být aktualizován na verzi %B%s%b, ale je podržen ve verzi %B%s"
 "%b."
 
-#: src/reason_fragment.cc:426
+#: src/reason_fragment.cc:423
 msgid "%B%s%b will be re-installed."
 msgstr "%B%s%b bude reinstalován."
 
-#: src/reason_fragment.cc:430
+#: src/reason_fragment.cc:427
 msgid "%B%s%b will be installed."
 msgstr "%B%s%b bude instalován."
 
-#: src/reason_fragment.cc:434
+#: src/reason_fragment.cc:431
 msgid "%B%s%b will be removed."
 msgstr "%B%s%b bude odstraněn."
 
-#: src/reason_fragment.cc:439
+#: src/reason_fragment.cc:436
 msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b."
 msgstr "%B%s%b bude aktualizován z verze %B%s%b na verzi %B%s%b."
 
-#: src/reason_fragment.cc:475
+#: src/reason_fragment.cc:472
 msgid ""
 "The following packages depend on %B%s%b and will be broken by its removal:"
 msgstr "Následující balíky závisí na %B%s%b a budou jeho odstraněním porušeny:"
 
-#: src/reason_fragment.cc:478
+#: src/reason_fragment.cc:475
 msgid "The following packages depend on %B%s%b and are broken:"
 msgstr "Následující balíky závisí na %B%s%b a jsou porušeny:"
 
-#: src/reason_fragment.cc:485
+#: src/reason_fragment.cc:482
 msgid ""
 "The following packages conflict with %B%s%b and will be broken by its "
 "installation:"
 msgstr ""
 "Následující balíky jsou v konfliktu s %B%s%b a budou jeho instalací porušeny:"
 
-#: src/reason_fragment.cc:518
+#: src/reason_fragment.cc:515
 msgid ""
 "The following packages depend on a version of %B%s%b other than the "
 "currently installed version of %B%s%b, or conflict with the currently "
@@ -3647,7 +3658,7 @@
 "Následující balíky závisí na balíku %B%s%b v jiné verzi, než je aktuálně "
 "instalovaná %B%s%b, nebo jsou s ní v konfliktu:"
 
-#: src/reason_fragment.cc:522
+#: src/reason_fragment.cc:519
 msgid ""
 "The following packages conflict with %B%s%b, or depend on a version of it "
 "which is not going to be installed."
@@ -3655,11 +3666,11 @@
 "Následující balíky jsou v konfliktu s %B%s%b, nebo závisí na jeho verzi, "
 "která nebude instalována."
 
-#: src/reason_fragment.cc:526
+#: src/reason_fragment.cc:523
 msgid "The following packages conflict with %B%s%b:"
 msgstr "Následující balíky jsou v konfliktu s %B%s%b:"
 
-#: src/reason_fragment.cc:531
+#: src/reason_fragment.cc:528
 msgid ""
 "The following packages depend on a version of %B%s%b other than the "
 "currently installed version of %B%s%b:"
@@ -3667,22 +3678,22 @@
 "Následující balíky závisí na balíku %B%s%b v jiné verzi, než je aktuálně "
 "instalovaná %B%s%b:"
 
-#: src/reason_fragment.cc:535
+#: src/reason_fragment.cc:532
 msgid ""
 "The following packages depend on a version of %B%s%b which is not going to "
 "be installed."
 msgstr ""
 "Následující balíky závisí na verzi balíku %B%s%b, která se nebude instalovat."
 
-#: src/reason_fragment.cc:541
+#: src/reason_fragment.cc:538
 msgid "upgraded"
 msgstr "aktualizován"
 
-#: src/reason_fragment.cc:541
+#: src/reason_fragment.cc:538
 msgid "downgraded"
 msgstr "degradován"
 
-#: src/reason_fragment.cc:547
+#: src/reason_fragment.cc:544
 msgid ""
 "The following packages depend on the currently installed version of %B%s%b (%"
 "B%s%b), or conflict with the version it will be %s to (%B%s%b), and will be "
@@ -3692,7 +3703,7 @@
 "b), nebo jsou v konfliktu s verzí, na kterou bude balík %s (%B%s%b). Pokud "
 "bude balík %s, budou tyto balíky porušeny."
 
-#: src/reason_fragment.cc:554
+#: src/reason_fragment.cc:551
 msgid ""
 "The following packages conflict with version %B%s%b of %B%s%b, and will be "
 "broken if it is %s."
@@ -3700,7 +3711,7 @@
 "Následující balíky jsou v konfliktu s verzí %B%s%b balíku %B%s%b. Pokud bude "
 "balík %s, budou tyto balíky porušeny."
 
-#: src/reason_fragment.cc:559
+#: src/reason_fragment.cc:556
 msgid ""
 "The following packages depend on version %B%s%b of %B%s%b, and will be "
 "broken if it is %s."
@@ -3747,38 +3758,43 @@
 msgid "Close"
 msgstr "Zavřít"
 
-#: src/solution_fragment.cc:125
+#: src/solution_fragment.cc:134
 #, fuzzy
 msgid "%BRemove%b the following packages:%n"
 msgstr "Následující balíky jsou POŠKOZENY:"
 
-#: src/solution_fragment.cc:135
+#: src/solution_fragment.cc:144
 #, fuzzy
 msgid "%BInstall%b the following packages:%n"
 msgstr "Následující balíky jsou POŠKOZENY:"
 
-#: src/solution_fragment.cc:148
+#: src/solution_fragment.cc:157
 msgid "%BKeep%b the following packages at their current version:%n"
 msgstr ""
 
-#: src/solution_fragment.cc:161
+#: src/solution_fragment.cc:164
+#, fuzzy
+msgid "Not Installed"
+msgstr "nenainstalovaný"
+
+#: src/solution_fragment.cc:177
 #, fuzzy
 msgid "%BUpgrade%b the following packages:%n"
 msgstr "Následující balíky jsou POŠKOZENY:"
 
-#: src/solution_fragment.cc:176
+#: src/solution_fragment.cc:192
 #, fuzzy
 msgid "%BDowngrade%b the following packages:%n"
 msgstr "Stahuji balíky"
 
-#: src/solution_fragment.cc:190
+#: src/solution_fragment.cc:206
 #, c-format
 msgid "Score is %d"
 msgstr ""
 
 #: src/trust.cc:17 src/trust.cc:19
 msgid "WARNING"
-msgstr ""
+msgstr "VAROVÁNÍ"
 
 #: src/trust.cc:18
 msgid ""
@@ -3786,6 +3802,9 @@
 "package could allow a malicious individual to damage or take control of your "
 "system."
 msgstr ""
+"%F: Tato verze %s pochází z %Bnedůvěryhodného zdroje%b! Instalací tohoto "
+"balíku možná pomůžete zlovolnému jedinci poškodit systém nebo nad ním získat "
+"kontrolu."
 
 #: src/ui.cc:165
 msgid "Er, there aren't any errors, this shouldn't have happened.."
@@ -3799,43 +3818,43 @@
 msgid "W:"
 msgstr ""
 
-#: src/ui.cc:194
+#: src/ui.cc:193
 msgid "Search for:"
 msgstr "Hledat:"
 
-#: src/ui.cc:262
+#: src/ui.cc:258
 msgid "You already are root!"
 msgstr "Již jste root!"
 
-#: src/ui.cc:360
+#: src/ui.cc:356
 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:388
+#: src/ui.cc:384
 msgid "Loading cache"
 msgstr "Nahrávám cache"
 
-#: src/ui.cc:410
+#: src/ui.cc:406
 msgid "Really quit Aptitude?"
 msgstr "Opravdu ukončit Aptitude?"
 
-#: src/ui.cc:489
+#: src/ui.cc:485
 msgid "Really discard your personal settings and reload the defaults?"
 msgstr "Opravdu zahodit osobní nastavení a načíst standardní hodnoty?"
 
-#: src/ui.cc:589 src/ui.cc:591 src/ui.cc:619 src/ui.cc:621
+#: src/ui.cc:585 src/ui.cc:587 src/ui.cc:615 src/ui.cc:617
 msgid "Packages"
 msgstr "Balíky"
 
-#: src/ui.cc:590 src/ui.cc:620
+#: src/ui.cc:586 src/ui.cc:616
 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:667
+#: src/ui.cc:663
 #, fuzzy
 msgid ""
-"%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
+"Aptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
 "BABSOLUTELY NO WARRANTY%b; for details see 'license' in the Help menu.  This "
 "is free software, and you are welcome to redistribute it under certain "
 "conditions; see 'license' for details."
@@ -3848,61 +3867,69 @@
 "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:688
+#: src/ui.cc:684
 msgid "help.txt"
 msgstr "help-cs.txt"
 
-#: src/ui.cc:704
+#: src/ui.cc:700
 msgid "README"
 msgstr "README.cs"
 
-#: src/ui.cc:786
+#: src/ui.cc:782
 msgid ""
-"%C%BWARNING%b: untrusted versions of the following packages will be "
-"installed!%n%nUntrusted packages could %Bcompromise your system's security%"
-"b.  You should only proceed with the installation if you are certain that "
-"this is what you want to do.%n%n"
+"%BWARNING%b: untrusted versions of the following packages will be installed!%"
+"n%nUntrusted packages could %Bcompromise your system's security%b.  You "
+"should only proceed with the installation if you are certain that this is "
+"what you want to do.%n%n"
 msgstr ""
+"%BVAROVÁNÍ%b: budou instalovány nedůvěryhodné verze následujících balíků!%n%"
+"nNedůvěryhodné balíky mohou %Bkompromitovat bezpečnost vašeho systému.%bV "
+"instalaci byste měli pokračovat pouze v případě, že jste sinaprosto jisti, "
+"že to je to, co opravdu chcete udělat.%n%n"
 
-#: src/ui.cc:800
+#: src/ui.cc:788
 #, fuzzy
+msgid "  %S*%N %s [version %s]%n"
+msgstr "Verze"
+
+#: src/ui.cc:795
 msgid "Really Continue"
-msgstr "Pokračovat"
+msgstr "Opravdu pokračovat"
 
-#: src/ui.cc:802
+#: src/ui.cc:797
 msgid "Abort Installation"
-msgstr ""
+msgstr "Přerušit instalaci"
 
-#: src/ui.cc:863
+#: src/ui.cc:858
 msgid "Preview of package installation"
 msgstr "Náhled instalace balíků"
 
-#: src/ui.cc:864
+#: src/ui.cc:859
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Zobrazí a/nebo upraví akce, které se mají vykonat"
 
-#: src/ui.cc:865
+#: src/ui.cc:860
 #, fuzzy
 msgid "Preview"
 msgstr "^Předchozí"
 
-#: src/ui.cc:901
+#: src/ui.cc:896
 #, 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:907
+#: src/ui.cc:902
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:913
-#, c-format
+#: src/ui.cc:908
+#, fuzzy, c-format
 msgid ""
-"Ran out of time while trying to resolver dependencies (press \"%s\" to try "
+"Ran out of time while trying to resolve dependencies (press \"%s\" to try "
 "harder)"
-msgstr ""
+msgstr "Ukrátit čas hledáním min."
 
-#: src/ui.cc:959
+#: src/ui.cc:954
 #, fuzzy
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
@@ -3911,23 +3938,23 @@
 "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:962 src/ui.cc:1078
+#: src/ui.cc:957 src/ui.cc:1072
 msgid "Become root"
 msgstr "Stát se rootem"
 
-#: src/ui.cc:964 src/ui.cc:1080
+#: src/ui.cc:959 src/ui.cc:1074
 msgid "Don't become root"
 msgstr "Nestát se rootem"
 
-#: src/ui.cc:969 src/ui.cc:1085
+#: src/ui.cc:964 src/ui.cc:1079
 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:996
+#: src/ui.cc:991
 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:1002
+#: src/ui.cc:997
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -3940,7 +3967,7 @@
 "aktualizovat.\n"
 "Aktualizaci můžete připravit klávesou \"U\"."
 
-#: src/ui.cc:1074
+#: src/ui.cc:1069
 #, fuzzy
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
@@ -3949,112 +3976,112 @@
 "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:1090 src/ui.cc:1377
+#: src/ui.cc:1084 src/ui.cc:1371
 msgid "Waste time trying to find mines"
 msgstr "Ukrátit čas hledáním min."
 
-#: src/ui.cc:1097 src/ui.cc:1150
+#: src/ui.cc:1091 src/ui.cc:1144
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "Čištění během stahování není dovoleno"
 
-#: src/ui.cc:1100
+#: src/ui.cc:1094
 msgid "Deleting downloaded files"
 msgstr "Mažu stažené soubory"
 
-#: src/ui.cc:1114
+#: src/ui.cc:1108
 msgid "Downloaded package files have been deleted"
 msgstr "Stažené balíky byly smazány"
 
-#: src/ui.cc:1175
+#: src/ui.cc:1169
 #, 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:1247
+#: src/ui.cc:1241
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1252 src/ui.cc:1283
+#: src/ui.cc:1246 src/ui.cc:1277
 #, fuzzy
 msgid "Ran out of time while trying to find a solution."
 msgstr "Ukrátit čas hledáním min."
 
-#: src/ui.cc:1277
+#: src/ui.cc:1271
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1307
+#: src/ui.cc:1301
 #, fuzzy, c-format
 msgid "Unable to open %s"
 msgstr "Nemohu otevřít %s pro zápis"
 
-#: src/ui.cc:1313
+#: src/ui.cc:1307
 msgid "Error while dumping resolver state"
 msgstr ""
 
-#: src/ui.cc:1323
+#: src/ui.cc:1317
 msgid "File to which the resolver state should be dumped:"
 msgstr ""
 
-#: src/ui.cc:1353
+#: src/ui.cc:1347
 msgid "^Install/remove packages"
 msgstr "^Instalovat/odstranit balíky"
 
-#: src/ui.cc:1354
+#: src/ui.cc:1348
 msgid "Perform all pending installs and removals"
 msgstr "Provede všechny nevyřízené instalace a odstraňování"
 
-#: src/ui.cc:1356
+#: src/ui.cc:1350
 msgid "^Update package list"
 msgstr "^Aktualizovat seznam balíků"
 
-#: src/ui.cc:1357
+#: src/ui.cc:1351
 msgid "Check for new versions of packages"
 msgstr "Zjistí, zda nejsou k dispozici novější verze balíků"
 
-#: src/ui.cc:1360
+#: src/ui.cc:1354
 msgid "^Forget new packages"
 msgstr "^Zapomenout nové balíky"
 
-#: src/ui.cc:1361
+#: src/ui.cc:1355
 msgid "Forget which packages are \"new\""
 msgstr "Zapomene, které balíky jsou \"nové\""
 
-#: src/ui.cc:1364
+#: src/ui.cc:1358
 msgid "^Clean package cache"
 msgstr "Vyčistit ^cache s balíky"
 
-#: src/ui.cc:1365
+#: src/ui.cc:1359
 msgid "Delete package files which were previously downloaded"
 msgstr "Smaže stažené soubory (balíky) z /var/cache/apt"
 
-#: src/ui.cc:1368
+#: src/ui.cc:1362
 msgid "Clean ^obsolete files"
 msgstr "Vyčistit staré s^oubory"
 
-#: src/ui.cc:1369
+#: src/ui.cc:1363
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Smaže soubory, které se již nedají stáhnout"
 
-#: src/ui.cc:1372
+#: src/ui.cc:1366
 msgid "Mark ^Upgradable"
 msgstr "Označit aktualizovatelné"
 
-#: src/ui.cc:1373
+#: src/ui.cc:1367
 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:1376
+#: src/ui.cc:1370
 msgid "^Play Minesweeper"
 msgstr "Zahrát si minové ^pole"
 
-#: src/ui.cc:1379
+#: src/ui.cc:1373
 msgid "^Become root"
 msgstr "Stát se rootem"
 
-#: src/ui.cc:1380
+#: src/ui.cc:1374
 #, fuzzy
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
@@ -4063,69 +4090,69 @@
 "Pro přepnutí na uživatele root spusťte 'su'. Tím se program restartuje,\n"
 "ale nastavení budou zachována"
 
-#: src/ui.cc:1383
+#: src/ui.cc:1377
 msgid "^Reload package cache"
 msgstr "Znovu načíst cache"
 
-#: src/ui.cc:1384
+#: src/ui.cc:1378
 msgid "Reload the package cache"
 msgstr "Znovu načíst obsah cache"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1384
 msgid "^Quit"
 msgstr "Konec"
 
-#: src/ui.cc:1391
+#: src/ui.cc:1385
 msgid "Exit the program"
 msgstr "Ukončí program"
 
-#: src/ui.cc:1397 src/ui.cc:1669
+#: src/ui.cc:1391 src/ui.cc:1661
 msgid "Undo"
 msgstr "Zpět"
 
-#: src/ui.cc:1398
+#: src/ui.cc:1392
 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:1405
+#: src/ui.cc:1399
 msgid "^Install"
 msgstr "^Instalovat"
 
-#: src/ui.cc:1406
+#: src/ui.cc:1400
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "Označí aktuálně vybraný balík pro instalaci nebo aktualizaci"
 
-#: src/ui.cc:1409
+#: src/ui.cc:1403
 msgid "^Remove"
 msgstr "Odst^ranit"
 
-#: src/ui.cc:1410
+#: src/ui.cc:1404
 msgid "Flag the currently selected package for removal"
 msgstr "Označí aktuálně vybraný balík pro odstranění"
 
-#: src/ui.cc:1413
+#: src/ui.cc:1407
 msgid "^Purge"
 msgstr "Vyčistit"
 
-#: src/ui.cc:1414
+#: src/ui.cc:1408
 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:1417
+#: src/ui.cc:1411
 msgid "^Keep"
 msgstr "Ponechat"
 
-#: src/ui.cc:1418
+#: src/ui.cc:1412
 msgid "Cancel any action on the selected package"
 msgstr "Na vybraném balíku zruší veškeré akce"
 
-#: src/ui.cc:1421
+#: src/ui.cc:1415
 msgid "^Hold"
 msgstr "Přidržet"
 
-#: src/ui.cc:1422
+#: src/ui.cc:1416
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -4133,11 +4160,11 @@
 "Na vybraném balíku zruší veškeré akce a ochrání jej před budoucími "
 "aktualizacemi."
 
-#: src/ui.cc:1425
+#: src/ui.cc:1419
 msgid "Mark ^Auto"
 msgstr "Spravovat ^automaticky"
 
-#: src/ui.cc:1426
+#: src/ui.cc:1420
 #, fuzzy
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
@@ -4146,11 +4173,11 @@
 "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:1429
+#: src/ui.cc:1423
 msgid "Mark ^Manual"
 msgstr "Spravovat ručně"
 
-#: src/ui.cc:1430
+#: src/ui.cc:1424
 #, fuzzy
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
@@ -4159,11 +4186,11 @@
 "Označí vybraný balík, jako by byl nainstalován ručně;\n"
 "takový nebude odstraněn, dokud jej neodstraníte sami"
 
-#: src/ui.cc:1433
+#: src/ui.cc:1427
 msgid "^Forbid Version"
 msgstr "Zakázat ^verzi"
 
-#: src/ui.cc:1434
+#: src/ui.cc:1428
 #, fuzzy
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
@@ -4172,232 +4199,232 @@
 "Zakáže, aby se nainstalovala kandidátská verze balíku;\n"
 "novější verze balíku se budou instalovat jako obvykle"
 
-#: src/ui.cc:1438
+#: src/ui.cc:1432
 msgid "I^nformation"
 msgstr "I^nformace"
 
-#: src/ui.cc:1439
+#: src/ui.cc:1433
 msgid "Display more information about the selected package"
 msgstr "Pro vybraný balík zobrazí další informace"
 
-#: src/ui.cc:1442
+#: src/ui.cc:1436
 msgid "^Changelog"
 msgstr "^Changelog"
 
-#: src/ui.cc:1443
+#: src/ui.cc:1437
 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:1450
+#: src/ui.cc:1444
 msgid "^Find"
 msgstr "Hledat"
 
-#: src/ui.cc:1451
+#: src/ui.cc:1445
 msgid "Search for a package"
 msgstr "Hledá balík"
 
-#: src/ui.cc:1454
+#: src/ui.cc:1448
 msgid "Find ^Again"
 msgstr "Hledat znovu"
 
-#: src/ui.cc:1455
+#: src/ui.cc:1449
 msgid "Repeat the last search"
 msgstr "Zopakuje poslední hledání"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1453
 msgid "^Limit Display"
 msgstr "Omezit zobrazení"
 
-#: src/ui.cc:1460
+#: src/ui.cc:1454
 msgid "Apply a filter to the package list"
 msgstr "Na seznam balíků aplikuje výběrový filtr"
 
-#: src/ui.cc:1463
+#: src/ui.cc:1457
 msgid "^Un-Limit Display"
 msgstr "Zrušit omezení"
 
-#: src/ui.cc:1464
+#: src/ui.cc:1458
 msgid "Remove the filter from the package list"
 msgstr "Odstraní filtr aplikovaný na seznam balíků"
 
-#: src/ui.cc:1468
+#: src/ui.cc:1462
 msgid "Find ^Broken"
 msgstr "Hledat porušené"
 
-#: src/ui.cc:1469
+#: src/ui.cc:1463
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Hledá další balík s nesplněnými závislostmi"
 
-#: src/ui.cc:1476
+#: src/ui.cc:1470
 msgid "^UI options"
 msgstr "Nastavení zobrazení"
 
-#: src/ui.cc:1477
+#: src/ui.cc:1471
 msgid "Change the settings which affect the user interface"
 msgstr "Změní nastavení, která ovlivňují uživatelské rozhraní"
 
-#: src/ui.cc:1480
+#: src/ui.cc:1474
 msgid "^Dependency handling"
 msgstr "Správa závislostí"
 
-#: src/ui.cc:1481
+#: src/ui.cc:1475
 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:1484
+#: src/ui.cc:1478
 msgid "^Miscellaneous"
 msgstr "Různé"
 
-#: src/ui.cc:1485
+#: src/ui.cc:1479
 msgid "Change miscellaneous program settings"
 msgstr "Změní ostatní nastavení programu"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1484
 msgid "^Revert options"
 msgstr "Původní nastavení"
 
-#: src/ui.cc:1491
+#: src/ui.cc:1485
 msgid "Reset all settings to the system defaults"
 msgstr "Vrátí všechna nastavení do původního stavu"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1496
 msgid "^Next"
 msgstr "Další"
 
-#: src/ui.cc:1503
+#: src/ui.cc:1497
 msgid "View next display"
 msgstr "Zobrazí další pohled"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1500
 msgid "^Prev"
 msgstr "^Předchozí"
 
-#: src/ui.cc:1507
+#: src/ui.cc:1501
 msgid "View previous display"
 msgstr "Zobrazí předchozí pohled"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1504
 msgid "^Close"
 msgstr "Zavřít"
 
-#: src/ui.cc:1511
+#: src/ui.cc:1505
 msgid "Close this display"
 msgstr "Zavře tento pohled"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1510
 msgid "New Package ^View"
 msgstr "No^vý pohled na balíky"
 
-#: src/ui.cc:1517
+#: src/ui.cc:1511
 msgid "Create a new default package view"
 msgstr "Vytvoří nový standardní pohled na balíky"
 
-#: src/ui.cc:1520
+#: src/ui.cc:1514
 msgid "New Categorical ^Browser"
 msgstr "Nový prohlížeč kategorií"
 
-#: src/ui.cc:1522
+#: src/ui.cc:1516
 msgid "Browse packages by category"
 msgstr "Prohlíží balíky podle kategorií"
 
-#: src/ui.cc:1530
+#: src/ui.cc:1524
 msgid "^About"
 msgstr "O progr^amu"
 
-#: src/ui.cc:1531
+#: src/ui.cc:1525
 msgid "View information about this program"
 msgstr "Zobrazí informace o programu"
 
-#: src/ui.cc:1534
+#: src/ui.cc:1528
 msgid "^Help"
 msgstr "Nápověda"
 
-#: src/ui.cc:1535
+#: src/ui.cc:1529
 msgid "View the on-line help"
 msgstr "Zobrazí on-line nápovědu"
 
-#: src/ui.cc:1537
+#: src/ui.cc:1531
 msgid "User's ^Manual"
 msgstr "Uživatelský ^manuál"
 
-#: src/ui.cc:1538
+#: src/ui.cc:1532
 msgid "View the detailed program manual"
 msgstr "Zobrazí podrobný manuál tohoto programu"
 
-#: src/ui.cc:1541
+#: src/ui.cc:1535
 msgid "^FAQ"
 msgstr "^FAQ"
 
-#: src/ui.cc:1542
+#: src/ui.cc:1536
 msgid "View a list of frequently asked questions"
 msgstr "Zobrazí seznam často kladených otázek"
 
-#: src/ui.cc:1545
+#: src/ui.cc:1539
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1546
+#: src/ui.cc:1540
 #, 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:1549
+#: src/ui.cc:1543
 msgid "^License"
 msgstr "^Licence"
 
-#: src/ui.cc:1550
+#: src/ui.cc:1544
 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:1668
+#: src/ui.cc:1660
 msgid "Actions"
 msgstr "Akce"
 
-#: src/ui.cc:1671
+#: src/ui.cc:1663
 msgid "Search"
 msgstr "Hledat"
 
-#: src/ui.cc:1672
+#: src/ui.cc:1664
 msgid "Options"
 msgstr "Volby"
 
-#: src/ui.cc:1673
+#: src/ui.cc:1665
 msgid "Views"
 msgstr "Pohledy"
 
-#: src/ui.cc:1674
+#: src/ui.cc:1666
 msgid "Help"
 msgstr "Nápověda"
 
-#: src/ui.cc:1734
+#: src/ui.cc:1726
 #, 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:2003 src/vscreen/vscreen.cc:281
+#: src/ui.cc:1996 src/vscreen/vscreen.cc:281
 msgid "yes_key"
 msgstr "ano_key"
 
-#: src/ui.cc:2004 src/vscreen/vscreen.cc:282
+#: src/ui.cc:1997 src/vscreen/vscreen.cc:282
 msgid "no_key"
 msgstr "ne_key"
 
-#: src/view_changelog.cc:46
+#: src/view_changelog.cc:61
 msgid "You can only view changelogs of official Debian packages."
 msgstr "Můžete prohlížet seznamy změn pouze u oficiálních debianích balíků."
 
-#: src/view_changelog.cc:52
+#: src/view_changelog.cc:67
 msgid "Downloading Changelog"
 msgstr "Stahuji Changelog"
 
-#: src/view_changelog.cc:54
+#: src/view_changelog.cc:69
 #, fuzzy
 msgid "Download Changelog"
 msgstr "Stahuji Changelog"
 
-#: src/view_changelog.cc:63
+#: src/view_changelog.cc:78
 #, c-format
 msgid "%s changes"
 msgstr ""
@@ -4493,18 +4520,190 @@
 #~ "Následující disk vložte do mechaniky \"%s\":\n"
 #~ "%s"
 
+#~ msgid "Need exactly two colors in color definition \"%s\""
+#~ msgstr "Pro deficici barvy potřebuji přesně dvě hodnoty \"%s\""
+
+#~ msgid "Can't parse foreground \"%s\"of color \"%s\""
+#~ msgstr "Nemohu zpracovat barvu popředí \"%s\" (\"%s\")"
+
+#~ msgid "Can't parse background \"%s\" of color \"%s\""
+#~ msgstr "Nemohu zpracovat barvu pozadí \"%s\" (\"%s\")"
+
 #~ msgid "Invalid option for interactive mode: -s\n"
 #~ msgstr "Neplatná volba pro interaktivní režim: -s\n"
 
+#~ 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."
+#~ 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 "
+#~ "komunikačních zařízení. To zahrnuje software pro faxmodemy (PPP pro "
+#~ "vytáčené připojení k Internetu a původní software jako zmodem/kermit), "
+#~ "mobilní telefony, rozhraní k FidoNetu, nebo vlastní BBS server."
+
+#~ 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"
+#~ " .\n"
+#~ " For more information about what Debian considers to be Free Software, "
+#~ "see http://www.debian.org/social_contract#guidelines"
+#~ msgstr ""
+#~ "Nesvobodný software\n"
+#~ " Balíky v sekci 'non-free' nejsou součástí Debianu.\n"
+#~ " .\n"
+#~ " Tyto balíky nesplňují některé požadavky z Debian Free Software "
+#~ "Guidelines. Před použitím těchto balíků si přečtěte jejich licenční "
+#~ "podmínky, zda můžete software používat pro zamýšlené účely.\n"
+#~ " .\n"
+#~ " Více informací o tom, co Debian považuje za svobodný software, naleznete "
+#~ "v http://www.debian.org/social_contract#guidelines, nebo česky na http://"
+#~ "www.debian.cz/info/social_contract.php#guidelines."
+
+#~ 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)"
+#~ msgstr ""
+#~ "Nové Balíky\n"
+#~ " Tyto balíky byly přidány do Debianu od posledního čištění \"nových\" "
+#~ "balíků. (Pro vyprázdnění tohoto seznamu vyberte z menu Akce položku "
+#~ "\"Zapomenout nové balíky\".)"
+
+#~ msgid ""
+#~ "%s is an essential package!\n"
+#~ "\n"
+#~ "Are you sure you want to remove it?\n"
+#~ "Type '%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'."
+
+#~ msgid "Available versions of "
+#~ msgstr "Dostupné verze "
+
+#~ 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."
+#~ 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."
+
 #~ msgid "Information about "
 #~ msgstr "Informace o "
 
+#~ msgid ""
+#~ "Aptitude %s\n"
+#~ "\n"
+#~ "Copyright 2000 Daniel Burrows.\n"
+#~ "\n"
+#~ "aptitude comes with ABSOLUTELY NO WARRANTY; for details see 'license' in "
+#~ "the\n"
+#~ "Help menu.  This is free software, and you are welcome to redistribute "
+#~ "it\n"
+#~ "under certain conditions; see 'license' for details."
+#~ msgstr ""
+#~ "Aptitude %s\n"
+#~ "\n"
+#~ "Copyright 2000 Daniel Burrows.\n"
+#~ "\n"
+#~ "na aptitude se nevztahuje ŽÁDNÁ ZÁRUKA; podrobnosti naleznete v menu \n"
+#~ "Nápověda, 'licence'. Toto je svobodný software a budeme rádi, když jej\n"
+#~ "budete dále šířit; podrobnosti viz 'licence'."
+
+#~ msgid "Some packages were broken and have been fixed"
+#~ msgstr "Některé balíky byly poškozené, ale podařilo se je opravit"
+
 #~ msgid "Some broken packages could not be fixed!"
 #~ msgstr "Některé poškozené balíky nemohly být opraveny!"
 
+#~ msgid "Some packages are broken.  Try to fix them?"
+#~ msgstr "Některé balíky jsou poškozené. Zkusit je opravit?"
+
+#~ msgid ""
+#~ "Installing/removing packages requires administrative privileges, which\n"
+#~ "you currently do not have.  Would you like to change to the root "
+#~ "account?\n"
+#~ 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"
+
+#~ msgid ""
+#~ "No packages will be installed, removed or upgraded.\n"
+#~ "\n"
+#~ "Some packages could be upgraded, but you have not chosen to upgrade "
+#~ "them.\n"
+#~ "Type \"U\" to prepare an upgrade."
+#~ msgstr ""
+#~ "Žádné balíky nebudou instalovány, odstraněny nebo aktualizovány.\n"
+#~ "\n"
+#~ "Některé balíky sice mohou být aktualizovány, ale vybrali jste, že se "
+#~ "nemají aktualizovat.\n"
+#~ "Aktualizaci můžete připravit klávesou \"U\"."
+
+#~ 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"
+#~ 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"
+
+#~ msgid "Obsolete downloaded package files have been deleted"
+#~ msgstr "Staré stažené balíky byly smazány"
+
+#~ msgid ""
+#~ "Run 'su' to become root; this will restart the program, but your\n"
+#~ "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"
+
+#~ msgid ""
+#~ "Mark the selected package as having been automatically installed;\n"
+#~ "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."
+
+#~ msgid ""
+#~ "Mark the selected package as having been manually installed;\n"
+#~ "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"
+
+#~ msgid ""
+#~ "Forbid the candidate version of the selected package from being "
+#~ "installed;\n"
+#~ "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"
+
 #~ msgid "^ChangeLog"
 #~ msgstr "^ChangeLog"
 
+#~ msgid "View the important changes made in each version of the program"
+#~ msgstr "Zobrazí důležité změny mezi jednotlivými verzemi programu"
+
 #~ 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	Sun Jun 12 21:04:47 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-05-01 14:08-0400\n"
+"POT-Creation-Date: 2005-06-12 22:42+0200\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"
@@ -155,14 +155,14 @@
 msgid "Automatically remove unused packages matching this filter"
 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:219 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
-#: src/vscreen/vs_util.cc:328
+#: src/apt_options.cc:240 src/mine/cmine.cc:249 src/mine/cmine.cc:312
+#: src/ui.cc:215 src/vscreen/vs_util.cc:77 src/vscreen/vs_util.cc:90
+#: src/vscreen/vs_util.cc:264 src/vscreen/vs_util.cc:298
 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:328
+#: src/apt_options.cc:241 src/download_list.cc:69 src/mine/cmine.cc:250
+#: src/mine/cmine.cc:313 src/vscreen/vs_util.cc:298
 msgid "Cancel"
 msgstr "Afbryd"
 
@@ -243,15 +243,15 @@
 msgid "%s: Previous"
 msgstr ""
 
-#: src/broken_indicator.cc:233
+#: src/broken_indicator.cc:232
 #, c-format
-msgid "%CSolution search failed.  %s: try harder"
+msgid "Solution search failed.  %s: try harder"
 msgstr ""
 
-#: src/broken_indicator.cc:239
-#, c-format
-msgid "%CUnable to resolve dependencies."
-msgstr ""
+#: src/broken_indicator.cc:237
+#, fuzzy
+msgid "Unable to resolve dependencies."
+msgstr "Kunne ikke åbne %s til skrivning"
 
 #: src/cmdline/cmdline_action.cc:36
 #, c-format
@@ -623,13 +623,13 @@
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
-#: src/vscreen/vs_util.cc:212
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:165
+#: src/vscreen/vs_util.cc:202
 msgid "Yes"
 msgstr "Ja"
 
-#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
-#: src/vscreen/vs_util.cc:212
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:165
+#: src/vscreen/vs_util.cc:202
 msgid "No"
 msgstr "Nej"
 
@@ -938,7 +938,7 @@
 msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:212
+#: src/cmdline/cmdline_resolver.cc:212 src/cmdline/cmdline_resolver.cc:285
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
@@ -993,196 +993,201 @@
 msgid "The following packages have unmet dependencies:\n"
 msgstr "Følgende pakker har uopfyldte afhængigheder:\n"
 
-#: src/cmdline/cmdline_show.cc:133
+#: src/cmdline/cmdline_show.cc:119 src/cmdline/cmdline_show.cc:305
+#: src/solution_fragment.cc:65
+msgid "<NULL>"
+msgstr ""
+
+#: src/cmdline/cmdline_show.cc:138
 msgid "not installed"
 msgstr "ikke installeret"
 
-#: src/cmdline/cmdline_show.cc:135 src/pkg_columnizer.cc:231
+#: src/cmdline/cmdline_show.cc:140 src/pkg_columnizer.cc:231
 #: src/pkg_ver_item.cc:225
 msgid "unpacked"
 msgstr "ikke-pakket"
 
-#: src/cmdline/cmdline_show.cc:137
+#: src/cmdline/cmdline_show.cc:142
 msgid "partially configured"
 msgstr "delvist konfigureret"
 
-#: src/cmdline/cmdline_show.cc:139
+#: src/cmdline/cmdline_show.cc:144
 msgid "partially installed"
 msgstr "delvist installeret"
 
-#: src/cmdline/cmdline_show.cc:141
+#: src/cmdline/cmdline_show.cc:146
 msgid "not installed (configuration files remain)"
 msgstr "ikke installeret (opsætningsfiler resterer)"
 
-#: src/cmdline/cmdline_show.cc:143 src/pkg_columnizer.cc:239
+#: src/cmdline/cmdline_show.cc:148 src/pkg_columnizer.cc:239
 #: src/pkg_ver_item.cc:233
 msgid "installed"
 msgstr "installeret"
 
-#: src/cmdline/cmdline_show.cc:152
+#: src/cmdline/cmdline_show.cc:157
 msgid "not a real package"
 msgstr "ikke en rigtig pakke"
 
-#: src/cmdline/cmdline_show.cc:165
+#: src/cmdline/cmdline_show.cc:170
 msgid " [held]"
 msgstr " [tilbageholdt]"
 
-#: src/cmdline/cmdline_show.cc:174
+#: src/cmdline/cmdline_show.cc:179
 #, c-format
 msgid "%s; version %s will be installed"
 msgstr "%s; version %s vil blive installeret"
 
-#: src/cmdline/cmdline_show.cc:178
+#: src/cmdline/cmdline_show.cc:183
 #, c-format
 msgid "%s; version %s will be installed automatically"
 msgstr "%s; version %s vil blive installeret automatisk"
 
-#: src/cmdline/cmdline_show.cc:184 src/cmdline/cmdline_show.cc:199
+#: src/cmdline/cmdline_show.cc:189 src/cmdline/cmdline_show.cc:204
 #, c-format
 msgid "%s; will be purged"
 msgstr "%s; vil blive udrenset"
 
-#: src/cmdline/cmdline_show.cc:197
+#: src/cmdline/cmdline_show.cc:202
 #, c-format
 msgid "%s; will be purged because nothing depends on it"
 msgstr "%s; vil blive udrenset, fordi ingen pakker afhænger af den"
 
-#: src/cmdline/cmdline_show.cc:204
+#: src/cmdline/cmdline_show.cc:209
 #, c-format
 msgid "%s; will be removed because nothing depends on it"
 msgstr "%s; vil blive afinstalleret, fordi ingen pakker afhænger af den"
 
-#: src/cmdline/cmdline_show.cc:206
+#: src/cmdline/cmdline_show.cc:211
 #, c-format
 msgid "%s; will be removed"
 msgstr "%s; vil blive afinstalleret."
 
-#: src/cmdline/cmdline_show.cc:220
+#: src/cmdline/cmdline_show.cc:225
 #, c-format
 msgid "%s%s; will be downgraded [%s -> %s]"
 msgstr "%s%s; vil blive nedgraderet [%s -> %s]"
 
-#: src/cmdline/cmdline_show.cc:223
+#: src/cmdline/cmdline_show.cc:228
 #, c-format
 msgid "%s%s; will be upgraded [%s -> %s]"
 msgstr "%s%s; vil blive opgraderet [%s -> %s]"
 
-#: src/cmdline/cmdline_show.cc:235 src/cmdline/cmdline_show.cc:256
+#: src/cmdline/cmdline_show.cc:240 src/cmdline/cmdline_show.cc:261
 msgid "Package: "
 msgstr "Pakke: "
 
-#: src/cmdline/cmdline_show.cc:236 src/cmdline/cmdline_show.cc:264
+#: src/cmdline/cmdline_show.cc:241 src/cmdline/cmdline_show.cc:269
 #: src/pkg_columnizer.cc:87
 msgid "State"
 msgstr "Status"
 
-#: src/cmdline/cmdline_show.cc:237 src/cmdline/cmdline_show.cc:318
+#: src/cmdline/cmdline_show.cc:242 src/cmdline/cmdline_show.cc:325
 msgid "Provided by"
 msgstr "Givet af"
 
-#: src/cmdline/cmdline_show.cc:258 src/pkg_info_screen.cc:105
+#: src/cmdline/cmdline_show.cc:263 src/pkg_info_screen.cc:105
 msgid "Essential: "
 msgstr "Essentiel: "
 
-#: src/cmdline/cmdline_show.cc:258 src/cmdline/cmdline_show.cc:262
-#: src/cmdline/cmdline_show.cc:273 src/pkg_info_screen.cc:105
+#: src/cmdline/cmdline_show.cc:263 src/cmdline/cmdline_show.cc:267
+#: src/cmdline/cmdline_show.cc:278 src/pkg_info_screen.cc:105
 msgid "yes"
 msgstr "ja"
 
-#: src/cmdline/cmdline_show.cc:262
+#: src/cmdline/cmdline_show.cc:267
 msgid "New"
 msgstr "Nye"
 
-#: src/cmdline/cmdline_show.cc:267
+#: src/cmdline/cmdline_show.cc:272
 msgid "Forbidden version"
 msgstr "Forbudt version"
 
-#: src/cmdline/cmdline_show.cc:271
+#: src/cmdline/cmdline_show.cc:276
 msgid "Automatically installed"
 msgstr "Automatisk installeret"
 
-#: src/cmdline/cmdline_show.cc:273
+#: src/cmdline/cmdline_show.cc:278
 msgid "no"
 msgstr "nej"
 
-#: src/cmdline/cmdline_show.cc:275
+#: src/cmdline/cmdline_show.cc:280
 msgid "Version: "
 msgstr "Version: "
 
-#: src/cmdline/cmdline_show.cc:276 src/pkg_info_screen.cc:113
+#: src/cmdline/cmdline_show.cc:281 src/pkg_info_screen.cc:113
 msgid "Priority: "
 msgstr "Prioritet: "
 
-#: src/cmdline/cmdline_show.cc:277 src/cmdline/cmdline_show.cc:279
-#: src/cmdline/cmdline_show.cc:288
+#: src/cmdline/cmdline_show.cc:282 src/cmdline/cmdline_show.cc:284
+#: src/cmdline/cmdline_show.cc:293
 msgid "N/A"
 msgstr "N/A"
 
-#: src/cmdline/cmdline_show.cc:278 src/pkg_info_screen.cc:114
+#: src/cmdline/cmdline_show.cc:283 src/pkg_info_screen.cc:114
 msgid "Section: "
 msgstr "Afsnit: "
 
-#: src/cmdline/cmdline_show.cc:280 src/pkg_info_screen.cc:115
+#: src/cmdline/cmdline_show.cc:285 src/pkg_info_screen.cc:115
 msgid "Maintainer: "
 msgstr "Vedligeholder: "
 
-#: src/cmdline/cmdline_show.cc:283
+#: src/cmdline/cmdline_show.cc:288
 msgid "Uncompressed Size: "
 msgstr "Ukomprimeret størrelse: "
 
-#: src/cmdline/cmdline_show.cc:287
+#: src/cmdline/cmdline_show.cc:292
 msgid "Architecture: "
 msgstr "Arkitektur: "
 
-#: src/cmdline/cmdline_show.cc:289
+#: src/cmdline/cmdline_show.cc:294
 msgid "Compressed Size: "
 msgstr "Komprimeret størrelse: "
 
-#: src/cmdline/cmdline_show.cc:291
+#: src/cmdline/cmdline_show.cc:296
 msgid "Filename: "
 msgstr "Filnavn: "
 
-#: src/cmdline/cmdline_show.cc:293
+#: src/cmdline/cmdline_show.cc:298
 msgid "MD5sum: "
 msgstr "MD5sum: "
 
-#: src/cmdline/cmdline_show.cc:297 src/cmdline/cmdline_show.cc:299
+#: src/cmdline/cmdline_show.cc:302 src/cmdline/cmdline_show.cc:305
 msgid "Archive"
 msgstr "Arkiv"
 
-#: src/cmdline/cmdline_show.cc:303
+#: src/cmdline/cmdline_show.cc:310
 msgid "Depends"
 msgstr "Afhænger"
 
-#: src/cmdline/cmdline_show.cc:305
+#: src/cmdline/cmdline_show.cc:312
 msgid "PreDepends"
 msgstr "Forhåndsafhænger"
 
-#: src/cmdline/cmdline_show.cc:307
+#: src/cmdline/cmdline_show.cc:314
 msgid "Recommends"
 msgstr "Anbefaler"
 
-#: src/cmdline/cmdline_show.cc:309
+#: src/cmdline/cmdline_show.cc:316
 msgid "Suggests"
 msgstr "Foreslår"
 
-#: src/cmdline/cmdline_show.cc:311
+#: src/cmdline/cmdline_show.cc:318
 msgid "Conflicts"
 msgstr "Konflikter med"
 
-#: src/cmdline/cmdline_show.cc:313
+#: src/cmdline/cmdline_show.cc:320
 msgid "Replaces"
 msgstr "Erstatter"
 
-#: src/cmdline/cmdline_show.cc:315
+#: src/cmdline/cmdline_show.cc:322
 msgid "Obsoletes"
 msgstr "Forælder"
 
-#: src/cmdline/cmdline_show.cc:317
+#: src/cmdline/cmdline_show.cc:324
 msgid "Provides"
 msgstr "Giver"
 
-#: src/cmdline/cmdline_show.cc:321 src/pkg_info_screen.cc:97
+#: src/cmdline/cmdline_show.cc:328 src/pkg_info_screen.cc:97
 msgid "Description: "
 msgstr "Beskrivelse: "
 
@@ -1225,32 +1230,32 @@
 msgid "You cannot specify both an archive and a version for a package\n"
 msgstr "Man kan ikke anføre både et arkiv og en version af en pakke\n"
 
-#: src/dep_item.cc:137
+#: src/dep_item.cc:139
 msgid "UNSATISFIED"
 msgstr "UOPFYLDT"
 
-#: src/dep_item.cc:137 src/reason_fragment.cc:247
+#: src/dep_item.cc:139 src/reason_fragment.cc:244
 msgid "UNAVAILABLE"
 msgstr "UTILGÆNGELIG"
 
-#: src/download_bar.cc:56 src/download_list.cc:263 src/download_screen.cc:57
+#: src/download_bar.cc:56 src/download_list.cc:266 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_bar.cc:77 src/generic/acqprogress.cc:63
+#: src/download_bar.cc:75 src/generic/acqprogress.cc:63
 msgid "Hit "
 msgstr "Fundet "
 
-#: src/download_bar.cc:90
+#: src/download_bar.cc:88
 msgid "Downloading "
 msgstr "Henter "
 
-#: src/download_bar.cc:103
+#: src/download_bar.cc:101
 msgid "Got "
 msgstr "Fik "
 
-#: src/download_bar.cc:157
+#: src/download_bar.cc:155
 msgid "Downloading..."
 msgstr "Henter ..."
 
@@ -1278,7 +1283,7 @@
 msgid "Couldn't clean out list directories"
 msgstr "Kunne ikke tømme kataloger for lister"
 
-#: src/download.cc:177 src/ui.cc:1153
+#: src/download.cc:177 src/ui.cc:1147
 msgid "Deleting obsolete downloaded files"
 msgstr "Sletter hentede filer som er forældede"
 
@@ -1414,7 +1419,7 @@
 msgstr ""
 "Uff! Der skete noget slemt ved installering af pakker. Prøver at genskabe:"
 
-#: src/download.cc:477 src/pkg_item.cc:432
+#: src/download.cc:477 src/pkg_item.cc:430
 msgid "Press return to continue.\n"
 msgstr "Tryk retur for at fortsætte.\n"
 
@@ -1424,17 +1429,17 @@
 msgstr ""
 "Kunne ikke gøre krav på systemlåsen! (Måske kører en anden apt eller dpkg?)"
 
-#: src/download_item.cc:66 src/download_item.cc:70 src/download_item.cc:100
+#: src/download_item.cc:70 src/download_item.cc:74 src/download_item.cc:104
 #: src/generic/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr " [Arbejder]"
 
-#: src/download_item.cc:104 src/download_list.cc:283
+#: src/download_item.cc:108 src/download_list.cc:284
 msgid "[Hit]"
 msgstr "[Fundet]"
 
-#: src/download_item.cc:104 src/download_list.cc:303
+#: src/download_item.cc:108 src/download_list.cc:304
 msgid "[Downloaded]"
 msgstr "[Hentet]"
 
@@ -1448,34 +1453,34 @@
 msgid "%n%nSome files were not downloaded successfully."
 msgstr ""
 
-#: src/download_list.cc:68
+#: src/download_list.cc:66
 msgid "Continue"
 msgstr "Fortsæt"
 
-#: src/download_list.cc:175 src/download_screen.cc:203
+#: src/download_list.cc:178 src/download_screen.cc:203
 msgid "Total Progress: "
 msgstr "Totalt fuldført: "
 
-#: src/download_list.cc:194 src/download_screen.cc:218
+#: src/download_list.cc:197 src/download_screen.cc:218
 #, c-format
 msgid " [ %i%% ] (%sB/s, %s remaining)"
 msgstr " [ %i%% ] (%sB/s, %s tilbage)"
 
-#: src/download_list.cc:196
+#: src/download_list.cc:199
 #, c-format
 msgid " [ %i%% ] (stalled)"
 msgstr " [ %i%% ] (gået i stå)"
 
-#: src/download_list.cc:198
+#: src/download_list.cc:201
 #, c-format
 msgid " [ %i%% ]"
 msgstr " [ %i%% ]"
 
-#: src/download_list.cc:323
+#: src/download_list.cc:324
 msgid "[IGNORED]"
 msgstr "[IGNORERET]"
 
-#: src/download_list.cc:329
+#: src/download_list.cc:330
 msgid "[ERROR]"
 msgstr "[FEJL]"
 
@@ -1484,11 +1489,11 @@
 msgid "Downloaded %sB in %ss (%sB/s)."
 msgstr "Hentede %sB på %ss (%sB/s)."
 
-#: src/edit_pkg_hier.cc:158
+#: src/edit_pkg_hier.cc:176
 msgid "No hierarchy information to edit"
 msgstr "ingen oplysning om hierarki at redigere"
 
-#: src/edit_pkg_hier.cc:258
+#: src/edit_pkg_hier.cc:276
 msgid "Couldn't open for writing"
 msgstr "Kunne ikke åbne til skrivning"
 
@@ -1583,39 +1588,39 @@
 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:797
+#: src/generic/matchers.cc:798
 msgid "Unmatched '('"
 msgstr "Ubalanceret '('"
 
-#: src/generic/matchers.cc:887 src/generic/matchers.cc:968
+#: src/generic/matchers.cc:888 src/generic/matchers.cc:969
 #, c-format
 msgid "Unknown dependency type: %s"
 msgstr "Ukendt afhængighedstype: %s"
 
-#: src/generic/matchers.cc:950
+#: src/generic/matchers.cc:951
 #, c-format
 msgid "Unknown action type: %s"
 msgstr "Ukendt handlingstype: %s"
 
-#: src/generic/matchers.cc:1017
+#: src/generic/matchers.cc:1018
 #, c-format
 msgid "Unknown priority %s"
 msgstr "Ukendt prioritetstype: %s"
 
-#: src/generic/matchers.cc:1039
+#: src/generic/matchers.cc:1040
 #, c-format
 msgid "Unknown pattern type: %c"
 msgstr "Ukendt mønstertype: %c"
 
-#: src/generic/matchers.cc:1084
+#: src/generic/matchers.cc:1105
 msgid "Unexpected empty expression"
 msgstr "Uventet tomt udtryk"
 
-#: src/generic/matchers.cc:1119
+#: src/generic/matchers.cc:1143
 msgid "Badly formed expression"
 msgstr "Forkert udformet udtryk"
 
-#: src/generic/matchers.cc:1148
+#: src/generic/matchers.cc:1175
 msgid "Unexpected ')'"
 msgstr "Uventet ')'"
 
@@ -1638,7 +1643,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:61
+#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:76
 #, c-format
 msgid "ChangeLog of %s"
 msgstr "ChangeLog for %s"
@@ -1679,37 +1684,37 @@
 msgid "Reading task descriptions"
 msgstr "Læser beskrivelser af opgavepakker"
 
-#: src/load_config.cc:30
-#, c-format
-msgid "Invalid entry in color definition group: \"%s\""
-msgstr "Ugyldig post i gruppe der definerer farver: \"%s\""
+#: src/load_config.cc:42
+#, fuzzy, c-format
+msgid "Unrecognized color name \"%s\""
+msgstr "Ikke-anerkendte opgaver"
 
-#: src/load_config.cc:32
-#, c-format
-msgid "Invalid tagless entry in color definition group: \"%s\""
-msgstr "Ugyldigt element uden mærke i farvedefinitionsgruppe: \"%s\""
+#: src/load_config.cc:69
+#, fuzzy, c-format
+msgid "Unrecognized attribute name \"%s\""
+msgstr "Ikke-anerkendte opgaver"
 
-#: src/load_config.cc:34
-#, c-format
-msgid "Need exactly two colors in color definition \"%s\""
-msgstr "Præcis to farver er påkrævet i farvedefinition \"%s\""
+#: src/load_config.cc:106
+#, fuzzy, c-format
+msgid "Invalid entry in style definition group: \"%s\""
+msgstr "Ugyldig post i gruppe der definerer farver: \"%s\""
 
-#: src/load_config.cc:50
-#, c-format
-msgid "Can't parse foreground \"%s\"of color \"%s\""
-msgstr "Kan ikke finde forgrundsfarve \"%s\" til farven \"%s\""
+#: src/load_config.cc:108
+#, fuzzy, c-format
+msgid "Invalid tagless entry in style definition group: \"%s\""
+msgstr "Ugyldigt element uden mærke i farvedefinitionsgruppe: \"%s\""
 
-#: src/load_config.cc:53
-#, c-format
-msgid "Can't parse background \"%s\" of color \"%s\""
-msgstr "Kan ikke finde baggrundsfarve \"%s\" til farven \"%s\""
+#: src/load_config.cc:130
+#, fuzzy, c-format
+msgid "Unknown style attribute %s"
+msgstr "Ukendt handlingstype: %s"
 
-#: src/load_config.cc:72 src/load_config.cc:74
+#: src/load_config.cc:153 src/load_config.cc:155
 #, c-format
 msgid "Invalid entry in keybinding group: \"%s\""
 msgstr "Ugyldig post i gruppen med tastebindinger: \"%s\""
 
-#: src/load_config.cc:89
+#: src/load_config.cc:170
 #, c-format
 msgid "Ignoring invalid keybinding \"%s\" -> \"%s\""
 msgstr "Ignorerer ugyldig tastebinding \"%s\" -> \"%s\""
@@ -2116,43 +2121,43 @@
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                  Denne aptitude har ikke \"Super Cow Powers\".\n"
 
-#: src/main.cc:255
+#: src/main.cc:252
 #, 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:301 src/main.cc:310
+#: src/main.cc:291 src/main.cc:300
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr "MYSTISK: modtog en ukendt kode for tilvalg\n"
 
-#: src/main.cc:319
+#: src/main.cc:309
 msgid "Only one of -u and -i may be specified\n"
 msgstr "Kun -u eller -i må angives\n"
 
-#: src/main.cc:327
+#: src/main.cc:317
 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:348
+#: src/main.cc:338
 msgid "-u and -i may not be specified with a command"
 msgstr "-u og -i må ikke angives i en kommando"
 
-#: src/main.cc:405
+#: src/main.cc:395
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr "Ukendt kommando \"%s\"\n"
 
-#: src/main.cc:412 src/main.cc:469
+#: src/main.cc:402 src/main.cc:450
 msgid "Internal error: uncaught 'out of solutions' exception.\n"
 msgstr ""
 
-#: src/main.cc:417 src/main.cc:474
+#: src/main.cc:407 src/main.cc:455
 msgid "Internal error: uncaught 'out of time' exception.\n"
 msgstr ""
 
-#: src/main.cc:424
+#: src/main.cc:414
 #, c-format
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
@@ -2183,7 +2188,7 @@
 msgid "Lost"
 msgstr "Tabte"
 
-#: src/mine/cmine.cc:119 src/ui.cc:1090
+#: src/mine/cmine.cc:119 src/ui.cc:1084
 msgid "Minesweeper"
 msgstr "Minestryger"
 
@@ -2209,93 +2214,93 @@
 msgid "The number of mines must be a number"
 msgstr "Antallet af miner skal være et tal"
 
-#: src/mine/cmine.cc:240
+#: src/mine/cmine.cc:238
 msgid "Setup custom game"
 msgstr "Klargør brugerdefineret spil"
 
-#: src/mine/cmine.cc:243
+#: src/mine/cmine.cc:240
 msgid "Height of board: "
 msgstr "Bræthøjde: "
 
-#: src/mine/cmine.cc:247
+#: src/mine/cmine.cc:243
 msgid "Width of board: "
 msgstr "Brætbredde: "
 
-#: src/mine/cmine.cc:251
+#: src/mine/cmine.cc:246
 msgid "Number of mines: "
 msgstr "Antal miner: "
 
-#: src/mine/cmine.cc:316
+#: src/mine/cmine.cc:305
 msgid "Choose difficulty level"
 msgstr "Vælg sværhedsgrad"
 
-#: src/mine/cmine.cc:318
+#: src/mine/cmine.cc:307
 msgid "Easy"
 msgstr "Nem"
 
-#: src/mine/cmine.cc:319
+#: src/mine/cmine.cc:308
 msgid "Medium"
 msgstr "Mellem"
 
-#: src/mine/cmine.cc:320
+#: src/mine/cmine.cc:309
 msgid "Hard"
 msgstr "Svær"
 
-#: src/mine/cmine.cc:321
+#: src/mine/cmine.cc:310
 msgid "Custom"
 msgstr "Brugertilpasset"
 
-#: src/mine/cmine.cc:411
+#: src/mine/cmine.cc:392
 msgid "You have won."
 msgstr "Du vandt."
 
-#: src/mine/cmine.cc:414
+#: src/mine/cmine.cc:395
 msgid "You lose!"
 msgstr "Du tabte!"
 
-#: src/mine/cmine.cc:419
+#: src/mine/cmine.cc:400
 msgid "You die...  --More--"
 msgstr "Du dør...  --Mere--"
 
-#: src/mine/cmine.cc:432
+#: src/mine/cmine.cc:413
 msgid "The spikes were poisoned!  The poison was deadly..  --More--"
 msgstr "Sylene var forgiftede! Giften var dødelig..  --Mere--"
 
-#: src/mine/cmine.cc:435
+#: src/mine/cmine.cc:416
 msgid "You land on a set of sharp iron spikes!  --More--"
 msgstr "Du lander på et sæt skarpe jernsyle!  --Mere--"
 
-#: src/mine/cmine.cc:438
+#: src/mine/cmine.cc:419
 msgid "You fall into a pit!  --More--"
 msgstr "Du faldt i en grav!  --Mere--"
 
-#: src/mine/cmine.cc:441
+#: src/mine/cmine.cc:422
 msgid "KABOOM!  You step on a land mine.  --More--"
 msgstr "KABAM! Du træder på en landmine.  --Mere--"
 
-#: src/mine/cmine.cc:446
+#: src/mine/cmine.cc:427
 msgid "The dart was poisoned!  The poison was deadly...  --More--"
 msgstr "Pilen var forgiftet! Giften var dødelig...  --Mere--"
 
-#: src/mine/cmine.cc:448
+#: src/mine/cmine.cc:429
 msgid ""
 "A little dart shoots out at you!  You are hit by a little dart!  --More--"
 msgstr ""
 "En lille pil skydes af mod dig! Du bliver ramt af en lille pil!  --Mere--"
 
-#: src/mine/cmine.cc:452
+#: src/mine/cmine.cc:433
 msgid "You turn to stone... --More--"
 msgstr "Du bliver til sten... --Mere--"
 
-#: src/mine/cmine.cc:454
+#: src/mine/cmine.cc:435
 msgid "Touching the cockatrice corpse was a fatal mistake.  --More--"
 msgstr "Det var en dødelig fejl at røre ved basiliskens kadaver.  --Mere--"
 
-#: src/mine/cmine.cc:456
+#: src/mine/cmine.cc:437
 msgid "You feel here a cockatrice corpse.  --More--"
 msgstr "Du kan her mærke basiliskens kadaver.  --Mere--"
 
-#: src/mine/cmine.cc:460
+#: src/mine/cmine.cc:441
 msgid ""
 "Click!  You trigger a rolling boulder trap!  You are hit by a boulder! --"
 "More--"
@@ -2303,56 +2308,56 @@
 "Klik!  Du udløser en rullende kampesten! Du bliver ramt af en kampesten! --"
 "Mere--"
 
-#: src/mine/cmine.cc:470
+#: src/mine/cmine.cc:451
 msgid "sleep"
 msgstr "søvn"
 
-#: src/mine/cmine.cc:473
+#: src/mine/cmine.cc:454
 msgid "striking"
 msgstr "slår til"
 
-#: src/mine/cmine.cc:476
+#: src/mine/cmine.cc:457
 msgid "death"
 msgstr "død"
 
-#: src/mine/cmine.cc:479
+#: src/mine/cmine.cc:460
 msgid "polymorph"
 msgstr "polymorf"
 
-#: src/mine/cmine.cc:482
+#: src/mine/cmine.cc:463
 msgid "magic missile"
 msgstr "magisk missil"
 
-#: src/mine/cmine.cc:485
+#: src/mine/cmine.cc:466
 msgid "secret door detection"
 msgstr "find hemmelige døre"
 
-#: src/mine/cmine.cc:488
+#: src/mine/cmine.cc:469
 msgid "invisibility"
 msgstr "usynlighed"
 
-#: src/mine/cmine.cc:491
+#: src/mine/cmine.cc:472
 msgid "cold"
 msgstr "kold"
 
-#: src/mine/cmine.cc:497
+#: src/mine/cmine.cc:478
 #, c-format
 msgid "Your wand of %s breaks apart and explodes!  --More--"
 msgstr "Din tryllestav fra %s knækker og eksploderer!  --Mere--"
 
-#: src/mine/cmine.cc:503
+#: src/mine/cmine.cc:484
 msgid "You are jolted by a surge of electricity!  --More--"
 msgstr "Du gennemrystes af elektriske stød!  --Mere--"
 
-#: src/mine/cmine.cc:607
+#: src/mine/cmine.cc:588
 msgid "Enter the filename to load: "
 msgstr "Indtast navn på filen der skal indlæses: "
 
-#: src/mine/cmine.cc:614
+#: src/mine/cmine.cc:595
 msgid "Enter the filename to save: "
 msgstr "Indtast navn på filen der skal gemmes i: "
 
-#: src/mine/cmine.cc:624
+#: src/mine/cmine.cc:605
 msgid "mine-help.txt"
 msgstr "mine-help.txt"
 
@@ -2360,7 +2365,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:1670
+#: src/pkg_columnizer.cc:84 src/ui.cc:1662
 msgid "Package"
 msgstr "Pakke"
 
@@ -3420,52 +3425,52 @@
 "Er du sikker på at du vil afinstallere den?\n"
 "Tast '%s' hvis du er sikker."
 
-#: src/pkg_item.cc:222 src/pkg_ver_item.cc:625
+#: src/pkg_item.cc:220 src/pkg_ver_item.cc:626
 #, c-format
 msgid "Information about %s"
 msgstr "Oplysninger om %s"
 
-#: src/pkg_item.cc:224 src/pkg_ver_item.cc:627
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:628
 #, c-format
 msgid "%s info"
 msgstr ""
 
-#: src/pkg_item.cc:310
+#: src/pkg_item.cc:308
 #, fuzzy, c-format
 msgid "Available versions of %s"
 msgstr "Tilgængelige versioner af "
 
-#: src/pkg_item.cc:313
+#: src/pkg_item.cc:311
 #, fuzzy, c-format
 msgid "%s versions"
 msgstr "Versioner"
 
-#: src/pkg_item.cc:325 src/pkg_ver_item.cc:655
+#: src/pkg_item.cc:323 src/pkg_ver_item.cc:656
 #, c-format
 msgid "Dependencies of %s"
 msgstr "Afhængigheder for %s"
 
-#: src/pkg_item.cc:327 src/pkg_ver_item.cc:657
+#: src/pkg_item.cc:325 src/pkg_ver_item.cc:658
 #, c-format
 msgid "%s deps"
 msgstr ""
 
-#: src/pkg_item.cc:338 src/pkg_ver_item.cc:667
+#: src/pkg_item.cc:336 src/pkg_ver_item.cc:668
 #, c-format
 msgid "Packages depending on %s"
 msgstr "Pakker der afhænger af %s"
 
-#: src/pkg_item.cc:340 src/pkg_ver_item.cc:669
+#: src/pkg_item.cc:338 src/pkg_ver_item.cc:670
 #, c-format
 msgid "%s reverse deps"
 msgstr ""
 
-#: src/pkg_item.cc:392 src/pkg_ver_item.cc:707
+#: src/pkg_item.cc:390 src/pkg_ver_item.cc:708
 #, c-format
 msgid "Reporting a bug in %s:\n"
 msgstr "Rapporterer en programfejl i %s:\n"
 
-#: src/pkg_item.cc:414
+#: src/pkg_item.cc:412
 #, fuzzy
 msgid ""
 "You are not root and I cannot find any way to become root.  To reconfigure "
@@ -3477,16 +3482,16 @@
 "pakke skal pakkerne \"menu\" og \"login\"\n"
 "installeres eller aptitude skal køres som root."
 
-#: src/pkg_item.cc:422
+#: src/pkg_item.cc:420
 #, c-format
 msgid "Reconfiguring %s\n"
 msgstr "Genopsætter %s\n"
 
-#: src/pkg_item.cc:447
+#: src/pkg_item.cc:445
 msgid "Hierarchy editor"
 msgstr "Hierarkiredigering"
 
-#: src/pkg_item.cc:447
+#: src/pkg_item.cc:445
 #, fuzzy
 msgid "Hierarchy Editor"
 msgstr "Hierarkiredigering"
@@ -3520,22 +3525,22 @@
 msgid "Enter the new package sorting mechanism for this display: "
 msgstr "Indtast en ny sorteringsmetode for pakker i dette skærmbillede: "
 
-#: src/pkg_view.cc:344
+#: src/pkg_view.cc:359
 msgid "make_package_view: error in arguments -- two main widgets??"
 msgstr "make_package_view: fejl i parametre - to \"main widgets\"??"
 
-#: src/pkg_view.cc:350
+#: src/pkg_view.cc:365
 msgid ""
 "make_package_view: error in arguments -- bad column list for static item"
 msgstr ""
 "make_package_view: fejl i parametre - forkert kolonneliste for statisk "
 "element"
 
-#: src/pkg_view.cc:443
+#: src/pkg_view.cc:458
 msgid "make_package_view: bad argument!"
 msgstr "make_package_view: forkert argument!"
 
-#: src/pkg_view.cc:495
+#: src/pkg_view.cc:510
 msgid "make_package_view: no main widget found"
 msgstr "make_package_view: ingen \"main widget\" fundet"
 
@@ -3572,12 +3577,12 @@
 msgid " (provided by %F)"
 msgstr " (givet af %F)"
 
-#: src/reason_fragment.cc:278
+#: src/reason_fragment.cc:275
 #, c-format
 msgid "%F%s %F %F"
 msgstr "%F%s %F %F"
 
-#: src/reason_fragment.cc:327
+#: src/reason_fragment.cc:324
 msgid ""
 "If you select a package, an explanation of its current state will appear in "
 "this space."
@@ -3585,7 +3590,7 @@
 "Hvis du vælger en pakke, vil en forklaring af dens nuværende tilstand blive "
 "vist på dette sted."
 
-#: src/reason_fragment.cc:361
+#: src/reason_fragment.cc:358
 msgid ""
 "%B%s%b was installed automatically;  it is being removed because all of the "
 "packages which depend upon it are being removed:"
@@ -3593,17 +3598,17 @@
 "%B%s%b blev installeret automatisk; den afinstalleres fordi alle de pakker "
 "der afhænger af den er ved at blive afinstalleret:"
 
-#: src/reason_fragment.cc:365
+#: src/reason_fragment.cc:362
 msgid "%B%s%b will be automatically removed because of dependency errors:"
 msgstr "%B%s%b vil blive afinstalleret automatisk p.g.a. afhængighedsfejl:"
 
-#: src/reason_fragment.cc:369
+#: src/reason_fragment.cc:366
 msgid ""
 "%B%s%b will be automatically installed to satisfy the following dependencies:"
 msgstr ""
 "%B%s%b vil blive installeret automatisk for at opfylde flg. afhængigheder:"
 
-#: src/reason_fragment.cc:375 src/reason_fragment.cc:387
+#: src/reason_fragment.cc:372 src/reason_fragment.cc:384
 msgid ""
 "%B%s%b cannot be upgraded now, but if it could be, it would still be held at "
 "version %B%s%b."
@@ -3611,7 +3616,7 @@
 "%B%s%b kan ikke opgraderes nu, men hvis den kunne, ville den stadig blive "
 "tilbageholdt på version %B%s%b."
 
-#: src/reason_fragment.cc:378
+#: src/reason_fragment.cc:375
 msgid ""
 "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the "
 "following dependencies:"
@@ -3619,27 +3624,27 @@
 "%B%s%b vil ikke blive opgraderet til version %B%s%b, for at undgå at "
 "følgende afhængigheder brydes: "
 
-#: src/reason_fragment.cc:390
+#: src/reason_fragment.cc:387
 msgid "%B%s%b is currently installed."
 msgstr "%B%s%b er aktuelt installeret."
 
-#: src/reason_fragment.cc:396
+#: src/reason_fragment.cc:393
 msgid "%B%s%b is not currently installed."
 msgstr "%B%s%b er aktuelt ikke installeret."
 
-#: src/reason_fragment.cc:404
+#: src/reason_fragment.cc:401
 msgid "Some dependencies of %B%s%b are not satisfied:"
 msgstr "Visse afhængigheder af %B%s%b er ikke opfyldt:"
 
-#: src/reason_fragment.cc:408
+#: src/reason_fragment.cc:405
 msgid "%B%s%b will be downgraded."
 msgstr "%B%s%b vil blive nedgraderet."
 
-#: src/reason_fragment.cc:415
+#: src/reason_fragment.cc:412
 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b."
 msgstr "%B%s%b vil ikke blive opgraderet til den forbudte version %B%s%b."
 
-#: src/reason_fragment.cc:419
+#: src/reason_fragment.cc:416
 msgid ""
 "%B%s%b could be upgraded to version %B%s%b, but it is being held at version %"
 "B%s%b."
@@ -3647,34 +3652,34 @@
 "%B%s%b kunne opgraderes til version %B%s%b, men bliver tilbageholdt i "
 "version %B%s%b."
 
-#: src/reason_fragment.cc:426
+#: src/reason_fragment.cc:423
 msgid "%B%s%b will be re-installed."
 msgstr "%B%s%b vil blive geninstalleret."
 
-#: src/reason_fragment.cc:430
+#: src/reason_fragment.cc:427
 msgid "%B%s%b will be installed."
 msgstr "%B%s%b vil blive installeret."
 
-#: src/reason_fragment.cc:434
+#: src/reason_fragment.cc:431
 msgid "%B%s%b will be removed."
 msgstr "%B%s%b vil blive afinstalleret."
 
-#: src/reason_fragment.cc:439
+#: src/reason_fragment.cc:436
 msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b."
 msgstr "%B%s%b vil blive opgraderet fra version %B%s%b til version %B%s%b."
 
-#: src/reason_fragment.cc:475
+#: src/reason_fragment.cc:472
 msgid ""
 "The following packages depend on %B%s%b and will be broken by its removal:"
 msgstr ""
 "Følgende pakker afhænger af %B%s%b og vil blive brudte ved dens "
 "afinstallering:"
 
-#: src/reason_fragment.cc:478
+#: src/reason_fragment.cc:475
 msgid "The following packages depend on %B%s%b and are broken:"
 msgstr "Følgende pakker afhænger af %B%s%b og er brudte:"
 
-#: src/reason_fragment.cc:485
+#: src/reason_fragment.cc:482
 msgid ""
 "The following packages conflict with %B%s%b and will be broken by its "
 "installation:"
@@ -3682,7 +3687,7 @@
 "Følgende pakker konflikter med %B%s%b og vil blive brudte ved dens "
 "installering:"
 
-#: src/reason_fragment.cc:518
+#: src/reason_fragment.cc:515
 msgid ""
 "The following packages depend on a version of %B%s%b other than the "
 "currently installed version of %B%s%b, or conflict with the currently "
@@ -3691,7 +3696,7 @@
 "Følgende pakker afhænger af en anden version af %B%s%b end den aktuelt "
 "installerede, eller konflikter med denne:"
 
-#: src/reason_fragment.cc:522
+#: src/reason_fragment.cc:519
 msgid ""
 "The following packages conflict with %B%s%b, or depend on a version of it "
 "which is not going to be installed."
@@ -3699,11 +3704,11 @@
 "Følgende pakker konflikter med %B%s%b, eller afhænger af en version af den "
 "som ikke vil blive installeret."
 
-#: src/reason_fragment.cc:526
+#: src/reason_fragment.cc:523
 msgid "The following packages conflict with %B%s%b:"
 msgstr "Følgende pakker konflikter med %B%s%b:"
 
-#: src/reason_fragment.cc:531
+#: src/reason_fragment.cc:528
 msgid ""
 "The following packages depend on a version of %B%s%b other than the "
 "currently installed version of %B%s%b:"
@@ -3711,7 +3716,7 @@
 "Følgende pakker afhænger af en anden version af %B%s%b end den som aktuelt "
 "er installeret:"
 
-#: src/reason_fragment.cc:535
+#: src/reason_fragment.cc:532
 msgid ""
 "The following packages depend on a version of %B%s%b which is not going to "
 "be installed."
@@ -3719,15 +3724,15 @@
 "Følgende pakker afhænger af en version af %B%s%b som ikke vil blive "
 "installeret."
 
-#: src/reason_fragment.cc:541
+#: src/reason_fragment.cc:538
 msgid "upgraded"
 msgstr "opgraderet"
 
-#: src/reason_fragment.cc:541
+#: src/reason_fragment.cc:538
 msgid "downgraded"
 msgstr "nedgraderet"
 
-#: src/reason_fragment.cc:547
+#: src/reason_fragment.cc:544
 msgid ""
 "The following packages depend on the currently installed version of %B%s%b (%"
 "B%s%b), or conflict with the version it will be %s to (%B%s%b), and will be "
@@ -3737,7 +3742,7 @@
 "b), eller konflikter med versionen den vil blive %s til (%B%s%b), og de vil "
 "blive brudt hvis de bliver %s."
 
-#: src/reason_fragment.cc:554
+#: src/reason_fragment.cc:551
 msgid ""
 "The following packages conflict with version %B%s%b of %B%s%b, and will be "
 "broken if it is %s."
@@ -3745,7 +3750,7 @@
 "Følgende pakker konflikter med version %B%s%b af %B%s%b og vil blive brudte "
 "hvis den bliver %s."
 
-#: src/reason_fragment.cc:559
+#: src/reason_fragment.cc:556
 msgid ""
 "The following packages depend on version %B%s%b of %B%s%b, and will be "
 "broken if it is %s."
@@ -3792,31 +3797,36 @@
 msgid "Close"
 msgstr "^Luk"
 
-#: src/solution_fragment.cc:125
+#: src/solution_fragment.cc:134
 #, fuzzy
 msgid "%BRemove%b the following packages:%n"
 msgstr "Følgende pakker er BRUDTE:"
 
-#: src/solution_fragment.cc:135
+#: src/solution_fragment.cc:144
 #, fuzzy
 msgid "%BInstall%b the following packages:%n"
 msgstr "Følgende pakker er BRUDTE:"
 
-#: src/solution_fragment.cc:148
+#: src/solution_fragment.cc:157
 msgid "%BKeep%b the following packages at their current version:%n"
 msgstr ""
 
-#: src/solution_fragment.cc:161
+#: src/solution_fragment.cc:164
+#, fuzzy
+msgid "Not Installed"
+msgstr "ikke installeret"
+
+#: src/solution_fragment.cc:177
 #, fuzzy
 msgid "%BUpgrade%b the following packages:%n"
 msgstr "Følgende pakker er BRUDTE:"
 
-#: src/solution_fragment.cc:176
+#: src/solution_fragment.cc:192
 #, fuzzy
 msgid "%BDowngrade%b the following packages:%n"
 msgstr "Henter pakker"
 
-#: src/solution_fragment.cc:190
+#: src/solution_fragment.cc:206
 #, c-format
 msgid "Score is %d"
 msgstr ""
@@ -3844,44 +3854,44 @@
 msgid "W:"
 msgstr ""
 
-#: src/ui.cc:194
+#: src/ui.cc:193
 msgid "Search for:"
 msgstr "Søg efter:"
 
-#: src/ui.cc:262
+#: src/ui.cc:258
 msgid "You already are root!"
 msgstr "Du er allerede root!"
 
-#: src/ui.cc:360
+#: src/ui.cc:356
 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:388
+#: src/ui.cc:384
 msgid "Loading cache"
 msgstr "Indlæser cache ..."
 
-#: src/ui.cc:410
+#: src/ui.cc:406
 msgid "Really quit Aptitude?"
 msgstr "Afslut Aptitude?"
 
-#: src/ui.cc:489
+#: src/ui.cc:485
 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:589 src/ui.cc:591 src/ui.cc:619 src/ui.cc:621
+#: src/ui.cc:585 src/ui.cc:587 src/ui.cc:615 src/ui.cc:617
 msgid "Packages"
 msgstr "Pakker"
 
-#: src/ui.cc:590 src/ui.cc:620
+#: src/ui.cc:586 src/ui.cc:616
 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:667
+#: src/ui.cc:663
 #, fuzzy
 msgid ""
-"%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
+"Aptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
 "BABSOLUTELY NO WARRANTY%b; for details see 'license' in the Help menu.  This "
 "is free software, and you are welcome to redistribute it under certain "
 "conditions; see 'license' for details."
@@ -3894,61 +3904,66 @@
 "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:688
+#: src/ui.cc:684
 msgid "help.txt"
 msgstr "help.txt"
 
-#: src/ui.cc:704
+#: src/ui.cc:700
 msgid "README"
 msgstr "README"
 
-#: src/ui.cc:786
+#: src/ui.cc:782
 msgid ""
-"%C%BWARNING%b: untrusted versions of the following packages will be "
-"installed!%n%nUntrusted packages could %Bcompromise your system's security%"
-"b.  You should only proceed with the installation if you are certain that "
-"this is what you want to do.%n%n"
+"%BWARNING%b: untrusted versions of the following packages will be installed!%"
+"n%nUntrusted packages could %Bcompromise your system's security%b.  You "
+"should only proceed with the installation if you are certain that this is "
+"what you want to do.%n%n"
 msgstr ""
 
-#: src/ui.cc:800
+#: src/ui.cc:788
+#, fuzzy
+msgid "  %S*%N %s [version %s]%n"
+msgstr "Versioner"
+
+#: src/ui.cc:795
 #, fuzzy
 msgid "Really Continue"
 msgstr "Fortsæt"
 
-#: src/ui.cc:802
+#: src/ui.cc:797
 msgid "Abort Installation"
 msgstr ""
 
-#: src/ui.cc:863
+#: src/ui.cc:858
 msgid "Preview of package installation"
 msgstr "Forhåndsvisning af pakkeinstallering"
 
-#: src/ui.cc:864
+#: src/ui.cc:859
 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:865
+#: src/ui.cc:860
 #, fuzzy
 msgid "Preview"
 msgstr "^Forrige"
 
-#: src/ui.cc:901
+#: src/ui.cc:896
 #, fuzzy
 msgid "Some packages were broken and have been fixed:"
 msgstr "Visse pakkeafhængigheder var brudte og er blevet repareret"
 
-#: src/ui.cc:907
+#: src/ui.cc:902
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:913
-#, c-format
+#: src/ui.cc:908
+#, fuzzy, c-format
 msgid ""
-"Ran out of time while trying to resolver dependencies (press \"%s\" to try "
+"Ran out of time while trying to resolve dependencies (press \"%s\" to try "
 "harder)"
-msgstr ""
+msgstr "Spild tid mens du prøver at finde miner"
 
-#: src/ui.cc:959
+#: src/ui.cc:954
 #, fuzzy
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
@@ -3957,23 +3972,23 @@
 "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:962 src/ui.cc:1078
+#: src/ui.cc:957 src/ui.cc:1072
 msgid "Become root"
 msgstr "Bliv root"
 
-#: src/ui.cc:964 src/ui.cc:1080
+#: src/ui.cc:959 src/ui.cc:1074
 msgid "Don't become root"
 msgstr "Bliv ikke root"
 
-#: src/ui.cc:969 src/ui.cc:1085
+#: src/ui.cc:964 src/ui.cc:1079
 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:996
+#: src/ui.cc:991
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "Ingen pakker vil blive installeret, opgraderet eller afinstalleret."
 
-#: src/ui.cc:1002
+#: src/ui.cc:997
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -3985,7 +4000,7 @@
 "Visse pakker kunne opgraderes, men du har valgt ikke at opgradere dem.\n"
 "Tast \"U\" for at igangsætte en opgradering."
 
-#: src/ui.cc:1074
+#: src/ui.cc:1069
 #, fuzzy
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
@@ -3994,112 +4009,112 @@
 "Opdatering af pakkelisterne kræver administrative rettigheder,\n"
 "som du ikke har lige nu. Vil du ændre bruger til root?\n"
 
-#: src/ui.cc:1090 src/ui.cc:1377
+#: src/ui.cc:1084 src/ui.cc:1371
 msgid "Waste time trying to find mines"
 msgstr "Spild tid mens du prøver at finde miner"
 
-#: src/ui.cc:1097 src/ui.cc:1150
+#: src/ui.cc:1091 src/ui.cc:1144
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "Tømning er ikke tilladt mens der hentes filer"
 
-#: src/ui.cc:1100
+#: src/ui.cc:1094
 msgid "Deleting downloaded files"
 msgstr "Sletter hentede filer"
 
-#: src/ui.cc:1114
+#: src/ui.cc:1108
 msgid "Downloaded package files have been deleted"
 msgstr "Hentede pakkefiler er blevet slettet"
 
-#: src/ui.cc:1175
+#: src/ui.cc:1169
 #, 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:1247
+#: src/ui.cc:1241
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1252 src/ui.cc:1283
+#: src/ui.cc:1246 src/ui.cc:1277
 #, 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:1277
+#: src/ui.cc:1271
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1307
+#: src/ui.cc:1301
 #, fuzzy, c-format
 msgid "Unable to open %s"
 msgstr "Kunne ikke åbne %s til skrivning"
 
-#: src/ui.cc:1313
+#: src/ui.cc:1307
 msgid "Error while dumping resolver state"
 msgstr ""
 
-#: src/ui.cc:1323
+#: src/ui.cc:1317
 msgid "File to which the resolver state should be dumped:"
 msgstr ""
 
-#: src/ui.cc:1353
+#: src/ui.cc:1347
 msgid "^Install/remove packages"
 msgstr "^Installér/afinstallér pakker"
 
-#: src/ui.cc:1354
+#: src/ui.cc:1348
 msgid "Perform all pending installs and removals"
 msgstr "Udfør alle afventende installeringer og afinstalleringer"
 
-#: src/ui.cc:1356
+#: src/ui.cc:1350
 msgid "^Update package list"
 msgstr "^Opdatér pakkeliste"
 
-#: src/ui.cc:1357
+#: src/ui.cc:1351
 msgid "Check for new versions of packages"
 msgstr "Check efter nye versioner af pakker"
 
-#: src/ui.cc:1360
+#: src/ui.cc:1354
 msgid "^Forget new packages"
 msgstr "^Glem nye pakker"
 
-#: src/ui.cc:1361
+#: src/ui.cc:1355
 msgid "Forget which packages are \"new\""
 msgstr "Glem hvilke pakker der er \"nye\""
 
-#: src/ui.cc:1364
+#: src/ui.cc:1358
 msgid "^Clean package cache"
 msgstr "^Tøm pakkecache"
 
-#: src/ui.cc:1365
+#: src/ui.cc:1359
 msgid "Delete package files which were previously downloaded"
 msgstr "Slet tidligere hentede pakkefiler"
 
-#: src/ui.cc:1368
+#: src/ui.cc:1362
 msgid "Clean ^obsolete files"
 msgstr "Slet ^forældede filer"
 
-#: src/ui.cc:1369
+#: src/ui.cc:1363
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Slet pakkefiler som ikke længere kan hentes"
 
-#: src/ui.cc:1372
+#: src/ui.cc:1366
 msgid "Mark ^Upgradable"
 msgstr "^Marker opgradérbare"
 
-#: src/ui.cc:1373
+#: src/ui.cc:1367
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr "Marker alle ikke-tilbageholdte pakker til opgradering"
 
-#: src/ui.cc:1376
+#: src/ui.cc:1370
 msgid "^Play Minesweeper"
 msgstr "^Spil minestryger"
 
-#: src/ui.cc:1379
+#: src/ui.cc:1373
 msgid "^Become root"
 msgstr "Bliv ^root"
 
-#: src/ui.cc:1380
+#: src/ui.cc:1374
 #, fuzzy
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
@@ -4108,69 +4123,69 @@
 "Kør \"su\" for at blive root. Dette vil genstarte programmet, men dine\n"
 "indstillinger vil blive bevaret"
 
-#: src/ui.cc:1383
+#: src/ui.cc:1377
 msgid "^Reload package cache"
 msgstr "^Genindlæs pakkecache"
 
-#: src/ui.cc:1384
+#: src/ui.cc:1378
 msgid "Reload the package cache"
 msgstr "Genindlæs pakkecachen"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1384
 msgid "^Quit"
 msgstr "^Afslut"
 
-#: src/ui.cc:1391
+#: src/ui.cc:1385
 msgid "Exit the program"
 msgstr "Afslut programmet"
 
-#: src/ui.cc:1397 src/ui.cc:1669
+#: src/ui.cc:1391 src/ui.cc:1661
 msgid "Undo"
 msgstr "Fortryd"
 
-#: src/ui.cc:1398
+#: src/ui.cc:1392
 msgid "Undo the last package operation or group of operations"
 msgstr "Fortryd den sidste pakkehandling eller gruppe af handlinger"
 
-#: src/ui.cc:1405
+#: src/ui.cc:1399
 msgid "^Install"
 msgstr "^Installér"
 
-#: src/ui.cc:1406
+#: src/ui.cc:1400
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "Markér den aktuelt valgte pakke til installering eller opgradering"
 
-#: src/ui.cc:1409
+#: src/ui.cc:1403
 msgid "^Remove"
 msgstr "^Afinstallér"
 
-#: src/ui.cc:1410
+#: src/ui.cc:1404
 msgid "Flag the currently selected package for removal"
 msgstr "Markér den aktuelt valgte pakke til afinstallering"
 
-#: src/ui.cc:1413
+#: src/ui.cc:1407
 msgid "^Purge"
 msgstr "^Udrens"
 
-#: src/ui.cc:1414
+#: src/ui.cc:1408
 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:1417
+#: src/ui.cc:1411
 msgid "^Keep"
 msgstr "^Behold"
 
-#: src/ui.cc:1418
+#: src/ui.cc:1412
 msgid "Cancel any action on the selected package"
 msgstr "Fortryd alle handlinger på den valgte pakke"
 
-#: src/ui.cc:1421
+#: src/ui.cc:1415
 msgid "^Hold"
 msgstr "^Tilbagehold"
 
-#: src/ui.cc:1422
+#: src/ui.cc:1416
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -4178,11 +4193,11 @@
 "Fortryd alle handlinger på den valgte pakke og beskyt den mod\n"
 "fremtidige opgraderinger"
 
-#: src/ui.cc:1425
+#: src/ui.cc:1419
 msgid "Mark ^Auto"
 msgstr "Markér a^uto"
 
-#: src/ui.cc:1426
+#: src/ui.cc:1420
 #, fuzzy
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
@@ -4192,11 +4207,11 @@
 "den vil blive afinstalleret automatisk hvis ingen andre pakker\n"
 "afhænger af den"
 
-#: src/ui.cc:1429
+#: src/ui.cc:1423
 msgid "Mark ^Manual"
 msgstr "Markér ^manuel"
 
-#: src/ui.cc:1430
+#: src/ui.cc:1424
 #, fuzzy
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
@@ -4205,11 +4220,11 @@
 "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:1433
+#: src/ui.cc:1427
 msgid "^Forbid Version"
 msgstr "^Forbyd version"
 
-#: src/ui.cc:1434
+#: src/ui.cc:1428
 #, fuzzy
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
@@ -4218,233 +4233,233 @@
 "Forbyd at kandidat-versionen af den valgte pakke bliver installeret;\n"
 "nyere versioner af pakken vil blive installeret som sædvanlig"
 
-#: src/ui.cc:1438
+#: src/ui.cc:1432
 msgid "I^nformation"
 msgstr "^Oplysning"
 
-#: src/ui.cc:1439
+#: src/ui.cc:1433
 msgid "Display more information about the selected package"
 msgstr "Vis flere oplysninger om den valgte pakke"
 
-#: src/ui.cc:1442
+#: src/ui.cc:1436
 msgid "^Changelog"
 msgstr "^Programændringer"
 
-#: src/ui.cc:1443
+#: src/ui.cc:1437
 msgid "Display the Debian changelog of the selected package"
 msgstr "Vis Debians logfil over programændringer for den valgte pakke"
 
-#: src/ui.cc:1450
+#: src/ui.cc:1444
 msgid "^Find"
 msgstr "^Find"
 
-#: src/ui.cc:1451
+#: src/ui.cc:1445
 msgid "Search for a package"
 msgstr "Søg efter en pakke"
 
-#: src/ui.cc:1454
+#: src/ui.cc:1448
 msgid "Find ^Again"
 msgstr "Find ^igen"
 
-#: src/ui.cc:1455
+#: src/ui.cc:1449
 msgid "Repeat the last search"
 msgstr "Gentag sidste søgning"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1453
 msgid "^Limit Display"
 msgstr "^Afgræns visning"
 
-#: src/ui.cc:1460
+#: src/ui.cc:1454
 msgid "Apply a filter to the package list"
 msgstr "Anvend et filter på pakkelisten"
 
-#: src/ui.cc:1463
+#: src/ui.cc:1457
 msgid "^Un-Limit Display"
 msgstr "^Uafgrænset visning"
 
-#: src/ui.cc:1464
+#: src/ui.cc:1458
 msgid "Remove the filter from the package list"
 msgstr "Fjern filteret fra pakkelisten"
 
-#: src/ui.cc:1468
+#: src/ui.cc:1462
 msgid "Find ^Broken"
 msgstr "Find ^brudte"
 
-#: src/ui.cc:1469
+#: src/ui.cc:1463
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Find næste pakke med uopfyldte afhængigheder"
 
-#: src/ui.cc:1476
+#: src/ui.cc:1470
 msgid "^UI options"
 msgstr "^Brugergrænseflade"
 
-#: src/ui.cc:1477
+#: src/ui.cc:1471
 msgid "Change the settings which affect the user interface"
 msgstr "Ændr indstillinger som påvirker brugergrænsefladen"
 
-#: src/ui.cc:1480
+#: src/ui.cc:1474
 msgid "^Dependency handling"
 msgstr "^Afhængigheder"
 
-#: src/ui.cc:1481
+#: src/ui.cc:1475
 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:1484
+#: src/ui.cc:1478
 msgid "^Miscellaneous"
 msgstr "^Diverse"
 
-#: src/ui.cc:1485
+#: src/ui.cc:1479
 msgid "Change miscellaneous program settings"
 msgstr "Ændr diverse programindstillinger"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1484
 msgid "^Revert options"
 msgstr "^Nulstil indstillinger"
 
-#: src/ui.cc:1491
+#: src/ui.cc:1485
 msgid "Reset all settings to the system defaults"
 msgstr "Nulstil alle indstillinger til systemets forvalgte"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1496
 msgid "^Next"
 msgstr "^Næste"
 
-#: src/ui.cc:1503
+#: src/ui.cc:1497
 msgid "View next display"
 msgstr "Vis næste skærmbillede"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1500
 msgid "^Prev"
 msgstr "^Forrige"
 
-#: src/ui.cc:1507
+#: src/ui.cc:1501
 msgid "View previous display"
 msgstr "Vis forrige skærmbillede"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1504
 msgid "^Close"
 msgstr "^Luk"
 
-#: src/ui.cc:1511
+#: src/ui.cc:1505
 msgid "Close this display"
 msgstr "Luk dette skærmbillede"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1510
 msgid "New Package ^View"
 msgstr "Ny pakke^oversigt"
 
-#: src/ui.cc:1517
+#: src/ui.cc:1511
 msgid "Create a new default package view"
 msgstr "Lav en ny standard for pakkeoversigt"
 
-#: src/ui.cc:1520
+#: src/ui.cc:1514
 msgid "New Categorical ^Browser"
 msgstr "Ny ^kategorivisning"
 
-#: src/ui.cc:1522
+#: src/ui.cc:1516
 msgid "Browse packages by category"
 msgstr "Vis pakker efter kategori"
 
-#: src/ui.cc:1530
+#: src/ui.cc:1524
 msgid "^About"
 msgstr "^Om"
 
-#: src/ui.cc:1531
+#: src/ui.cc:1525
 msgid "View information about this program"
 msgstr "Vis information om dette program"
 
-#: src/ui.cc:1534
+#: src/ui.cc:1528
 msgid "^Help"
 msgstr "^Hjælp"
 
-#: src/ui.cc:1535
+#: src/ui.cc:1529
 msgid "View the on-line help"
 msgstr "Læs online-hjælpen"
 
-#: src/ui.cc:1537
+#: src/ui.cc:1531
 msgid "User's ^Manual"
 msgstr "^Brugervejledning"
 
-#: src/ui.cc:1538
+#: src/ui.cc:1532
 msgid "View the detailed program manual"
 msgstr "Vis den detaljerede program-manual"
 
-#: src/ui.cc:1541
+#: src/ui.cc:1535
 msgid "^FAQ"
 msgstr "^FAQ"
 
-#: src/ui.cc:1542
+#: src/ui.cc:1536
 msgid "View a list of frequently asked questions"
 msgstr "Vis en liste over ofte stillede spørgsmål"
 
-#: src/ui.cc:1545
+#: src/ui.cc:1539
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1546
+#: src/ui.cc:1540
 #, fuzzy
 msgid "View the important changes made in each version of "
 msgstr "Vis vigtige ændringer lavet i hver version af programmet"
 
-#: src/ui.cc:1549
+#: src/ui.cc:1543
 msgid "^License"
 msgstr "^Licens"
 
-#: src/ui.cc:1550
+#: src/ui.cc:1544
 msgid "View the terms under which you may copy the program"
 msgstr "Læs betingelserne for kopiering af dette program"
 
-#: src/ui.cc:1668
+#: src/ui.cc:1660
 msgid "Actions"
 msgstr "Handlinger"
 
-#: src/ui.cc:1671
+#: src/ui.cc:1663
 msgid "Search"
 msgstr "Søg"
 
-#: src/ui.cc:1672
+#: src/ui.cc:1664
 msgid "Options"
 msgstr "Indstillinger"
 
-#: src/ui.cc:1673
+#: src/ui.cc:1665
 msgid "Views"
 msgstr "Skærmbilleder"
 
-#: src/ui.cc:1674
+#: src/ui.cc:1666
 msgid "Help"
 msgstr "Hjælp"
 
-#: src/ui.cc:1734
+#: src/ui.cc:1726
 #, 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:2003 src/vscreen/vscreen.cc:281
+#: src/ui.cc:1996 src/vscreen/vscreen.cc:281
 msgid "yes_key"
 msgstr "ja_taste"
 
-#: src/ui.cc:2004 src/vscreen/vscreen.cc:282
+#: src/ui.cc:1997 src/vscreen/vscreen.cc:282
 msgid "no_key"
 msgstr "nej_taste"
 
-#: src/view_changelog.cc:46
+#: src/view_changelog.cc:61
 msgid "You can only view changelogs of official Debian packages."
 msgstr ""
 "Du kan kun se logfiler over programændringer for officielle Debian-pakker."
 
-#: src/view_changelog.cc:52
+#: src/view_changelog.cc:67
 msgid "Downloading Changelog"
 msgstr "Henter Changelog"
 
-#: src/view_changelog.cc:54
+#: src/view_changelog.cc:69
 #, fuzzy
 msgid "Download Changelog"
 msgstr "Henter Changelog"
 
-#: src/view_changelog.cc:63
+#: src/view_changelog.cc:78
 #, c-format
 msgid "%s changes"
 msgstr ""
@@ -4542,18 +4557,192 @@
 #~ "Indsæt venligst den følgende disk i drevet \"%s\":\n"
 #~ "%s"
 
+#~ msgid "Need exactly two colors in color definition \"%s\""
+#~ msgstr "Præcis to farver er påkrævet i farvedefinition \"%s\""
+
+#~ msgid "Can't parse foreground \"%s\"of color \"%s\""
+#~ msgstr "Kan ikke finde forgrundsfarve \"%s\" til farven \"%s\""
+
+#~ msgid "Can't parse background \"%s\" of color \"%s\""
+#~ msgstr "Kan ikke finde baggrundsfarve \"%s\" til farven \"%s\""
+
 #~ msgid "Invalid option for interactive mode: -s\n"
 #~ msgstr "Ugyldigt tilvalg for interaktiv tilstand: -s\n"
 
+#~ 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."
+#~ msgstr ""
+#~ "Programmer til faxmodemer og anden hardware til telekommunikation\n"
+#~ " Pakker i afsnittet \"comm\" bruges til at kontrollere modemer og anden "
+#~ "hardware til telekommunikation. Dette indbefatter software til at "
+#~ "kontrollere faxmodemer der ringer op til internet via PPP og andre "
+#~ "programmer som oprindeligt blev skrevet med dette formål for øje (zmodem/"
+#~ "kermit), samt software til styring af mobiltelefoner, grænsesnit til "
+#~ "FidoNet og kørsel af BBS."
+
+#~ 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"
+#~ " .\n"
+#~ " For more information about what Debian considers to be Free Software, "
+#~ "see http://www.debian.org/social_contract#guidelines"
+#~ msgstr ""
+#~ "Programmer som ikke er fri software\n"
+#~ " Pakker i afsnittet \"non-free\" er ikke en del af Debian.\n"
+#~ " .\n"
+#~ " Disse pakker lever ikke op til et eller flere krav i Debians \"Free "
+#~ "Software Guidelines\" (se nedenfor). Du bør læse licensen for programmer "
+#~ "i dette afsnit for at være sikker på at du har love til at bruge dem på "
+#~ "den måde som du påtænker.\n"
+#~ " .\n"
+#~ " For yderligere oplysninger om hvad Debian anser for at være fri "
+#~ "software, se http://www.debian.org/social_contract#guidelines"
+
+#~ 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)"
+#~ msgstr ""
+#~ "Nye Pakker\n"
+#~ " Disse pakker er føjet til Debian siden sidste gang du nulstillede listen "
+#~ "over \"nye\" pakker (vælg \"Glem nye pakker\" fra menuen Handlinger for "
+#~ "at nulstille denne liste)."
+
+#~ msgid ""
+#~ "%s is an essential package!\n"
+#~ "\n"
+#~ "Are you sure you want to remove it?\n"
+#~ "Type '%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."
+
+#~ msgid "Available versions of "
+#~ msgstr "Tilgængelige versioner af "
+
+#~ 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."
+#~ 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."
+
 #~ msgid "Information about "
 #~ msgstr "Oplysning om "
 
+#~ msgid ""
+#~ "Aptitude %s\n"
+#~ "\n"
+#~ "Copyright 2000 Daniel Burrows.\n"
+#~ "\n"
+#~ "aptitude comes with ABSOLUTELY NO WARRANTY; for details see 'license' in "
+#~ "the\n"
+#~ "Help menu.  This is free software, and you are welcome to redistribute "
+#~ "it\n"
+#~ "under certain conditions; see 'license' for details."
+#~ msgstr ""
+#~ "Aptitude %s\n"
+#~ "\n"
+#~ "Copyright 2000 Daniel Burrows.\n"
+#~ "\n"
+#~ "Med aptitude følger ABSOLUT INGEN GARANTI; for detaljer se 'Licens' i\n"
+#~ "Hjælpemenuen. Dette er fri software, og du er velkommen til at\n"
+#~ "gendistribuere det under visse betingelser; se 'Licens' for detaljer."
+
+#~ msgid "Some packages were broken and have been fixed"
+#~ msgstr "Visse pakkeafhængigheder var brudte og er blevet repareret"
+
 #~ msgid "Some broken packages could not be fixed!"
 #~ msgstr "Visse brudte pakkeafhængigheder kunne ikke repareres!"
 
+#~ msgid "Some packages are broken.  Try to fix them?"
+#~ msgstr "Visse pakkeafhængigheder er brudte.  Prøv at reparere dem?"
+
+#~ msgid ""
+#~ "Installing/removing packages requires administrative privileges, which\n"
+#~ "you currently do not have.  Would you like to change to the root "
+#~ "account?\n"
+#~ msgstr ""
+#~ "Installering/afinstallering af pakker kræver administrative rettigheder,\n"
+#~ "som du ikke har lige nu. Vil du ændre bruger til root?\n"
+
+#~ msgid ""
+#~ "No packages will be installed, removed or upgraded.\n"
+#~ "\n"
+#~ "Some packages could be upgraded, but you have not chosen to upgrade "
+#~ "them.\n"
+#~ "Type \"U\" to prepare an upgrade."
+#~ msgstr ""
+#~ "Ingen pakker vil blive installeret, afinstalleret eller opgraderet.\n"
+#~ "\n"
+#~ "Visse pakker kunne opgraderes, men du har valgt ikke at opgradere dem.\n"
+#~ "Tast \"U\" for at igangsætte en opgradering."
+
+#~ 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"
+#~ msgstr ""
+#~ "Opdatering af pakkelisterne kræver administrative rettigheder,\n"
+#~ "som du ikke har lige nu. Vil du ændre bruger til root?\n"
+
+#~ msgid "Obsolete downloaded package files have been deleted"
+#~ msgstr "Hentede, forældede pakkefiler er blevet slettet"
+
+#~ msgid ""
+#~ "Run 'su' to become root; this will restart the program, but your\n"
+#~ "settings will be preserved"
+#~ msgstr ""
+#~ "Kør \"su\" for at blive root. Dette vil genstarte programmet, men dine\n"
+#~ "indstillinger vil blive bevaret"
+
+#~ msgid ""
+#~ "Mark the selected package as having been automatically installed;\n"
+#~ "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"
+
+#~ msgid ""
+#~ "Mark the selected package as having been manually installed;\n"
+#~ "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"
+
+#~ msgid ""
+#~ "Forbid the candidate version of the selected package from being "
+#~ "installed;\n"
+#~ "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"
+
 #~ msgid "^ChangeLog"
 #~ msgstr "^Programændringer"
 
+#~ msgid "View the important changes made in each version of the program"
+#~ msgstr "Vis vigtige ændringer lavet i hver version af programmet"
+
 #~ 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	Sun Jun 12 21:04:47 2005
@@ -9,8 +9,8 @@
 msgstr ""
 "Project-Id-Version: aptitude 0.2.15.5\n"
 "Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-05-01 14:08-0400\n"
-"PO-Revision-Date: 2004-12-01 18:09GMT\n"
+"POT-Creation-Date: 2005-06-12 22:42+0200\n"
+"PO-Revision-Date: 2005-02-02 22:33GMT\n"
 "Last-Translator: Dennis Stampfer <seppy at debian.org>\n"
 "Language-Team: Debian German <debian-l10n-german at lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -151,14 +151,14 @@
 msgstr ""
 "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:219 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
-#: src/vscreen/vs_util.cc:328
+#: src/apt_options.cc:240 src/mine/cmine.cc:249 src/mine/cmine.cc:312
+#: src/ui.cc:215 src/vscreen/vs_util.cc:77 src/vscreen/vs_util.cc:90
+#: src/vscreen/vs_util.cc:264 src/vscreen/vs_util.cc:298
 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:328
+#: src/apt_options.cc:241 src/download_list.cc:69 src/mine/cmine.cc:250
+#: src/mine/cmine.cc:313 src/vscreen/vs_util.cc:298
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -239,15 +239,15 @@
 msgid "%s: Previous"
 msgstr ""
 
-#: src/broken_indicator.cc:233
+#: src/broken_indicator.cc:232
 #, c-format
-msgid "%CSolution search failed.  %s: try harder"
+msgid "Solution search failed.  %s: try harder"
 msgstr ""
 
-#: src/broken_indicator.cc:239
-#, c-format
-msgid "%CUnable to resolve dependencies."
-msgstr ""
+#: src/broken_indicator.cc:237
+#, fuzzy
+msgid "Unable to resolve dependencies."
+msgstr "%s konnte nicht zum schreiben geöffnet werden"
 
 #: src/cmdline/cmdline_action.cc:36
 #, c-format
@@ -632,13 +632,13 @@
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
-#: src/vscreen/vs_util.cc:212
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:165
+#: src/vscreen/vs_util.cc:202
 msgid "Yes"
 msgstr "Ja"
 
-#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
-#: src/vscreen/vs_util.cc:212
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:165
+#: src/vscreen/vs_util.cc:202
 msgid "No"
 msgstr "Nein"
 
@@ -951,7 +951,7 @@
 msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:212
+#: src/cmdline/cmdline_resolver.cc:212 src/cmdline/cmdline_resolver.cc:285
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
@@ -1010,196 +1010,201 @@
 msgid "The following packages have unmet dependencies:\n"
 msgstr "Die folgenden Pakete haben verletzte Abhängigkeiten:\n"
 
-#: src/cmdline/cmdline_show.cc:133
+#: src/cmdline/cmdline_show.cc:119 src/cmdline/cmdline_show.cc:305
+#: src/solution_fragment.cc:65
+msgid "<NULL>"
+msgstr ""
+
+#: src/cmdline/cmdline_show.cc:138
 msgid "not installed"
 msgstr "nicht installiert"
 
-#: src/cmdline/cmdline_show.cc:135 src/pkg_columnizer.cc:231
+#: src/cmdline/cmdline_show.cc:140 src/pkg_columnizer.cc:231
 #: src/pkg_ver_item.cc:225
 msgid "unpacked"
 msgstr "entpackt"
 
-#: src/cmdline/cmdline_show.cc:137
+#: src/cmdline/cmdline_show.cc:142
 msgid "partially configured"
 msgstr "teilweise konfiguriert"
 
-#: src/cmdline/cmdline_show.cc:139
+#: src/cmdline/cmdline_show.cc:144
 msgid "partially installed"
 msgstr "teilweise installiert"
 
-#: src/cmdline/cmdline_show.cc:141
+#: src/cmdline/cmdline_show.cc:146
 msgid "not installed (configuration files remain)"
 msgstr "nicht installiert (Konfigurationsdateien vorhanden)"
 
-#: src/cmdline/cmdline_show.cc:143 src/pkg_columnizer.cc:239
+#: src/cmdline/cmdline_show.cc:148 src/pkg_columnizer.cc:239
 #: src/pkg_ver_item.cc:233
 msgid "installed"
 msgstr "Installiert"
 
-#: src/cmdline/cmdline_show.cc:152
+#: src/cmdline/cmdline_show.cc:157
 msgid "not a real package"
 msgstr "kein echtes Paket"
 
-#: src/cmdline/cmdline_show.cc:165
+#: src/cmdline/cmdline_show.cc:170
 msgid " [held]"
 msgstr " [gehalten]"
 
-#: src/cmdline/cmdline_show.cc:174
+#: src/cmdline/cmdline_show.cc:179
 #, c-format
 msgid "%s; version %s will be installed"
 msgstr "%s; Version %s wird installiert"
 
-#: src/cmdline/cmdline_show.cc:178
+#: src/cmdline/cmdline_show.cc:183
 #, c-format
 msgid "%s; version %s will be installed automatically"
 msgstr "%s; Version %s wird automatisch installiert"
 
-#: src/cmdline/cmdline_show.cc:184 src/cmdline/cmdline_show.cc:199
+#: src/cmdline/cmdline_show.cc:189 src/cmdline/cmdline_show.cc:204
 #, c-format
 msgid "%s; will be purged"
 msgstr "%s; wird vollständig gelöscht"
 
-#: src/cmdline/cmdline_show.cc:197
+#: src/cmdline/cmdline_show.cc:202
 #, c-format
 msgid "%s; will be purged because nothing depends on it"
 msgstr "%s; wird vollständig gelöscht werden, weil nichts davon abhängt"
 
-#: src/cmdline/cmdline_show.cc:204
+#: src/cmdline/cmdline_show.cc:209
 #, c-format
 msgid "%s; will be removed because nothing depends on it"
 msgstr "%s; wird gelöscht, weil nichts davon abhängt"
 
-#: src/cmdline/cmdline_show.cc:206
+#: src/cmdline/cmdline_show.cc:211
 #, c-format
 msgid "%s; will be removed"
 msgstr "%s; wird gelöscht"
 
-#: src/cmdline/cmdline_show.cc:220
+#: src/cmdline/cmdline_show.cc:225
 #, c-format
 msgid "%s%s; will be downgraded [%s -> %s]"
 msgstr "%s%s; ältere Version wird installiert [%s -> %s]"
 
-#: src/cmdline/cmdline_show.cc:223
+#: src/cmdline/cmdline_show.cc:228
 #, c-format
 msgid "%s%s; will be upgraded [%s -> %s]"
 msgstr "%s%s; wird aktualisiert [%s -> %s]"
 
-#: src/cmdline/cmdline_show.cc:235 src/cmdline/cmdline_show.cc:256
+#: src/cmdline/cmdline_show.cc:240 src/cmdline/cmdline_show.cc:261
 msgid "Package: "
 msgstr "Paket: "
 
-#: src/cmdline/cmdline_show.cc:236 src/cmdline/cmdline_show.cc:264
+#: src/cmdline/cmdline_show.cc:241 src/cmdline/cmdline_show.cc:269
 #: src/pkg_columnizer.cc:87
 msgid "State"
 msgstr "Zustand"
 
-#: src/cmdline/cmdline_show.cc:237 src/cmdline/cmdline_show.cc:318
+#: src/cmdline/cmdline_show.cc:242 src/cmdline/cmdline_show.cc:325
 msgid "Provided by"
 msgstr "Bereitgestellt von"
 
-#: src/cmdline/cmdline_show.cc:258 src/pkg_info_screen.cc:105
+#: src/cmdline/cmdline_show.cc:263 src/pkg_info_screen.cc:105
 msgid "Essential: "
 msgstr "Essentiell: "
 
-#: src/cmdline/cmdline_show.cc:258 src/cmdline/cmdline_show.cc:262
-#: src/cmdline/cmdline_show.cc:273 src/pkg_info_screen.cc:105
+#: src/cmdline/cmdline_show.cc:263 src/cmdline/cmdline_show.cc:267
+#: src/cmdline/cmdline_show.cc:278 src/pkg_info_screen.cc:105
 msgid "yes"
 msgstr "ja"
 
-#: src/cmdline/cmdline_show.cc:262
+#: src/cmdline/cmdline_show.cc:267
 msgid "New"
 msgstr "Neu"
 
-#: src/cmdline/cmdline_show.cc:267
+#: src/cmdline/cmdline_show.cc:272
 msgid "Forbidden version"
 msgstr "Verbotene Version"
 
-#: src/cmdline/cmdline_show.cc:271
+#: src/cmdline/cmdline_show.cc:276
 msgid "Automatically installed"
 msgstr "Automatisch installiert"
 
-#: src/cmdline/cmdline_show.cc:273
+#: src/cmdline/cmdline_show.cc:278
 msgid "no"
 msgstr "nein"
 
-#: src/cmdline/cmdline_show.cc:275
+#: src/cmdline/cmdline_show.cc:280
 msgid "Version: "
 msgstr "Version: "
 
-#: src/cmdline/cmdline_show.cc:276 src/pkg_info_screen.cc:113
+#: src/cmdline/cmdline_show.cc:281 src/pkg_info_screen.cc:113
 msgid "Priority: "
 msgstr "Priorität: "
 
-#: src/cmdline/cmdline_show.cc:277 src/cmdline/cmdline_show.cc:279
-#: src/cmdline/cmdline_show.cc:288
+#: src/cmdline/cmdline_show.cc:282 src/cmdline/cmdline_show.cc:284
+#: src/cmdline/cmdline_show.cc:293
 msgid "N/A"
 msgstr "--"
 
-#: src/cmdline/cmdline_show.cc:278 src/pkg_info_screen.cc:114
+#: src/cmdline/cmdline_show.cc:283 src/pkg_info_screen.cc:114
 msgid "Section: "
 msgstr "Bereich: "
 
-#: src/cmdline/cmdline_show.cc:280 src/pkg_info_screen.cc:115
+#: src/cmdline/cmdline_show.cc:285 src/pkg_info_screen.cc:115
 msgid "Maintainer: "
 msgstr "Verwalter: "
 
-#: src/cmdline/cmdline_show.cc:283
+#: src/cmdline/cmdline_show.cc:288
 msgid "Uncompressed Size: "
 msgstr "Unkomprimierte Größe: "
 
-#: src/cmdline/cmdline_show.cc:287
+#: src/cmdline/cmdline_show.cc:292
 msgid "Architecture: "
 msgstr "Architektur: "
 
-#: src/cmdline/cmdline_show.cc:289
+#: src/cmdline/cmdline_show.cc:294
 msgid "Compressed Size: "
 msgstr "Komprimierte Größe: "
 
-#: src/cmdline/cmdline_show.cc:291
+#: src/cmdline/cmdline_show.cc:296
 msgid "Filename: "
 msgstr "Dateiname: "
 
-#: src/cmdline/cmdline_show.cc:293
+#: src/cmdline/cmdline_show.cc:298
 msgid "MD5sum: "
 msgstr "Prüfsumme (MD5): "
 
-#: src/cmdline/cmdline_show.cc:297 src/cmdline/cmdline_show.cc:299
+#: src/cmdline/cmdline_show.cc:302 src/cmdline/cmdline_show.cc:305
 msgid "Archive"
 msgstr "Archiv"
 
-#: src/cmdline/cmdline_show.cc:303
+#: src/cmdline/cmdline_show.cc:310
 msgid "Depends"
 msgstr "Hängt ab von"
 
-#: src/cmdline/cmdline_show.cc:305
+#: src/cmdline/cmdline_show.cc:312
 msgid "PreDepends"
 msgstr "Hängt ab (vorher) von"
 
-#: src/cmdline/cmdline_show.cc:307
+#: src/cmdline/cmdline_show.cc:314
 msgid "Recommends"
 msgstr "Empfiehlt"
 
-#: src/cmdline/cmdline_show.cc:309
+#: src/cmdline/cmdline_show.cc:316
 msgid "Suggests"
 msgstr "Schlägt vor"
 
-#: src/cmdline/cmdline_show.cc:311
+#: src/cmdline/cmdline_show.cc:318
 msgid "Conflicts"
 msgstr "Kollidiert mit"
 
-#: src/cmdline/cmdline_show.cc:313
+#: src/cmdline/cmdline_show.cc:320
 msgid "Replaces"
 msgstr "Ersetzt"
 
-#: src/cmdline/cmdline_show.cc:315
+#: src/cmdline/cmdline_show.cc:322
 msgid "Obsoletes"
 msgstr "Ersetzt"
 
-#: src/cmdline/cmdline_show.cc:317
+#: src/cmdline/cmdline_show.cc:324
 msgid "Provides"
 msgstr "Liefert"
 
-#: src/cmdline/cmdline_show.cc:321 src/pkg_info_screen.cc:97
+#: src/cmdline/cmdline_show.cc:328 src/pkg_info_screen.cc:97
 msgid "Description: "
 msgstr "Beschreibung: "
 
@@ -1247,32 +1252,32 @@
 #  If we can quickly prove that this is not satisfiable, tell
 #  the user that.  (specifically, if there are no available packages
 #  fulfilling the dependency)
-#: src/dep_item.cc:137
+#: src/dep_item.cc:139
 msgid "UNSATISFIED"
 msgstr "NICHT ERFÃœLLT"
 
-#: src/dep_item.cc:137 src/reason_fragment.cc:247
+#: src/dep_item.cc:139 src/reason_fragment.cc:244
 msgid "UNAVAILABLE"
 msgstr "NICHT VERFÃœGBAR"
 
-#: src/download_bar.cc:56 src/download_list.cc:263 src/download_screen.cc:57
+#: src/download_bar.cc:56 src/download_list.cc:266 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_bar.cc:77 src/generic/acqprogress.cc:63
+#: src/download_bar.cc:75 src/generic/acqprogress.cc:63
 msgid "Hit "
 msgstr "Treffer "
 
-#: src/download_bar.cc:90
+#: src/download_bar.cc:88
 msgid "Downloading "
 msgstr "Herunterladen von "
 
-#: src/download_bar.cc:103
+#: src/download_bar.cc:101
 msgid "Got "
 msgstr "Habe "
 
-#: src/download_bar.cc:157
+#: src/download_bar.cc:155
 msgid "Downloading..."
 msgstr "Ladend..."
 
@@ -1302,7 +1307,7 @@
 msgid "Couldn't clean out list directories"
 msgstr "Konnte Listenverzeichnisse nicht aufräumen"
 
-#: src/download.cc:177 src/ui.cc:1153
+#: src/download.cc:177 src/ui.cc:1147
 msgid "Deleting obsolete downloaded files"
 msgstr "Lösche veraltete heruntergeladene Dateien"
 
@@ -1442,7 +1447,7 @@
 msgstr ""
 "Während der Paketinstallation sind Probleme aufgetreten.  Versuche zu lösen:"
 
-#: src/download.cc:477 src/pkg_item.cc:432
+#: src/download.cc:477 src/pkg_item.cc:430
 msgid "Press return to continue.\n"
 msgstr "Drücken Sie zum Fortsetzen die Eingabetaste.\n"
 
@@ -1453,17 +1458,17 @@
 "Konnte die System-Sperre nicht zurückerlangen!  (Vielleicht läuft noch ein "
 "apt oder dpkg?)"
 
-#: src/download_item.cc:66 src/download_item.cc:70 src/download_item.cc:100
+#: src/download_item.cc:70 src/download_item.cc:74 src/download_item.cc:104
 #: src/generic/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr " [Arbeite]"
 
-#: src/download_item.cc:104 src/download_list.cc:283
+#: src/download_item.cc:108 src/download_list.cc:284
 msgid "[Hit]"
 msgstr "[Treffer]"
 
-#: src/download_item.cc:104 src/download_list.cc:303
+#: src/download_item.cc:108 src/download_list.cc:304
 msgid "[Downloaded]"
 msgstr "[Geladen]"
 
@@ -1477,34 +1482,34 @@
 msgid "%n%nSome files were not downloaded successfully."
 msgstr ""
 
-#: src/download_list.cc:68
+#: src/download_list.cc:66
 msgid "Continue"
 msgstr "Weiter"
 
-#: src/download_list.cc:175 src/download_screen.cc:203
+#: src/download_list.cc:178 src/download_screen.cc:203
 msgid "Total Progress: "
 msgstr "Gesamtfortschritt: "
 
-#: src/download_list.cc:194 src/download_screen.cc:218
+#: src/download_list.cc:197 src/download_screen.cc:218
 #, c-format
 msgid " [ %i%% ] (%sB/s, %s remaining)"
 msgstr " [ %i%% ] (%sB/s, %s übrig)"
 
-#: src/download_list.cc:196
+#: src/download_list.cc:199
 #, c-format
 msgid " [ %i%% ] (stalled)"
 msgstr " [ %i%% ] (hängt)"
 
-#: src/download_list.cc:198
+#: src/download_list.cc:201
 #, c-format
 msgid " [ %i%% ]"
 msgstr " [ %i%% ]"
 
-#: src/download_list.cc:323
+#: src/download_list.cc:324
 msgid "[IGNORED]"
 msgstr "[IGNORIERT]"
 
-#: src/download_list.cc:329
+#: src/download_list.cc:330
 msgid "[ERROR]"
 msgstr "[FEHLER]"
 
@@ -1513,11 +1518,11 @@
 msgid "Downloaded %sB in %ss (%sB/s)."
 msgstr "%sB wurden in %ss heruntergeladen (%sB/s)."
 
-#: src/edit_pkg_hier.cc:158
+#: src/edit_pkg_hier.cc:176
 msgid "No hierarchy information to edit"
 msgstr "Keine Hierarchie-Information zum Bearbeiten"
 
-#: src/edit_pkg_hier.cc:258
+#: src/edit_pkg_hier.cc:276
 msgid "Couldn't open for writing"
 msgstr "Kann nicht zum Schreiben geöffnet werden"
 
@@ -1619,39 +1624,39 @@
 msgstr ""
 "Warnung:  Konnte Cache-Datei nicht sperren.  Öffne Sie jetzt schreibgeschützt"
 
-#: src/generic/matchers.cc:797
+#: src/generic/matchers.cc:798
 msgid "Unmatched '('"
 msgstr "Offene '('"
 
-#: src/generic/matchers.cc:887 src/generic/matchers.cc:968
+#: src/generic/matchers.cc:888 src/generic/matchers.cc:969
 #, c-format
 msgid "Unknown dependency type: %s"
 msgstr "Unbekannter Abhängigkeitstyp: %s"
 
-#: src/generic/matchers.cc:950
+#: src/generic/matchers.cc:951
 #, c-format
 msgid "Unknown action type: %s"
 msgstr "Unbekannter Aktionstyp %s"
 
-#: src/generic/matchers.cc:1017
+#: src/generic/matchers.cc:1018
 #, c-format
 msgid "Unknown priority %s"
 msgstr "Unbekannte Priorität %s"
 
-#: src/generic/matchers.cc:1039
+#: src/generic/matchers.cc:1040
 #, c-format
 msgid "Unknown pattern type: %c"
 msgstr "Unbekannter Mustertyp: %c"
 
-#: src/generic/matchers.cc:1084
+#: src/generic/matchers.cc:1105
 msgid "Unexpected empty expression"
 msgstr "Unerwarteter leerer Ausdruck"
 
-#: src/generic/matchers.cc:1119
+#: src/generic/matchers.cc:1143
 msgid "Badly formed expression"
 msgstr "Ungültiger Ausdruck"
 
-#: src/generic/matchers.cc:1148
+#: src/generic/matchers.cc:1175
 msgid "Unexpected ')'"
 msgstr "Unerwartete ')'"
 
@@ -1674,7 +1679,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:61
+#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:76
 #, c-format
 msgid "ChangeLog of %s"
 msgstr "ChangeLog für %s"
@@ -1716,37 +1721,37 @@
 msgid "Reading task descriptions"
 msgstr "Lese Task-Beschreibungen"
 
-#: src/load_config.cc:30
-#, c-format
-msgid "Invalid entry in color definition group: \"%s\""
-msgstr "Ungültiger Eintrag in Farbdefinitionsgruppe »%s«"
+#: src/load_config.cc:42
+#, fuzzy, c-format
+msgid "Unrecognized color name \"%s\""
+msgstr "Nicht erkannte Tasks"
 
-#: src/load_config.cc:32
-#, c-format
-msgid "Invalid tagless entry in color definition group: \"%s\""
-msgstr "Ungültiger Eintrag ohne »tag« in Farbdefinitionsgruppe »%s«"
+#: src/load_config.cc:69
+#, fuzzy, c-format
+msgid "Unrecognized attribute name \"%s\""
+msgstr "Nicht erkannte Tasks"
 
-#: src/load_config.cc:34
-#, c-format
-msgid "Need exactly two colors in color definition \"%s\""
-msgstr "Benötige genau zwei Farben in Farbdefinition »%s«"
+#: src/load_config.cc:106
+#, fuzzy, c-format
+msgid "Invalid entry in style definition group: \"%s\""
+msgstr "Ungültiger Eintrag in Farbdefinitionsgruppe »%s«"
 
-#: src/load_config.cc:50
-#, c-format
-msgid "Can't parse foreground \"%s\"of color \"%s\""
-msgstr "Kann Vordergrund »%s« der Farbe »%s« nicht verarbeiten."
+#: src/load_config.cc:108
+#, fuzzy, c-format
+msgid "Invalid tagless entry in style definition group: \"%s\""
+msgstr "Ungültiger Eintrag ohne »tag« in Farbdefinitionsgruppe »%s«"
 
-#: src/load_config.cc:53
-#, c-format
-msgid "Can't parse background \"%s\" of color \"%s\""
-msgstr "Kann Hintergrund »%s« der Farbe »%s« nicht verarbeiten."
+#: src/load_config.cc:130
+#, fuzzy, c-format
+msgid "Unknown style attribute %s"
+msgstr "Unbekannter Aktionstyp %s"
 
-#: src/load_config.cc:72 src/load_config.cc:74
+#: src/load_config.cc:153 src/load_config.cc:155
 #, c-format
 msgid "Invalid entry in keybinding group: \"%s\""
 msgstr "Ungültiger Eintrag in Tastaturbelegungs-Gruppe »%s«"
 
-#: src/load_config.cc:89
+#: src/load_config.cc:170
 #, c-format
 msgid "Ignoring invalid keybinding \"%s\" -> \"%s\""
 msgstr "Ignoriere ungültige Tastenzuweisung »%s« -> »%s«"
@@ -2163,44 +2168,44 @@
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                  Dieses Aptitude hat keine Super-Kuh-Kräfte.\n"
 
-#: src/main.cc:255
+#: src/main.cc:252
 #, 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:301 src/main.cc:310
+#: src/main.cc:291 src/main.cc:300
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr "MERKWÃœRDIG: unbekannten Optionscode erhalten\n"
 
-#: src/main.cc:319
+#: src/main.cc:309
 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:327
+#: src/main.cc:317
 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:348
+#: src/main.cc:338
 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:405
+#: src/main.cc:395
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr "Unbekanntes Kommando »%s«\n"
 
-#: src/main.cc:412 src/main.cc:469
+#: src/main.cc:402 src/main.cc:450
 msgid "Internal error: uncaught 'out of solutions' exception.\n"
 msgstr ""
 
-#: src/main.cc:417 src/main.cc:474
+#: src/main.cc:407 src/main.cc:455
 msgid "Internal error: uncaught 'out of time' exception.\n"
 msgstr ""
 
-#: src/main.cc:424
+#: src/main.cc:414
 #, c-format
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
@@ -2231,7 +2236,7 @@
 msgid "Lost"
 msgstr "Verloren"
 
-#: src/mine/cmine.cc:119 src/ui.cc:1090
+#: src/mine/cmine.cc:119 src/ui.cc:1084
 msgid "Minesweeper"
 msgstr "Minesweeper"
 
@@ -2258,49 +2263,49 @@
 msgid "The number of mines must be a number"
 msgstr "Die Anzahl der Minen muss eine Zahl sein"
 
-#: src/mine/cmine.cc:240
+#: src/mine/cmine.cc:238
 msgid "Setup custom game"
 msgstr "Individuelles Spiel einrichten"
 
-#: src/mine/cmine.cc:243
+#: src/mine/cmine.cc:240
 msgid "Height of board: "
 msgstr "Höhe des Spielfeldes: "
 
-#: src/mine/cmine.cc:247
+#: src/mine/cmine.cc:243
 msgid "Width of board: "
 msgstr "Breite des Spielfeldes: "
 
-#: src/mine/cmine.cc:251
+#: src/mine/cmine.cc:246
 msgid "Number of mines: "
 msgstr "Anzahl der Minen: "
 
-#: src/mine/cmine.cc:316
+#: src/mine/cmine.cc:305
 msgid "Choose difficulty level"
 msgstr "Schwierigkeitsgrad wählen"
 
-#: src/mine/cmine.cc:318
+#: src/mine/cmine.cc:307
 msgid "Easy"
 msgstr "Leicht"
 
-#: src/mine/cmine.cc:319
+#: src/mine/cmine.cc:308
 msgid "Medium"
 msgstr "Mittel"
 
-#: src/mine/cmine.cc:320
+#: src/mine/cmine.cc:309
 msgid "Hard"
 msgstr "Schwer"
 
-#: src/mine/cmine.cc:321
+#: src/mine/cmine.cc:310
 msgid "Custom"
 msgstr "Eigener"
 
 #  I should continue the Nethack theme, but I've never won so I don't
 #  know what the message should be :)
-#: src/mine/cmine.cc:411
+#: src/mine/cmine.cc:392
 msgid "You have won."
 msgstr "Sie haben gewonnen."
 
-#: src/mine/cmine.cc:414
+#: src/mine/cmine.cc:395
 msgid "You lose!"
 msgstr "Sie haben verloren!"
 
@@ -2310,51 +2315,51 @@
 #  (messages in reverse order because the minibuf is a stack by default..
 #  I could use the special feature of sticking them at the end, but I
 #  want them to override whatever's there (probably nothing :) )
-#: src/mine/cmine.cc:419
+#: src/mine/cmine.cc:400
 msgid "You die...  --More--"
 msgstr "Sie sterben...  --Mehr--"
 
-#: src/mine/cmine.cc:432
+#: src/mine/cmine.cc:413
 msgid "The spikes were poisoned!  The poison was deadly..  --More--"
 msgstr "Die Spieße waren vergiftet!  Das Gift war tödlich..  --Mehr--"
 
-#: src/mine/cmine.cc:435
+#: src/mine/cmine.cc:416
 msgid "You land on a set of sharp iron spikes!  --More--"
 msgstr "Sie landen auf einem Satz spitzer Eisenspieße!  --Mehr--"
 
-#: src/mine/cmine.cc:438
+#: src/mine/cmine.cc:419
 msgid "You fall into a pit!  --More--"
 msgstr "Sie fallen in ein Loch!  --More--"
 
-#: src/mine/cmine.cc:441
+#: src/mine/cmine.cc:422
 msgid "KABOOM!  You step on a land mine.  --More--"
 msgstr "KAWUMM!  Sie sind auf eine Landmine getreten.  --Mehr--"
 
-#: src/mine/cmine.cc:446
+#: src/mine/cmine.cc:427
 msgid "The dart was poisoned!  The poison was deadly...  --More--"
 msgstr "Der Pfeil war vergiftet!  Das Gift war tödlich...  --Mehr--"
 
-#: src/mine/cmine.cc:448
+#: src/mine/cmine.cc:429
 msgid ""
 "A little dart shoots out at you!  You are hit by a little dart!  --More--"
 msgstr ""
 "Ein kleiner Pfeil schiesst auf Sie zu!  Sie werden getroffen!  --Mehr--"
 
-#: src/mine/cmine.cc:452
+#: src/mine/cmine.cc:433
 msgid "You turn to stone... --More--"
 msgstr "Sie versteinern... --Mehr--"
 
-#: src/mine/cmine.cc:454
+#: src/mine/cmine.cc:435
 msgid "Touching the cockatrice corpse was a fatal mistake.  --More--"
 msgstr "Den Cockatrice zu berühren war ein fataler Fehler.  --Mehr--"
 
 # auskommentiert
-#: src/mine/cmine.cc:456
+#: src/mine/cmine.cc:437
 msgid "You feel here a cockatrice corpse.  --More--"
 msgstr "You feel here a cockatrice corpse.  --More--"
 
 # auskommentiert
-#: src/mine/cmine.cc:460
+#: src/mine/cmine.cc:441
 msgid ""
 "Click!  You trigger a rolling boulder trap!  You are hit by a boulder! --"
 "More--"
@@ -2363,67 +2368,67 @@
 "More--"
 
 # auskommentiert
-#: src/mine/cmine.cc:470
+#: src/mine/cmine.cc:451
 msgid "sleep"
 msgstr "sleep"
 
 # auskommentiert
-#: src/mine/cmine.cc:473
+#: src/mine/cmine.cc:454
 msgid "striking"
 msgstr "striking"
 
 # auskommentiert
-#: src/mine/cmine.cc:476
+#: src/mine/cmine.cc:457
 msgid "death"
 msgstr "death"
 
 # auskommentiert
-#: src/mine/cmine.cc:479
+#: src/mine/cmine.cc:460
 msgid "polymorph"
 msgstr "polymorph"
 
 # auskommentiert
-#: src/mine/cmine.cc:482
+#: src/mine/cmine.cc:463
 msgid "magic missile"
 msgstr "magic missile"
 
 # auskommentiert
-#: src/mine/cmine.cc:485
+#: src/mine/cmine.cc:466
 msgid "secret door detection"
 msgstr "secret door detection"
 
 # auskommentiert
-#: src/mine/cmine.cc:488
+#: src/mine/cmine.cc:469
 msgid "invisibility"
 msgstr "invisibility"
 
 # auskommentiert
-#: src/mine/cmine.cc:491
+#: src/mine/cmine.cc:472
 msgid "cold"
 msgstr "cold"
 
 # auskommentiert
-#: src/mine/cmine.cc:497
+#: src/mine/cmine.cc:478
 #, c-format
 msgid "Your wand of %s breaks apart and explodes!  --More--"
 msgstr "Your wand of %s breaks apart and explodes!  --More--"
 
 # auskommentiert
-#: src/mine/cmine.cc:503
+#: src/mine/cmine.cc:484
 msgid "You are jolted by a surge of electricity!  --More--"
 msgstr "You are jolted by a surge of electricity!  --More--"
 
 # (Verb for "enter" in computer contexts appears to be "eingeben", which makes
 #  some sense..)
-#: src/mine/cmine.cc:607
+#: src/mine/cmine.cc:588
 msgid "Enter the filename to load: "
 msgstr "Geben Sie den Dateinamen zum Laden ein: "
 
-#: src/mine/cmine.cc:614
+#: src/mine/cmine.cc:595
 msgid "Enter the filename to save: "
 msgstr "Geben Sie den Dateinamen zum Speichern ein: "
 
-#: src/mine/cmine.cc:624
+#: src/mine/cmine.cc:605
 msgid "mine-help.txt"
 msgstr "mine-help-de.txt"
 
@@ -2443,7 +2448,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:1670
+#: src/pkg_columnizer.cc:84 src/ui.cc:1662
 msgid "Package"
 msgstr "Paket"
 
@@ -3286,7 +3291,7 @@
 "provide full functionality in some other programs that you are installing or "
 "upgrading."
 msgstr ""
-"Pakete,  die von anderen Paketen empfohlen werden\n"
+"Pakete, die von anderen Paketen empfohlen werden\n"
 " Diese Pakete sind nicht unbedingt erforderlich; sie können jedoch notwendig "
 "sein, um die volle Funktionalität einiger anderer Programme, die Sie "
 "installieren oder aktualisieren, zu nutzen."
@@ -3502,52 +3507,52 @@
 "Geben Sie '%s' ein."
 
 # ummmm...
-#: src/pkg_item.cc:222 src/pkg_ver_item.cc:625
+#: src/pkg_item.cc:220 src/pkg_ver_item.cc:626
 #, c-format
 msgid "Information about %s"
 msgstr "Informationen über %s"
 
-#: src/pkg_item.cc:224 src/pkg_ver_item.cc:627
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:628
 #, c-format
 msgid "%s info"
 msgstr ""
 
-#: src/pkg_item.cc:310
+#: src/pkg_item.cc:308
 #, fuzzy, c-format
 msgid "Available versions of %s"
 msgstr "Verfügbare Versionen von "
 
-#: src/pkg_item.cc:313
+#: src/pkg_item.cc:311
 #, fuzzy, c-format
 msgid "%s versions"
 msgstr "Versionen"
 
-#: src/pkg_item.cc:325 src/pkg_ver_item.cc:655
+#: src/pkg_item.cc:323 src/pkg_ver_item.cc:656
 #, c-format
 msgid "Dependencies of %s"
 msgstr "Abhängigkeiten von %s"
 
-#: src/pkg_item.cc:327 src/pkg_ver_item.cc:657
+#: src/pkg_item.cc:325 src/pkg_ver_item.cc:658
 #, c-format
 msgid "%s deps"
 msgstr ""
 
-#: src/pkg_item.cc:338 src/pkg_ver_item.cc:667
+#: src/pkg_item.cc:336 src/pkg_ver_item.cc:668
 #, c-format
 msgid "Packages depending on %s"
 msgstr "Pakete, die von %s abhängen"
 
-#: src/pkg_item.cc:340 src/pkg_ver_item.cc:669
+#: src/pkg_item.cc:338 src/pkg_ver_item.cc:670
 #, c-format
 msgid "%s reverse deps"
 msgstr ""
 
-#: src/pkg_item.cc:392 src/pkg_ver_item.cc:707
+#: src/pkg_item.cc:390 src/pkg_ver_item.cc:708
 #, c-format
 msgid "Reporting a bug in %s:\n"
 msgstr "Einen Fehler in %s melden:\n"
 
-#: src/pkg_item.cc:414
+#: src/pkg_item.cc:412
 #, fuzzy
 msgid ""
 "You are not root and I cannot find any way to become root.  To reconfigure "
@@ -3559,16 +3564,16 @@
 "installieren Sie die Pakete »menu« und »login«\n"
 "oder führen Sie Aptitude als root aus."
 
-#: src/pkg_item.cc:422
+#: src/pkg_item.cc:420
 #, c-format
 msgid "Reconfiguring %s\n"
 msgstr "Neukonfigurieren von %s\n"
 
-#: src/pkg_item.cc:447
+#: src/pkg_item.cc:445
 msgid "Hierarchy editor"
 msgstr "Hierarchie-Editor"
 
-#: src/pkg_item.cc:447
+#: src/pkg_item.cc:445
 #, fuzzy
 msgid "Hierarchy Editor"
 msgstr "Hierarchie-Editor"
@@ -3611,21 +3616,21 @@
 msgstr ""
 "Geben Sie bitte den neuen Paketsortierungs-Mechanismus für dies Ansicht ein: "
 
-#: src/pkg_view.cc:344
+#: src/pkg_view.cc:359
 msgid "make_package_view: error in arguments -- two main widgets??"
 msgstr "make_package_view: error in arguments -- two main widgets??"
 
-#: src/pkg_view.cc:350
+#: src/pkg_view.cc:365
 msgid ""
 "make_package_view: error in arguments -- bad column list for static item"
 msgstr ""
 "make_package_view: error in arguments -- bad column list for static item"
 
-#: src/pkg_view.cc:443
+#: src/pkg_view.cc:458
 msgid "make_package_view: bad argument!"
 msgstr "make_package_view: bad argument!"
 
-#: src/pkg_view.cc:495
+#: src/pkg_view.cc:510
 msgid "make_package_view: no main widget found"
 msgstr "make_package_view: no main widget found"
 
@@ -3662,12 +3667,12 @@
 msgid " (provided by %F)"
 msgstr " (bereitgestellt von %F)"
 
-#: src/reason_fragment.cc:278
+#: src/reason_fragment.cc:275
 #, c-format
 msgid "%F%s %F %F"
 msgstr "%F%s %F %F"
 
-#: src/reason_fragment.cc:327
+#: src/reason_fragment.cc:324
 msgid ""
 "If you select a package, an explanation of its current state will appear in "
 "this space."
@@ -3675,7 +3680,7 @@
 "Wenn Sie ein Paket auswählen, wird hier eine Erläuterung seines derzeitigen "
 "Status erscheinen."
 
-#: src/reason_fragment.cc:361
+#: src/reason_fragment.cc:358
 msgid ""
 "%B%s%b was installed automatically;  it is being removed because all of the "
 "packages which depend upon it are being removed:"
@@ -3683,19 +3688,19 @@
 "%B%s%b wurde automatisch installiert;  es wird entfernt, weil alle Pakete, "
 "die von ihm abhängen, entfernt werden:"
 
-#: src/reason_fragment.cc:365
+#: src/reason_fragment.cc:362
 msgid "%B%s%b will be automatically removed because of dependency errors:"
 msgstr ""
 "%B%s%b wird aufgrund von verletzten Abhängigkeiten automatisch entfernt:"
 
-#: src/reason_fragment.cc:369
+#: src/reason_fragment.cc:366
 msgid ""
 "%B%s%b will be automatically installed to satisfy the following dependencies:"
 msgstr ""
 "%B%s%b wird automatisch installiert, um die folgenden Abhängigkeiten zu "
 "erfüllen:"
 
-#: src/reason_fragment.cc:375 src/reason_fragment.cc:387
+#: src/reason_fragment.cc:372 src/reason_fragment.cc:384
 msgid ""
 "%B%s%b cannot be upgraded now, but if it could be, it would still be held at "
 "version %B%s%b."
@@ -3703,7 +3708,7 @@
 "%B%s%b kann derzeit nicht aktualisiert werden;  wäre dies möglich, würde es "
 "trotzdem auf Version %B%s%b gehalten werden."
 
-#: src/reason_fragment.cc:378
+#: src/reason_fragment.cc:375
 msgid ""
 "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the "
 "following dependencies:"
@@ -3711,28 +3716,28 @@
 "%B%s%b wird nicht auf Version %B%s%b aktualisiert, um folgende "
 "Abhängigkeiten nicht zu verletzen:"
 
-#: src/reason_fragment.cc:390
+#: src/reason_fragment.cc:387
 msgid "%B%s%b is currently installed."
 msgstr "%B%s%b ist zur Zeit installiert."
 
-#: src/reason_fragment.cc:396
+#: src/reason_fragment.cc:393
 msgid "%B%s%b is not currently installed."
 msgstr "%B%s%b ist zur Zeit nicht installiert."
 
-#: src/reason_fragment.cc:404
+#: src/reason_fragment.cc:401
 msgid "Some dependencies of %B%s%b are not satisfied:"
 msgstr "Einige Abhängigkeiten von %B%s%b sind nicht erfüllt:"
 
-#: src/reason_fragment.cc:408
+#: src/reason_fragment.cc:405
 msgid "%B%s%b will be downgraded."
 msgstr "%B%s%b wird durch eine ältere Version ersetzt werden (Downgrade)."
 
-#: src/reason_fragment.cc:415
+#: src/reason_fragment.cc:412
 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b."
 msgstr ""
 "%B%s%b wird nicht auf die verbotene Version %B%s%b aktualisiert werden."
 
-#: src/reason_fragment.cc:419
+#: src/reason_fragment.cc:416
 msgid ""
 "%B%s%b could be upgraded to version %B%s%b, but it is being held at version %"
 "B%s%b."
@@ -3740,34 +3745,34 @@
 "%B%s%b könnte auf Version %B%s%b aktualisiert werden, wird aber auf Version %"
 "B%s%b gehalten."
 
-#: src/reason_fragment.cc:426
+#: src/reason_fragment.cc:423
 msgid "%B%s%b will be re-installed."
 msgstr "%B%s%b wird erneut installiert werden."
 
-#: src/reason_fragment.cc:430
+#: src/reason_fragment.cc:427
 msgid "%B%s%b will be installed."
 msgstr "%B%s%b wird installiert werden."
 
-#: src/reason_fragment.cc:434
+#: src/reason_fragment.cc:431
 msgid "%B%s%b will be removed."
 msgstr "%B%s%b wird entfernt."
 
-#: src/reason_fragment.cc:439
+#: src/reason_fragment.cc:436
 msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b."
 msgstr "%B%s%b wird von Version %B%s%b auf Version %B%s%b aktualisiert werden."
 
-#: src/reason_fragment.cc:475
+#: src/reason_fragment.cc:472
 msgid ""
 "The following packages depend on %B%s%b and will be broken by its removal:"
 msgstr ""
 "Die folgenden Pakete hängen von %B%s%b ab und werden nach dem Entfernen "
 "kaputt sein:"
 
-#: src/reason_fragment.cc:478
+#: src/reason_fragment.cc:475
 msgid "The following packages depend on %B%s%b and are broken:"
 msgstr "Die folgenden Pakete hängen von %B%s%b ab und sind kaputt:"
 
-#: src/reason_fragment.cc:485
+#: src/reason_fragment.cc:482
 msgid ""
 "The following packages conflict with %B%s%b and will be broken by its "
 "installation:"
@@ -3775,7 +3780,7 @@
 "Die folgenden Pakete kollidieren mit %B%s%b und werden nach der Installation "
 "kaputt sein:"
 
-#: src/reason_fragment.cc:518
+#: src/reason_fragment.cc:515
 msgid ""
 "The following packages depend on a version of %B%s%b other than the "
 "currently installed version of %B%s%b, or conflict with the currently "
@@ -3785,7 +3790,7 @@
 "momentan installierten (%B%s%b) ab, oder kollidieren mit der momentan "
 "installierten:"
 
-#: src/reason_fragment.cc:522
+#: src/reason_fragment.cc:519
 msgid ""
 "The following packages conflict with %B%s%b, or depend on a version of it "
 "which is not going to be installed."
@@ -3793,11 +3798,11 @@
 "Die folgenden Pakete kollidieren mit %B%s%b oder hängen von einer Version "
 "ab, die nicht installiert wird:"
 
-#: src/reason_fragment.cc:526
+#: src/reason_fragment.cc:523
 msgid "The following packages conflict with %B%s%b:"
 msgstr "Die folgenden Pakete kollidieren mit %B%s%b:"
 
-#: src/reason_fragment.cc:531
+#: src/reason_fragment.cc:528
 msgid ""
 "The following packages depend on a version of %B%s%b other than the "
 "currently installed version of %B%s%b:"
@@ -3805,7 +3810,7 @@
 "Die folgenden Pakete hängen von einer anderen Version von %B%s%b als der "
 "momentan installierten Version von %B%s%b ab:"
 
-#: src/reason_fragment.cc:535
+#: src/reason_fragment.cc:532
 msgid ""
 "The following packages depend on a version of %B%s%b which is not going to "
 "be installed."
@@ -3813,18 +3818,18 @@
 "Die folgenden Pakete hängen von einer Version von %B%s%b ab, die nicht "
 "installiert wird:"
 
-#: src/reason_fragment.cc:541
+#: src/reason_fragment.cc:538
 msgid "upgraded"
 msgstr "aktualisiert"
 
-#: src/reason_fragment.cc:541
+#: src/reason_fragment.cc:538
 msgid "downgraded"
 msgstr "deaktualisiert"
 
 #  I hope this is ok for the translators :-/ --
 #  factoring out upgraded/downgraded in its two senses
 #  would be a royal pain even if gettext supported it.
-#: src/reason_fragment.cc:547
+#: src/reason_fragment.cc:544
 msgid ""
 "The following packages depend on the currently installed version of %B%s%b (%"
 "B%s%b), or conflict with the version it will be %s to (%B%s%b), and will be "
@@ -3834,7 +3839,7 @@
 "Pakets %B%s%b (%B%s%b) ab oder kollidieren mit der Version, auf die es %s "
 "wird (%B%s%b).  Sie werden kaputt sein, wenn es %s wird."
 
-#: src/reason_fragment.cc:554
+#: src/reason_fragment.cc:551
 msgid ""
 "The following packages conflict with version %B%s%b of %B%s%b, and will be "
 "broken if it is %s."
@@ -3842,7 +3847,7 @@
 "Die folgenden Pakete kollidieren mit Version %B%s%b des Pakets %B%s%b, und "
 "werden kaputt sein, wenn es %s wird."
 
-#: src/reason_fragment.cc:559
+#: src/reason_fragment.cc:556
 msgid ""
 "The following packages depend on version %B%s%b of %B%s%b, and will be "
 "broken if it is %s."
@@ -3889,31 +3894,36 @@
 msgid "Close"
 msgstr "^Schließen"
 
-#: src/solution_fragment.cc:125
+#: src/solution_fragment.cc:134
 #, fuzzy
 msgid "%BRemove%b the following packages:%n"
 msgstr "Die folgenden Pakete sind KAPUTT:"
 
-#: src/solution_fragment.cc:135
+#: src/solution_fragment.cc:144
 #, fuzzy
 msgid "%BInstall%b the following packages:%n"
 msgstr "Die folgenden Pakete sind KAPUTT:"
 
-#: src/solution_fragment.cc:148
+#: src/solution_fragment.cc:157
 msgid "%BKeep%b the following packages at their current version:%n"
 msgstr ""
 
-#: src/solution_fragment.cc:161
+#: src/solution_fragment.cc:164
+#, fuzzy
+msgid "Not Installed"
+msgstr "nicht installiert"
+
+#: src/solution_fragment.cc:177
 #, fuzzy
 msgid "%BUpgrade%b the following packages:%n"
 msgstr "Die folgenden Pakete sind KAPUTT:"
 
-#: src/solution_fragment.cc:176
+#: src/solution_fragment.cc:192
 #, fuzzy
 msgid "%BDowngrade%b the following packages:%n"
 msgstr "Herunterladen von Paketen"
 
-#: src/solution_fragment.cc:190
+#: src/solution_fragment.cc:206
 #, c-format
 msgid "Score is %d"
 msgstr ""
@@ -3941,44 +3951,44 @@
 msgid "W:"
 msgstr ""
 
-#: src/ui.cc:194
+#: src/ui.cc:193
 msgid "Search for:"
 msgstr "Suchen nach:"
 
-#: src/ui.cc:262
+#: src/ui.cc:258
 msgid "You already are root!"
 msgstr "Sie sind bereits root!"
 
-#: src/ui.cc:360
+#: src/ui.cc:356
 msgid ""
 "Subprocess exited with an error -- did you type your password correctly?"
 msgstr "Unterprozess mit Fehler beendet -- richtiges Passwort?"
 
-#: src/ui.cc:388
+#: src/ui.cc:384
 msgid "Loading cache"
 msgstr "Lade Cache"
 
-#: src/ui.cc:410
+#: src/ui.cc:406
 msgid "Really quit Aptitude?"
 msgstr "Aptitude wirklich beenden?"
 
-#: src/ui.cc:489
+#: src/ui.cc:485
 msgid "Really discard your personal settings and reload the defaults?"
 msgstr ""
 "Wirklich ihre persönlichen Einstellungen verwerfen und Standardwerte laden?"
 
-#: src/ui.cc:589 src/ui.cc:591 src/ui.cc:619 src/ui.cc:621
+#: src/ui.cc:585 src/ui.cc:587 src/ui.cc:615 src/ui.cc:617
 msgid "Packages"
 msgstr "Pakete"
 
-#: src/ui.cc:590 src/ui.cc:620
+#: src/ui.cc:586 src/ui.cc:616
 msgid "View available packages and choose actions to perform"
 msgstr "Verfügbare Pakete anzeigen und Änderungen vornehmen"
 
-#: src/ui.cc:667
+#: src/ui.cc:663
 #, fuzzy
 msgid ""
-"%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
+"Aptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
 "BABSOLUTELY NO WARRANTY%b; for details see 'license' in the Help menu.  This "
 "is free software, and you are welcome to redistribute it under certain "
 "conditions; see 'license' for details."
@@ -3994,61 +4004,66 @@
 "unter bestimmten Bedingungen weiterzuvertreiben;  Details dazu finden Sie\n"
 "ebenfalls unter »Lizenz«."
 
-#: src/ui.cc:688
+#: src/ui.cc:684
 msgid "help.txt"
 msgstr "help-de.txt"
 
-#: src/ui.cc:704
+#: src/ui.cc:700
 msgid "README"
 msgstr "README"
 
-#: src/ui.cc:786
+#: src/ui.cc:782
 msgid ""
-"%C%BWARNING%b: untrusted versions of the following packages will be "
-"installed!%n%nUntrusted packages could %Bcompromise your system's security%"
-"b.  You should only proceed with the installation if you are certain that "
-"this is what you want to do.%n%n"
+"%BWARNING%b: untrusted versions of the following packages will be installed!%"
+"n%nUntrusted packages could %Bcompromise your system's security%b.  You "
+"should only proceed with the installation if you are certain that this is "
+"what you want to do.%n%n"
 msgstr ""
 
-#: src/ui.cc:800
+#: src/ui.cc:788
+#, fuzzy
+msgid "  %S*%N %s [version %s]%n"
+msgstr "Versionen"
+
+#: src/ui.cc:795
 #, fuzzy
 msgid "Really Continue"
 msgstr "Weiter"
 
-#: src/ui.cc:802
+#: src/ui.cc:797
 msgid "Abort Installation"
 msgstr ""
 
-#: src/ui.cc:863
+#: src/ui.cc:858
 msgid "Preview of package installation"
 msgstr "Vorschau der Paketinstallation"
 
-#: src/ui.cc:864
+#: src/ui.cc:859
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Anzeigen und anpassen der geplanten Aktionen"
 
-#: src/ui.cc:865
+#: src/ui.cc:860
 #, fuzzy
 msgid "Preview"
 msgstr "^Vorherige"
 
-#: src/ui.cc:901
+#: src/ui.cc:896
 #, fuzzy
 msgid "Some packages were broken and have been fixed:"
 msgstr "Manche Pakete waren kaputt und wurden repariert"
 
-#: src/ui.cc:907
+#: src/ui.cc:902
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:913
-#, c-format
+#: src/ui.cc:908
+#, fuzzy, c-format
 msgid ""
-"Ran out of time while trying to resolver dependencies (press \"%s\" to try "
+"Ran out of time while trying to resolve dependencies (press \"%s\" to try "
 "harder)"
-msgstr ""
+msgstr "Zeit verschwenden (Minensuchspiel)"
 
-#: src/ui.cc:959
+#: src/ui.cc:954
 #, fuzzy
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
@@ -4057,25 +4072,25 @@
 "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:962 src/ui.cc:1078
+#: src/ui.cc:957 src/ui.cc:1072
 msgid "Become root"
 msgstr "»root« werden"
 
-#: src/ui.cc:964 src/ui.cc:1080
+#: src/ui.cc:959 src/ui.cc:1074
 msgid "Don't become root"
 msgstr "Nicht »root« werden"
 
-#: src/ui.cc:969 src/ui.cc:1085
+#: src/ui.cc:964 src/ui.cc:1079
 msgid "A package-list update or install run is already taking place."
 msgstr "Ein Aktualisierungs oder Installationsvorgang findet gerade statt."
 
-#: src/ui.cc:996
+#: src/ui.cc:991
 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:1002
+#: src/ui.cc:997
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -4088,7 +4103,7 @@
 "ausgewählt.\n"
 "Geben Sie »Umschalt+U« ein, um diese Pakete zu aktualisieren."
 
-#: src/ui.cc:1074
+#: src/ui.cc:1069
 #, fuzzy
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
@@ -4097,118 +4112,118 @@
 "Zum Aktualisieren der Paketliste sind Administrationsrechte nötig,\n"
 "die Sie derzeit nicht haben.  Wollen Sie zum root-Account wechseln?\n"
 
-#: src/ui.cc:1090 src/ui.cc:1377
+#: src/ui.cc:1084 src/ui.cc:1371
 msgid "Waste time trying to find mines"
 msgstr "Zeit verschwenden (Minensuchspiel)"
 
 #  Erk!  That's weird!
-#: src/ui.cc:1097 src/ui.cc:1150
+#: src/ui.cc:1091 src/ui.cc:1144
 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:1100
+#: src/ui.cc:1094
 msgid "Deleting downloaded files"
 msgstr "Lösche heruntergeladene Dateien"
 
-#: src/ui.cc:1114
+#: src/ui.cc:1108
 msgid "Downloaded package files have been deleted"
 msgstr "Heruntergeladene Dateien wurden gelöscht"
 
-#: src/ui.cc:1175
+#: src/ui.cc:1169
 #, 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:1247
+#: src/ui.cc:1241
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1252 src/ui.cc:1283
+#: src/ui.cc:1246 src/ui.cc:1277
 #, fuzzy
 msgid "Ran out of time while trying to find a solution."
 msgstr "Zeit verschwenden (Minensuchspiel)"
 
-#: src/ui.cc:1277
+#: src/ui.cc:1271
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1307
+#: src/ui.cc:1301
 #, fuzzy, c-format
 msgid "Unable to open %s"
 msgstr "%s konnte nicht zum schreiben geöffnet werden"
 
-#: src/ui.cc:1313
+#: src/ui.cc:1307
 msgid "Error while dumping resolver state"
 msgstr ""
 
-#: src/ui.cc:1323
+#: src/ui.cc:1317
 msgid "File to which the resolver state should be dumped:"
 msgstr ""
 
-#: src/ui.cc:1353
+#: src/ui.cc:1347
 msgid "^Install/remove packages"
 msgstr "^Installieren/Entfernen von Paketen"
 
-#: src/ui.cc:1354
+#: src/ui.cc:1348
 msgid "Perform all pending installs and removals"
 msgstr "Durchführen geplanter Installations- und Löschvorgänge"
 
-#: src/ui.cc:1356
+#: src/ui.cc:1350
 msgid "^Update package list"
 msgstr "Paketliste ^aktualisieren"
 
-#: src/ui.cc:1357
+#: src/ui.cc:1351
 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:1360
+#: src/ui.cc:1354
 msgid "^Forget new packages"
 msgstr "Neue Pakete ^vergessen"
 
-#: src/ui.cc:1361
+#: src/ui.cc:1355
 msgid "Forget which packages are \"new\""
 msgstr "Vergessen, welche Pakete »neu« sind"
 
-#: src/ui.cc:1364
+#: src/ui.cc:1358
 msgid "^Clean package cache"
-msgstr "Paketcache komplett leeren"
+msgstr "Paketcache komplett ^leeren"
 
-#: src/ui.cc:1365
+#: src/ui.cc:1359
 msgid "Delete package files which were previously downloaded"
 msgstr "Alle Paketdateien aus dem Paketcache löschen"
 
-#: src/ui.cc:1368
+#: src/ui.cc:1362
 msgid "Clean ^obsolete files"
 msgstr "Nur ^veraltete Paketdateien löschen"
 
-#: src/ui.cc:1369
+#: src/ui.cc:1363
 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:1372
+#: src/ui.cc:1366
 msgid "Mark ^Upgradable"
 msgstr "Aktualisierbare ^markieren"
 
-#: src/ui.cc:1373
+#: src/ui.cc:1367
 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:1376
+#: src/ui.cc:1370
 msgid "^Play Minesweeper"
 msgstr "^Minesweeper spielen"
 
-#: src/ui.cc:1379
+#: src/ui.cc:1373
 msgid "^Become root"
 msgstr "^Root werden"
 
-#: src/ui.cc:1380
+#: src/ui.cc:1374
 #, fuzzy
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
@@ -4217,69 +4232,69 @@
 "'su' ausführen um root zu werden.  Dies wird das Programm neu starten, aber\n"
 "Ihre Einstellungen werden erhalten bleiben."
 
-#: src/ui.cc:1383
+#: src/ui.cc:1377
 msgid "^Reload package cache"
 msgstr "Paketcache ^neu laden"
 
-#: src/ui.cc:1384
+#: src/ui.cc:1378
 msgid "Reload the package cache"
 msgstr "Paketcache neu laden"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1384
 msgid "^Quit"
 msgstr "^Beenden"
 
-#: src/ui.cc:1391
+#: src/ui.cc:1385
 msgid "Exit the program"
 msgstr "Aptitude verlassen"
 
-#: src/ui.cc:1397 src/ui.cc:1669
+#: src/ui.cc:1391 src/ui.cc:1661
 msgid "Undo"
 msgstr "Rückgängig"
 
-#: src/ui.cc:1398
+#: src/ui.cc:1392
 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:1405
+#: src/ui.cc:1399
 msgid "^Install"
 msgstr "^Installieren"
 
-#: src/ui.cc:1406
+#: src/ui.cc:1400
 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:1409
+#: src/ui.cc:1403
 msgid "^Remove"
 msgstr "^Entfernen"
 
-#: src/ui.cc:1410
+#: src/ui.cc:1404
 msgid "Flag the currently selected package for removal"
 msgstr "Das ausgewählte Paket zum Entfernen auswählen"
 
-#: src/ui.cc:1413
+#: src/ui.cc:1407
 msgid "^Purge"
 msgstr "^Vollständig entfernen"
 
-#: src/ui.cc:1414
+#: src/ui.cc:1408
 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:1417
+#: src/ui.cc:1411
 msgid "^Keep"
 msgstr "^Beibehalten"
 
-#: src/ui.cc:1418
+#: src/ui.cc:1412
 msgid "Cancel any action on the selected package"
 msgstr "Alle Aktionen mit dem gewählten Paket zurücknehmen"
 
-#: src/ui.cc:1421
+#: src/ui.cc:1415
 msgid "^Hold"
 msgstr "^Zurückhalten"
 
-#: src/ui.cc:1422
+#: src/ui.cc:1416
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -4287,11 +4302,11 @@
 "Geplante Vorgänge mit dem gewählten Paket zurücknehmen und\n"
 "es vor zukünftigen Upgrades schützen"
 
-#: src/ui.cc:1425
+#: src/ui.cc:1419
 msgid "Mark ^Auto"
 msgstr "Als ^automatisch markieren"
 
-#: src/ui.cc:1426
+#: src/ui.cc:1420
 #, fuzzy
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
@@ -4301,11 +4316,11 @@
 "es wird dann automatisch gelöscht, wenn keine anderen Pakete mehr davon "
 "abhängen"
 
-#: src/ui.cc:1429
+#: src/ui.cc:1423
 msgid "Mark ^Manual"
 msgstr "Als ^manuell markieren"
 
-#: src/ui.cc:1430
+#: src/ui.cc:1424
 #, fuzzy
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
@@ -4314,11 +4329,11 @@
 "Dieses Paket als manuell installiert markieren;\n"
 "es wird dann nur noch auf Ihren Wunsch hin gelöscht."
 
-#: src/ui.cc:1433
+#: src/ui.cc:1427
 msgid "^Forbid Version"
 msgstr "Version verbieten"
 
-#: src/ui.cc:1434
+#: src/ui.cc:1428
 #, fuzzy
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
@@ -4328,206 +4343,206 @@
 "noch neuere Versionen werden wie üblich installiert werden"
 
 # ummmm...
-#: src/ui.cc:1438
+#: src/ui.cc:1432
 msgid "I^nformation"
 msgstr "Informationen"
 
-#: src/ui.cc:1439
+#: src/ui.cc:1433
 msgid "Display more information about the selected package"
 msgstr "Mehr Informationen zum gewählten Paket"
 
-#: src/ui.cc:1442
+#: src/ui.cc:1436
 msgid "^Changelog"
 msgstr "^ChangeLog"
 
-#: src/ui.cc:1443
+#: src/ui.cc:1437
 msgid "Display the Debian changelog of the selected package"
 msgstr "Das Debian-Änderungsprotokoll für das gewählte Paket anzeigen"
 
-#: src/ui.cc:1450
+#: src/ui.cc:1444
 msgid "^Find"
 msgstr "^Suchen"
 
-#: src/ui.cc:1451
+#: src/ui.cc:1445
 msgid "Search for a package"
 msgstr "Nach einem Paket suchen"
 
-#: src/ui.cc:1454
+#: src/ui.cc:1448
 msgid "Find ^Again"
 msgstr "^Weitersuchen"
 
-#: src/ui.cc:1455
+#: src/ui.cc:1449
 msgid "Repeat the last search"
 msgstr "Die letzte Suche wiederholen"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1453
 msgid "^Limit Display"
 msgstr "^Filtern des Paketbaums"
 
-#: src/ui.cc:1460
+#: src/ui.cc:1454
 msgid "Apply a filter to the package list"
 msgstr "Einen Filter auf die Paketliste anwenden"
 
-#: src/ui.cc:1463
+#: src/ui.cc:1457
 msgid "^Un-Limit Display"
 msgstr "^Löschen des Filters"
 
-#: src/ui.cc:1464
+#: src/ui.cc:1458
 msgid "Remove the filter from the package list"
 msgstr "Die Paketliste nicht mehr filtern"
 
-#: src/ui.cc:1468
+#: src/ui.cc:1462
 msgid "Find ^Broken"
 msgstr "Kaputtes Paket suchen"
 
-#: src/ui.cc:1469
+#: src/ui.cc:1463
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Das nächste Paket mit verletzten Abhängigkeiten finden"
 
-#: src/ui.cc:1476
+#: src/ui.cc:1470
 msgid "^UI options"
 msgstr "^Oberfläche"
 
-#: src/ui.cc:1477
+#: src/ui.cc:1471
 msgid "Change the settings which affect the user interface"
 msgstr "Einstellungen verändern, die die Benutzeroberfläche betreffen"
 
-#: src/ui.cc:1480
+#: src/ui.cc:1474
 msgid "^Dependency handling"
 msgstr "^Abhängigkeisbehandlung"
 
-#: src/ui.cc:1481
+#: src/ui.cc:1475
 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:1484
+#: src/ui.cc:1478
 msgid "^Miscellaneous"
 msgstr "^Verschiedenes"
 
-#: src/ui.cc:1485
+#: src/ui.cc:1479
 msgid "Change miscellaneous program settings"
 msgstr "Sonstige Programmeinstellungen ändern"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1484
 msgid "^Revert options"
 msgstr "^Optionen zurücksetzen"
 
-#: src/ui.cc:1491
+#: src/ui.cc:1485
 msgid "Reset all settings to the system defaults"
 msgstr "Alle Einstellungen auf die Vorgabewerte zurücksetzen"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1496
 msgid "^Next"
 msgstr "^Nächste"
 
-#: src/ui.cc:1503
+#: src/ui.cc:1497
 msgid "View next display"
 msgstr "Nächste Ansicht zeigen"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1500
 msgid "^Prev"
 msgstr "^Vorherige"
 
-#: src/ui.cc:1507
+#: src/ui.cc:1501
 msgid "View previous display"
 msgstr "Vorherige Ansicht zeigen"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1504
 msgid "^Close"
 msgstr "^Schließen"
 
-#: src/ui.cc:1511
+#: src/ui.cc:1505
 msgid "Close this display"
 msgstr "Ansicht schließen"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1510
 msgid "New Package ^View"
 msgstr "Neue Paket^ansicht"
 
-#: src/ui.cc:1517
+#: src/ui.cc:1511
 msgid "Create a new default package view"
 msgstr "Eine neue Paketansicht erzeugen"
 
-#: src/ui.cc:1520
+#: src/ui.cc:1514
 msgid "New Categorical ^Browser"
 msgstr "Neuen Kategorie-^Browser"
 
-#: src/ui.cc:1522
+#: src/ui.cc:1516
 msgid "Browse packages by category"
 msgstr "Pakete nach Kategorie durchsuchen"
 
-#: src/ui.cc:1530
+#: src/ui.cc:1524
 msgid "^About"
 msgstr "Ü^ber"
 
 # ummmm...
-#: src/ui.cc:1531
+#: src/ui.cc:1525
 msgid "View information about this program"
 msgstr "Information über Aptitude"
 
-#: src/ui.cc:1534
+#: src/ui.cc:1528
 msgid "^Help"
 msgstr "K^urzhilfe"
 
-#: src/ui.cc:1535
+#: src/ui.cc:1529
 msgid "View the on-line help"
 msgstr "Kurzhilfe zu Aptitude"
 
-#: src/ui.cc:1537
+#: src/ui.cc:1531
 msgid "User's ^Manual"
 msgstr "^Anleitung"
 
-#: src/ui.cc:1538
+#: src/ui.cc:1532
 msgid "View the detailed program manual"
 msgstr "Die detaillierte Anleitung (README, derzeit nur englisch)"
 
-#: src/ui.cc:1541
+#: src/ui.cc:1535
 msgid "^FAQ"
 msgstr "^FAQ"
 
-#: src/ui.cc:1542
+#: src/ui.cc:1536
 msgid "View a list of frequently asked questions"
 msgstr "Die Liste häufig gestellter Fragen (Frequently Asked Questions, FAQ)"
 
-#: src/ui.cc:1545
+#: src/ui.cc:1539
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1546
+#: src/ui.cc:1540
 #, fuzzy
 msgid "View the important changes made in each version of "
 msgstr "Protokoll der Änderungen, die an Aptitude vorgenommen wurden"
 
-#: src/ui.cc:1549
+#: src/ui.cc:1543
 msgid "^License"
 msgstr "Lizen^z"
 
-#: src/ui.cc:1550
+#: src/ui.cc:1544
 msgid "View the terms under which you may copy the program"
 msgstr "Die Bedingungen, unter denen Sie Aptitude kopieren dürfen"
 
-#: src/ui.cc:1668
+#: src/ui.cc:1660
 msgid "Actions"
 msgstr "Aktionen"
 
-#: src/ui.cc:1671
+#: src/ui.cc:1663
 msgid "Search"
 msgstr "Suchen"
 
-#: src/ui.cc:1672
+#: src/ui.cc:1664
 msgid "Options"
 msgstr "Optionen"
 
-#: src/ui.cc:1673
+#: src/ui.cc:1665
 msgid "Views"
 msgstr "Ansichten"
 
-#: src/ui.cc:1674
+#: src/ui.cc:1666
 msgid "Help"
 msgstr "Hilfe"
 
-#: src/ui.cc:1734
+#: src/ui.cc:1726
 #, c-format
 msgid ""
 "%s: Menu  %s: Help  %s: Quit  %s: Update  %s: Download/Install/Remove Pkgs"
@@ -4535,30 +4550,30 @@
 "%s: Menü  %s: Hilfe  %s: Beenden  %s: Update  %s: Download/Installieren/"
 "Entf. von Paketen"
 
-#: src/ui.cc:2003 src/vscreen/vscreen.cc:281
+#: src/ui.cc:1996 src/vscreen/vscreen.cc:281
 msgid "yes_key"
 msgstr "j"
 
-#: src/ui.cc:2004 src/vscreen/vscreen.cc:282
+#: src/ui.cc:1997 src/vscreen/vscreen.cc:282
 msgid "no_key"
 msgstr "n"
 
-#: src/view_changelog.cc:46
+#: src/view_changelog.cc:61
 msgid "You can only view changelogs of official Debian packages."
 msgstr ""
 "Sie können nur die Änderungsprotokolle von offiziellen Debian-Paketen "
 "anzeigen."
 
-#: src/view_changelog.cc:52
+#: src/view_changelog.cc:67
 msgid "Downloading Changelog"
 msgstr "Herunterladen des Changelogs"
 
-#: src/view_changelog.cc:54
+#: src/view_changelog.cc:69
 #, fuzzy
 msgid "Download Changelog"
 msgstr "Herunterladen des Changelogs"
 
-#: src/view_changelog.cc:63
+#: src/view_changelog.cc:78
 #, c-format
 msgid "%s changes"
 msgstr ""
@@ -4660,15 +4675,193 @@
 #~ "Bitte legen Sie folgenden Datenträger in das Laufwerk »%s« ein:\n"
 #~ "%s"
 
+#~ msgid "Need exactly two colors in color definition \"%s\""
+#~ msgstr "Benötige genau zwei Farben in Farbdefinition »%s«"
+
+#~ msgid "Can't parse foreground \"%s\"of color \"%s\""
+#~ msgstr "Kann Vordergrund »%s« der Farbe »%s« nicht verarbeiten."
+
+#~ msgid "Can't parse background \"%s\" of color \"%s\""
+#~ msgstr "Kann Hintergrund »%s« der Farbe »%s« nicht verarbeiten."
+
 #~ msgid "Invalid option for interactive mode: -s\n"
 #~ msgstr "Unbekannte Option für den Interaktiven Modus: -s\n"
 
+#~ 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."
+#~ msgstr ""
+#~ "Programme für Faxmodems und andere Kommunikationsgeräte\n"
+#~ " Pakete im Bereich »comm« werden verwendet, um Modems und andere "
+#~ "Kommunikationshardware zu steuern.  Hier finden Sie zum Beispiel Software "
+#~ "für Faxmodems, PPP für Einwahlverbindungen ins Internet, zmodem/kermit, "
+#~ "Software für Mobiltelefone, zum Datenaustausch mit dem Fido-Netz und zum "
+#~ "Betreiben einer BBS."
+
+#~ 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"
+#~ " .\n"
+#~ " For more information about what Debian considers to be Free Software, "
+#~ "see http://www.debian.org/social_contract#guidelines"
+#~ msgstr ""
+#~ "Nicht-freie Software\n"
+#~ " Pakete im Abschnitt »non-free« sind nicht Teil von Debian.\n"
+#~ " .\n"
+#~ " Diese Pakete erfüllen nicht alle Anforderungen der Debian Free Software "
+#~ "Guidelines (siehe unten).  Sie sollten die Lizenz dieser Programme lesen, "
+#~ "um sicherzugehen, dass Sie sie verwenden dürfen.\n"
+#~ " .\n"
+#~ " Für mehr Informationen darüber, was Debian als Freie Software ansieht: "
+#~ "siehe http://www.debian.org/social_contract#guidelines"
+
+#~ 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)"
+#~ msgstr ""
+#~ "Neue Pakete\n"
+#~ " Diese Pakete sind neu zu Debian hinzugekommen, seit Sie das letzte Mal "
+#~ "die Liste der »neuen« Pakete geleert haben.  (Dazu dient der Befehl "
+#~ "\"Neue Pakete vergessen\" im \"Aktionen\"-Menü.)"
+
+#~ msgid ""
+#~ "%s is an essential package!\n"
+#~ "\n"
+#~ "Are you sure you want to remove it?\n"
+#~ "Type '%s' if you are."
+#~ msgstr ""
+#~ "%s ist ein essentielles Paket!\n"
+#~ "\n"
+#~ "Sind Sie sicher dass sie es entfernen wollen?\n"
+#~ "Geben Sie '%s' ein."
+
+#~ msgid "Available versions of "
+#~ msgstr "Verfügbare Versionen von "
+
+#~ 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."
+#~ 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."
+
 # ummmm...
 #~ msgid "Information about "
 #~ msgstr "Information über "
 
+#~ msgid ""
+#~ "Aptitude %s\n"
+#~ "\n"
+#~ "Copyright 2000 Daniel Burrows.\n"
+#~ "\n"
+#~ "aptitude comes with ABSOLUTELY NO WARRANTY; for details see 'license' in "
+#~ "the\n"
+#~ "Help menu.  This is free software, and you are welcome to redistribute "
+#~ "it\n"
+#~ "under certain conditions; see 'license' for details."
+#~ msgstr ""
+#~ "Aptitude %s\n"
+#~ "\n"
+#~ "Copyright 2000-2004 Daniel Burrows.\n"
+#~ "\n"
+#~ "Für Aptitude gibt es KEINE GEWÄHR ODER GARANTIE;  Details dazu finden Sie "
+#~ "im Punkt »Lizenz«\n"
+#~ "im Hilfe-Menü.  Dieses Programm ist Freie Software, und Sie sind "
+#~ "eingeladen, es\n"
+#~ "unter bestimmten Bedingungen weiterzuvertreiben;  Details dazu finden "
+#~ "Sie\n"
+#~ "ebenfalls unter »Lizenz«."
+
+#~ msgid "Some packages were broken and have been fixed"
+#~ msgstr "Manche Pakete waren kaputt und wurden repariert"
+
 #~ msgid "Some broken packages could not be fixed!"
 #~ msgstr "Manche kaputten Pakete konnten nicht repariert werden!"
 
+#~ msgid "Some packages are broken.  Try to fix them?"
+#~ msgstr "Manche Pakete sind kaputt.  Versuchen, das zu reparieren?"
+
+#~ msgid ""
+#~ "Installing/removing packages requires administrative privileges, which\n"
+#~ "you currently do not have.  Would you like to change to the root "
+#~ "account?\n"
+#~ msgstr ""
+#~ "Zum Installieren/Entfernen von Paketen sind Administrationsrechte nötig,\n"
+#~ "die Sie derzeit nicht haben.  Wollen Sie zum root-Account wechseln?\n"
+
+#~ msgid ""
+#~ "No packages will be installed, removed or upgraded.\n"
+#~ "\n"
+#~ "Some packages could be upgraded, but you have not chosen to upgrade "
+#~ "them.\n"
+#~ "Type \"U\" to prepare an upgrade."
+#~ msgstr ""
+#~ "Keine Pakete werden installiert, entfernt oder aktualisiert.\n"
+#~ "\n"
+#~ "Einige Pakete könnten aktualisiert werden, aber Sie haben diese nicht "
+#~ "ausgewählt.\n"
+#~ "Geben Sie »Umschalt+U« ein, um diese Pakete zu aktualisieren."
+
+#~ 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"
+#~ msgstr ""
+#~ "Zum Aktualisieren der Paketliste sind Administrationsrechte nötig,\n"
+#~ "die Sie derzeit nicht haben.  Wollen Sie zum root-Account wechseln?\n"
+
+#~ msgid "Obsolete downloaded package files have been deleted"
+#~ msgstr "Veraltete heruntergeladene Paketdateien wurden gelöscht"
+
+#~ msgid ""
+#~ "Run 'su' to become root; this will restart the program, but your\n"
+#~ "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."
+
+#~ msgid ""
+#~ "Mark the selected package as having been automatically installed;\n"
+#~ "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"
+
+#~ msgid ""
+#~ "Mark the selected package as having been manually installed;\n"
+#~ "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."
+
+#~ msgid ""
+#~ "Forbid the candidate version of the selected package from being "
+#~ "installed;\n"
+#~ "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"
+
 #~ msgid "^ChangeLog"
 #~ msgstr "^ChangeLog"
+
+#~ msgid "View the important changes made in each version of the program"
+#~ msgstr "Protokoll der Änderungen, die an Aptitude vorgenommen wurden"

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	Sun Jun 12 21:04:47 2005
@@ -1,4 +1,4 @@
-# translation of aptitude_po_el.po to 
+# translation of aptitude_po_el.po to
 # translation of aptitude_po_el-1.po to
 # translation of aptitude_po_el-1.po to
 # translation of aptitude_po_el.po to
@@ -12,20 +12,22 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
 # Konstantinos Margaritis <markos at debian.org>, 2003, 2004.
 # George Papamichelakis <george at step.gr>, 2004.
+# Greek Translation Team <debian-l10n-greek at lists.debian.org>, 2005.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: aptitude_po_el\n"
 "Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-05-01 14:08-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"
+"POT-Creation-Date: 2005-06-12 22:42+0200\n"
+"PO-Revision-Date: 2005-04-03 14:02EEST\n"
+"Last-Translator: Greek Translation Team <debian-l10n-greek at lists.debian."
+"org>\n"
+"Language-Team: Greek <debian-l10n-greek at lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Translation addition: Nick Niktaris <niktarin at yahoo.com>\n"
-"X-Generator: KBabel 1.3.1\n"
+"X-Generator: KBabel 1.9.1\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "\n"
 "\n"
@@ -170,14 +172,14 @@
 msgstr ""
 "Αυτόματη αφαίρεση αχρησιμοποιήτων πακέτων που ταιριάζουν σε αυτό το φίλτρο"
 
-#: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:219 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
-#: src/vscreen/vs_util.cc:328
+#: src/apt_options.cc:240 src/mine/cmine.cc:249 src/mine/cmine.cc:312
+#: src/ui.cc:215 src/vscreen/vs_util.cc:77 src/vscreen/vs_util.cc:90
+#: src/vscreen/vs_util.cc:264 src/vscreen/vs_util.cc:298
 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:328
+#: src/apt_options.cc:241 src/download_list.cc:69 src/mine/cmine.cc:250
+#: src/mine/cmine.cc:313 src/vscreen/vs_util.cc:298
 msgid "Cancel"
 msgstr "Ακύρωση"
 
@@ -258,15 +260,15 @@
 msgid "%s: Previous"
 msgstr ""
 
-#: src/broken_indicator.cc:233
+#: src/broken_indicator.cc:232
 #, c-format
-msgid "%CSolution search failed.  %s: try harder"
+msgid "Solution search failed.  %s: try harder"
 msgstr ""
 
-#: src/broken_indicator.cc:239
-#, c-format
-msgid "%CUnable to resolve dependencies."
-msgstr ""
+#: src/broken_indicator.cc:237
+#, fuzzy
+msgid "Unable to resolve dependencies."
+msgstr "Αδύνατο το άνοιγμα του %s για εγγραφή"
 
 #: src/cmdline/cmdline_action.cc:36
 #, c-format
@@ -641,14 +643,21 @@
 "this is what you want to do.\n"
 "\n"
 msgstr ""
+"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: θα εγκατασταθούν μή έμπιστες εκδόσεις των ακόλουθων\n"
+"πακέτων!!\n"
+"\n"
+"Τυχόν μη έμπιστα πακέτα μπορεί να οδηγήσουν στην παραβίαση της ασφάλειας\n"
+"του συστήματός σας. Προχωρήστε στην εγκατάσταση μόνο αν είστε βέβαιοι ότι\n"
+"για αυτό θέλετε\n"
+"\n"
 
-#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
-#: src/vscreen/vs_util.cc:212
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:165
+#: src/vscreen/vs_util.cc:202
 msgid "Yes"
 msgstr "Ναι"
 
-#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
-#: src/vscreen/vs_util.cc:212
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:165
+#: src/vscreen/vs_util.cc:202
 msgid "No"
 msgstr "Οχι"
 
@@ -656,16 +665,18 @@
 #, c-format
 msgid "Do you want to ignore this warning and proceed anyway?\n"
 msgstr ""
+"Θέλετε να αγνοήσετε αυτήν την προειδοποίηση και να προχωρήσετε\n"
+"ούτως ή άλλως;\n"
 
 #: src/cmdline/cmdline_prompt.cc:389
-#, fuzzy, c-format
+#, c-format
 msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
-msgstr "Για να συνεχίσετε, πληκτρολογήστε την φράση \"%s\":\n"
+msgstr "Για να συνεχίσετε, δώστε \"%s\", για να εγκαταλείψετε, \"%s\": "
 
 #: src/cmdline/cmdline_prompt.cc:400
 #, c-format
 msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
-msgstr ""
+msgstr "Μη αναγνωρίσιμη είσοδος. Δώστε είτε \"%s\" ή \"%s\".\n"
 
 #: src/cmdline/cmdline_prompt.cc:499
 #, c-format
@@ -961,7 +972,7 @@
 msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:212
+#: src/cmdline/cmdline_resolver.cc:212 src/cmdline/cmdline_resolver.cc:285
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
@@ -1018,196 +1029,201 @@
 msgid "The following packages have unmet dependencies:\n"
 msgstr "Τα ακόλουθα πακέτα έχουν ανεπίλυτες εξαρτήσεις:\n"
 
-#: src/cmdline/cmdline_show.cc:133
+#: src/cmdline/cmdline_show.cc:119 src/cmdline/cmdline_show.cc:305
+#: src/solution_fragment.cc:65
+msgid "<NULL>"
+msgstr ""
+
+#: src/cmdline/cmdline_show.cc:138
 msgid "not installed"
 msgstr "μη εγκατεστημένο"
 
-#: src/cmdline/cmdline_show.cc:135 src/pkg_columnizer.cc:231
+#: src/cmdline/cmdline_show.cc:140 src/pkg_columnizer.cc:231
 #: src/pkg_ver_item.cc:225
 msgid "unpacked"
 msgstr "ξεπακεταρισμένο"
 
-#: src/cmdline/cmdline_show.cc:137
+#: src/cmdline/cmdline_show.cc:142
 msgid "partially configured"
 msgstr "μερικώς ρυθμισμένο"
 
-#: src/cmdline/cmdline_show.cc:139
+#: src/cmdline/cmdline_show.cc:144
 msgid "partially installed"
 msgstr "μερικώς εγκατεστημένο"
 
-#: src/cmdline/cmdline_show.cc:141
+#: src/cmdline/cmdline_show.cc:146
 msgid "not installed (configuration files remain)"
 msgstr "μη εγκατεστημένο (παραμένουν αρχεία ρυθμίσεων)"
 
-#: src/cmdline/cmdline_show.cc:143 src/pkg_columnizer.cc:239
+#: src/cmdline/cmdline_show.cc:148 src/pkg_columnizer.cc:239
 #: src/pkg_ver_item.cc:233
 msgid "installed"
 msgstr "εγκατεστημένο"
 
-#: src/cmdline/cmdline_show.cc:152
+#: src/cmdline/cmdline_show.cc:157
 msgid "not a real package"
 msgstr "όχι πραγματικό πακέτο"
 
-#: src/cmdline/cmdline_show.cc:165
+#: src/cmdline/cmdline_show.cc:170
 msgid " [held]"
 msgstr " [κρατημένο]"
 
-#: src/cmdline/cmdline_show.cc:174
+#: src/cmdline/cmdline_show.cc:179
 #, c-format
 msgid "%s; version %s will be installed"
 msgstr "το %s; έκδοσης %s θα εγκατασταθεί"
 
-#: src/cmdline/cmdline_show.cc:178
+#: src/cmdline/cmdline_show.cc:183
 #, c-format
 msgid "%s; version %s will be installed automatically"
 msgstr "το %s; έκδοσης %s θα εγκατασταθεί αυτόματα"
 
-#: src/cmdline/cmdline_show.cc:184 src/cmdline/cmdline_show.cc:199
+#: src/cmdline/cmdline_show.cc:189 src/cmdline/cmdline_show.cc:204
 #, c-format
 msgid "%s; will be purged"
 msgstr "το %s θα διαγραφεί"
 
-#: src/cmdline/cmdline_show.cc:197
+#: src/cmdline/cmdline_show.cc:202
 #, c-format
 msgid "%s; will be purged because nothing depends on it"
 msgstr "το %s θα διαγραφεί επειδή δεν υπάρχουν εξαρτήσεις σε αυτό"
 
-#: src/cmdline/cmdline_show.cc:204
+#: src/cmdline/cmdline_show.cc:209
 #, c-format
 msgid "%s; will be removed because nothing depends on it"
 msgstr "το %s θα αφαιρεθεί επειδή δεν υπάρχουν εξαρτήσεις σε αυτό"
 
-#: src/cmdline/cmdline_show.cc:206
+#: src/cmdline/cmdline_show.cc:211
 #, c-format
 msgid "%s; will be removed"
 msgstr "το %s, θα αφαιρεθεί"
 
-#: src/cmdline/cmdline_show.cc:220
+#: src/cmdline/cmdline_show.cc:225
 #, c-format
 msgid "%s%s; will be downgraded [%s -> %s]"
 msgstr "το %s%s, θα υποβαθμιστεί [%s -> %s]"
 
-#: src/cmdline/cmdline_show.cc:223
+#: src/cmdline/cmdline_show.cc:228
 #, c-format
 msgid "%s%s; will be upgraded [%s -> %s]"
 msgstr "το %s%s, θα αναβαθμιστεί [%s -> %s]"
 
-#: src/cmdline/cmdline_show.cc:235 src/cmdline/cmdline_show.cc:256
+#: src/cmdline/cmdline_show.cc:240 src/cmdline/cmdline_show.cc:261
 msgid "Package: "
 msgstr "Πακέτο: "
 
-#: src/cmdline/cmdline_show.cc:236 src/cmdline/cmdline_show.cc:264
+#: src/cmdline/cmdline_show.cc:241 src/cmdline/cmdline_show.cc:269
 #: src/pkg_columnizer.cc:87
 msgid "State"
 msgstr "Κατάσταση"
 
-#: src/cmdline/cmdline_show.cc:237 src/cmdline/cmdline_show.cc:318
+#: src/cmdline/cmdline_show.cc:242 src/cmdline/cmdline_show.cc:325
 msgid "Provided by"
 msgstr "Παρέχεται από"
 
-#: src/cmdline/cmdline_show.cc:258 src/pkg_info_screen.cc:105
+#: src/cmdline/cmdline_show.cc:263 src/pkg_info_screen.cc:105
 msgid "Essential: "
 msgstr "Απαραίτητα: "
 
-#: src/cmdline/cmdline_show.cc:258 src/cmdline/cmdline_show.cc:262
-#: src/cmdline/cmdline_show.cc:273 src/pkg_info_screen.cc:105
+#: src/cmdline/cmdline_show.cc:263 src/cmdline/cmdline_show.cc:267
+#: src/cmdline/cmdline_show.cc:278 src/pkg_info_screen.cc:105
 msgid "yes"
 msgstr "ναι"
 
-#: src/cmdline/cmdline_show.cc:262
+#: src/cmdline/cmdline_show.cc:267
 msgid "New"
 msgstr "Νέα"
 
-#: src/cmdline/cmdline_show.cc:267
+#: src/cmdline/cmdline_show.cc:272
 msgid "Forbidden version"
 msgstr "Απαγορευμένη έκδοση"
 
-#: src/cmdline/cmdline_show.cc:271
+#: src/cmdline/cmdline_show.cc:276
 msgid "Automatically installed"
 msgstr "Αυτόματη εγκατάσταση"
 
-#: src/cmdline/cmdline_show.cc:273
+#: src/cmdline/cmdline_show.cc:278
 msgid "no"
 msgstr "όχι"
 
-#: src/cmdline/cmdline_show.cc:275
+#: src/cmdline/cmdline_show.cc:280
 msgid "Version: "
 msgstr "Εκδοση: "
 
-#: src/cmdline/cmdline_show.cc:276 src/pkg_info_screen.cc:113
+#: src/cmdline/cmdline_show.cc:281 src/pkg_info_screen.cc:113
 msgid "Priority: "
 msgstr "Προτεραιότητα: "
 
-#: src/cmdline/cmdline_show.cc:277 src/cmdline/cmdline_show.cc:279
-#: src/cmdline/cmdline_show.cc:288
+#: src/cmdline/cmdline_show.cc:282 src/cmdline/cmdline_show.cc:284
+#: src/cmdline/cmdline_show.cc:293
 msgid "N/A"
 msgstr "Μ/Δ"
 
-#: src/cmdline/cmdline_show.cc:278 src/pkg_info_screen.cc:114
+#: src/cmdline/cmdline_show.cc:283 src/pkg_info_screen.cc:114
 msgid "Section: "
 msgstr "Τομέας: "
 
-#: src/cmdline/cmdline_show.cc:280 src/pkg_info_screen.cc:115
+#: src/cmdline/cmdline_show.cc:285 src/pkg_info_screen.cc:115
 msgid "Maintainer: "
 msgstr "Συντηρητής: "
 
-#: src/cmdline/cmdline_show.cc:283
+#: src/cmdline/cmdline_show.cc:288
 msgid "Uncompressed Size: "
 msgstr "Μέγεθος Αποσυμπιεσμένου: "
 
-#: src/cmdline/cmdline_show.cc:287
+#: src/cmdline/cmdline_show.cc:292
 msgid "Architecture: "
 msgstr "Αρχιτεκτονική: "
 
-#: src/cmdline/cmdline_show.cc:289
+#: src/cmdline/cmdline_show.cc:294
 msgid "Compressed Size: "
 msgstr "Μέγεθος Συμπιεσμένου: "
 
-#: src/cmdline/cmdline_show.cc:291
+#: src/cmdline/cmdline_show.cc:296
 msgid "Filename: "
 msgstr "Ονομα Αρχείου: "
 
-#: src/cmdline/cmdline_show.cc:293
+#: src/cmdline/cmdline_show.cc:298
 msgid "MD5sum: "
 msgstr "MD5sum: "
 
-#: src/cmdline/cmdline_show.cc:297 src/cmdline/cmdline_show.cc:299
+#: src/cmdline/cmdline_show.cc:302 src/cmdline/cmdline_show.cc:305
 msgid "Archive"
 msgstr "Αρχείο"
 
-#: src/cmdline/cmdline_show.cc:303
+#: src/cmdline/cmdline_show.cc:310
 msgid "Depends"
 msgstr "Εξαρτάται"
 
-#: src/cmdline/cmdline_show.cc:305
+#: src/cmdline/cmdline_show.cc:312
 msgid "PreDepends"
 msgstr "ΠροΕξαρτάται"
 
-#: src/cmdline/cmdline_show.cc:307
+#: src/cmdline/cmdline_show.cc:314
 msgid "Recommends"
 msgstr "Συνιστά"
 
-#: src/cmdline/cmdline_show.cc:309
+#: src/cmdline/cmdline_show.cc:316
 msgid "Suggests"
 msgstr "Προτείνει"
 
-#: src/cmdline/cmdline_show.cc:311
+#: src/cmdline/cmdline_show.cc:318
 msgid "Conflicts"
 msgstr "Αντιτίθεται"
 
-#: src/cmdline/cmdline_show.cc:313
+#: src/cmdline/cmdline_show.cc:320
 msgid "Replaces"
 msgstr "Αντικαθιστά"
 
-#: src/cmdline/cmdline_show.cc:315
+#: src/cmdline/cmdline_show.cc:322
 msgid "Obsoletes"
 msgstr "Αχρηστεύει"
 
-#: src/cmdline/cmdline_show.cc:317
+#: src/cmdline/cmdline_show.cc:324
 msgid "Provides"
 msgstr "Παρέχει"
 
-#: src/cmdline/cmdline_show.cc:321 src/pkg_info_screen.cc:97
+#: src/cmdline/cmdline_show.cc:328 src/pkg_info_screen.cc:97
 msgid "Description: "
 msgstr "Περιγραφή: "
 
@@ -1250,32 +1266,32 @@
 msgid "You cannot specify both an archive and a version for a package\n"
 msgstr "Δεν γίνεται να καθορίσετε και αρχείο και έκδοση για ένα πακέτο\n"
 
-#: src/dep_item.cc:137
+#: src/dep_item.cc:139
 msgid "UNSATISFIED"
 msgstr "ΜΗ ΙΚΑΝΟΠΟΙΗΜΕΝΑ"
 
-#: src/dep_item.cc:137 src/reason_fragment.cc:247
+#: src/dep_item.cc:139 src/reason_fragment.cc:244
 msgid "UNAVAILABLE"
 msgstr "ΜΗ ΔΙΑΘΕΣΙΜΑ"
 
-#: src/download_bar.cc:56 src/download_list.cc:263 src/download_screen.cc:57
+#: src/download_bar.cc:56 src/download_list.cc:266 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_bar.cc:77 src/generic/acqprogress.cc:63
+#: src/download_bar.cc:75 src/generic/acqprogress.cc:63
 msgid "Hit "
 msgstr "Επιτυχία "
 
-#: src/download_bar.cc:90
+#: src/download_bar.cc:88
 msgid "Downloading "
 msgstr "Μεταφόρτωση του "
 
-#: src/download_bar.cc:103
+#: src/download_bar.cc:101
 msgid "Got "
 msgstr "Μεταφορτώθηκε το "
 
-#: src/download_bar.cc:157
+#: src/download_bar.cc:155
 msgid "Downloading..."
 msgstr "Μεταφόρτωση..."
 
@@ -1303,7 +1319,7 @@
 msgid "Couldn't clean out list directories"
 msgstr "Αδύνατο ο καθαρισμός του φακέλου της λίστας"
 
-#: src/download.cc:177 src/ui.cc:1153
+#: src/download.cc:177 src/ui.cc:1147
 msgid "Deleting obsolete downloaded files"
 msgstr "Διαγράφονται τα περιττά μεταφορτωμένα αρχεία"
 
@@ -1444,7 +1460,7 @@
 "Φτού! Κάτι κακό συνέβη κατά την εγκατάσταση των πακέτων. Προσπάθεια "
 "επαναφοράς:"
 
-#: src/download.cc:477 src/pkg_item.cc:432
+#: src/download.cc:477 src/pkg_item.cc:430
 msgid "Press return to continue.\n"
 msgstr "Πατήστε enter για συνέχεια.\n"
 
@@ -1454,17 +1470,17 @@
 msgstr ""
 "Απέτυχε η ανάκτηση κλειδώματος!  (εκτελείται και άλλη διαδικασία apt ή dpkg;)"
 
-#: src/download_item.cc:66 src/download_item.cc:70 src/download_item.cc:100
+#: src/download_item.cc:70 src/download_item.cc:74 src/download_item.cc:104
 #: src/generic/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr " [Λειτουργεί]"
 
-#: src/download_item.cc:104 src/download_list.cc:283
+#: src/download_item.cc:108 src/download_list.cc:284
 msgid "[Hit]"
 msgstr "[Επιτυχία]"
 
-#: src/download_item.cc:104 src/download_list.cc:303
+#: src/download_item.cc:108 src/download_list.cc:304
 msgid "[Downloaded]"
 msgstr "[Μεταφορτώθηκε]"
 
@@ -1478,34 +1494,34 @@
 msgid "%n%nSome files were not downloaded successfully."
 msgstr ""
 
-#: src/download_list.cc:68
+#: src/download_list.cc:66
 msgid "Continue"
 msgstr "Συνέχεια"
 
-#: src/download_list.cc:175 src/download_screen.cc:203
+#: src/download_list.cc:178 src/download_screen.cc:203
 msgid "Total Progress: "
 msgstr "Συνολική Πρόοδος: "
 
-#: src/download_list.cc:194 src/download_screen.cc:218
+#: src/download_list.cc:197 src/download_screen.cc:218
 #, c-format
 msgid " [ %i%% ] (%sB/s, %s remaining)"
 msgstr " [ %i%% ] (%sB/s, απομένουν %s)"
 
-#: src/download_list.cc:196
+#: src/download_list.cc:199
 #, c-format
 msgid " [ %i%% ] (stalled)"
 msgstr " [ %i%% ] (χρονοτριβεί)"
 
-#: src/download_list.cc:198
+#: src/download_list.cc:201
 #, c-format
 msgid " [ %i%% ]"
 msgstr " [ %i%% ]"
 
-#: src/download_list.cc:323
+#: src/download_list.cc:324
 msgid "[IGNORED]"
 msgstr "[ΑΓΝΟΟΥΝΤΑΙ]"
 
-#: src/download_list.cc:329
+#: src/download_list.cc:330
 msgid "[ERROR]"
 msgstr "[ΣΦΑΛΜΑ]"
 
@@ -1514,11 +1530,11 @@
 msgid "Downloaded %sB in %ss (%sB/s)."
 msgstr "Εγινε μεταφόρτωση %sB σε %ss (%sB/s)."
 
-#: src/edit_pkg_hier.cc:158
+#: src/edit_pkg_hier.cc:176
 msgid "No hierarchy information to edit"
 msgstr "Δεν υπάρχουν πληροφορίες ιεραρχίας για διόρθωση"
 
-#: src/edit_pkg_hier.cc:258
+#: src/edit_pkg_hier.cc:276
 msgid "Couldn't open for writing"
 msgstr "Αδύνατο το άνοιγμα για εγγραφή"
 
@@ -1621,39 +1637,39 @@
 "Προειδοποίηση: Αδύνατο το κλείδωμα του αρχείου cache.  Θα ανοιχτεί μόνο για "
 "ανάγνωση."
 
-#: src/generic/matchers.cc:797
+#: src/generic/matchers.cc:798
 msgid "Unmatched '('"
 msgstr "Αταίριαστη '('"
 
-#: src/generic/matchers.cc:887 src/generic/matchers.cc:968
+#: src/generic/matchers.cc:888 src/generic/matchers.cc:969
 #, c-format
 msgid "Unknown dependency type: %s"
 msgstr "Άγνωστος τύπος εξάρτησης: %s"
 
-#: src/generic/matchers.cc:950
+#: src/generic/matchers.cc:951
 #, c-format
 msgid "Unknown action type: %s"
 msgstr "Άγνωστος τύπος εργασίας: %s"
 
-#: src/generic/matchers.cc:1017
+#: src/generic/matchers.cc:1018
 #, c-format
 msgid "Unknown priority %s"
 msgstr "Άγνωστη προτεραιότητα %s"
 
-#: src/generic/matchers.cc:1039
+#: src/generic/matchers.cc:1040
 #, c-format
 msgid "Unknown pattern type: %c"
 msgstr "Άγνωστος τύπος κανονικής παράστασης: %c"
 
-#: src/generic/matchers.cc:1084
+#: src/generic/matchers.cc:1105
 msgid "Unexpected empty expression"
 msgstr "Μη αναμενόμενη κενή παράσταση"
 
-#: src/generic/matchers.cc:1119
+#: src/generic/matchers.cc:1143
 msgid "Badly formed expression"
 msgstr "Λάθος διαμορφωμένη παράσταση"
 
-#: src/generic/matchers.cc:1148
+#: src/generic/matchers.cc:1175
 msgid "Unexpected ')'"
 msgstr "Μή αναμενόμενη ')'"
 
@@ -1677,7 +1693,7 @@
 msgstr ""
 "Δεν μπορεί να βρεθεί η τιμή του $HOME, με τη χρήση του TMPDIR (ανασφαλές)"
 
-#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:61
+#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:76
 #, c-format
 msgid "ChangeLog of %s"
 msgstr "Αρχείο Αλλαγής του %s"
@@ -1719,37 +1735,37 @@
 msgid "Reading task descriptions"
 msgstr "Ανάγνωση περιγραφών"
 
-#: src/load_config.cc:30
-#, c-format
-msgid "Invalid entry in color definition group: \"%s\""
-msgstr "Ακυρη εγγραφή στην ομάδα καθορισμού χρώματος: \"%s\""
+#: src/load_config.cc:42
+#, fuzzy, c-format
+msgid "Unrecognized color name \"%s\""
+msgstr "Μη αναγνωρίσιμες εργασίες"
 
-#: src/load_config.cc:32
-#, c-format
-msgid "Invalid tagless entry in color definition group: \"%s\""
-msgstr "Ακυρη χωρίς ετικέτα εγγραφή στην ομάδα καθορισμού χρώματος: \"%s\""
+#: src/load_config.cc:69
+#, fuzzy, c-format
+msgid "Unrecognized attribute name \"%s\""
+msgstr "Μη αναγνωρίσιμες εργασίες"
 
-#: src/load_config.cc:34
-#, c-format
-msgid "Need exactly two colors in color definition \"%s\""
-msgstr "Απαιτούνται ακριβώς δύο χρώματα στον καθορισμό χρώματος \"%s\""
+#: src/load_config.cc:106
+#, fuzzy, c-format
+msgid "Invalid entry in style definition group: \"%s\""
+msgstr "Ακυρη εγγραφή στην ομάδα καθορισμού χρώματος: \"%s\""
 
-#: src/load_config.cc:50
-#, c-format
-msgid "Can't parse foreground \"%s\"of color \"%s\""
-msgstr "Αδύνατο το πέρασμα του προσκηνίου \"%s\" του χρώματος \"%s\""
+#: src/load_config.cc:108
+#, fuzzy, c-format
+msgid "Invalid tagless entry in style definition group: \"%s\""
+msgstr "Ακυρη χωρίς ετικέτα εγγραφή στην ομάδα καθορισμού χρώματος: \"%s\""
 
-#: src/load_config.cc:53
-#, c-format
-msgid "Can't parse background \"%s\" of color \"%s\""
-msgstr "Αδύνατο το πέρασμα παρασκηνίου \"%s\" του χρώματος \"%s\""
+#: src/load_config.cc:130
+#, fuzzy, c-format
+msgid "Unknown style attribute %s"
+msgstr "Άγνωστος τύπος εργασίας: %s"
 
-#: src/load_config.cc:72 src/load_config.cc:74
+#: src/load_config.cc:153 src/load_config.cc:155
 #, c-format
 msgid "Invalid entry in keybinding group: \"%s\""
 msgstr "Ακυρη εγγραφή στην ομάδα συνδυασμών: \"%s\""
 
-#: src/load_config.cc:89
+#: src/load_config.cc:170
 #, c-format
 msgid "Ignoring invalid keybinding \"%s\" -> \"%s\""
 msgstr "Αγνοείται ο άκυρος συνδυασμός \"%s\" -> \"%s\""
@@ -2174,44 +2190,44 @@
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                  Αυτό το APT έχει Δυνάμεις ΥπερΑγελάδας.\n"
 
-#: src/main.cc:255
+#: src/main.cc:252
 #, c-format
 msgid "-o requires an argument of the form key=value, got %s"
 msgstr "-o απαιτεί μια παράμετρο της μορφής key=value, έλαβε %s"
 
-#: src/main.cc:301 src/main.cc:310
+#: src/main.cc:291 src/main.cc:300
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr "ΠΑΡΑΞΕΝΟ: ελήφθη άγνωστος κώδικας παράμετρου\n"
 
-#: src/main.cc:319
+#: src/main.cc:309
 msgid "Only one of -u and -i may be specified\n"
 msgstr "Μόνο ένα από το -u και i μπορούν να οριστούν\n"
 
-#: src/main.cc:327
+#: src/main.cc:317
 msgid ""
 "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgstr ""
 "το -u και -i δεν μπορεί να οριστούν στη λειτουργία γραμμής εντολών(π.χ. με "
 "το 'install')"
 
-#: src/main.cc:348
+#: src/main.cc:338
 msgid "-u and -i may not be specified with a command"
 msgstr "το -u και -i δεν μπορούν να οριστούν στην ίδια εντολή"
 
-#: src/main.cc:405
+#: src/main.cc:395
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr "Αγνωστη εντολή \"%s\"\n"
 
-#: src/main.cc:412 src/main.cc:469
+#: src/main.cc:402 src/main.cc:450
 msgid "Internal error: uncaught 'out of solutions' exception.\n"
 msgstr ""
 
-#: src/main.cc:417 src/main.cc:474
+#: src/main.cc:407 src/main.cc:455
 msgid "Internal error: uncaught 'out of time' exception.\n"
 msgstr ""
 
-#: src/main.cc:424
+#: src/main.cc:414
 #, c-format
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
@@ -2242,7 +2258,7 @@
 msgid "Lost"
 msgstr "Εχασε"
 
-#: src/mine/cmine.cc:119 src/ui.cc:1090
+#: src/mine/cmine.cc:119 src/ui.cc:1084
 msgid "Minesweeper"
 msgstr "Ναρκαλιευτής"
 
@@ -2268,153 +2284,153 @@
 msgid "The number of mines must be a number"
 msgstr "Ο αριθμός των ναρκών πρέπει να είναι αριθμός"
 
-#: src/mine/cmine.cc:240
+#: src/mine/cmine.cc:238
 msgid "Setup custom game"
 msgstr "Ρύθμιση προσαρμοσμένου παιχνιδιού"
 
-#: src/mine/cmine.cc:243
+#: src/mine/cmine.cc:240
 msgid "Height of board: "
 msgstr "Ύψος της πινακίδας:"
 
-#: src/mine/cmine.cc:247
+#: src/mine/cmine.cc:243
 msgid "Width of board: "
 msgstr "Πλάτος της πινακίδας:"
 
-#: src/mine/cmine.cc:251
+#: src/mine/cmine.cc:246
 msgid "Number of mines: "
 msgstr "Αριθμός ναρκών: "
 
-#: src/mine/cmine.cc:316
+#: src/mine/cmine.cc:305
 msgid "Choose difficulty level"
 msgstr "Επιλέξτε επίπεδο δυσκολίας"
 
-#: src/mine/cmine.cc:318
+#: src/mine/cmine.cc:307
 msgid "Easy"
 msgstr "Εύκολο"
 
-#: src/mine/cmine.cc:319
+#: src/mine/cmine.cc:308
 msgid "Medium"
 msgstr "Μέτριο"
 
-#: src/mine/cmine.cc:320
+#: src/mine/cmine.cc:309
 msgid "Hard"
 msgstr "Δύσκολο"
 
-#: src/mine/cmine.cc:321
+#: src/mine/cmine.cc:310
 msgid "Custom"
 msgstr "Προσαρμοσμένο"
 
-#: src/mine/cmine.cc:411
+#: src/mine/cmine.cc:392
 msgid "You have won."
 msgstr "Νικήσατε."
 
-#: src/mine/cmine.cc:414
+#: src/mine/cmine.cc:395
 msgid "You lose!"
 msgstr "Χάσατε!"
 
-#: src/mine/cmine.cc:419
+#: src/mine/cmine.cc:400
 msgid "You die...  --More--"
 msgstr "Πεθάνατε...--Κι άλλο--"
 
-#: src/mine/cmine.cc:432
+#: src/mine/cmine.cc:413
 msgid "The spikes were poisoned!  The poison was deadly..  --More--"
 msgstr ""
 "Τα καρφία ήταν δηλητηριασμένα! Το δηλητήριο ήταν θανάσιμο . -- Κι άλλο --"
 
-#: src/mine/cmine.cc:435
+#: src/mine/cmine.cc:416
 msgid "You land on a set of sharp iron spikes!  --More--"
 msgstr "Προσγειωθήκατε σε κάποια μυτερά μεταλλικά καρφία! --Κι άλλο--"
 
-#: src/mine/cmine.cc:438
+#: src/mine/cmine.cc:419
 msgid "You fall into a pit!  --More--"
 msgstr "Πέσατε σε πηγάδι!  --Κι άλλο--"
 
-#: src/mine/cmine.cc:441
+#: src/mine/cmine.cc:422
 msgid "KABOOM!  You step on a land mine.  --More--"
 msgstr "ΜΠΟΥΜ!   Πατήσατε νάρκη.  -Κι άλλο--"
 
-#: src/mine/cmine.cc:446
+#: src/mine/cmine.cc:427
 msgid "The dart was poisoned!  The poison was deadly...  --More--"
 msgstr ""
 "Το βέλος ήταν δηλητηριασμένο!   Το δηλητήριο ήταν μοιραίο     --Κι άλλο--"
 
-#: src/mine/cmine.cc:448
+#: src/mine/cmine.cc:429
 msgid ""
 "A little dart shoots out at you!  You are hit by a little dart!  --More--"
 msgstr ""
 "Σας πυροβολούν με ένα μικρό βέλος! Xτυπηθήκαtε με ένα μικρό βέλος! --Κι "
 "άλλο--"
 
-#: src/mine/cmine.cc:452
+#: src/mine/cmine.cc:433
 msgid "You turn to stone... --More--"
 msgstr "Γίνατε πέτρα    --Κι άλλο--"
 
-#: src/mine/cmine.cc:454
+#: src/mine/cmine.cc:435
 msgid "Touching the cockatrice corpse was a fatal mistake.  --More--"
 msgstr ""
 "Το άγγιγμα του πτώματος του cockatrice ήταν ένα μοιραίο σφάλμα. --Κι άλλο--"
 
-#: src/mine/cmine.cc:456
+#: src/mine/cmine.cc:437
 msgid "You feel here a cockatrice corpse.  --More--"
 msgstr "Εδώ νοιώθετε ένα πτώμα ενός cockatrice. --Κι άλλο--"
 
-#: src/mine/cmine.cc:460
+#: src/mine/cmine.cc:441
 msgid ""
 "Click!  You trigger a rolling boulder trap!  You are hit by a boulder! --"
 "More--"
 msgstr ""
 "Κλικ! Ενεργοποιήσατε μια παγίδα κυλιόμενων λίθων! Χτυπηθήκατε από έναν λίθο! "
 
-#: src/mine/cmine.cc:470
+#: src/mine/cmine.cc:451
 msgid "sleep"
 msgstr "σε αδράνεια"
 
-#: src/mine/cmine.cc:473
+#: src/mine/cmine.cc:454
 msgid "striking"
 msgstr "χτύπημα"
 
-#: src/mine/cmine.cc:476
+#: src/mine/cmine.cc:457
 msgid "death"
 msgstr "θάνατος"
 
-#: src/mine/cmine.cc:479
+#: src/mine/cmine.cc:460
 msgid "polymorph"
 msgstr "πολυμορφικό"
 
-#: src/mine/cmine.cc:482
+#: src/mine/cmine.cc:463
 msgid "magic missile"
 msgstr "μαγική τορπίλη"
 
-#: src/mine/cmine.cc:485
+#: src/mine/cmine.cc:466
 msgid "secret door detection"
 msgstr "ανίχνευση κρυμμένης πόρτας"
 
-#: src/mine/cmine.cc:488
+#: src/mine/cmine.cc:469
 msgid "invisibility"
 msgstr "αορατότητα"
 
-#: src/mine/cmine.cc:491
+#: src/mine/cmine.cc:472
 msgid "cold"
 msgstr "κρύο"
 
-#: src/mine/cmine.cc:497
+#: src/mine/cmine.cc:478
 #, c-format
 msgid "Your wand of %s breaks apart and explodes!  --More--"
 msgstr "Το %s ραβί σας έσπασε και εξερράγη!  --Κι άλλο--"
 
-#: src/mine/cmine.cc:503
+#: src/mine/cmine.cc:484
 msgid "You are jolted by a surge of electricity!  --More--"
 msgstr "Ταρακουνηθήκατε από ένα κύμα ηλεκτρικού ρεύματος! --Κι άλλο--"
 
-#: src/mine/cmine.cc:607
+#: src/mine/cmine.cc:588
 msgid "Enter the filename to load: "
 msgstr "Είσαγετε το όνομα του αρχείου προς φόρτωση: "
 
-#: src/mine/cmine.cc:614
+#: src/mine/cmine.cc:595
 msgid "Enter the filename to save: "
 msgstr "Εισάγετε το όνομα αρχείου για αποθήκευση: "
 
-#: src/mine/cmine.cc:624
+#: src/mine/cmine.cc:605
 msgid "mine-help.txt"
 msgstr "mine-help.txt"
 
@@ -2422,7 +2438,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:1670
+#: src/pkg_columnizer.cc:84 src/ui.cc:1662
 msgid "Package"
 msgstr "Πακέτο"
 
@@ -3498,52 +3514,52 @@
 "Είστε βέβαιοι για την αφαίρεσή του;\n"
 "Πληκτρολογήστε '%s' αν είστε βέβαιοι."
 
-#: src/pkg_item.cc:222 src/pkg_ver_item.cc:625
+#: src/pkg_item.cc:220 src/pkg_ver_item.cc:626
 #, c-format
 msgid "Information about %s"
 msgstr "Πληροφορίες σχετικά με το %s"
 
-#: src/pkg_item.cc:224 src/pkg_ver_item.cc:627
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:628
 #, c-format
 msgid "%s info"
 msgstr ""
 
-#: src/pkg_item.cc:310
+#: src/pkg_item.cc:308
 #, fuzzy, c-format
 msgid "Available versions of %s"
 msgstr "Διαθέσιμες εκδόσεις του "
 
-#: src/pkg_item.cc:313
+#: src/pkg_item.cc:311
 #, fuzzy, c-format
 msgid "%s versions"
 msgstr "Εκδόσεις"
 
-#: src/pkg_item.cc:325 src/pkg_ver_item.cc:655
+#: src/pkg_item.cc:323 src/pkg_ver_item.cc:656
 #, c-format
 msgid "Dependencies of %s"
 msgstr "Εξαρτήσεις του %s"
 
-#: src/pkg_item.cc:327 src/pkg_ver_item.cc:657
+#: src/pkg_item.cc:325 src/pkg_ver_item.cc:658
 #, c-format
 msgid "%s deps"
 msgstr ""
 
-#: src/pkg_item.cc:338 src/pkg_ver_item.cc:667
+#: src/pkg_item.cc:336 src/pkg_ver_item.cc:668
 #, c-format
 msgid "Packages depending on %s"
 msgstr "Πακέτα που εξαρτώνται από το %s"
 
-#: src/pkg_item.cc:340 src/pkg_ver_item.cc:669
+#: src/pkg_item.cc:338 src/pkg_ver_item.cc:670
 #, c-format
 msgid "%s reverse deps"
 msgstr ""
 
-#: src/pkg_item.cc:392 src/pkg_ver_item.cc:707
+#: src/pkg_item.cc:390 src/pkg_ver_item.cc:708
 #, c-format
 msgid "Reporting a bug in %s:\n"
 msgstr "Αναφορά ενός σφάλματος για το %s:\n"
 
-#: src/pkg_item.cc:414
+#: src/pkg_item.cc:412
 #, fuzzy
 msgid ""
 "You are not root and I cannot find any way to become root.  To reconfigure "
@@ -3555,16 +3571,16 @@
 "εγκαταστήστε το πακέτο μενού, το πακέτο\n"
 "προσπέλασης, ή εκτελέστε το aptitude ως root."
 
-#: src/pkg_item.cc:422
+#: src/pkg_item.cc:420
 #, c-format
 msgid "Reconfiguring %s\n"
 msgstr "Ξαναρυθμίζεται το %s\n"
 
-#: src/pkg_item.cc:447
+#: src/pkg_item.cc:445
 msgid "Hierarchy editor"
 msgstr "Επεξεργαστής Ιεραρχίας"
 
-#: src/pkg_item.cc:447
+#: src/pkg_item.cc:445
 #, fuzzy
 msgid "Hierarchy Editor"
 msgstr "Επεξεργαστής Ιεραρχίας"
@@ -3598,21 +3614,21 @@
 msgid "Enter the new package sorting mechanism for this display: "
 msgstr "Εισάγετε το τρόπο ταξινόμησης πακέτων για αυτή την απεικόνιση:"
 
-#: src/pkg_view.cc:344
+#: src/pkg_view.cc:359
 msgid "make_package_view: error in arguments -- two main widgets??"
 msgstr "make_package_view: σφάλμα στα ορίσματα -- two main widgets??"
 
-#: src/pkg_view.cc:350
+#: src/pkg_view.cc:365
 msgid ""
 "make_package_view: error in arguments -- bad column list for static item"
 msgstr ""
 "make_package_view: σφάλμα στα ορίσματα -- bad column list for static item"
 
-#: src/pkg_view.cc:443
+#: src/pkg_view.cc:458
 msgid "make_package_view: bad argument!"
 msgstr "make_package_view: κακό όρισμα!"
 
-#: src/pkg_view.cc:495
+#: src/pkg_view.cc:510
 msgid "make_package_view: no main widget found"
 msgstr "make_package_view: no main widget found"
 
@@ -3649,12 +3665,12 @@
 msgid " (provided by %F)"
 msgstr " (παρέχεται από %F)"
 
-#: src/reason_fragment.cc:278
+#: src/reason_fragment.cc:275
 #, c-format
 msgid "%F%s %F %F"
 msgstr "%F%s %F %F"
 
-#: src/reason_fragment.cc:327
+#: src/reason_fragment.cc:324
 msgid ""
 "If you select a package, an explanation of its current state will appear in "
 "this space."
@@ -3662,7 +3678,7 @@
 "Αν επιλέξετε ένα πακέτο, θα εμφανιστεί η τρέχουσα κατάσταση του σε αυτόν τον "
 "χώρο."
 
-#: src/reason_fragment.cc:361
+#: src/reason_fragment.cc:358
 msgid ""
 "%B%s%b was installed automatically;  it is being removed because all of the "
 "packages which depend upon it are being removed:"
@@ -3670,18 +3686,18 @@
 "το %B%s%b εγκαταστάθηκε αυτόματα.  Θα αφαιρεθεί γιατί όλα τα πακέτα που "
 "εξαρτώνται από αυτό θα αφαιρεθούν:"
 
-#: src/reason_fragment.cc:365
+#: src/reason_fragment.cc:362
 msgid "%B%s%b will be automatically removed because of dependency errors:"
 msgstr "το %B%s%b θα αφαιρεθεί αυτόματα λόγω προβλημάτων με τις εξαρτήσεις:"
 
-#: src/reason_fragment.cc:369
+#: src/reason_fragment.cc:366
 msgid ""
 "%B%s%b will be automatically installed to satisfy the following dependencies:"
 msgstr ""
 "το %B%s%b θα εγκατασταθεί αυτόματα για να ικανοποιηθούν οι ακόλουθες "
 "εξαρτήσεις:"
 
-#: src/reason_fragment.cc:375 src/reason_fragment.cc:387
+#: src/reason_fragment.cc:372 src/reason_fragment.cc:384
 msgid ""
 "%B%s%b cannot be upgraded now, but if it could be, it would still be held at "
 "version %B%s%b."
@@ -3689,7 +3705,7 @@
 "το %B%s%b δεν είναι δυνατό να αναβαθμιστεί τώρα, αλλά αν μπορούσε, και πάλι "
 "θα κρατείτο στη έκδοση %B%s%b."
 
-#: src/reason_fragment.cc:378
+#: src/reason_fragment.cc:375
 msgid ""
 "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the "
 "following dependencies:"
@@ -3697,27 +3713,27 @@
 "το %B%s%b δεν θα αναβαθμιστεί στην έκδοση %B%s%b, για να αποφευχθεί το "
 "σπάσιμο των παρακάτω εξαρτήσεων:"
 
-#: src/reason_fragment.cc:390
+#: src/reason_fragment.cc:387
 msgid "%B%s%b is currently installed."
 msgstr "το %B%s%b είναι εγκατεστημένο."
 
-#: src/reason_fragment.cc:396
+#: src/reason_fragment.cc:393
 msgid "%B%s%b is not currently installed."
 msgstr "το %B%s%b δεν είναι εγκατεστημένο."
 
-#: src/reason_fragment.cc:404
+#: src/reason_fragment.cc:401
 msgid "Some dependencies of %B%s%b are not satisfied:"
 msgstr "Μερικές εξαρτήσεις του %B%s%b δεν ικανοποιήθηκαν:"
 
-#: src/reason_fragment.cc:408
+#: src/reason_fragment.cc:405
 msgid "%B%s%b will be downgraded."
 msgstr "το %B%s%b θα υποβαθμιστεί."
 
-#: src/reason_fragment.cc:415
+#: src/reason_fragment.cc:412
 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b."
 msgstr "το %B%s%b δεν θα αναβαθμιστεί στη απαγορευμένη έκδοση %B%s%b."
 
-#: src/reason_fragment.cc:419
+#: src/reason_fragment.cc:416
 msgid ""
 "%B%s%b could be upgraded to version %B%s%b, but it is being held at version %"
 "B%s%b."
@@ -3725,34 +3741,34 @@
 "το %B%s%b θα μπορούσε να αναβαθμιστεί στην έκδοση %B%s%b, αλλά κρατείται "
 "στην έκδοση %B%s%b."
 
-#: src/reason_fragment.cc:426
+#: src/reason_fragment.cc:423
 msgid "%B%s%b will be re-installed."
 msgstr "το %B%s%b θα επανεγκατασταθεί."
 
-#: src/reason_fragment.cc:430
+#: src/reason_fragment.cc:427
 msgid "%B%s%b will be installed."
 msgstr "το %B%s%b θα εγκατασταθεί."
 
-#: src/reason_fragment.cc:434
+#: src/reason_fragment.cc:431
 msgid "%B%s%b will be removed."
 msgstr "το %B%s%b θα αφαιρεθεί."
 
-#: src/reason_fragment.cc:439
+#: src/reason_fragment.cc:436
 msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b."
 msgstr "το %B%s%b θα αναβαθμιστεί από την έκδοση %B%s%b στην έκδοση %B%s%b."
 
-#: src/reason_fragment.cc:475
+#: src/reason_fragment.cc:472
 msgid ""
 "The following packages depend on %B%s%b and will be broken by its removal:"
 msgstr ""
 "Τα ακόλουθα πακέτα εξαρτώνται από το %B%s%b και θα χαλάσουν από την αφαίρεσή "
 "του:"
 
-#: src/reason_fragment.cc:478
+#: src/reason_fragment.cc:475
 msgid "The following packages depend on %B%s%b and are broken:"
 msgstr "Τα ακόλουθα πακέτα εξαρτώνται από το %B%s%b και είναι χαλασμένα:"
 
-#: src/reason_fragment.cc:485
+#: src/reason_fragment.cc:482
 msgid ""
 "The following packages conflict with %B%s%b and will be broken by its "
 "installation:"
@@ -3760,7 +3776,7 @@
 "Τα ακόλουθα πακέτα συγκρούονται με το %B%s%b και θα χαλάσουν από την "
 "εγκατάστασή του:"
 
-#: src/reason_fragment.cc:518
+#: src/reason_fragment.cc:515
 msgid ""
 "The following packages depend on a version of %B%s%b other than the "
 "currently installed version of %B%s%b, or conflict with the currently "
@@ -3770,7 +3786,7 @@
 "εγκατεστημένη έκδοση του %B%s%b, ή συγκρούονται με την τρέχουσα "
 "εγκατεστημένη έκδοση:"
 
-#: src/reason_fragment.cc:522
+#: src/reason_fragment.cc:519
 msgid ""
 "The following packages conflict with %B%s%b, or depend on a version of it "
 "which is not going to be installed."
@@ -3778,11 +3794,11 @@
 "Τα ακόλουθα πακέτα συγκρούονται με το %B%s%b, ή εξαρτώνται από μια έκδοση "
 "του , που δεν θα εγκατασταθεί."
 
-#: src/reason_fragment.cc:526
+#: src/reason_fragment.cc:523
 msgid "The following packages conflict with %B%s%b:"
 msgstr "Τα ακόλουθα πακέτα συγκρούονται με το %B%s%b:"
 
-#: src/reason_fragment.cc:531
+#: src/reason_fragment.cc:528
 msgid ""
 "The following packages depend on a version of %B%s%b other than the "
 "currently installed version of %B%s%b:"
@@ -3790,7 +3806,7 @@
 "Τα ακόλουθα πακέτα εξαρτώνται από μια έκδοση του %B%s%b διαφορετική από την "
 "τρέχουσα εγκατεστημένη έκδοση του %B%s%b:"
 
-#: src/reason_fragment.cc:535
+#: src/reason_fragment.cc:532
 msgid ""
 "The following packages depend on a version of %B%s%b which is not going to "
 "be installed."
@@ -3798,15 +3814,15 @@
 "Τα ακόλουθα πακέτα εξαρτώνται από μια έκδοση του %B%s%b η οποία δεν θα "
 "εγκατασταθεί."
 
-#: src/reason_fragment.cc:541
+#: src/reason_fragment.cc:538
 msgid "upgraded"
 msgstr "αναβαθμίζονται"
 
-#: src/reason_fragment.cc:541
+#: src/reason_fragment.cc:538
 msgid "downgraded"
 msgstr "υποβαθμίζονται"
 
-#: src/reason_fragment.cc:547
+#: src/reason_fragment.cc:544
 msgid ""
 "The following packages depend on the currently installed version of %B%s%b (%"
 "B%s%b), or conflict with the version it will be %s to (%B%s%b), and will be "
@@ -3816,7 +3832,7 @@
 "b (%B%s%b), ή συγκρούονται αν η έκδοση θα είναι %s σε (%B%s%b), και θα "
 "χαλάσουν αν είναι %s."
 
-#: src/reason_fragment.cc:554
+#: src/reason_fragment.cc:551
 msgid ""
 "The following packages conflict with version %B%s%b of %B%s%b, and will be "
 "broken if it is %s."
@@ -3824,7 +3840,7 @@
 "Τα ακόλουθα πακέτα συγκρούονται με την έκδοση %B%s%b του %B%s%b, και θα "
 "χαλάσουν εάν είναι %s."
 
-#: src/reason_fragment.cc:559
+#: src/reason_fragment.cc:556
 msgid ""
 "The following packages depend on version %B%s%b of %B%s%b, and will be "
 "broken if it is %s."
@@ -3872,38 +3888,43 @@
 msgid "Close"
 msgstr "^Κλείσιμο"
 
-#: src/solution_fragment.cc:125
+#: src/solution_fragment.cc:134
 #, fuzzy
 msgid "%BRemove%b the following packages:%n"
 msgstr "Τα ακόλουθα πακέτα είναι ΕΛΑΤΤΩΜΑΤΙΚΑ:"
 
-#: src/solution_fragment.cc:135
+#: src/solution_fragment.cc:144
 #, fuzzy
 msgid "%BInstall%b the following packages:%n"
 msgstr "Τα ακόλουθα πακέτα είναι ΕΛΑΤΤΩΜΑΤΙΚΑ:"
 
-#: src/solution_fragment.cc:148
+#: src/solution_fragment.cc:157
 msgid "%BKeep%b the following packages at their current version:%n"
 msgstr ""
 
-#: src/solution_fragment.cc:161
+#: src/solution_fragment.cc:164
+#, fuzzy
+msgid "Not Installed"
+msgstr "μη εγκατεστημένο"
+
+#: src/solution_fragment.cc:177
 #, fuzzy
 msgid "%BUpgrade%b the following packages:%n"
 msgstr "Τα ακόλουθα πακέτα είναι ΕΛΑΤΤΩΜΑΤΙΚΑ:"
 
-#: src/solution_fragment.cc:176
+#: src/solution_fragment.cc:192
 #, fuzzy
 msgid "%BDowngrade%b the following packages:%n"
 msgstr "Μεταφόρτωση πακέτων"
 
-#: src/solution_fragment.cc:190
+#: src/solution_fragment.cc:206
 #, c-format
 msgid "Score is %d"
 msgstr ""
 
 #: src/trust.cc:17 src/trust.cc:19
 msgid "WARNING"
-msgstr ""
+msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ"
 
 #: src/trust.cc:18
 msgid ""
@@ -3911,6 +3932,9 @@
 "package could allow a malicious individual to damage or take control of your "
 "system."
 msgstr ""
+"%F: Αυτή η έκδοση του %s είναι από μια %Bμή έμπιστη πηγή%b!  Η εγκατάσταση "
+"αυτούτου πακέτου θα μπορούσε να επιτρέψει σε κακόβουλα άτομα να αποκτήσουν "
+"τον έλεγχο του συστήματός σας."
 
 #: src/ui.cc:165
 msgid "Er, there aren't any errors, this shouldn't have happened.."
@@ -3924,46 +3948,46 @@
 msgid "W:"
 msgstr ""
 
-#: src/ui.cc:194
+#: src/ui.cc:193
 msgid "Search for:"
 msgstr "Αναζήτηση του:"
 
-#: src/ui.cc:262
+#: src/ui.cc:258
 msgid "You already are root!"
 msgstr "Είστε ήδη ο χρήστης root!"
 
-#: src/ui.cc:360
+#: src/ui.cc:356
 msgid ""
 "Subprocess exited with an error -- did you type your password correctly?"
 msgstr ""
 "Η υποδιεργασία τερματίστηκε με σφάλμα -- εισάγατε τον κωδικό σας σωστά;"
 
-#: src/ui.cc:388
+#: src/ui.cc:384
 msgid "Loading cache"
 msgstr "Φόρτωση του cache"
 
-#: src/ui.cc:410
+#: src/ui.cc:406
 msgid "Really quit Aptitude?"
 msgstr "Έξοδος από το Aptitude; Σίγουρα;"
 
-#: src/ui.cc:489
+#: src/ui.cc:485
 msgid "Really discard your personal settings and reload the defaults?"
 msgstr ""
 "Είστε σίγουροι ότι θέλετε να διαγράψετε τις προσωπικές σας ρυθμίσεις και να "
 "φορτώσετε τις προκαθορισμένες;"
 
-#: src/ui.cc:589 src/ui.cc:591 src/ui.cc:619 src/ui.cc:621
+#: src/ui.cc:585 src/ui.cc:587 src/ui.cc:615 src/ui.cc:617
 msgid "Packages"
 msgstr "Πακέτα"
 
-#: src/ui.cc:590 src/ui.cc:620
+#: src/ui.cc:586 src/ui.cc:616
 msgid "View available packages and choose actions to perform"
 msgstr "Εμφάνιση των διαθέσιμων πακέτων και επιλογή εργασιών"
 
-#: src/ui.cc:667
+#: src/ui.cc:663
 #, fuzzy
 msgid ""
-"%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
+"Aptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
 "BABSOLUTELY NO WARRANTY%b; for details see 'license' in the Help menu.  This "
 "is free software, and you are welcome to redistribute it under certain "
 "conditions; see 'license' for details."
@@ -3977,61 +4001,69 @@
 "επιτρέπεται η διανομή του υπό συγκεκριμένες προϋποθέσεις. Δείτε το\n"
 "'license' για λεπτομέρειες."
 
-#: src/ui.cc:688
+#: src/ui.cc:684
 msgid "help.txt"
 msgstr "help.txt"
 
-#: src/ui.cc:704
+#: src/ui.cc:700
 msgid "README"
 msgstr "README"
 
-#: src/ui.cc:786
+#: src/ui.cc:782
 msgid ""
-"%C%BWARNING%b: untrusted versions of the following packages will be "
-"installed!%n%nUntrusted packages could %Bcompromise your system's security%"
-"b.  You should only proceed with the installation if you are certain that "
-"this is what you want to do.%n%n"
+"%BWARNING%b: untrusted versions of the following packages will be installed!%"
+"n%nUntrusted packages could %Bcompromise your system's security%b.  You "
+"should only proceed with the installation if you are certain that this is "
+"what you want to do.%n%n"
 msgstr ""
+"%BΠΡΟΕΙΔΟΠΟΙΗΣΗ%b: θα εγκατασταθούν μή έμπιστες εκδόσεις των παρακάτω%n "
+"πακέτων!%n%n Η εγκατάσταση μη έμπιστων πακέτων θα μπορούσε να οδηγήσει στην %"
+"Bπαραβίαση της ασφάλειας του συστήματός σας%b.  Προχωρήστε στην εγκατάσταση "
+"μόνο αν είστε βέβαιοι ότι αυτό θέλετε.%n%n"
 
-#: src/ui.cc:800
+#: src/ui.cc:788
 #, fuzzy
+msgid "  %S*%N %s [version %s]%n"
+msgstr "Εκδόσεις"
+
+#: src/ui.cc:795
 msgid "Really Continue"
-msgstr "Συνέχεια"
+msgstr "Χωρίς πλάκα, συνέχεια"
 
-#: src/ui.cc:802
+#: src/ui.cc:797
 msgid "Abort Installation"
-msgstr ""
+msgstr "Εγκατάλειψη εγκατάστασης"
 
-#: src/ui.cc:863
+#: src/ui.cc:858
 msgid "Preview of package installation"
 msgstr "Προεπισκόπηση της εγκατάστασης των πακέτων"
 
-#: src/ui.cc:864
+#: src/ui.cc:859
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Εμφάνιση και/ή ρύθμιση των ενεργειών που θα εκτελεστούν"
 
-#: src/ui.cc:865
+#: src/ui.cc:860
 #, fuzzy
 msgid "Preview"
 msgstr "^Προηγ"
 
-#: src/ui.cc:901
+#: src/ui.cc:896
 #, fuzzy
 msgid "Some packages were broken and have been fixed:"
 msgstr "Κάποια πακέτα ήταν κατεστραμμένα και έχουν διορθωθεί"
 
-#: src/ui.cc:907
+#: src/ui.cc:902
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:913
-#, c-format
+#: src/ui.cc:908
+#, fuzzy, c-format
 msgid ""
-"Ran out of time while trying to resolver dependencies (press \"%s\" to try "
+"Ran out of time while trying to resolve dependencies (press \"%s\" to try "
 "harder)"
-msgstr ""
+msgstr "Σκοτώστε την ώρα σας βρίσκοντας νάρκες"
 
-#: src/ui.cc:959
+#: src/ui.cc:954
 #, fuzzy
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
@@ -4040,23 +4072,23 @@
 "Η εγκατάσταση/αφαίρεση πακέτων απαιτεί προνόμια διαχειριστή, που δεν\n"
 "έχετε αυτή τη στιγμή.  Θα θέλατε να συνδεθείτε ως χρήστης root;\n"
 
-#: src/ui.cc:962 src/ui.cc:1078
+#: src/ui.cc:957 src/ui.cc:1072
 msgid "Become root"
 msgstr "Μετατροπή σε root"
 
-#: src/ui.cc:964 src/ui.cc:1080
+#: src/ui.cc:959 src/ui.cc:1074
 msgid "Don't become root"
 msgstr "Οχι μετατροπή σε root"
 
-#: src/ui.cc:969 src/ui.cc:1085
+#: src/ui.cc:964 src/ui.cc:1079
 msgid "A package-list update or install run is already taking place."
 msgstr "Ήδη βρίσκεται σε εξέλιξη μια διαδικασία αναβάθμισης ή εγκατάστασης."
 
-#: src/ui.cc:996
+#: src/ui.cc:991
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "Δεν έχουν επιλεγεί πακέτα για εγκατάσταση, αφαίρεση ή αναβάθμιση."
 
-#: src/ui.cc:1002
+#: src/ui.cc:997
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -4069,7 +4101,7 @@
 "αναβαθμίσετε.\n"
 "Πληκτρολογήστε \"U\" για να προετοιμάσετε μια αναβάθμιση."
 
-#: src/ui.cc:1074
+#: src/ui.cc:1069
 #, fuzzy
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
@@ -4078,114 +4110,114 @@
 "Η ενημέρωση των λιστών πακέτων απαιτεί προνόμια διαχειριστή, που δεν\n"
 "έχετε αυτή τη στιγμή.  Θα θέλατε να συνδεθείτε ως χρήστης root;\n"
 
-#: src/ui.cc:1090 src/ui.cc:1377
+#: src/ui.cc:1084 src/ui.cc:1371
 msgid "Waste time trying to find mines"
 msgstr "Σκοτώστε την ώρα σας βρίσκοντας νάρκες"
 
-#: src/ui.cc:1097 src/ui.cc:1150
+#: src/ui.cc:1091 src/ui.cc:1144
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "Δεν επιτρέπεται εκκαθάριση κατά τη διάρκεια της μεταφόρτωσης"
 
-#: src/ui.cc:1100
+#: src/ui.cc:1094
 msgid "Deleting downloaded files"
 msgstr "Διαγράφονται τα μεταφορτωμένα αρχείων"
 
-#: src/ui.cc:1114
+#: src/ui.cc:1108
 msgid "Downloaded package files have been deleted"
 msgstr "Τα μεταφορτωμένα αρχεία έχουν διαγραφεί"
 
-#: src/ui.cc:1175
+#: src/ui.cc:1169
 #, fuzzy, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr "Τα περιττά μεταφορτωμένα αρχεία έχουν διαγραφεί"
 
-#: src/ui.cc:1247
+#: src/ui.cc:1241
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1252 src/ui.cc:1283
+#: src/ui.cc:1246 src/ui.cc:1277
 #, fuzzy
 msgid "Ran out of time while trying to find a solution."
 msgstr "Σκοτώστε την ώρα σας βρίσκοντας νάρκες"
 
-#: src/ui.cc:1277
+#: src/ui.cc:1271
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1307
+#: src/ui.cc:1301
 #, fuzzy, c-format
 msgid "Unable to open %s"
 msgstr "Αδύνατο το άνοιγμα του %s για εγγραφή"
 
-#: src/ui.cc:1313
+#: src/ui.cc:1307
 msgid "Error while dumping resolver state"
 msgstr ""
 
-#: src/ui.cc:1323
+#: src/ui.cc:1317
 msgid "File to which the resolver state should be dumped:"
 msgstr ""
 
-#: src/ui.cc:1353
+#: src/ui.cc:1347
 msgid "^Install/remove packages"
 msgstr "^Εγκατάσταση/Αφαίρεση πακέτων"
 
-#: src/ui.cc:1354
+#: src/ui.cc:1348
 msgid "Perform all pending installs and removals"
 msgstr "Ολοκλήρωση όλων των εκκρεμών εγκαταστάσεων/αφαιρέσεων"
 
-#: src/ui.cc:1356
+#: src/ui.cc:1350
 msgid "^Update package list"
 msgstr "^Ενημέρωση της λίστας πακέτων"
 
-#: src/ui.cc:1357
+#: src/ui.cc:1351
 msgid "Check for new versions of packages"
 msgstr "Έλεγχος για νέες εκδόσεις πακέτων"
 
-#: src/ui.cc:1360
+#: src/ui.cc:1354
 msgid "^Forget new packages"
 msgstr "Ξέχασε τα νέα πακέτα"
 
-#: src/ui.cc:1361
+#: src/ui.cc:1355
 msgid "Forget which packages are \"new\""
 msgstr "Ξέχασε τα πακέτα που είναι \"νέα\""
 
-#: src/ui.cc:1364
+#: src/ui.cc:1358
 msgid "^Clean package cache"
 msgstr "Εκκαθάριση του cache των πακέτων"
 
-#: src/ui.cc:1365
+#: src/ui.cc:1359
 msgid "Delete package files which were previously downloaded"
 msgstr "Διαγραφή των αρχείων πακέτου που έχουν μεταφορτωθεί προηγουμένως"
 
-#: src/ui.cc:1368
+#: src/ui.cc:1362
 msgid "Clean ^obsolete files"
 msgstr "Εκκαθάριση ^περιττών αρχείων"
 
-#: src/ui.cc:1369
+#: src/ui.cc:1363
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Διαγραφή των αρχείων πακέτων που δεν μπορούν πλέον να μεταφορτωθούν"
 
-#: src/ui.cc:1372
+#: src/ui.cc:1366
 msgid "Mark ^Upgradable"
 msgstr "Σημείωση ^Αναβαθμιζομένων"
 
-#: src/ui.cc:1373
+#: src/ui.cc:1367
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr ""
 "Σημείωση όλων των αναβαθμιζομένων πακέτων που δεν κρατούνται πλέον για "
 "αναβάθμιση"
 
-#: src/ui.cc:1376
+#: src/ui.cc:1370
 msgid "^Play Minesweeper"
 msgstr "Παίξε Ναρκαλιευτή"
 
-#: src/ui.cc:1379
+#: src/ui.cc:1373
 msgid "^Become root"
 msgstr "Σύνδεση ως root"
 
-#: src/ui.cc:1380
+#: src/ui.cc:1374
 #, fuzzy
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
@@ -4194,69 +4226,69 @@
 "Εκτελέστε την εντολή 'su' για να συνδεθείτε ως root.  Αυτή θα ξαναεκτελέσει\n"
 "το πρόγραμμα διατηρώντας τις δικές σας ρυθμίσεις"
 
-#: src/ui.cc:1383
+#: src/ui.cc:1377
 msgid "^Reload package cache"
 msgstr "Επαναφόρτωση του cache πακέτων"
 
-#: src/ui.cc:1384
+#: src/ui.cc:1378
 msgid "Reload the package cache"
 msgstr "Επαναφόρτωση του cache των πακέτων"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1384
 msgid "^Quit"
 msgstr "Έξοδος"
 
-#: src/ui.cc:1391
+#: src/ui.cc:1385
 msgid "Exit the program"
 msgstr "Έξοδος από το πρόγραμμα"
 
-#: src/ui.cc:1397 src/ui.cc:1669
+#: src/ui.cc:1391 src/ui.cc:1661
 msgid "Undo"
 msgstr "Αναίρεση"
 
-#: src/ui.cc:1398
+#: src/ui.cc:1392
 msgid "Undo the last package operation or group of operations"
 msgstr "Επαναφορά της τελευταίας εργασίας ή ομάδας εργασιών σε πακέτο."
 
-#: src/ui.cc:1405
+#: src/ui.cc:1399
 msgid "^Install"
 msgstr "^Εγκατάσταση"
 
-#: src/ui.cc:1406
+#: src/ui.cc:1400
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "Σήμανση του τρέχοντος πακέτου για εγκατάσταση ή αναβάθμιση"
 
-#: src/ui.cc:1409
+#: src/ui.cc:1403
 msgid "^Remove"
 msgstr "^Αφαίρεση"
 
-#: src/ui.cc:1410
+#: src/ui.cc:1404
 msgid "Flag the currently selected package for removal"
 msgstr "Σήμανση του τρέχοντος πακέτου για αφαίρεση"
 
-#: src/ui.cc:1413
+#: src/ui.cc:1407
 msgid "^Purge"
 msgstr "^Διαγραφή"
 
-#: src/ui.cc:1414
+#: src/ui.cc:1408
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr ""
 "Σήμανση του τρέχοντος πακέτου και των αρχείων ρυθμίσεών του για αφαίρεση"
 
-#: src/ui.cc:1417
+#: src/ui.cc:1411
 msgid "^Keep"
 msgstr "^Κράτηση"
 
-#: src/ui.cc:1418
+#: src/ui.cc:1412
 msgid "Cancel any action on the selected package"
 msgstr "Ακύρωση κάθε ενέργειας για το επιλεγμένο πακέτο"
 
-#: src/ui.cc:1421
+#: src/ui.cc:1415
 msgid "^Hold"
 msgstr "^Αναμονή"
 
-#: src/ui.cc:1422
+#: src/ui.cc:1416
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -4264,11 +4296,11 @@
 "Ακύρωση κάθε ενέργειας για το επιλεγμένο πακέτο, και προστασία του από "
 "μελλοντικές αναβαθμίσεις"
 
-#: src/ui.cc:1425
+#: src/ui.cc:1419
 msgid "Mark ^Auto"
 msgstr "^Αυτόματη Σήμανση"
 
-#: src/ui.cc:1426
+#: src/ui.cc:1420
 #, fuzzy
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
@@ -4277,11 +4309,11 @@
 "Σήμανση του επιλεγμένου πακέτου ως αυτόματα εγκατεστημένου. \n"
 "έτσι θα αφαιρεθεί αυτόματα όταν δεν θα εξαρτώνται άλλα πακέτα από αυτό."
 
-#: src/ui.cc:1429
+#: src/ui.cc:1423
 msgid "Mark ^Manual"
 msgstr "^Χειροκίνητη Σήμανση"
 
-#: src/ui.cc:1430
+#: src/ui.cc:1424
 #, fuzzy
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
@@ -4290,11 +4322,11 @@
 "Σήμανση των επιλεγμένων πακέτων ως χειροκίνητα εγκατεστημένων. \n"
 "δεν θα αφαιρεθούν εκτός και αν τα αφαιρέσετε εσείς χειροκίνητα."
 
-#: src/ui.cc:1433
+#: src/ui.cc:1427
 msgid "^Forbid Version"
 msgstr "^Απαγόρευση έκδοσης"
 
-#: src/ui.cc:1434
+#: src/ui.cc:1428
 #, fuzzy
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
@@ -4304,232 +4336,232 @@
 "εγκατασταθεί\n"
 "νεώτερες εκδόσεις του, θα εγκατασταθούν κανονικά"
 
-#: src/ui.cc:1438
+#: src/ui.cc:1432
 msgid "I^nformation"
 msgstr "Π^ληροφορίες"
 
-#: src/ui.cc:1439
+#: src/ui.cc:1433
 msgid "Display more information about the selected package"
 msgstr "Εμφάνισε περισσότερες πληροφορίες για το επιλεγμένο πακέτο"
 
-#: src/ui.cc:1442
+#: src/ui.cc:1436
 msgid "^Changelog"
 msgstr "Α^ρχείο Αλλαγών"
 
-#: src/ui.cc:1443
+#: src/ui.cc:1437
 msgid "Display the Debian changelog of the selected package"
 msgstr "Εμφάνισε το ημερολόγιο αλλαγών του Debian για το επιλεγμένο πακέτο"
 
-#: src/ui.cc:1450
+#: src/ui.cc:1444
 msgid "^Find"
 msgstr "^Ευρεση"
 
-#: src/ui.cc:1451
+#: src/ui.cc:1445
 msgid "Search for a package"
 msgstr "Αναζήτηση για ένα πακέτο"
 
-#: src/ui.cc:1454
+#: src/ui.cc:1448
 msgid "Find ^Again"
 msgstr "Βρές ^Ξανά"
 
-#: src/ui.cc:1455
+#: src/ui.cc:1449
 msgid "Repeat the last search"
 msgstr "Επανάληψη της τελευταίας αναζήτησης"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1453
 msgid "^Limit Display"
 msgstr "^Περιόρισε Εμφάνιση"
 
-#: src/ui.cc:1460
+#: src/ui.cc:1454
 msgid "Apply a filter to the package list"
 msgstr "Εφαρμογή φίλτρου στον κατάλογο των πακέτων"
 
-#: src/ui.cc:1463
+#: src/ui.cc:1457
 msgid "^Un-Limit Display"
 msgstr "^Εμφάνιση Χωρίς Περιορισμούς"
 
-#: src/ui.cc:1464
+#: src/ui.cc:1458
 msgid "Remove the filter from the package list"
 msgstr "Αφαίρεση του φίλτρου από τον κατάλογο των πακέτων"
 
-#: src/ui.cc:1468
+#: src/ui.cc:1462
 msgid "Find ^Broken"
 msgstr "Βρές Σ^πασμένο"
 
-#: src/ui.cc:1469
+#: src/ui.cc:1463
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Βρες το επόμενο πακέτο με ανεπίλυτες εξαρτήσεις"
 
-#: src/ui.cc:1476
+#: src/ui.cc:1470
 msgid "^UI options"
 msgstr "Επιλογές ^Περιβάλλοντος"
 
-#: src/ui.cc:1477
+#: src/ui.cc:1471
 msgid "Change the settings which affect the user interface"
 msgstr "Αλλαγή των επιλογών που μεταβάλουν το περιβάλλον εργασίας"
 
-#: src/ui.cc:1480
+#: src/ui.cc:1474
 msgid "^Dependency handling"
 msgstr "Διαχείριση Εξαρτήσεων"
 
-#: src/ui.cc:1481
+#: src/ui.cc:1475
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr ""
 "Αλλαγή των ρυθμίσεων που επηρεάζουν τη διαχείριση των εξαρτήσεων των πακέτων"
 
-#: src/ui.cc:1484
+#: src/ui.cc:1478
 msgid "^Miscellaneous"
 msgstr "^Διάφορα"
 
-#: src/ui.cc:1485
+#: src/ui.cc:1479
 msgid "Change miscellaneous program settings"
 msgstr "Αλλαγή διαφόρων επιλογών του προγράμματος"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1484
 msgid "^Revert options"
 msgstr "^Επαναφορά επιλογών"
 
-#: src/ui.cc:1491
+#: src/ui.cc:1485
 msgid "Reset all settings to the system defaults"
 msgstr "Ορισμός όλων των επιλογών στις προκαθορισμένες τιμές"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1496
 msgid "^Next"
 msgstr "^Επόμενο"
 
-#: src/ui.cc:1503
+#: src/ui.cc:1497
 msgid "View next display"
 msgstr "Εμφάνιση επόμενης οθόνης"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1500
 msgid "^Prev"
 msgstr "^Προηγ"
 
-#: src/ui.cc:1507
+#: src/ui.cc:1501
 msgid "View previous display"
 msgstr "Εμφάνιση προηγούμενης οθόνης"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1504
 msgid "^Close"
 msgstr "^Κλείσιμο"
 
-#: src/ui.cc:1511
+#: src/ui.cc:1505
 msgid "Close this display"
 msgstr "Κλείσιμο αυτής της οθόνης"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1510
 msgid "New Package ^View"
 msgstr "Νέα Εμφάνιση ^Πακέτου"
 
-#: src/ui.cc:1517
+#: src/ui.cc:1511
 msgid "Create a new default package view"
 msgstr "Δημιουργία νέας οθόνης εμφάνισης πακέτου"
 
-#: src/ui.cc:1520
+#: src/ui.cc:1514
 msgid "New Categorical ^Browser"
 msgstr "Εμφάνιση Νέας Κατηγοριοποίησης"
 
-#: src/ui.cc:1522
+#: src/ui.cc:1516
 msgid "Browse packages by category"
 msgstr "Εμφάνιση πακέτων ανά κατηγορία"
 
-#: src/ui.cc:1530
+#: src/ui.cc:1524
 msgid "^About"
 msgstr "Σχετικά"
 
-#: src/ui.cc:1531
+#: src/ui.cc:1525
 msgid "View information about this program"
 msgstr "Εμφάνιση πληροφορίας σχετικά με το πρόγραμμα"
 
-#: src/ui.cc:1534
+#: src/ui.cc:1528
 msgid "^Help"
 msgstr "^Βοήθεια"
 
-#: src/ui.cc:1535
+#: src/ui.cc:1529
 msgid "View the on-line help"
 msgstr "Εμφάνιση της βοήθειας του προγράμματος"
 
-#: src/ui.cc:1537
+#: src/ui.cc:1531
 msgid "User's ^Manual"
 msgstr "Οδηγίες ^Χρήσης"
 
-#: src/ui.cc:1538
+#: src/ui.cc:1532
 msgid "View the detailed program manual"
 msgstr "Εμφάνιση των αναλυτικών οδηγιών χρήσης"
 
-#: src/ui.cc:1541
+#: src/ui.cc:1535
 msgid "^FAQ"
 msgstr "^FAQ"
 
-#: src/ui.cc:1542
+#: src/ui.cc:1536
 msgid "View a list of frequently asked questions"
 msgstr "Εμφάνιση των πιο συχνών ερωτήσεων"
 
-#: src/ui.cc:1545
+#: src/ui.cc:1539
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1546
+#: src/ui.cc:1540
 #, fuzzy
 msgid "View the important changes made in each version of "
 msgstr "Εμφάνιση των σημαντικών αλλαγών σε κάθε έκδοση του προγράμματος"
 
-#: src/ui.cc:1549
+#: src/ui.cc:1543
 msgid "^License"
 msgstr "Άδεια ^χρήσης"
 
-#: src/ui.cc:1550
+#: src/ui.cc:1544
 msgid "View the terms under which you may copy the program"
 msgstr "Εμφάνιση των όρων χρήσης και διανομής του του προγράμματος"
 
-#: src/ui.cc:1668
+#: src/ui.cc:1660
 msgid "Actions"
 msgstr "Ενέργειες"
 
-#: src/ui.cc:1671
+#: src/ui.cc:1663
 msgid "Search"
 msgstr "Αναζήτηση"
 
-#: src/ui.cc:1672
+#: src/ui.cc:1664
 msgid "Options"
 msgstr "Επιλογές"
 
-#: src/ui.cc:1673
+#: src/ui.cc:1665
 msgid "Views"
 msgstr "Οθόνες"
 
-#: src/ui.cc:1674
+#: src/ui.cc:1666
 msgid "Help"
 msgstr "Βοήθεια"
 
-#: src/ui.cc:1734
+#: src/ui.cc:1726
 #, 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:2003 src/vscreen/vscreen.cc:281
+#: src/ui.cc:1996 src/vscreen/vscreen.cc:281
 msgid "yes_key"
 msgstr "Ν"
 
-#: src/ui.cc:2004 src/vscreen/vscreen.cc:282
+#: src/ui.cc:1997 src/vscreen/vscreen.cc:282
 msgid "no_key"
 msgstr "Ο"
 
-#: src/view_changelog.cc:46
+#: src/view_changelog.cc:61
 msgid "You can only view changelogs of official Debian packages."
 msgstr "Μπορείτε να εμφανίσετε ημερολόγια αλλαγών μόνο για επίσημα πακέτα."
 
-#: src/view_changelog.cc:52
+#: src/view_changelog.cc:67
 msgid "Downloading Changelog"
 msgstr "Μεταφόρτωση Αρχείου Αλλαγών"
 
-#: src/view_changelog.cc:54
+#: src/view_changelog.cc:69
 #, fuzzy
 msgid "Download Changelog"
 msgstr "Μεταφόρτωση Αρχείου Αλλαγών"
 
-#: src/view_changelog.cc:63
+#: src/view_changelog.cc:78
 #, c-format
 msgid "%s changes"
 msgstr ""
@@ -4624,18 +4656,198 @@
 #~ "Παρακαλώ τοποθετήστε τον ακόλουθο δίσκο στη μονάδα \"%s\":\n"
 #~ "%s"
 
+#~ msgid "Need exactly two colors in color definition \"%s\""
+#~ msgstr "Απαιτούνται ακριβώς δύο χρώματα στον καθορισμό χρώματος \"%s\""
+
+#~ msgid "Can't parse foreground \"%s\"of color \"%s\""
+#~ msgstr "Αδύνατο το πέρασμα του προσκηνίου \"%s\" του χρώματος \"%s\""
+
+#~ msgid "Can't parse background \"%s\" of color \"%s\""
+#~ msgstr "Αδύνατο το πέρασμα παρασκηνίου \"%s\" του χρώματος \"%s\""
+
 #~ msgid "Invalid option for interactive mode: -s\n"
 #~ msgstr "Εσφαλμένη επιλογή για τη διαδραστική λειτουργία: -s\n"
 
+#~ 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."
+#~ msgstr ""
+#~ "Προγράμματα για φαξ μόντεμ και άλλες συσκευές επικοινωνίας\n"
+#~ "Τα πακέτα στο τομέα 'comm' χρησιμοποιούνται για τον έλεγχο μόντεμ και "
+#~ "άλλες συσκευές επικοινωνίας. Αυτά περιλαμβάνουν λογισμικό για τον έλεγχο "
+#~ "φαξ μόντεμ( π.χ. PPP για συνδέσεις στο ίντερνετ και προγράμματα που "
+#~ "αρχικά είχαν γραφτεί για αυτόν τον λόγο (zmodem/kermit), όπως επίσης και "
+#~ "λογισμικό για τον έλεγχο κινητών τηλεφώνων, διεπαφή με το FidoNet, και "
+#~ "για την εκτέλεση ενός BBS."
+
+#~ 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"
+#~ " .\n"
+#~ " For more information about what Debian considers to be Free Software, "
+#~ "see http://www.debian.org/social_contract#guidelines"
+#~ msgstr ""
+#~ "Προγράμματα που δεν είναι ελεύθερο λογισμικό\n"
+#~ " Τα πακέτα του τομέα 'non-free' δεν αποτελούν μέρος της διανομής μας.\n"
+#~ " .\n"
+#~ " Αυτά τα πακέτα δεν ανταποκρίνονται σε μία ή περισσότερες απαιτήσεις των "
+#~ "Οδηγιών Ελεύθερου Λογισμικού του Debian (δείτε παρακάτω). Θα πρέπει να "
+#~ "διαβάσετε την άδεια που συνοδεύει τα προγράμματα αυτού του τομέα, για να "
+#~ "βεβαιωθείτε ότι μπορείτε να τα χρησιμοποιήσετε με τον τρόπο που "
+#~ "επιθυμείτε.\n"
+#~ " .\n"
+#~ " Για περισσότερες πληροφορίες σχετικά με το τι θεωρεί το Debian Ελεύθερο "
+#~ "Λογισμικό διαβάστε τη σελίδα http://www.debian.org/"
+#~ "social_contract#guidelines"
+
+#~ 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)"
+#~ msgstr ""
+#~ "Νέα Πακέτα\n"
+#~ " Αυτά τα πακέτα προστέθηκαν στο Debian από την τελευταία φορά που "
+#~ "καθαρίσατε τη λίστα \"νέα\" πακέτα (επιλέξτε \" Ξέχασε τα νέα πακέτα\" "
+#~ "από το μενού Ενέργειες για να καθαρίσετε αυτή τη λίστα)"
+
+#~ msgid ""
+#~ "%s is an essential package!\n"
+#~ "\n"
+#~ "Are you sure you want to remove it?\n"
+#~ "Type '%s' if you are."
+#~ msgstr ""
+#~ "το %s είναι απαραίτητο πακέτο!\n"
+#~ "\n"
+#~ "Είστε βέβαιοι για την αφαίρεσή του;\n"
+#~ "Πληκτρολογήστε '%s' αν είστε βέβαιοι."
+
+#~ msgid "Available versions of "
+#~ msgstr "Διαθέσιμες εκδόσεις του "
+
+#~ 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."
+#~ msgstr ""
+#~ "Δεν είστε root και δεν μπορώ να βρω τρόπο\n"
+#~ "να γίνετε root. Για να ρυθμίσετε ξανά αυτό το πακέτο\n"
+#~ "εγκαταστήστε το πακέτο μενού, το πακέτο\n"
+#~ "προσπέλασης, ή εκτελέστε το aptitude ως root."
+
 #~ msgid "Information about "
 #~ msgstr "Πληροφορίες σχετικά με "
 
+#~ msgid ""
+#~ "Aptitude %s\n"
+#~ "\n"
+#~ "Copyright 2000 Daniel Burrows.\n"
+#~ "\n"
+#~ "aptitude comes with ABSOLUTELY NO WARRANTY; for details see 'license' in "
+#~ "the\n"
+#~ "Help menu.  This is free software, and you are welcome to redistribute "
+#~ "it\n"
+#~ "under certain conditions; see 'license' for details."
+#~ msgstr ""
+#~ "Aptitude %s\n"
+#~ "\n"
+#~ "Copyright 2000 Daniel Burrows.\n"
+#~ "\n"
+#~ "το aptitude δε φέρει ΚΑΜΙΑ ΑΠΟΛΥΤΩΣ ΕΓΓΥΗΣΗ. Για λεπτομέρειες δείτε το\n"
+#~ "'license' στο μενού Βοήθεια.  Πρόκειται για ελεύθερο λογισμικό, και\n"
+#~ "επιτρέπεται η διανομή του υπό συγκεκριμένες προϋποθέσεις. Δείτε το\n"
+#~ "'license' για λεπτομέρειες."
+
+#~ msgid "Some packages were broken and have been fixed"
+#~ msgstr "Κάποια πακέτα ήταν κατεστραμμένα και έχουν διορθωθεί"
+
 #~ msgid "Some broken packages could not be fixed!"
 #~ msgstr "Δεν ήταν δυνατή η διόρθωση κάποιων κατεστραμμένων πακέτων!"
 
+#~ msgid "Some packages are broken.  Try to fix them?"
+#~ msgstr ""
+#~ "Κάποια πακέτα είναι κατεστραμμένα.  Να γίνει προσπάθεια επιδιόρθωσής τους;"
+
+#~ msgid ""
+#~ "Installing/removing packages requires administrative privileges, which\n"
+#~ "you currently do not have.  Would you like to change to the root "
+#~ "account?\n"
+#~ msgstr ""
+#~ "Η εγκατάσταση/αφαίρεση πακέτων απαιτεί προνόμια διαχειριστή, που δεν\n"
+#~ "έχετε αυτή τη στιγμή.  Θα θέλατε να συνδεθείτε ως χρήστης root;\n"
+
+#~ msgid ""
+#~ "No packages will be installed, removed or upgraded.\n"
+#~ "\n"
+#~ "Some packages could be upgraded, but you have not chosen to upgrade "
+#~ "them.\n"
+#~ "Type \"U\" to prepare an upgrade."
+#~ msgstr ""
+#~ "Δεν θα εγκατασταθούν, αφαιρεθούν ή θα αναβαθμιστούν πακέτα.\n"
+#~ "\n"
+#~ "Μερικά πακέτα θα μπορούσαν να αναβαθμιστούν, αλλά επιλέξατε να μην τα "
+#~ "αναβαθμίσετε.\n"
+#~ "Πληκτρολογήστε \"U\" για να προετοιμάσετε μια αναβάθμιση."
+
+#~ 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"
+#~ msgstr ""
+#~ "Η ενημέρωση των λιστών πακέτων απαιτεί προνόμια διαχειριστή, που δεν\n"
+#~ "έχετε αυτή τη στιγμή.  Θα θέλατε να συνδεθείτε ως χρήστης root;\n"
+
+#~ msgid "Obsolete downloaded package files have been deleted"
+#~ msgstr "Τα περιττά μεταφορτωμένα αρχεία έχουν διαγραφεί"
+
+#~ msgid ""
+#~ "Run 'su' to become root; this will restart the program, but your\n"
+#~ "settings will be preserved"
+#~ msgstr ""
+#~ "Εκτελέστε την εντολή 'su' για να συνδεθείτε ως root.  Αυτή θα "
+#~ "ξαναεκτελέσει\n"
+#~ "το πρόγραμμα διατηρώντας τις δικές σας ρυθμίσεις"
+
+#~ msgid ""
+#~ "Mark the selected package as having been automatically installed;\n"
+#~ "it will automatically be removed if no other packages depend on it"
+#~ msgstr ""
+#~ "Σήμανση του επιλεγμένου πακέτου ως αυτόματα εγκατεστημένου. \n"
+#~ "έτσι θα αφαιρεθεί αυτόματα όταν δεν θα εξαρτώνται άλλα πακέτα από αυτό."
+
+#~ msgid ""
+#~ "Mark the selected package as having been manually installed;\n"
+#~ "it will not be removed unless you manually remove it"
+#~ msgstr ""
+#~ "Σήμανση των επιλεγμένων πακέτων ως χειροκίνητα εγκατεστημένων. \n"
+#~ "δεν θα αφαιρεθούν εκτός και αν τα αφαιρέσετε εσείς χειροκίνητα."
+
+#~ msgid ""
+#~ "Forbid the candidate version of the selected package from being "
+#~ "installed;\n"
+#~ "newer versions of the package will be installed as usual"
+#~ msgstr ""
+#~ "Απαγόρευσε την υποψήφια έκδοση του επιλεγμένου πακέτου από το να "
+#~ "εγκατασταθεί\n"
+#~ "νεώτερες εκδόσεις του, θα εγκατασταθούν κανονικά"
+
 #~ msgid "^ChangeLog"
 #~ msgstr "Αρχείο Αλλαγών"
 
+#~ msgid "View the important changes made in each version of the program"
+#~ 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	Sun Jun 12 21:04:47 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-05-01 14:08-0400\n"
+"POT-Creation-Date: 2005-06-12 22:42+0200\n"
 "PO-Revision-Date: 2005-04-13 11:25+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"
@@ -155,14 +155,14 @@
 msgstr ""
 "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:219 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
-#: src/vscreen/vs_util.cc:328
+#: src/apt_options.cc:240 src/mine/cmine.cc:249 src/mine/cmine.cc:312
+#: src/ui.cc:215 src/vscreen/vs_util.cc:77 src/vscreen/vs_util.cc:90
+#: src/vscreen/vs_util.cc:264 src/vscreen/vs_util.cc:298
 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:328
+#: src/apt_options.cc:241 src/download_list.cc:69 src/mine/cmine.cc:250
+#: src/mine/cmine.cc:313 src/vscreen/vs_util.cc:298
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -243,15 +243,15 @@
 msgid "%s: Previous"
 msgstr ""
 
-#: src/broken_indicator.cc:233
+#: src/broken_indicator.cc:232
 #, c-format
-msgid "%CSolution search failed.  %s: try harder"
+msgid "Solution search failed.  %s: try harder"
 msgstr ""
 
-#: src/broken_indicator.cc:239
-#, c-format
-msgid "%CUnable to resolve dependencies."
-msgstr ""
+#: src/broken_indicator.cc:237
+#, fuzzy
+msgid "Unable to resolve dependencies."
+msgstr "No se pudo abrir %s para escribir en él"
 
 #: src/cmdline/cmdline_action.cc:36
 #, c-format
@@ -637,13 +637,13 @@
 "que quiere.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
-#: src/vscreen/vs_util.cc:212
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:165
+#: src/vscreen/vs_util.cc:202
 msgid "Yes"
 msgstr "Sí"
 
-#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
-#: src/vscreen/vs_util.cc:212
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:165
+#: src/vscreen/vs_util.cc:202
 msgid "No"
 msgstr "No"
 
@@ -959,7 +959,7 @@
 msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:212
+#: src/cmdline/cmdline_resolver.cc:212 src/cmdline/cmdline_resolver.cc:285
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
@@ -1018,196 +1018,201 @@
 msgid "The following packages have unmet dependencies:\n"
 msgstr "No se satisfacen las dependencias de los siguientes paquetes:\n"
 
-#: src/cmdline/cmdline_show.cc:133
+#: src/cmdline/cmdline_show.cc:119 src/cmdline/cmdline_show.cc:305
+#: src/solution_fragment.cc:65
+msgid "<NULL>"
+msgstr ""
+
+#: src/cmdline/cmdline_show.cc:138
 msgid "not installed"
 msgstr "sin instalar"
 
-#: src/cmdline/cmdline_show.cc:135 src/pkg_columnizer.cc:231
+#: src/cmdline/cmdline_show.cc:140 src/pkg_columnizer.cc:231
 #: src/pkg_ver_item.cc:225
 msgid "unpacked"
 msgstr "desempaquetado"
 
-#: src/cmdline/cmdline_show.cc:137
+#: src/cmdline/cmdline_show.cc:142
 msgid "partially configured"
 msgstr "configurado parcialmente"
 
-#: src/cmdline/cmdline_show.cc:139
+#: src/cmdline/cmdline_show.cc:144
 msgid "partially installed"
 msgstr "instalado parcialmente"
 
-#: src/cmdline/cmdline_show.cc:141
+#: src/cmdline/cmdline_show.cc:146
 msgid "not installed (configuration files remain)"
 msgstr "sin instalar (permanecen los ficheros de configuración)"
 
-#: src/cmdline/cmdline_show.cc:143 src/pkg_columnizer.cc:239
+#: src/cmdline/cmdline_show.cc:148 src/pkg_columnizer.cc:239
 #: src/pkg_ver_item.cc:233
 msgid "installed"
 msgstr "instalado"
 
-#: src/cmdline/cmdline_show.cc:152
+#: src/cmdline/cmdline_show.cc:157
 msgid "not a real package"
 msgstr "no es un paquete real"
 
-#: src/cmdline/cmdline_show.cc:165
+#: src/cmdline/cmdline_show.cc:170
 msgid " [held]"
 msgstr " [retenido]"
 
-#: src/cmdline/cmdline_show.cc:174
+#: src/cmdline/cmdline_show.cc:179
 #, c-format
 msgid "%s; version %s will be installed"
 msgstr "%s; se instalará la versión %s"
 
-#: src/cmdline/cmdline_show.cc:178
+#: src/cmdline/cmdline_show.cc:183
 #, c-format
 msgid "%s; version %s will be installed automatically"
 msgstr "%s; se instalará la versión %s automáticamente"
 
-#: src/cmdline/cmdline_show.cc:184 src/cmdline/cmdline_show.cc:199
+#: src/cmdline/cmdline_show.cc:189 src/cmdline/cmdline_show.cc:204
 #, c-format
 msgid "%s; will be purged"
 msgstr "%s; se purgará"
 
-#: src/cmdline/cmdline_show.cc:197
+#: src/cmdline/cmdline_show.cc:202
 #, c-format
 msgid "%s; will be purged because nothing depends on it"
 msgstr "%s; se purgará porque no hay nada que dependa de él"
 
-#: src/cmdline/cmdline_show.cc:204
+#: src/cmdline/cmdline_show.cc:209
 #, c-format
 msgid "%s; will be removed because nothing depends on it"
 msgstr "%s; se eliminará automáticamente porque nada depende de él"
 
-#: src/cmdline/cmdline_show.cc:206
+#: src/cmdline/cmdline_show.cc:211
 #, c-format
 msgid "%s; will be removed"
 msgstr "%s; se eliminará"
 
-#: src/cmdline/cmdline_show.cc:220
+#: src/cmdline/cmdline_show.cc:225
 #, c-format
 msgid "%s%s; will be downgraded [%s -> %s]"
 msgstr "%s%s; se desactualizará [%s -> %s]"
 
-#: src/cmdline/cmdline_show.cc:223
+#: src/cmdline/cmdline_show.cc:228
 #, c-format
 msgid "%s%s; will be upgraded [%s -> %s]"
 msgstr "%s%s; se desactualizará [%s -> %s]"
 
-#: src/cmdline/cmdline_show.cc:235 src/cmdline/cmdline_show.cc:256
+#: src/cmdline/cmdline_show.cc:240 src/cmdline/cmdline_show.cc:261
 msgid "Package: "
 msgstr "Paquete: "
 
-#: src/cmdline/cmdline_show.cc:236 src/cmdline/cmdline_show.cc:264
+#: src/cmdline/cmdline_show.cc:241 src/cmdline/cmdline_show.cc:269
 #: src/pkg_columnizer.cc:87
 msgid "State"
 msgstr "Estado"
 
-#: src/cmdline/cmdline_show.cc:237 src/cmdline/cmdline_show.cc:318
+#: src/cmdline/cmdline_show.cc:242 src/cmdline/cmdline_show.cc:325
 msgid "Provided by"
 msgstr "Proporcionado por"
 
-#: src/cmdline/cmdline_show.cc:258 src/pkg_info_screen.cc:105
+#: src/cmdline/cmdline_show.cc:263 src/pkg_info_screen.cc:105
 msgid "Essential: "
 msgstr "Esencial: "
 
-#: src/cmdline/cmdline_show.cc:258 src/cmdline/cmdline_show.cc:262
-#: src/cmdline/cmdline_show.cc:273 src/pkg_info_screen.cc:105
+#: src/cmdline/cmdline_show.cc:263 src/cmdline/cmdline_show.cc:267
+#: src/cmdline/cmdline_show.cc:278 src/pkg_info_screen.cc:105
 msgid "yes"
 msgstr "sí"
 
-#: src/cmdline/cmdline_show.cc:262
+#: src/cmdline/cmdline_show.cc:267
 msgid "New"
 msgstr "Nuevo"
 
-#: src/cmdline/cmdline_show.cc:267
+#: src/cmdline/cmdline_show.cc:272
 msgid "Forbidden version"
 msgstr "Versión prohibida"
 
-#: src/cmdline/cmdline_show.cc:271
+#: src/cmdline/cmdline_show.cc:276
 msgid "Automatically installed"
 msgstr "Instalado automáticamente"
 
-#: src/cmdline/cmdline_show.cc:273
+#: src/cmdline/cmdline_show.cc:278
 msgid "no"
 msgstr "no"
 
-#: src/cmdline/cmdline_show.cc:275
+#: src/cmdline/cmdline_show.cc:280
 msgid "Version: "
 msgstr "Versión: "
 
-#: src/cmdline/cmdline_show.cc:276 src/pkg_info_screen.cc:113
+#: src/cmdline/cmdline_show.cc:281 src/pkg_info_screen.cc:113
 msgid "Priority: "
 msgstr "Prioridad: "
 
-#: src/cmdline/cmdline_show.cc:277 src/cmdline/cmdline_show.cc:279
-#: src/cmdline/cmdline_show.cc:288
+#: src/cmdline/cmdline_show.cc:282 src/cmdline/cmdline_show.cc:284
+#: src/cmdline/cmdline_show.cc:293
 msgid "N/A"
 msgstr "N/A"
 
-#: src/cmdline/cmdline_show.cc:278 src/pkg_info_screen.cc:114
+#: src/cmdline/cmdline_show.cc:283 src/pkg_info_screen.cc:114
 msgid "Section: "
 msgstr "Sección: "
 
-#: src/cmdline/cmdline_show.cc:280 src/pkg_info_screen.cc:115
+#: src/cmdline/cmdline_show.cc:285 src/pkg_info_screen.cc:115
 msgid "Maintainer: "
 msgstr "Desarrollador: "
 
-#: src/cmdline/cmdline_show.cc:283
+#: src/cmdline/cmdline_show.cc:288
 msgid "Uncompressed Size: "
 msgstr "Tamaño sin comprimir: "
 
-#: src/cmdline/cmdline_show.cc:287
+#: src/cmdline/cmdline_show.cc:292
 msgid "Architecture: "
 msgstr "Arquitectura: "
 
-#: src/cmdline/cmdline_show.cc:289
+#: src/cmdline/cmdline_show.cc:294
 msgid "Compressed Size: "
 msgstr "Tamaño comprimido: "
 
-#: src/cmdline/cmdline_show.cc:291
+#: src/cmdline/cmdline_show.cc:296
 msgid "Filename: "
 msgstr "Nombre del fichero: "
 
-#: src/cmdline/cmdline_show.cc:293
+#: src/cmdline/cmdline_show.cc:298
 msgid "MD5sum: "
 msgstr "Suma MD5: "
 
-#: src/cmdline/cmdline_show.cc:297 src/cmdline/cmdline_show.cc:299
+#: src/cmdline/cmdline_show.cc:302 src/cmdline/cmdline_show.cc:305
 msgid "Archive"
 msgstr "Archivo"
 
-#: src/cmdline/cmdline_show.cc:303
+#: src/cmdline/cmdline_show.cc:310
 msgid "Depends"
 msgstr "Depende de"
 
-#: src/cmdline/cmdline_show.cc:305
+#: src/cmdline/cmdline_show.cc:312
 msgid "PreDepends"
 msgstr "Predepende de"
 
-#: src/cmdline/cmdline_show.cc:307
+#: src/cmdline/cmdline_show.cc:314
 msgid "Recommends"
 msgstr "Recomienda"
 
-#: src/cmdline/cmdline_show.cc:309
+#: src/cmdline/cmdline_show.cc:316
 msgid "Suggests"
 msgstr "Sugiere"
 
-#: src/cmdline/cmdline_show.cc:311
+#: src/cmdline/cmdline_show.cc:318
 msgid "Conflicts"
 msgstr "Tiene conflictos con"
 
-#: src/cmdline/cmdline_show.cc:313
+#: src/cmdline/cmdline_show.cc:320
 msgid "Replaces"
 msgstr "Remplaza"
 
-#: src/cmdline/cmdline_show.cc:315
+#: src/cmdline/cmdline_show.cc:322
 msgid "Obsoletes"
 msgstr "Hace obsoleto a"
 
-#: src/cmdline/cmdline_show.cc:317
+#: src/cmdline/cmdline_show.cc:324
 msgid "Provides"
 msgstr "Proporciona"
 
-#: src/cmdline/cmdline_show.cc:321 src/pkg_info_screen.cc:97
+#: src/cmdline/cmdline_show.cc:328 src/pkg_info_screen.cc:97
 msgid "Description: "
 msgstr "Descripción: "
 
@@ -1252,32 +1257,32 @@
 msgstr ""
 "No puede especificar un archivo y una versión para un paquete a la vez\n"
 
-#: src/dep_item.cc:137
+#: src/dep_item.cc:139
 msgid "UNSATISFIED"
 msgstr "INSATISFECHO"
 
-#: src/dep_item.cc:137 src/reason_fragment.cc:247
+#: src/dep_item.cc:139 src/reason_fragment.cc:244
 msgid "UNAVAILABLE"
 msgstr "NO DISPONIBLE"
 
-#: src/download_bar.cc:56 src/download_list.cc:263 src/download_screen.cc:57
+#: src/download_bar.cc:56 src/download_list.cc:266 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_bar.cc:77 src/generic/acqprogress.cc:63
+#: src/download_bar.cc:75 src/generic/acqprogress.cc:63
 msgid "Hit "
 msgstr "Obj "
 
-#: src/download_bar.cc:90
+#: src/download_bar.cc:88
 msgid "Downloading "
 msgstr "Descargando "
 
-#: src/download_bar.cc:103
+#: src/download_bar.cc:101
 msgid "Got "
 msgstr "Listo "
 
-#: src/download_bar.cc:157
+#: src/download_bar.cc:155
 msgid "Downloading..."
 msgstr "Descargando..."
 
@@ -1305,7 +1310,7 @@
 msgid "Couldn't clean out list directories"
 msgstr "No se pudo borrar los directorios de lista"
 
-#: src/download.cc:177 src/ui.cc:1153
+#: src/download.cc:177 src/ui.cc:1147
 msgid "Deleting obsolete downloaded files"
 msgstr "Borrando los ficheros descargados ya obsoletos"
 
@@ -1443,7 +1448,7 @@
 "¡Argghh! Algo malo pasó mientras se instalaban los paquetes. Intentado "
 "recuperar:"
 
-#: src/download.cc:477 src/pkg_item.cc:432
+#: src/download.cc:477 src/pkg_item.cc:430
 msgid "Press return to continue.\n"
 msgstr "Presione ENTER para continuar.\n"
 
@@ -1454,17 +1459,17 @@
 "¡No se puede volver a obtener el sistema de bloqueo! (¿Quizá se está "
 "ejecutando otro apt o dpkg?)"
 
-#: src/download_item.cc:66 src/download_item.cc:70 src/download_item.cc:100
+#: src/download_item.cc:70 src/download_item.cc:74 src/download_item.cc:104
 #: src/generic/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr " [Trabajando]"
 
-#: src/download_item.cc:104 src/download_list.cc:283
+#: src/download_item.cc:108 src/download_list.cc:284
 msgid "[Hit]"
 msgstr "[Obj]"
 
-#: src/download_item.cc:104 src/download_list.cc:303
+#: src/download_item.cc:108 src/download_list.cc:304
 msgid "[Downloaded]"
 msgstr "[Descargado]"
 
@@ -1478,36 +1483,36 @@
 msgid "%n%nSome files were not downloaded successfully."
 msgstr ""
 
-#: src/download_list.cc:68
+#: src/download_list.cc:66
 msgid "Continue"
 msgstr "Continúa"
 
 # No me gusta mucho la traducción de 'progreso'
 # en este contexto, pero no se me ocurre una mejor
-#: src/download_list.cc:175 src/download_screen.cc:203
+#: src/download_list.cc:178 src/download_screen.cc:203
 msgid "Total Progress: "
 msgstr "Progreso total: "
 
-#: src/download_list.cc:194 src/download_screen.cc:218
+#: src/download_list.cc:197 src/download_screen.cc:218
 #, c-format
 msgid " [ %i%% ] (%sB/s, %s remaining)"
 msgstr " [ %i%% ] (%sB/s, faltan %s)"
 
-#: src/download_list.cc:196
+#: src/download_list.cc:199
 #, c-format
 msgid " [ %i%% ] (stalled)"
 msgstr "[ %i%% ] (detenido)"
 
-#: src/download_list.cc:198
+#: src/download_list.cc:201
 #, c-format
 msgid " [ %i%% ]"
 msgstr " [ %i%% ]"
 
-#: src/download_list.cc:323
+#: src/download_list.cc:324
 msgid "[IGNORED]"
 msgstr "[IGNORADO]"
 
-#: src/download_list.cc:329
+#: src/download_list.cc:330
 msgid "[ERROR]"
 msgstr "[ERROR]"
 
@@ -1516,11 +1521,11 @@
 msgid "Downloaded %sB in %ss (%sB/s)."
 msgstr "Descargados %sB en %ss (%sB/s)."
 
-#: src/edit_pkg_hier.cc:158
+#: src/edit_pkg_hier.cc:176
 msgid "No hierarchy information to edit"
 msgstr "No hay información de jerarquía para editar"
 
-#: src/edit_pkg_hier.cc:258
+#: src/edit_pkg_hier.cc:276
 msgid "Couldn't open for writing"
 msgstr "No se pudo abrir para escribir"
 
@@ -1625,39 +1630,39 @@
 "Aviso: no se pudo bloquear el fichero de caché. Abriendo en modo de sólo "
 "lectura."
 
-#: src/generic/matchers.cc:797
+#: src/generic/matchers.cc:798
 msgid "Unmatched '('"
 msgstr "'(' no cerrado"
 
-#: src/generic/matchers.cc:887 src/generic/matchers.cc:968
+#: src/generic/matchers.cc:888 src/generic/matchers.cc:969
 #, c-format
 msgid "Unknown dependency type: %s"
 msgstr "Tipo de dependencia desconocida: %s"
 
-#: src/generic/matchers.cc:950
+#: src/generic/matchers.cc:951
 #, c-format
 msgid "Unknown action type: %s"
 msgstr "Tipo de acción desconocida: %s"
 
-#: src/generic/matchers.cc:1017
+#: src/generic/matchers.cc:1018
 #, c-format
 msgid "Unknown priority %s"
 msgstr "Prioridad %s desconocida"
 
-#: src/generic/matchers.cc:1039
+#: src/generic/matchers.cc:1040
 #, c-format
 msgid "Unknown pattern type: %c"
 msgstr "Tipo de patrón desconocido: %c"
 
-#: src/generic/matchers.cc:1084
+#: src/generic/matchers.cc:1105
 msgid "Unexpected empty expression"
 msgstr "Expresión vacía no esperada"
 
-#: src/generic/matchers.cc:1119
+#: src/generic/matchers.cc:1143
 msgid "Badly formed expression"
 msgstr "Expresión malformada"
 
-#: src/generic/matchers.cc:1148
+#: src/generic/matchers.cc:1175
 msgid "Unexpected ')'"
 msgstr "')' inesperado"
 
@@ -1683,7 +1688,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:61
+#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:76
 #, c-format
 msgid "ChangeLog of %s"
 msgstr "Registro de cambios de %s"
@@ -1725,38 +1730,38 @@
 msgid "Reading task descriptions"
 msgstr "Leyendo las descripciones de las tareas"
 
-#: src/load_config.cc:30
-#, c-format
-msgid "Invalid entry in color definition group: \"%s\""
+#: src/load_config.cc:42
+#, fuzzy, c-format
+msgid "Unrecognized color name \"%s\""
+msgstr "Tareas sin reconocer"
+
+#: src/load_config.cc:69
+#, fuzzy, c-format
+msgid "Unrecognized attribute name \"%s\""
+msgstr "Tareas sin reconocer"
+
+#: src/load_config.cc:106
+#, fuzzy, c-format
+msgid "Invalid entry in style definition group: \"%s\""
 msgstr "Entrada no válida en grupo de definición de colores: \"%s\""
 
-#: src/load_config.cc:32
-#, c-format
-msgid "Invalid tagless entry in color definition group: \"%s\""
+#: src/load_config.cc:108
+#, fuzzy, c-format
+msgid "Invalid tagless entry in style definition group: \"%s\""
 msgstr ""
 "Entrada sin etiqueta no válida en grupo de definición de colores: \"%s\""
 
-#: src/load_config.cc:34
-#, c-format
-msgid "Need exactly two colors in color definition \"%s\""
-msgstr "Necesito exactamente dos colores en la definición de colores \"%s\""
-
-#: src/load_config.cc:50
-#, c-format
-msgid "Can't parse foreground \"%s\"of color \"%s\""
-msgstr "No se pudo analizar el primer plano \"%s\" del color \"%s\""
-
-#: src/load_config.cc:53
-#, c-format
-msgid "Can't parse background \"%s\" of color \"%s\""
-msgstr "No se pudo analizar el fondo \"%s\" del color \"%s\""
+#: src/load_config.cc:130
+#, fuzzy, c-format
+msgid "Unknown style attribute %s"
+msgstr "Tipo de acción desconocida: %s"
 
-#: src/load_config.cc:72 src/load_config.cc:74
+#: src/load_config.cc:153 src/load_config.cc:155
 #, c-format
 msgid "Invalid entry in keybinding group: \"%s\""
 msgstr "Entrada no válida en grupo de teclas de referencia: \"%s\""
 
-#: src/load_config.cc:89
+#: src/load_config.cc:170
 #, c-format
 msgid "Ignoring invalid keybinding \"%s\" -> \"%s\""
 msgstr "Ignorando la tecla de referencia \"%s\" -> \"%s\" no válida"
@@ -2185,44 +2190,44 @@
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                  Este aptitude no tiene poderes de Super Vaca.\n"
 
-#: src/main.cc:255
+#: src/main.cc:252
 #, 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:301 src/main.cc:310
+#: src/main.cc:291 src/main.cc:300
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr "RAREZA: recibido código de opción desconocido\n"
 
-#: src/main.cc:319
+#: src/main.cc:309
 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:327
+#: src/main.cc:317
 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:348
+#: src/main.cc:338
 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:405
+#: src/main.cc:395
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr "Orden desconocida \"%s\"\n"
 
-#: src/main.cc:412 src/main.cc:469
+#: src/main.cc:402 src/main.cc:450
 msgid "Internal error: uncaught 'out of solutions' exception.\n"
 msgstr ""
 
-#: src/main.cc:417 src/main.cc:474
+#: src/main.cc:407 src/main.cc:455
 msgid "Internal error: uncaught 'out of time' exception.\n"
 msgstr ""
 
-#: src/main.cc:424
+#: src/main.cc:414
 #, c-format
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
@@ -2253,7 +2258,7 @@
 msgid "Lost"
 msgstr "Perdió"
 
-#: src/mine/cmine.cc:119 src/ui.cc:1090
+#: src/mine/cmine.cc:119 src/ui.cc:1084
 msgid "Minesweeper"
 msgstr "Buscaminas"
 
@@ -2279,96 +2284,96 @@
 msgid "The number of mines must be a number"
 msgstr "El número de minas debe ser un número"
 
-#: src/mine/cmine.cc:240
+#: src/mine/cmine.cc:238
 msgid "Setup custom game"
 msgstr "Establecer un juego personalizado"
 
-#: src/mine/cmine.cc:243
+#: src/mine/cmine.cc:240
 msgid "Height of board: "
 msgstr "Altura del tablero"
 
-#: src/mine/cmine.cc:247
+#: src/mine/cmine.cc:243
 msgid "Width of board: "
 msgstr "Anchura del tablero"
 
-#: src/mine/cmine.cc:251
+#: src/mine/cmine.cc:246
 msgid "Number of mines: "
 msgstr "Número de minas"
 
-#: src/mine/cmine.cc:316
+#: src/mine/cmine.cc:305
 msgid "Choose difficulty level"
 msgstr "Elija el nivel de dificultad"
 
-#: src/mine/cmine.cc:318
+#: src/mine/cmine.cc:307
 msgid "Easy"
 msgstr "Fácil"
 
-#: src/mine/cmine.cc:319
+#: src/mine/cmine.cc:308
 msgid "Medium"
 msgstr "Medio"
 
-#: src/mine/cmine.cc:320
+#: src/mine/cmine.cc:309
 msgid "Hard"
 msgstr "Difícil"
 
-#: src/mine/cmine.cc:321
+#: src/mine/cmine.cc:310
 msgid "Custom"
 msgstr "Personalizado"
 
-#: src/mine/cmine.cc:411
+#: src/mine/cmine.cc:392
 msgid "You have won."
 msgstr "Ha ganado."
 
-#: src/mine/cmine.cc:414
+#: src/mine/cmine.cc:395
 msgid "You lose!"
 msgstr "¡Perdió!"
 
-#: src/mine/cmine.cc:419
+#: src/mine/cmine.cc:400
 msgid "You die...  --More--"
 msgstr "Mueres...  --Más--"
 
-#: src/mine/cmine.cc:432
+#: src/mine/cmine.cc:413
 msgid "The spikes were poisoned!  The poison was deadly..  --More--"
 msgstr "¡Las púas estaban envenenadas! El veneno era mortal...  --Más--"
 
-#: src/mine/cmine.cc:435
+#: src/mine/cmine.cc:416
 msgid "You land on a set of sharp iron spikes!  --More--"
 msgstr "¡Aterrizas en un grupo de púas de hierro afiladas!  --Más--"
 
-#: src/mine/cmine.cc:438
+#: src/mine/cmine.cc:419
 msgid "You fall into a pit!  --More--"
 msgstr "¡Caes en un hoyo!  --Más--"
 
-#: src/mine/cmine.cc:441
+#: src/mine/cmine.cc:422
 msgid "KABOOM!  You step on a land mine.  --More--"
 msgstr "¡KABOOM! Has pisado una mina. --Más--"
 
-#: src/mine/cmine.cc:446
+#: src/mine/cmine.cc:427
 msgid "The dart was poisoned!  The poison was deadly...  --More--"
 msgstr "¡El dardo estaba envenenado! El veneno era mortal...  --Más--"
 
-#: src/mine/cmine.cc:448
+#: src/mine/cmine.cc:429
 msgid ""
 "A little dart shoots out at you!  You are hit by a little dart!  --More--"
 msgstr ""
 "¡Un pequeño dardo se dispara hacia ti! ¡Eres golpeado por un pequeño dardo!  "
 "--Más--"
 
-#: src/mine/cmine.cc:452
+#: src/mine/cmine.cc:433
 msgid "You turn to stone... --More--"
 msgstr "Te conviertes en piedra...  --Más--"
 
 # Cockatrice = basilisco (el monstruo que convierte en piedra con su mirada)
 # Ver: nethack
-#: src/mine/cmine.cc:454
+#: src/mine/cmine.cc:435
 msgid "Touching the cockatrice corpse was a fatal mistake.  --More--"
 msgstr "Cometiste un error fatal al tocar el cuerpo de un basilisco.  --Más--"
 
-#: src/mine/cmine.cc:456
+#: src/mine/cmine.cc:437
 msgid "You feel here a cockatrice corpse.  --More--"
 msgstr "Sientes un cuerpo de basilisco.  --Más--"
 
-#: src/mine/cmine.cc:460
+#: src/mine/cmine.cc:441
 msgid ""
 "Click!  You trigger a rolling boulder trap!  You are hit by a boulder! --"
 "More--"
@@ -2376,56 +2381,56 @@
 "¡Click! ¡Activas una trampa de canto rodado! ¡Eres golpeado por el canto "
 "rodado! --Más--"
 
-#: src/mine/cmine.cc:470
+#: src/mine/cmine.cc:451
 msgid "sleep"
 msgstr "duerme"
 
-#: src/mine/cmine.cc:473
+#: src/mine/cmine.cc:454
 msgid "striking"
 msgstr "golpeando"
 
-#: src/mine/cmine.cc:476
+#: src/mine/cmine.cc:457
 msgid "death"
 msgstr "muerte"
 
-#: src/mine/cmine.cc:479
+#: src/mine/cmine.cc:460
 msgid "polymorph"
 msgstr "polimorfista"
 
-#: src/mine/cmine.cc:482
+#: src/mine/cmine.cc:463
 msgid "magic missile"
 msgstr "misil mágico"
 
-#: src/mine/cmine.cc:485
+#: src/mine/cmine.cc:466
 msgid "secret door detection"
 msgstr "detección de puerta secreta"
 
-#: src/mine/cmine.cc:488
+#: src/mine/cmine.cc:469
 msgid "invisibility"
 msgstr "invisibilidad"
 
-#: src/mine/cmine.cc:491
+#: src/mine/cmine.cc:472
 msgid "cold"
 msgstr "frío"
 
-#: src/mine/cmine.cc:497
+#: src/mine/cmine.cc:478
 #, c-format
 msgid "Your wand of %s breaks apart and explodes!  --More--"
 msgstr "¡Tu varita mágica de %s se rompe y explota!  --Más--"
 
-#: src/mine/cmine.cc:503
+#: src/mine/cmine.cc:484
 msgid "You are jolted by a surge of electricity!  --More--"
 msgstr "¡Te sacude una descarga eléctrica!  --Más--"
 
-#: src/mine/cmine.cc:607
+#: src/mine/cmine.cc:588
 msgid "Enter the filename to load: "
 msgstr "Introduzca el nombre del fichero a cargar:"
 
-#: src/mine/cmine.cc:614
+#: src/mine/cmine.cc:595
 msgid "Enter the filename to save: "
 msgstr "Introduzca el nombre del fichero a guardar:"
 
-#: src/mine/cmine.cc:624
+#: src/mine/cmine.cc:605
 msgid "mine-help.txt"
 msgstr "mine-help.txt"
 
@@ -2433,7 +2438,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:1670
+#: src/pkg_columnizer.cc:84 src/ui.cc:1662
 msgid "Package"
 msgstr "Paquete"
 
@@ -3513,52 +3518,52 @@
 "¿Seguro que quiere eliminarlo?\n"
 "Si lo está escriba '%s'."
 
-#: src/pkg_item.cc:222 src/pkg_ver_item.cc:625
+#: src/pkg_item.cc:220 src/pkg_ver_item.cc:626
 #, c-format
 msgid "Information about %s"
 msgstr "Información sobre %s"
 
-#: src/pkg_item.cc:224 src/pkg_ver_item.cc:627
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:628
 #, c-format
 msgid "%s info"
 msgstr ""
 
-#: src/pkg_item.cc:310
+#: src/pkg_item.cc:308
 #, fuzzy, c-format
 msgid "Available versions of %s"
 msgstr "Versiones disponibles de "
 
-#: src/pkg_item.cc:313
+#: src/pkg_item.cc:311
 #, fuzzy, c-format
 msgid "%s versions"
 msgstr "Versiones"
 
-#: src/pkg_item.cc:325 src/pkg_ver_item.cc:655
+#: src/pkg_item.cc:323 src/pkg_ver_item.cc:656
 #, c-format
 msgid "Dependencies of %s"
 msgstr "Dependencias de %s"
 
-#: src/pkg_item.cc:327 src/pkg_ver_item.cc:657
+#: src/pkg_item.cc:325 src/pkg_ver_item.cc:658
 #, c-format
 msgid "%s deps"
 msgstr ""
 
-#: src/pkg_item.cc:338 src/pkg_ver_item.cc:667
+#: src/pkg_item.cc:336 src/pkg_ver_item.cc:668
 #, c-format
 msgid "Packages depending on %s"
 msgstr "Paquetes que dependen de %s"
 
-#: src/pkg_item.cc:340 src/pkg_ver_item.cc:669
+#: src/pkg_item.cc:338 src/pkg_ver_item.cc:670
 #, c-format
 msgid "%s reverse deps"
 msgstr ""
 
-#: src/pkg_item.cc:392 src/pkg_ver_item.cc:707
+#: src/pkg_item.cc:390 src/pkg_ver_item.cc:708
 #, c-format
 msgid "Reporting a bug in %s:\n"
 msgstr "Informando de un fallo en %s:\n"
 
-#: src/pkg_item.cc:414
+#: src/pkg_item.cc:412
 #, fuzzy
 msgid ""
 "You are not root and I cannot find any way to become root.  To reconfigure "
@@ -3570,16 +3575,16 @@
 "este paquete, instale el paquete 'menu', el paquete\n"
 "'login', o ejecute aptitude como administrador."
 
-#: src/pkg_item.cc:422
+#: src/pkg_item.cc:420
 #, c-format
 msgid "Reconfiguring %s\n"
 msgstr "Reconfigurando %s\n"
 
-#: src/pkg_item.cc:447
+#: src/pkg_item.cc:445
 msgid "Hierarchy editor"
 msgstr "Editor de jerarquías"
 
-#: src/pkg_item.cc:447
+#: src/pkg_item.cc:445
 #, fuzzy
 msgid "Hierarchy Editor"
 msgstr "Editor de jerarquías"
@@ -3615,23 +3620,23 @@
 msgstr ""
 "Introduzca el nuevo mecanismo de ordenación de paquetes para esta vista: "
 
-#: src/pkg_view.cc:344
+#: src/pkg_view.cc:359
 msgid "make_package_view: error in arguments -- two main widgets??"
 msgstr ""
 "make_package_view: error en los argumentos  -- ¿dos componentes principales?"
 
-#: src/pkg_view.cc:350
+#: src/pkg_view.cc:365
 msgid ""
 "make_package_view: error in arguments -- bad column list for static item"
 msgstr ""
 "make_package_view: error en los argumentos -- la lista de columnas para el "
 "elemento estático es incorrecta."
 
-#: src/pkg_view.cc:443
+#: src/pkg_view.cc:458
 msgid "make_package_view: bad argument!"
 msgstr "make_package_view: ¡argumento incorrecto!"
 
-#: src/pkg_view.cc:495
+#: src/pkg_view.cc:510
 msgid "make_package_view: no main widget found"
 msgstr "make_package_view: componente principal no encontrado"
 
@@ -3668,12 +3673,12 @@
 msgid " (provided by %F)"
 msgstr " (proporcionado por %F)"
 
-#: src/reason_fragment.cc:278
+#: src/reason_fragment.cc:275
 #, c-format
 msgid "%F%s %F %F"
 msgstr "%F%s %F %F"
 
-#: src/reason_fragment.cc:327
+#: src/reason_fragment.cc:324
 msgid ""
 "If you select a package, an explanation of its current state will appear in "
 "this space."
@@ -3681,7 +3686,7 @@
 "Si selecciona un paquetes, en este espacio aparecerá una explicación de su "
 "estado actual."
 
-#: src/reason_fragment.cc:361
+#: src/reason_fragment.cc:358
 msgid ""
 "%B%s%b was installed automatically;  it is being removed because all of the "
 "packages which depend upon it are being removed:"
@@ -3689,18 +3694,18 @@
 "%B%s%b se instaló automáticamente, se elimina porque todos los paquetes que "
 "dependen de él van ha ser eliminados:"
 
-#: src/reason_fragment.cc:365
+#: src/reason_fragment.cc:362
 msgid "%B%s%b will be automatically removed because of dependency errors:"
 msgstr "%B%s%b se eliminará automáticamente por errores de dependencias:"
 
-#: src/reason_fragment.cc:369
+#: src/reason_fragment.cc:366
 msgid ""
 "%B%s%b will be automatically installed to satisfy the following dependencies:"
 msgstr ""
 "%B%s%b se instalará automáticamente para satisfacer las siguientes "
 "dependencias:"
 
-#: src/reason_fragment.cc:375 src/reason_fragment.cc:387
+#: src/reason_fragment.cc:372 src/reason_fragment.cc:384
 msgid ""
 "%B%s%b cannot be upgraded now, but if it could be, it would still be held at "
 "version %B%s%b."
@@ -3708,7 +3713,7 @@
 "%B%s%b no puede actualizarse ahora, pero si se pudiera, aún se tendría que "
 "mantener en la versión %B%s%b."
 
-#: src/reason_fragment.cc:378
+#: src/reason_fragment.cc:375
 msgid ""
 "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the "
 "following dependencies:"
@@ -3716,27 +3721,27 @@
 "%B%s%b no se actualizará a la versión %B%s%b, para evitar romper las "
 "siguientes dependencias:"
 
-#: src/reason_fragment.cc:390
+#: src/reason_fragment.cc:387
 msgid "%B%s%b is currently installed."
 msgstr "%B%s%b está actualmente instalado."
 
-#: src/reason_fragment.cc:396
+#: src/reason_fragment.cc:393
 msgid "%B%s%b is not currently installed."
 msgstr "%B%s%b no está instalado actualmente."
 
-#: src/reason_fragment.cc:404
+#: src/reason_fragment.cc:401
 msgid "Some dependencies of %B%s%b are not satisfied:"
 msgstr "Algunas dependencias de %B%s%b no están satisfechas:"
 
-#: src/reason_fragment.cc:408
+#: src/reason_fragment.cc:405
 msgid "%B%s%b will be downgraded."
 msgstr "se desactualizará %B%s%b."
 
-#: src/reason_fragment.cc:415
+#: src/reason_fragment.cc:412
 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b."
 msgstr "No se actualizará %B%s%b a la versión prohibida %B%s%b."
 
-#: src/reason_fragment.cc:419
+#: src/reason_fragment.cc:416
 msgid ""
 "%B%s%b could be upgraded to version %B%s%b, but it is being held at version %"
 "B%s%b."
@@ -3744,33 +3749,33 @@
 "%B%s%b puede actualizarse a la versión %B%s%b, pero está siendo retenido en "
 "la versión %B%s%b."
 
-#: src/reason_fragment.cc:426
+#: src/reason_fragment.cc:423
 msgid "%B%s%b will be re-installed."
 msgstr "Se reinstalará %B%s%b."
 
-#: src/reason_fragment.cc:430
+#: src/reason_fragment.cc:427
 msgid "%B%s%b will be installed."
 msgstr "Se instalará %B%s%b."
 
-#: src/reason_fragment.cc:434
+#: src/reason_fragment.cc:431
 msgid "%B%s%b will be removed."
 msgstr "Se eliminará %B%s%b."
 
-#: src/reason_fragment.cc:439
+#: src/reason_fragment.cc:436
 msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b."
 msgstr "Se actualizará %B%s%b de la versión %B%s%b a la versión %B%s%b."
 
-#: src/reason_fragment.cc:475
+#: src/reason_fragment.cc:472
 msgid ""
 "The following packages depend on %B%s%b and will be broken by its removal:"
 msgstr ""
 "Los siguientes dependen de %B%s%b y se romperán debido a su eliminación:"
 
-#: src/reason_fragment.cc:478
+#: src/reason_fragment.cc:475
 msgid "The following packages depend on %B%s%b and are broken:"
 msgstr "Los siguientes paquetes dependen de %B%s%b y están rotos:"
 
-#: src/reason_fragment.cc:485
+#: src/reason_fragment.cc:482
 msgid ""
 "The following packages conflict with %B%s%b and will be broken by its "
 "installation:"
@@ -3778,7 +3783,7 @@
 "Los siguientes paquetes tienen conflictos con %B%s%b y se romperán debido a "
 "su instalación:"
 
-#: src/reason_fragment.cc:518
+#: src/reason_fragment.cc:515
 msgid ""
 "The following packages depend on a version of %B%s%b other than the "
 "currently installed version of %B%s%b, or conflict with the currently "
@@ -3788,7 +3793,7 @@
 "versión actualmente instalada de %B%s%b, o tienen conflictos con la versión "
 "actualmente instalada:"
 
-#: src/reason_fragment.cc:522
+#: src/reason_fragment.cc:519
 msgid ""
 "The following packages conflict with %B%s%b, or depend on a version of it "
 "which is not going to be installed."
@@ -3796,11 +3801,11 @@
 "Los siguientes paquetes tienen conflictos con %B%s%b, o dependen de una "
 "versión de éste que no va a instalarse."
 
-#: src/reason_fragment.cc:526
+#: src/reason_fragment.cc:523
 msgid "The following packages conflict with %B%s%b:"
 msgstr "Los siguientes paquetes tienen conflictos con %B%s%b:"
 
-#: src/reason_fragment.cc:531
+#: src/reason_fragment.cc:528
 msgid ""
 "The following packages depend on a version of %B%s%b other than the "
 "currently installed version of %B%s%b:"
@@ -3808,7 +3813,7 @@
 "Los siguientes paquetes dependen de una versión de %B%s%b distinta de la "
 "versión actualmente instalada de %B%s%b:"
 
-#: src/reason_fragment.cc:535
+#: src/reason_fragment.cc:532
 msgid ""
 "The following packages depend on a version of %B%s%b which is not going to "
 "be installed."
@@ -3816,15 +3821,15 @@
 "Los siguientes paquetes dependen de una versión de %B%s%b que no va a "
 "instalarse."
 
-#: src/reason_fragment.cc:541
+#: src/reason_fragment.cc:538
 msgid "upgraded"
 msgstr "actualizado"
 
-#: src/reason_fragment.cc:541
+#: src/reason_fragment.cc:538
 msgid "downgraded"
 msgstr "desactualizado"
 
-#: src/reason_fragment.cc:547
+#: src/reason_fragment.cc:544
 msgid ""
 "The following packages depend on the currently installed version of %B%s%b (%"
 "B%s%b), or conflict with the version it will be %s to (%B%s%b), and will be "
@@ -3834,7 +3839,7 @@
 "b (%B%s%b), o tienen conflictos con la versión en que se convertirá %s (%B%s%"
 "b), y se romperán si es %s."
 
-#: src/reason_fragment.cc:554
+#: src/reason_fragment.cc:551
 msgid ""
 "The following packages conflict with version %B%s%b of %B%s%b, and will be "
 "broken if it is %s."
@@ -3842,7 +3847,7 @@
 "Los siguientes paquetes tienen conflictos con la versión %B%s%b de %B%s%b, y "
 "se romperán si es %s."
 
-#: src/reason_fragment.cc:559
+#: src/reason_fragment.cc:556
 msgid ""
 "The following packages depend on version %B%s%b of %B%s%b, and will be "
 "broken if it is %s."
@@ -3889,31 +3894,36 @@
 msgid "Close"
 msgstr "^Cierra"
 
-#: src/solution_fragment.cc:125
+#: src/solution_fragment.cc:134
 #, fuzzy
 msgid "%BRemove%b the following packages:%n"
 msgstr "Los siguientes paquetes están ROTOS:"
 
-#: src/solution_fragment.cc:135
+#: src/solution_fragment.cc:144
 #, fuzzy
 msgid "%BInstall%b the following packages:%n"
 msgstr "Los siguientes paquetes están ROTOS:"
 
-#: src/solution_fragment.cc:148
+#: src/solution_fragment.cc:157
 msgid "%BKeep%b the following packages at their current version:%n"
 msgstr ""
 
-#: src/solution_fragment.cc:161
+#: src/solution_fragment.cc:164
+#, fuzzy
+msgid "Not Installed"
+msgstr "sin instalar"
+
+#: src/solution_fragment.cc:177
 #, fuzzy
 msgid "%BUpgrade%b the following packages:%n"
 msgstr "Los siguientes paquetes están ROTOS:"
 
-#: src/solution_fragment.cc:176
+#: src/solution_fragment.cc:192
 #, fuzzy
 msgid "%BDowngrade%b the following packages:%n"
 msgstr "Descargando paquetes"
 
-#: src/solution_fragment.cc:190
+#: src/solution_fragment.cc:206
 #, c-format
 msgid "Score is %d"
 msgstr ""
@@ -3944,45 +3954,45 @@
 msgid "W:"
 msgstr ""
 
-#: src/ui.cc:194
+#: src/ui.cc:193
 msgid "Search for:"
 msgstr "Buscar por:"
 
-#: src/ui.cc:262
+#: src/ui.cc:258
 msgid "You already are root!"
 msgstr "¡Ya es el administrador!"
 
-#: src/ui.cc:360
+#: src/ui.cc:356
 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:388
+#: src/ui.cc:384
 msgid "Loading cache"
 msgstr "Cargando caché"
 
-#: src/ui.cc:410
+#: src/ui.cc:406
 msgid "Really quit Aptitude?"
 msgstr "¿Salir de Aptitude?"
 
-#: src/ui.cc:489
+#: src/ui.cc:485
 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:589 src/ui.cc:591 src/ui.cc:619 src/ui.cc:621
+#: src/ui.cc:585 src/ui.cc:587 src/ui.cc:615 src/ui.cc:617
 msgid "Packages"
 msgstr "Paquetes"
 
-#: src/ui.cc:590 src/ui.cc:620
+#: src/ui.cc:586 src/ui.cc:616
 msgid "View available packages and choose actions to perform"
 msgstr "Ver los paquetes disponibles y escoger las acciones a realizar"
 
-#: src/ui.cc:667
+#: src/ui.cc:663
 #, fuzzy
 msgid ""
-"%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
+"Aptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
 "BABSOLUTELY NO WARRANTY%b; for details see 'license' in the Help menu.  This "
 "is free software, and you are welcome to redistribute it under certain "
 "conditions; see 'license' for details."
@@ -3996,21 +4006,20 @@
 "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:688
+#: src/ui.cc:684
 msgid "help.txt"
 msgstr "help.txt"
 
-#: src/ui.cc:704
+#: src/ui.cc:700
 msgid "README"
 msgstr "LÉAME"
 
-#: src/ui.cc:786
-#, fuzzy
+#: src/ui.cc:782
 msgid ""
-"%C%BWARNING%b: untrusted versions of the following packages will be "
-"installed!%n%nUntrusted packages could %Bcompromise your system's security%"
-"b.  You should only proceed with the installation if you are certain that "
-"this is what you want to do.%n%n"
+"%BWARNING%b: untrusted versions of the following packages will be installed!%"
+"n%nUntrusted packages could %Bcompromise your system's security%b.  You "
+"should only proceed with the installation if you are certain that this is "
+"what you want to do.%n%n"
 msgstr ""
 "%BAVISO%b: ¡se instalarán versiones sin firmar de los siguientes\n"
 "paquetes!%n%nLos paquetes sin firmar pueden %Bcomprometer la seguridad del\n"
@@ -4018,44 +4027,49 @@
 "Sólo debe continuar la instalación si está seguro de que es lo que quiere.%n%"
 "n"
 
-#: src/ui.cc:800
+#: src/ui.cc:788
+#, fuzzy
+msgid "  %S*%N %s [version %s]%n"
+msgstr "Versiones"
+
+#: src/ui.cc:795
 msgid "Really Continue"
 msgstr "Continúa de todas formas"
 
-#: src/ui.cc:802
+#: src/ui.cc:797
 msgid "Abort Installation"
 msgstr "Aborta la instalación"
 
-#: src/ui.cc:863
+#: src/ui.cc:858
 msgid "Preview of package installation"
 msgstr "Pre-visualización de la instalación de los paquetes"
 
-#: src/ui.cc:864
+#: src/ui.cc:859
 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:865
+#: src/ui.cc:860
 #, fuzzy
 msgid "Preview"
 msgstr "^Prev"
 
-#: src/ui.cc:901
+#: src/ui.cc:896
 #, fuzzy
 msgid "Some packages were broken and have been fixed:"
 msgstr "Algunos paquetes estaban rotos y se han arreglado."
 
-#: src/ui.cc:907
+#: src/ui.cc:902
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:913
-#, c-format
+#: src/ui.cc:908
+#, fuzzy, c-format
 msgid ""
-"Ran out of time while trying to resolver dependencies (press \"%s\" to try "
+"Ran out of time while trying to resolve dependencies (press \"%s\" to try "
 "harder)"
-msgstr ""
+msgstr "Pierda su tiempo intentando buscar las minas"
 
-#: src/ui.cc:959
+#: src/ui.cc:954
 #, fuzzy
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
@@ -4065,26 +4079,26 @@
 "administración, que actualmente no tiene. ¿Desearía cambiar a la \n"
 "cuenta de administrador?\n"
 
-#: src/ui.cc:962 src/ui.cc:1078
+#: src/ui.cc:957 src/ui.cc:1072
 msgid "Become root"
 msgstr "Convertirse en administrador"
 
-#: src/ui.cc:964 src/ui.cc:1080
+#: src/ui.cc:959 src/ui.cc:1074
 msgid "Don't become root"
 msgstr "No convertirse en administrador"
 
-#: src/ui.cc:969 src/ui.cc:1085
+#: src/ui.cc:964 src/ui.cc:1079
 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:996
+#: src/ui.cc:991
 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:1002
+#: src/ui.cc:997
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -4096,7 +4110,7 @@
 "Algunos paquetes pueden actualizarse, pero ha elegido no actualizarlos.\n"
 "Escriba \"U\" para preparar una actualización."
 
-#: src/ui.cc:1074
+#: src/ui.cc:1069
 #, fuzzy
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
@@ -4107,114 +4121,114 @@
 "administración, que actualmente no tiene. ¿Desearía cambiar a la cuenta\n"
 "de administrador?\n"
 
-#: src/ui.cc:1090 src/ui.cc:1377
+#: src/ui.cc:1084 src/ui.cc:1371
 msgid "Waste time trying to find mines"
 msgstr "Pierda su tiempo intentando buscar las minas"
 
-#: src/ui.cc:1097 src/ui.cc:1150
+#: src/ui.cc:1091 src/ui.cc:1144
 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:1100
+#: src/ui.cc:1094
 msgid "Deleting downloaded files"
 msgstr "Eliminando ficheros descargados"
 
-#: src/ui.cc:1114
+#: src/ui.cc:1108
 msgid "Downloaded package files have been deleted"
 msgstr "Se han borrado los ficheros de paquetes descargados"
 
-#: src/ui.cc:1175
+#: src/ui.cc:1169
 #, 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:1247
+#: src/ui.cc:1241
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1252 src/ui.cc:1283
+#: src/ui.cc:1246 src/ui.cc:1277
 #, fuzzy
 msgid "Ran out of time while trying to find a solution."
 msgstr "Pierda su tiempo intentando buscar las minas"
 
-#: src/ui.cc:1277
+#: src/ui.cc:1271
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1307
+#: src/ui.cc:1301
 #, fuzzy, c-format
 msgid "Unable to open %s"
 msgstr "No se pudo abrir %s para escribir en él"
 
-#: src/ui.cc:1313
+#: src/ui.cc:1307
 msgid "Error while dumping resolver state"
 msgstr ""
 
-#: src/ui.cc:1323
+#: src/ui.cc:1317
 msgid "File to which the resolver state should be dumped:"
 msgstr ""
 
-#: src/ui.cc:1353
+#: src/ui.cc:1347
 msgid "^Install/remove packages"
 msgstr "^Instalar/eliminar paquetes"
 
-#: src/ui.cc:1354
+#: src/ui.cc:1348
 msgid "Perform all pending installs and removals"
 msgstr "Realizar todas las instalaciones y eliminaciones pendientes"
 
-#: src/ui.cc:1356
+#: src/ui.cc:1350
 msgid "^Update package list"
 msgstr "^Actualizar la lista de paquetes"
 
-#: src/ui.cc:1357
+#: src/ui.cc:1351
 msgid "Check for new versions of packages"
 msgstr "Buscar nuevas versiones de los paquetes"
 
-#: src/ui.cc:1360
+#: src/ui.cc:1354
 msgid "^Forget new packages"
 msgstr "^Olvidar paquetes nuevos"
 
-#: src/ui.cc:1361
+#: src/ui.cc:1355
 msgid "Forget which packages are \"new\""
 msgstr "Olvidar que paquetes son «nuevos»"
 
-#: src/ui.cc:1364
+#: src/ui.cc:1358
 msgid "^Clean package cache"
 msgstr "^Limpiar la caché de paquetes"
 
-#: src/ui.cc:1365
+#: src/ui.cc:1359
 msgid "Delete package files which were previously downloaded"
 msgstr "Borra los ficheros de paquetes descargados previamente"
 
-#: src/ui.cc:1368
+#: src/ui.cc:1362
 msgid "Clean ^obsolete files"
 msgstr "Limpiar ficheros ^obsoletos"
 
-#: src/ui.cc:1369
+#: src/ui.cc:1363
 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:1372
+#: src/ui.cc:1366
 msgid "Mark ^Upgradable"
 msgstr "Marcar ^actualizable"
 
-#: src/ui.cc:1373
+#: src/ui.cc:1367
 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:1376
+#: src/ui.cc:1370
 msgid "^Play Minesweeper"
 msgstr "^Jugar al buscaminas"
 
-#: src/ui.cc:1379
+#: src/ui.cc:1373
 msgid "^Become root"
 msgstr "^Convertirse en administrador"
 
-#: src/ui.cc:1380
+#: src/ui.cc:1374
 #, fuzzy
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
@@ -4223,70 +4237,70 @@
 "Ejecuta 'su' para convertirse en administrador. Esto reiniciará el programa\n"
 "pero se mantendrán sus preferencias."
 
-#: src/ui.cc:1383
+#: src/ui.cc:1377
 msgid "^Reload package cache"
 msgstr "^Recargar la caché de paquetes"
 
-#: src/ui.cc:1384
+#: src/ui.cc:1378
 msgid "Reload the package cache"
 msgstr "Recarga la caché de paquetes"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1384
 msgid "^Quit"
 msgstr "^Salir"
 
-#: src/ui.cc:1391
+#: src/ui.cc:1385
 msgid "Exit the program"
 msgstr "Salir del programa"
 
-#: src/ui.cc:1397 src/ui.cc:1669
+#: src/ui.cc:1391 src/ui.cc:1661
 msgid "Undo"
 msgstr "Deshacer"
 
-#: src/ui.cc:1398
+#: src/ui.cc:1392
 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:1405
+#: src/ui.cc:1399
 msgid "^Install"
 msgstr "^Instalar"
 
-#: src/ui.cc:1406
+#: src/ui.cc:1400
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "Marcar el paquete seleccionado actualmente para instalar o actualizar"
 
-#: src/ui.cc:1409
+#: src/ui.cc:1403
 msgid "^Remove"
 msgstr "^Eliminar"
 
-#: src/ui.cc:1410
+#: src/ui.cc:1404
 msgid "Flag the currently selected package for removal"
 msgstr "Marcar el paquete seleccionado actualmente para eliminar"
 
-#: src/ui.cc:1413
+#: src/ui.cc:1407
 msgid "^Purge"
 msgstr "^Purgar"
 
-#: src/ui.cc:1414
+#: src/ui.cc:1408
 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:1417
+#: src/ui.cc:1411
 msgid "^Keep"
 msgstr "^Mantener"
 
-#: src/ui.cc:1418
+#: src/ui.cc:1412
 msgid "Cancel any action on the selected package"
 msgstr "Cancelar cualquier acción en el paquete seleccionado"
 
-#: src/ui.cc:1421
+#: src/ui.cc:1415
 msgid "^Hold"
 msgstr "^Retener"
 
-#: src/ui.cc:1422
+#: src/ui.cc:1416
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -4294,11 +4308,11 @@
 "Cancelar cualquier acción en el paquete seleccionado, y protejerlo de "
 "futuras actualizaciones"
 
-#: src/ui.cc:1425
+#: src/ui.cc:1419
 msgid "Mark ^Auto"
 msgstr "Marcar ^automático"
 
-#: src/ui.cc:1426
+#: src/ui.cc:1420
 #, fuzzy
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
@@ -4307,11 +4321,11 @@
 "Marcar el paquete seleccionado como instalado automáticamente.\n"
 "Se eliminará automáticamente si ningún otro paquete depende de él"
 
-#: src/ui.cc:1429
+#: src/ui.cc:1423
 msgid "Mark ^Manual"
 msgstr "Marcar ^manual"
 
-#: src/ui.cc:1430
+#: src/ui.cc:1424
 #, fuzzy
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
@@ -4320,11 +4334,11 @@
 "Marcar el paquete seleccionado como instalado manualmente.\n"
 "No se eliminará a menos que lo haga manualmente"
 
-#: src/ui.cc:1433
+#: src/ui.cc:1427
 msgid "^Forbid Version"
 msgstr "^Prohíbir versiones"
 
-#: src/ui.cc:1434
+#: src/ui.cc:1428
 #, fuzzy
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
@@ -4333,235 +4347,235 @@
 "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:1438
+#: src/ui.cc:1432
 msgid "I^nformation"
 msgstr "^Información"
 
-#: src/ui.cc:1439
+#: src/ui.cc:1433
 msgid "Display more information about the selected package"
 msgstr "Mostrar más información acerca del paquete seleccionado"
 
-#: src/ui.cc:1442
+#: src/ui.cc:1436
 msgid "^Changelog"
 msgstr "^Registro de cambios"
 
-#: src/ui.cc:1443
+#: src/ui.cc:1437
 msgid "Display the Debian changelog of the selected package"
 msgstr "Mostrar el registro de cambios del paquete seleccionado"
 
-#: src/ui.cc:1450
+#: src/ui.cc:1444
 msgid "^Find"
 msgstr "^Buscar"
 
-#: src/ui.cc:1451
+#: src/ui.cc:1445
 msgid "Search for a package"
 msgstr "Buscar un paquete"
 
-#: src/ui.cc:1454
+#: src/ui.cc:1448
 msgid "Find ^Again"
 msgstr "Buscar otra ^Vez"
 
-#: src/ui.cc:1455
+#: src/ui.cc:1449
 msgid "Repeat the last search"
 msgstr "Repetir la última búsqueda"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1453
 msgid "^Limit Display"
 msgstr "^Limitar vista"
 
-#: src/ui.cc:1460
+#: src/ui.cc:1454
 msgid "Apply a filter to the package list"
 msgstr "Aplicar un filtro a la lista de paquetes"
 
-#: src/ui.cc:1463
+#: src/ui.cc:1457
 msgid "^Un-Limit Display"
 msgstr "^No limitar vista"
 
-#: src/ui.cc:1464
+#: src/ui.cc:1458
 msgid "Remove the filter from the package list"
 msgstr "Eliminar el filtro de la lista de paquetes"
 
-#: src/ui.cc:1468
+#: src/ui.cc:1462
 msgid "Find ^Broken"
 msgstr "Buscar ^Roto"
 
-#: src/ui.cc:1469
+#: src/ui.cc:1463
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Encontrar el siguiente paquete con dependencias insatisfechas"
 
-#: src/ui.cc:1476
+#: src/ui.cc:1470
 msgid "^UI options"
 msgstr "Opciones de la ^IU"
 
-#: src/ui.cc:1477
+#: src/ui.cc:1471
 msgid "Change the settings which affect the user interface"
 msgstr "Cambiar las preferencias que afectan a la interfaz de usuario"
 
-#: src/ui.cc:1480
+#: src/ui.cc:1474
 msgid "^Dependency handling"
 msgstr "Manejo de ^dependencias"
 
-#: src/ui.cc:1481
+#: src/ui.cc:1475
 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:1484
+#: src/ui.cc:1478
 msgid "^Miscellaneous"
 msgstr "^Miscelánea"
 
-#: src/ui.cc:1485
+#: src/ui.cc:1479
 msgid "Change miscellaneous program settings"
 msgstr "Cambiar diversas preferencias del programa"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1484
 msgid "^Revert options"
 msgstr "^Deshacer opciones"
 
-#: src/ui.cc:1491
+#: src/ui.cc:1485
 msgid "Reset all settings to the system defaults"
 msgstr "Fijar todas las preferencias en los valores predeterminados"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1496
 msgid "^Next"
 msgstr "^Siguiente"
 
-#: src/ui.cc:1503
+#: src/ui.cc:1497
 msgid "View next display"
 msgstr "Ver siguiente pantalla"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1500
 msgid "^Prev"
 msgstr "^Prev"
 
-#: src/ui.cc:1507
+#: src/ui.cc:1501
 msgid "View previous display"
 msgstr "Ver pantalla anterior"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1504
 msgid "^Close"
 msgstr "^Cierra"
 
-#: src/ui.cc:1511
+#: src/ui.cc:1505
 msgid "Close this display"
 msgstr "Cerrar esta pantalla"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1510
 msgid "New Package ^View"
 msgstr "Nueva ^vista de paquetes"
 
-#: src/ui.cc:1517
+#: src/ui.cc:1511
 msgid "Create a new default package view"
 msgstr "Crear una nueva vista de paquetes por defecto"
 
-#: src/ui.cc:1520
+#: src/ui.cc:1514
 msgid "New Categorical ^Browser"
 msgstr "Nuevo ^navegador de categorías"
 
-#: src/ui.cc:1522
+#: src/ui.cc:1516
 msgid "Browse packages by category"
 msgstr "Navegar paquetes por categorías"
 
-#: src/ui.cc:1530
+#: src/ui.cc:1524
 msgid "^About"
 msgstr "^Acerca de"
 
-#: src/ui.cc:1531
+#: src/ui.cc:1525
 msgid "View information about this program"
 msgstr "Ver información sobre este programa"
 
-#: src/ui.cc:1534
+#: src/ui.cc:1528
 msgid "^Help"
 msgstr "^Ayuda"
 
-#: src/ui.cc:1535
+#: src/ui.cc:1529
 msgid "View the on-line help"
 msgstr "Ver la ayuda en línea"
 
-#: src/ui.cc:1537
+#: src/ui.cc:1531
 msgid "User's ^Manual"
 msgstr "^Manual de usuario"
 
-#: src/ui.cc:1538
+#: src/ui.cc:1532
 msgid "View the detailed program manual"
 msgstr "Consultar el manual detallado del programa"
 
-#: src/ui.cc:1541
+#: src/ui.cc:1535
 msgid "^FAQ"
 msgstr "^PUF"
 
-#: src/ui.cc:1542
+#: src/ui.cc:1536
 msgid "View a list of frequently asked questions"
 msgstr "Ver una lista de preguntas frecuentes"
 
-#: src/ui.cc:1545
+#: src/ui.cc:1539
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1546
+#: src/ui.cc:1540
 #, 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:1549
+#: src/ui.cc:1543
 msgid "^License"
 msgstr "^Licencia"
 
-#: src/ui.cc:1550
+#: src/ui.cc:1544
 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:1668
+#: src/ui.cc:1660
 msgid "Actions"
 msgstr "Acciones"
 
-#: src/ui.cc:1671
+#: src/ui.cc:1663
 msgid "Search"
 msgstr "Buscar"
 
-#: src/ui.cc:1672
+#: src/ui.cc:1664
 msgid "Options"
 msgstr "Opciones"
 
-#: src/ui.cc:1673
+#: src/ui.cc:1665
 msgid "Views"
 msgstr "Vistas"
 
-#: src/ui.cc:1674
+#: src/ui.cc:1666
 msgid "Help"
 msgstr "Ayuda"
 
-#: src/ui.cc:1734
+#: src/ui.cc:1726
 #, 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:2003 src/vscreen/vscreen.cc:281
+#: src/ui.cc:1996 src/vscreen/vscreen.cc:281
 msgid "yes_key"
 msgstr "sí"
 
-#: src/ui.cc:2004 src/vscreen/vscreen.cc:282
+#: src/ui.cc:1997 src/vscreen/vscreen.cc:282
 msgid "no_key"
 msgstr "no"
 
-#: src/view_changelog.cc:46
+#: src/view_changelog.cc:61
 msgid "You can only view changelogs of official Debian packages."
 msgstr "Sólo puede ver registros de cambios de paquetes de Debian oficiales."
 
-#: src/view_changelog.cc:52
+#: src/view_changelog.cc:67
 msgid "Downloading Changelog"
 msgstr "Descargando registro de cambios"
 
-#: src/view_changelog.cc:54
+#: src/view_changelog.cc:69
 #, fuzzy
 msgid "Download Changelog"
 msgstr "Descargando registro de cambios"
 
-#: src/view_changelog.cc:63
+#: src/view_changelog.cc:78
 #, c-format
 msgid "%s changes"
 msgstr ""
@@ -4660,18 +4674,211 @@
 #~ "Por favor, introduzca en la unidad «%s» el siguiente disco:\n"
 #~ "%s"
 
+#~ msgid "Need exactly two colors in color definition \"%s\""
+#~ msgstr "Necesito exactamente dos colores en la definición de colores \"%s\""
+
+#~ msgid "Can't parse foreground \"%s\"of color \"%s\""
+#~ msgstr "No se pudo analizar el primer plano \"%s\" del color \"%s\""
+
+#~ msgid "Can't parse background \"%s\" of color \"%s\""
+#~ msgstr "No se pudo analizar el fondo \"%s\" del color \"%s\""
+
 #~ msgid "Invalid option for interactive mode: -s\n"
 #~ msgstr "Opción inválida para el modo interactivo: -s\n"
 
+#~ 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."
+#~ 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"
+#~ "dispositivos de comunicaciones. Esto incluye programas para controlar "
+#~ "faxmodems (por ejemplo, marcadores PPP para conexión a Internet y "
+#~ "programas escritos originalmente para ese propósito (zmodem/kermit)), así "
+#~ "como programas para controlar teléfonos celulares, interfaces con "
+#~ "FidoNet, y para ejecutar un BSS"
+
+#~ 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"
+#~ " .\n"
+#~ " For more information about what Debian considers to be Free Software, "
+#~ "see http://www.debian.org/social_contract#guidelines"
+#~ msgstr ""
+#~ "Programas que no son software libre\n"
+#~ " Los paquetes en la sección 'non-free' no son parte de Debian.\n"
+#~ " .\n"
+#~ " Estos paquetes no cumplen uno o más de los requerimientos de las "
+#~ "Directrices de Debian para el Software Libre (lea más abajo). Debe leer "
+#~ "la licencia de los programas en esta sección para estar seguro de que se "
+#~ "le permite usar el programa como usted pretende.\n"
+#~ " .\n"
+#~ " Para más información a cerca de lo que Debian considera software libre, "
+#~ "consulte http://www.debian.org/social_contract#guidelines"
+
+#~ 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)"
+#~ msgstr ""
+#~ "Paquetes nuevos\n"
+#~ " Estos paquetes se han añadido a Debian desde la última vez que borró la "
+#~ "lista de paquetes «nuevos». (elija «Olvidar paquetes nuevos» del menú "
+#~ "Acciones para vaciar la lista."
+
+#~ msgid ""
+#~ "%s is an essential package!\n"
+#~ "\n"
+#~ "Are you sure you want to remove it?\n"
+#~ "Type '%s' if you are."
+#~ msgstr ""
+#~ "¡%s es un paquete esencial!<\n"
+#~ "\n"
+#~ "¿Seguro que quiere eliminarlo?\n"
+#~ "Si lo está escriba '%s'."
+
+#~ msgid "Available versions of "
+#~ msgstr "Versiones disponibles de "
+
+#~ 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."
+#~ 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."
+
 #~ msgid "Information about "
 #~ msgstr "Información sobre "
 
+#~ msgid ""
+#~ "Aptitude %s\n"
+#~ "\n"
+#~ "Copyright 2000 Daniel Burrows.\n"
+#~ "\n"
+#~ "aptitude comes with ABSOLUTELY NO WARRANTY; for details see 'license' in "
+#~ "the\n"
+#~ "Help menu.  This is free software, and you are welcome to redistribute "
+#~ "it\n"
+#~ "under certain conditions; see 'license' for details."
+#~ msgstr ""
+#~ "Aptitude %s\n"
+#~ "\n"
+#~ "Copyright 2000 Daniel Burrows.\n"
+#~ "\n"
+#~ "aptitude se entrega SIN NINGUNA GARANTÍA, para más detalles consulte "
+#~ "'Licencia'\n"
+#~ "en el menú de Ayuda. Esto es software libre, puede redistribuirlo \n"
+#~ "bajo ciertas condiciones, para más información consulte la 'Licencia'."
+
+#~ msgid "Some packages were broken and have been fixed"
+#~ msgstr "Algunos paquetes estaban rotos y se han arreglado."
+
 #~ msgid "Some broken packages could not be fixed!"
 #~ msgstr "¡No se pudieron arreglar algunos paquetes rotos!"
 
+#~ msgid "Some packages are broken.  Try to fix them?"
+#~ msgstr "Algunos paquetes están rotos. ¿Los intento arreglar?"
+
+#~ msgid ""
+#~ "Installing/removing packages requires administrative privileges, which\n"
+#~ "you currently do not have.  Would you like to change to the root "
+#~ "account?\n"
+#~ 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"
+
+#~ msgid ""
+#~ "No packages will be installed, removed or upgraded.\n"
+#~ "\n"
+#~ "Some packages could be upgraded, but you have not chosen to upgrade "
+#~ "them.\n"
+#~ "Type \"U\" to prepare an upgrade."
+#~ msgstr ""
+#~ "No se instalará, eliminará o actualizará ningún paquete.\n"
+#~ "\n"
+#~ "Algunos paquetes pueden actualizarse, pero ha elegido no actualizarlos.\n"
+#~ "Escriba \"U\" para preparar una actualización."
+
+#~ 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"
+#~ 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"
+
+#~ msgid "Obsolete downloaded package files have been deleted"
+#~ msgstr "Se han borrado los ficheros de paquetes descargados y obsoletos"
+
+#~ msgid ""
+#~ "Run 'su' to become root; this will restart the program, but your\n"
+#~ "settings will be preserved"
+#~ msgstr ""
+#~ "Ejecuta 'su' para convertirse en administrador. Esto reiniciará el "
+#~ "programa\n"
+#~ "pero se mantendrán sus preferencias."
+
+#~ msgid ""
+#~ "Mark the selected package as having been automatically installed;\n"
+#~ "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"
+
+#~ msgid ""
+#~ "Mark the selected package as having been manually installed;\n"
+#~ "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"
+
+#~ msgid ""
+#~ "Forbid the candidate version of the selected package from being "
+#~ "installed;\n"
+#~ "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"
+
 #~ msgid "^ChangeLog"
 #~ msgstr "^Registro de cambios"
 
+#~ msgid "View the important changes made in each version of the program"
+#~ msgstr ""
+#~ "Leer los cambios más importantes realizados en cada versión del programa"
+
+#, fuzzy
+#~ msgid ""
+#~ "%C%BWARNING%b: untrusted versions of the following packages will be "
+#~ "installed!%n%nUntrusted packages could %Bcompromise your system's security"
+#~ "%b.  You should only proceed with the installation if you are certain "
+#~ "that this is what you want to do.%n%n"
+#~ msgstr ""
+#~ "%BAVISO%b: ¡se instalarán versiones sin firmar de los siguientes\n"
+#~ "paquetes!%n%nLos paquetes sin firmar pueden %Bcomprometer la seguridad "
+#~ "del\n"
+#~ "sistema%b.\n"
+#~ "Sólo debe continuar la instalación si está seguro de que es lo que quiere."
+#~ "%n%n"
+
 #~ msgid "Go away, I'm trying to think.\n"
 #~ msgstr "Váyase, estoy intentando pensar.\n"
 
@@ -4733,6 +4940,9 @@
 #~ msgid "Upgradable Packages"
 #~ msgstr "Paquetes susceptibles de actualización"
 
+#~ msgid "Not Installed Packages"
+#~ msgstr "Paquetes no instalados"
+
 #~ msgid "Virtual Packages"
 #~ msgstr "Paquetes virtuales"
 

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	Sun Jun 12 21:04:47 2005
@@ -1,50 +1,48 @@
-# translation of aptitude.po to Euskara
+# translation of aptitude-eu.po to Basque 
 # This file is distributed under the same license as the PACKAGE package.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
-# Piarres Beobide Egaña <pi at beobide.net>, 2004.
-# Piarres Beobide  <pi at beobide.egaña>, 2004.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER, 2005.
+# Inaki Larranaga Murgotio <dooteo at euskalgnu.org>
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: aptitude\n"
+"Project-Id-Version: aptitude-eu\n"
 "Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-05-01 14:08-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"
+"POT-Creation-Date: 2005-06-12 22:42+0200\n"
+"PO-Revision-Date: 2005-04-21 16:55+0200\n"
+"Last-Translator: Inaki Larranaga Murgotio <dooteo at euskalgnu.org>\n"
+"Language-Team:  <itzulpena at euskalgnu.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.3.1\n"
-"Plural-Forms: Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: KBabel 1.9.1\n"
 
 #: src/apt_options.cc:109
 msgid "Display some available commands at the top of the screen"
-msgstr "Bistarazi erabilagarri dauden komando batzu pantailaren goikaldean"
+msgstr "Bistaratu komando erabilgarri batzuk pantailaren goialdean"
 
 #: src/apt_options.cc:111
 msgid "Hide the menubar when it is not being used"
-msgstr "Ezkutatu menu-barra erabilia ez denean"
+msgstr "Ezkutatu menu-barra erabiltzen ari ez denean"
 
 #: src/apt_options.cc:113
 msgid "Use a minibuffer-style prompt when possible"
-msgstr "Erabili minibuffer-moduko galderak posible denean"
+msgstr "Erabili minibuffer-estiloko gonbita ahal denean"
 
 #: src/apt_options.cc:115
 msgid "Show partial search results (incremental search)"
-msgstr "Bistarazi bukatugabeko bilaketa erantzunak (bilaketa inkrementala)"
+msgstr "Erakutsi bilaketa-emaitza partzialak (bilaketa inkrementala)"
 
 #: src/apt_options.cc:117
 msgid "Closing the last view exits the program"
-msgstr "Azken ikuspegia ixtean programa utzi"
+msgstr "Azken ikuspegia ixtean programatik irteten da"
 
 #: src/apt_options.cc:119
 msgid "Prompt for confirmation at exit"
-msgstr "Berrespena eskatu irteterakoan"
+msgstr "Eskatu berrespena irtetean"
 
 #: src/apt_options.cc:121
 msgid "Pause after downloading files"
-msgstr "Gelditu fitxategiak deskargatu ondoren"
+msgstr "Pausarazi fitxategiak deskargatu ondoren"
 
 #: src/apt_options.cc:123
 #, fuzzy
@@ -61,109 +59,110 @@
 
 #: src/apt_options.cc:127
 msgid "Use a 'status-line' download indicator for all downloads"
-msgstr "Erabili egoera-barraren deskarga bistaratzea deskarga guztientzat"
+msgstr ""
+"Erabili 'egoera-lerro' gisako deskarga-adierazle bat deskarga guztientzat"
 
 #: src/apt_options.cc:129
 msgid "Display the extended description area by default"
-msgstr "Erabili argibide xehetuen area lehentsi bezala"
+msgstr "Bistaratu azalpen-area zabaldua lehenespenez"
 
 #: src/apt_options.cc:131
 msgid "Advance to the next item after changing the state of a package"
-msgstr "Hurrengora pasa pakete baten egoera aldatu ondoren"
+msgstr "Joan hurrengo elementura, pakete baten egoera aldatu ondoren"
 
 #: src/apt_options.cc:133
 msgid "Automatically show why packages are broken"
-msgstr "Automatikoki bistarazi zergatik pakete bat apurtua dagoen"
+msgstr "Automatikoki erakutsi paketeak zergatik dauden hautsita"
 
 #: src/apt_options.cc:135
 msgid "The default grouping method for package views"
-msgstr "Pakete ikuspegirako lehenetsitako taldekatze metodoa"
+msgstr "Pakete-ikuspegietako taldekatze-metodo lehenetsia"
 
 #: src/apt_options.cc:137
 msgid "The default display-limit for package views"
-msgstr "Pakete ikuspegirako lehenetsitako bistaratze muga"
+msgstr "Pakete-ikuspegietako bistaratze-muga lehenetsia"
 
 #: src/apt_options.cc:139
 msgid "The display format for package views"
-msgstr "Pakete ikuspegirako bistaratze formatua"
+msgstr "Pakete-ikuspegietako bistaratze-formatua"
 
 #: src/apt_options.cc:142
 msgid "The display format for the status line"
-msgstr "Egoera barra  bistaratze formatua"
+msgstr "Egoera-lerroaren bistaratze-formatua"
 
 #: src/apt_options.cc:145
 msgid "The display format for the header line"
-msgstr "goikaldeko barrarentzako bistaratze formatua"
+msgstr "Goiburu-lerroaren bistaratze-formatua"
 
 #: src/apt_options.cc:154
 msgid "Automatically upgrade installed packages"
-msgstr "Automatikoki eguneratu instalaturik daude paketeak"
+msgstr "Automatikoki bertsio-berritu instalatutako paketeak"
 
 #: src/apt_options.cc:156
 msgid "Remove obsolete package files after downloading new package lists"
 msgstr ""
-"Ezabatu zaharkituriko pakete fitxategiak pakete zerrenda berria deskargatu "
-"ondoren"
+"Kendu pakete-fitxategi zaharkituak pakete-zerrenda berriak deskargatutakoan"
 
 #: src/apt_options.cc:158
 msgid "URL to use to download changelogs"
-msgstr "deskarga erregistro aldaketak erabiltzeko URL-a"
+msgstr "Aldaketen egunkariak deskargatzeko erabiliko den URLa"
 
 #: src/apt_options.cc:161
 msgid "Display a preview of what will be done before doing it"
-msgstr "Bistarazu egitekoan gertatuko denaren aurreikuspegi bat."
+msgstr "Egin aurretik, erakutsi zer egingo den"
 
 #: src/apt_options.cc:164
 msgid ""
 "Forget which packages are \"new\" whenever the package lists are updated"
 msgstr ""
-"Ahaztu zein diren pakete \"berriak\" nahi pakete zerrenda eguneraturik egon."
+"Ahaztu zein pakete diren \"berriak\", pakete-zerrendak eguneratzen direnean"
 
 #: src/apt_options.cc:167
 msgid ""
 "Forget which packages are \"new\" whenever packages are installed or removed"
 msgstr ""
-"Ahaztu zein diren pakete \"berriak\" nahi paketea intalaturik edo ezabaturik "
-"egon"
+"Ahaztu zein pakete diren \"berriak\", paketeak instalatzen edo kentzen "
+"direnean"
 
 #: src/apt_options.cc:170
 msgid "Warn when attempting to perform a privileged action as a non-root user"
 msgstr ""
-"Ohartu root baimenak behar dituen zerbait root ez den erabiltzaile bat "
-"bezala egiterakoan."
+"Abisatu root ez den erabiltzaile gisa ekintza pribilegiatu bat egiten "
+"saiatzean"
 
 #: src/apt_options.cc:173
 msgid "File to log actions into"
-msgstr "Ekintzen erregistrorako fitxategia"
+msgstr "Ekintzak erregistratzeko egunkari-fitxategia"
 
 #: src/apt_options.cc:180
 msgid "Automatically resolve dependencies of a package when it is selected"
-msgstr "Automatikoki ebatzi paketearen dependentziak instalatzerakoan"
+msgstr "Automatikoki ebatzi pakete baten mendekotasunak hautatuta dagoenean"
 
 #: src/apt_options.cc:182
 msgid "Automatically fix broken packages before installing or removing"
-msgstr "Automatikoki konpondu apurtutako paketeak instalu edo ezabatu aurretik"
+msgstr ""
+"Automatikoki konpondu hautsitako paketeak, instalatu edo konpondu aurretik"
 
 #: src/apt_options.cc:184
 msgid "Install Recommended packages automatically"
-msgstr "Instalatu Gomendatutako paketeak automatikoki"
+msgstr "Automatikoki instalatu gomendatutako paketeak"
 
 #: src/apt_options.cc:186
 msgid "Remove unused packages automatically"
-msgstr "Ezabatu erabiligabeko paketeak automatikoki"
+msgstr "Automatikoki kendu erabili gabeko paketeak"
 
 #: src/apt_options.cc:188
 msgid "Automatically remove unused packages matching this filter"
-msgstr "Ezabatu erabiligabeko paketeak automatikoki iruzkin hau erabiliaz"
+msgstr "Automatikoki kendu iragazki honekin bat datozen pakete erabili gabeak"
 
-#: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:219 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
-#: src/vscreen/vs_util.cc:328
+#: src/apt_options.cc:240 src/mine/cmine.cc:249 src/mine/cmine.cc:312
+#: src/ui.cc:215 src/vscreen/vs_util.cc:77 src/vscreen/vs_util.cc:90
+#: src/vscreen/vs_util.cc:264 src/vscreen/vs_util.cc:298
 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:328
+#: src/apt_options.cc:241 src/download_list.cc:69 src/mine/cmine.cc:250
+#: src/mine/cmine.cc:313 src/vscreen/vs_util.cc:298
 msgid "Cancel"
 msgstr "Utzi"
 
@@ -244,15 +243,15 @@
 msgid "%s: Previous"
 msgstr ""
 
-#: src/broken_indicator.cc:233
+#: src/broken_indicator.cc:232
 #, c-format
-msgid "%CSolution search failed.  %s: try harder"
+msgid "Solution search failed.  %s: try harder"
 msgstr ""
 
-#: src/broken_indicator.cc:239
-#, c-format
-msgid "%CUnable to resolve dependencies."
-msgstr ""
+#: src/broken_indicator.cc:237
+#, fuzzy
+msgid "Unable to resolve dependencies."
+msgstr "Ezzinb da %s idazteko ireki"
 
 #: src/cmdline/cmdline_action.cc:36
 #, c-format
@@ -260,8 +259,8 @@
 "Note: \"%s\", providing the virtual package\n"
 "      \"%s\", is already installed.\n"
 msgstr ""
-"Oharra:\"%s\" pakete birtualak dakarren\n"
-"      \"%s\" dagoeneko instalaturik dago.\n"
+"Oharra: \"%s\", \"%s\" pakete birtuala\n"
+"       hornitzen duena, jada instalatuta dago.\n"
 
 #: src/cmdline/cmdline_action.cc:43
 #, c-format
@@ -269,9 +268,8 @@
 "Note: \"%s\", providing the virtual package\n"
 "      \"%s\", is already going to be installed.\n"
 msgstr ""
-"Oharra s\n"
-" s da - nOharra:\"%s\" pakete birtualak dakarren\n"
-"      \"%s\" dagoeneko instalatu izango da.\n"
+"Oharra: \"%s\", \"%s\" pakete birtuala\n"
+"       hornitzen duena, instalatzera doa jada.\n"
 
 #: src/cmdline/cmdline_action.cc:61
 #, c-format
@@ -279,18 +277,18 @@
 "\"%s\" exists in the package database, but it is not a\n"
 "real package and no package provides it.\n"
 msgstr ""
-"\"%s\" existitzen da pakete databasean, baina ez da egiazko\n"
-"pakete bat eta ez du beste pakete batek ekartzen.\n"
+"\"%s\" badago paketeen datu-basean, baina ez da pakete\n"
+"erreala, eta pakete batek ere ez du hornitzen.\n"
 
 #: src/cmdline/cmdline_action.cc:67
 #, c-format
 msgid "\"%s\" is a virtual package provided by:\n"
-msgstr "\"%s\" pakete birtual bat da eta beste honetan dator:\n"
+msgstr "\"%s\" pakete birtual bat da, honek hornitua:\n"
 
 #: src/cmdline/cmdline_action.cc:70
 #, c-format
 msgid "You must choose one to install.\n"
-msgstr "Zuk instalatzeko bat aukeratu behar duzu.\n"
+msgstr "Bat aukeratu behar duzu instalatzeko.\n"
 
 #: src/cmdline/cmdline_action.cc:75
 #, c-format
@@ -298,48 +296,51 @@
 "Note: selecting \"%s\" instead of the\n"
 "      virtual package \"%s\"\n"
 msgstr ""
-"Oharra: \"%s\" aukeratzen \"%s\"\n"
-"       pakete birtualaren ordez.\n"
+"Oharra: \"%s\" hautatzen \"%s\" \n"
+"       pakete birtualaren ordez\n"
 
 #: src/cmdline/cmdline_action.cc:93
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
-msgstr "%s dagoneko eskatutako bertsioan (%s) instalaturik dago\n"
+msgstr "%s dagoeneko instalatuta dago eskatutako bertsioan (%s)\n"
 
 #: src/cmdline/cmdline_action.cc:99
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
-msgstr "%s ez dago instalaturik beraz ez da berrinstalatu behar.\n"
+msgstr "%s ez dago instalatuta, eta, beraz, ez da berrinstalatuko.\n"
 
 #: src/cmdline/cmdline_action.cc:106 src/cmdline/cmdline_action.cc:112
 #, c-format
 msgid "Package %s is not installed, so it will not be removed\n"
-msgstr "%s paketea ez dago instalaturik beraz, ezin da ezabatu.\n"
+msgstr "%s paketea ez dago instalatuta, eta, beraz, ez da kenduko\n"
 
 #: src/cmdline/cmdline_action.cc:130
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
-msgstr "%s paketea ez dago instalaturik, ezin da eguneratu\n"
+msgstr "%s paketea ez dago instalatuta; ezin da bertsio-berritzea eragotzi\n"
 
 #: src/cmdline/cmdline_action.cc:132
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
-msgstr "%s paketea ez da eguneragarria, ezin da eguneratu\n"
+msgstr ""
+"%s paketea ez da bertsio-berritzeko modukoa; ezin da bertsio-berritzea "
+"eragotzi\n"
 
 #: src/cmdline/cmdline_action.cc:211
 #, c-format
 msgid "Note: selecting the task \"%s: %s\" for installation\n"
-msgstr "Oharra: \"%s: %s\" ataza instalatzeko aukeratzen\n"
+msgstr "Oharra: \"%s: %s\" ataza hautatzen instalatzeko\n"
 
 #: src/cmdline/cmdline_action.cc:238
 #, 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"
+msgstr "'install' komando batekin bakarrik zehatz daiteke pakete-bertsioa.\n"
 
 #: src/cmdline/cmdline_action.cc:244
 #, 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"
+msgstr ""
+"'install' komando batekin bakarrik zehatz daiteke pakete-artxibo bat.\n"
 
 #: src/cmdline/cmdline_action.cc:278
 #, c-format
@@ -347,8 +348,8 @@
 "Couldn't find package \"%s\", and more than 40\n"
 "packages contain \"%s\" in their name.\n"
 msgstr ""
-"Ezin da \"%s\" paketa aurkitu, eta 40 paketetik\n"
-"gora dute \"%s\" beren izenean.\n"
+"Ezin izan da \"%s\" paketea aurkitu; 40 paketek\n"
+"baino gehiagok dute \"%s\" euren izenean.\n"
 
 #: src/cmdline/cmdline_action.cc:281
 #, c-format
@@ -356,14 +357,13 @@
 "Couldn't find package \"%s\".  However, the following\n"
 "packages contain \"%s\" in their name:\n"
 msgstr ""
-"Ezin da \"%s\" paketa aurkitu, eta hurrengo paketeak\n"
-"\"%s\" beren izenean dute:\n"
+"Ezin izan da \"%s\" paketea aurkitu. Baina pakete hauek\n"
+"\"%s\" dute euren izenean:\n"
 
 #: src/cmdline/cmdline_action.cc:305
 #, 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"
+msgstr "Ezin izan da aurkitu izenean edo azalpenean \"%s\" duen paketerik.\n"
 
 #: src/cmdline/cmdline_action.cc:307
 #, c-format
@@ -371,8 +371,8 @@
 "Couldn't find any package matching \"%s\", and more than 40\n"
 "packages contain \"%s\" in their description.\n"
 msgstr ""
-"Ez da aurkitu \"%s\" duen paketerik eta 40 paketea baino gehiagoren\n"
-"azalpenean \"%s\" agertzen da.\n"
+"Ezin izan da aurkitu \"%s\"rekin bat datorren paketerik; baina\n"
+"40 paketek baino gehiagok dute \"%s\" azalpenean.\n"
 
 #: src/cmdline/cmdline_action.cc:310
 #, c-format
@@ -380,28 +380,30 @@
 "Couldn't find any package matching \"%s\".  However, the following\n"
 "packages contain \"%s\" in their description:\n"
 msgstr ""
-"Ez da aurkitu \"%s\" duen paketerik eta hurrengo paketeen\n"
-"azalpenean \"%s\" agertzen da:\n"
+"Ezin izan da aurkitu \"%s\"(r)ekin bat datorren paketerik. Baina\n"
+"pakete hauek \"%s\" dute azalpenean:\n"
 
 #: src/cmdline/cmdline_action.cc:437
 #, c-format
 msgid "Bad action character '%c'\n"
-msgstr "'%c' karaktere ekintza okerra\n"
+msgstr "Okerreko ekintza-karakterea: '%c'\n"
 
 #: src/cmdline/cmdline_changelog.cc:28
 msgid "Can't execute sensible-pager, is this a working Debian system?"
-msgstr "Ezin da paginatzaile-sensiblea erabili, hau Debian sistema bat al da?"
+msgstr ""
+"Ezin da 'sensible-pager' exekutatu, funtzionatzen duen Debian sistema da?"
 
 #: src/cmdline/cmdline_changelog.cc:71
 #, c-format
 msgid "%s is not an official Debian package, cannot display its changelog."
 msgstr ""
-"%s ez da Debian pakete ofizial bat, ezin da aldaketa erregistroa bistatu"
+"%s ez da Debianeko pakete ofiziala, ezin da bere 'changelog' (aldaketen "
+"erregistroa) bistaratu."
 
 #: src/cmdline/cmdline_changelog.cc:79
 #, c-format
 msgid "Couldn't find a changelog for %s"
-msgstr "Ezin da %s-ren erregistro aldaketa fitxategi aurkitu"
+msgstr "Ezin izan da %s(r)e 'changelog'a aurkitu"
 
 #: src/cmdline/cmdline_clean.cc:52
 #, c-format
@@ -426,27 +428,27 @@
 #: src/cmdline/cmdline_do_action.cc:71
 #, c-format
 msgid "Invalid operation %s"
-msgstr "Operazio baliogabea %s"
+msgstr "Eragiketa baliogabea: %s"
 
 #: src/cmdline/cmdline_do_action.cc:207 src/cmdline/cmdline_simulate.cc:31
 #: src/cmdline/cmdline_upgrade.cc:91
 #, c-format
 msgid "Abort.\n"
-msgstr "Eten.\n"
+msgstr "Abortatu.\n"
 
 #: src/cmdline/cmdline_download.cc:29
 #, c-format
 msgid "download: you must specify at least one package to download\n"
-msgstr "deskargak: zuk pakete bat beintzat ezarri behar duzu deskargatzeko\n"
+msgstr "deskargatu: gutxienez pakete bat zehaztu behar duzu deskargatzeko\n"
 
 #: src/cmdline/cmdline_download.cc:41 src/download.cc:344
 msgid "Couldn't read source list"
-msgstr "Ezin da jatorri zerrenda irakurri"
+msgstr "Ezin izan da iturburu-zerrenda irakurri"
 
 #: src/cmdline/cmdline_download.cc:62
 #, c-format
 msgid "Can't find a package named \"%s\""
-msgstr "Ez da \"%s\" izeneko paketerik aurkitu."
+msgstr "Ezin izan da \"%s\" izeneko paketea aurkitu "
 
 #: src/cmdline/cmdline_download.cc:72
 #, c-format
@@ -454,147 +456,142 @@
 "No downloadable files for %s version %s; perhaps it is a local or obsolete "
 "package?"
 msgstr ""
-"Ezin da%s paketearen %s bertsioa deskargatu, agian pakete lokal edo "
-"zaharkitu bat da?"
+"Ez dago %s(r)en %s bertsioko deskarga daitezkeen fitxategirik, agian pakete "
+"lokala edo zaharkitua izango da?"
 
 #: src/cmdline/cmdline_forget_new.cc:43
 #, c-format
 msgid "Would forget what packages are new\n"
-msgstr "Zein pakete berri diren ahaztuko luke\n"
+msgstr "Ahaztu egingo luke zein pakete diren berriak\n"
 
 #: src/cmdline/cmdline_moo.cc:16
 #, c-format
 msgid "There are no Easter Eggs in this program.\n"
-msgstr ""
-"Ez dago paskoa arrautzik programa honetan.\n"
-"\n"
+msgstr "Programa honetan ez dago pazko-arrautzarik.\n"
 
 #: src/cmdline/cmdline_moo.cc:19
 #, c-format
 msgid "There really are no Easter Eggs in this program.\n"
-msgstr ""
-"Benetan, ez dago paskoa arrautzik programa honetan.\n"
-"\n"
+msgstr "Benetan, programa honetan ez dago inolako pazko-arrautzarik.\n"
 
 #: src/cmdline/cmdline_moo.cc:22
 #, c-format
 msgid ""
 "Didn't I already tell you that there are no Easter Eggs in this program?\n"
-msgstr ""
-"¿No le he dicho ya que no hay ningún huevo de pascua en este programa?\n"
+msgstr "Ez dizut bada esan programa honetan ez dagoela pazko-arrautzarik?\n"
 
 #: src/cmdline/cmdline_moo.cc:25
 #, c-format
 msgid "Stop it!\n"
-msgstr "Gelditu!\n"
+msgstr "Nahikoa da. Utz ezazu!\n"
 
 #: src/cmdline/cmdline_moo.cc:28
 #, c-format
 msgid "Okay, okay, if I give you an Easter Egg, will you go away?\n"
-msgstr "Ados, Pazko arrautza bat ematen badizut joango al zara?\n"
+msgstr "Ados, ados. Pazko-arrautza bat ematen badizut, utziko duzu?\n"
 
 #: src/cmdline/cmdline_moo.cc:31
 #, c-format
 msgid "All right, you win.\n"
-msgstr "Dena zuzena, zu irabazle.\n"
+msgstr "Ondo da, zuk irabazi duzu.\n"
 
 #: src/cmdline/cmdline_moo.cc:40
 #, c-format
 msgid "Happy?"
-msgstr "Pozik?"
+msgstr "Pozik orain?"
 
 #: src/cmdline/cmdline_moo.cc:44
 #, c-format
 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"
+msgstr "Zer da hau? Suge bat elefante bat jaten, noski.\n"
 
 #: src/cmdline/cmdline_prompt.cc:46
 msgid "Couldn't read list of sources"
-msgstr "Ezin da jatorri zerrenda irakurri"
+msgstr "Ezin izan da iturburu-zerrenda irakurri"
 
 #: src/cmdline/cmdline_prompt.cc:221 src/cmdline/cmdline_show_broken.cc:73
 #, c-format
 msgid "but %s is to be installed."
-msgstr "baina %s ez dago instalaturik"
+msgstr "baina %s instalatu egingo da."
 
 #: src/cmdline/cmdline_prompt.cc:224 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."
+msgstr "baina %s instalatuta dago, eta mantendu egin da."
 
 #: src/cmdline/cmdline_prompt.cc:227 src/cmdline/cmdline_show_broken.cc:79
 #, c-format
 msgid "but %s is installed."
-msgstr "baina %s instalaturik dago"
+msgstr "baina %s instalatuta dago."
 
 #: src/cmdline/cmdline_prompt.cc:231 src/cmdline/cmdline_show_broken.cc:83
 #, c-format
 msgid "but it is not installable"
-msgstr "baina ez da instalagarri"
+msgstr "baina ez da instalagarria"
 
 #: src/cmdline/cmdline_prompt.cc:235 src/cmdline/cmdline_show_broken.cc:87
 #, c-format
 msgid " which is a virtual package."
-msgstr "pakete  birtual bat dena"
+msgstr " ; paketea birtuala da"
 
 #: src/cmdline/cmdline_prompt.cc:238 src/cmdline/cmdline_show_broken.cc:90
 #, c-format
 msgid " or"
-msgstr "edo"
+msgstr " edo"
 
 #: src/cmdline/cmdline_prompt.cc:250
 msgid "The following packages are BROKEN:"
-msgstr "Hurrengo paketeak APURTURIK daude:"
+msgstr "Ondorengo paketeak HAUTSITA daude:"
 
 #: src/cmdline/cmdline_prompt.cc:251
 msgid "The following packages are unused and will be REMOVED:"
-msgstr "Hurrengo apaketeak ez dira erabiltzen eta EZABATU egingo dira:"
+msgstr "Ondorengo paketeak erabili gabe daude, eta KENDU egingo dira:"
 
 #: src/cmdline/cmdline_prompt.cc:252
 msgid "The following packages have been automatically kept back:"
-msgstr "Hurrengo paketeak automatikoki eguneratu gabe utziko dira:"
+msgstr "Ondorengo paketeak automatikoki mantendu dira:"
 
 #: src/cmdline/cmdline_prompt.cc:253
 msgid "The following NEW packages will be automatically installed:"
-msgstr "Hurrengo pakete berri hauek automatikoki instalatu egingo dira:"
+msgstr "Ondorengo pakete BERRIAK automatikoki instalatuko dira:"
 
 #: src/cmdline/cmdline_prompt.cc:254
 msgid "The following packages will be automatically REMOVED:"
-msgstr "Hurrengo pakete berri hauek automatikoki EZABATU egingo dira:"
+msgstr "Ondorengo paketeak automatikoki KENDUKO dira:"
 
 #: src/cmdline/cmdline_prompt.cc:255
 msgid "The following packages will be DOWNGRADED:"
-msgstr "Hurrengo paketak ATZERATUAK izango dira:"
+msgstr "Ondorengo paketeak AURREKO BERTSIORA itzuliko dira:"
 
 #: src/cmdline/cmdline_prompt.cc:256
 msgid "The following packages have been kept back:"
-msgstr "Honako paketea hauek ez dira eguneratuko:"
+msgstr "Ondorengo paketeak mantendu egin dira:"
 
 #: src/cmdline/cmdline_prompt.cc:257
 msgid "The following packages will be REINSTALLED:"
-msgstr "Hurrengo paketak BERRINSTALATUAK izango dira:"
+msgstr "Ondorengo paketeak BERRINSTALATUKO dira:"
 
 #: src/cmdline/cmdline_prompt.cc:258
 msgid "The following NEW packages will be installed:"
-msgstr "Hurrengo paketak berriak INSTALATUAK izango dira:"
+msgstr "Ondorengo pakete BERRIAK instalatuko dira:"
 
 #: src/cmdline/cmdline_prompt.cc:259
 msgid "The following packages will be REMOVED:"
-msgstr "Hurrengo paketak EZABATUAK izango dira:"
+msgstr "Ondorengo paketeak KENDUKO dira:"
 
 #: src/cmdline/cmdline_prompt.cc:260
 msgid "The following packages will be upgraded:"
-msgstr "Hurrengo paketak EGUNERATUAK izango dira:"
+msgstr "Ondorengo paketeak BERTSIO-BERRITUKO dira:"
 
 #: src/cmdline/cmdline_prompt.cc:312
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
-msgstr "Hurrego BEHARREZKO paketeak EZABATU egingo dira!\n"
+msgstr "Ondorengo FUNTSEZKO paketeak KENDU egingo dira!\n"
 
 #: src/cmdline/cmdline_prompt.cc:321
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
-msgstr "Ekintza honek hurrego BEHARREZKO paketeak APURTU ditzake!\n"
+msgstr "Ondorengo FUNTSEZKO paketeak HAUTSI egingo dira ekintza honekin:\n"
 
 #: src/cmdline/cmdline_prompt.cc:331
 #, c-format
@@ -602,17 +599,17 @@
 "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 ""
-"KONTU: Ekintza hau egitak ziurreink zure sistema apurtuko du! \n"
-"         EZ JARRAITU ez badakizu ZEHATZ MEHATZ zer egiten ari zaren!\n"
+"KONTUZ: ekintza hau egitean, beharbada sistema hondatu egingo da!\n"
+"         Ez baldin badakizu ZEHAZKI zer egiten ari zaren, EZ jarraitu!\n"
 
 #: src/cmdline/cmdline_prompt.cc:333
 msgid "I am aware that this is a very bad idea"
-msgstr "Hau oso ideia txarra ela ziur nago"
+msgstr "Badakit oso ideia txarra dela"
 
 #: src/cmdline/cmdline_prompt.cc:336
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
-msgstr "Jarraitzeko idatzi \"%s\" esaldia:\n"
+msgstr "Jarraitzeko, idatzi esaldi hau: \"%s\":\n"
 
 #: src/cmdline/cmdline_prompt.cc:375
 #, c-format
@@ -624,101 +621,109 @@
 "this is what you want to do.\n"
 "\n"
 msgstr ""
+"ABISUA: fidagarritasunik ez duten honako paketeen bertsioak instalatuko "
+"dira!\n"
+"\n"
+"Fidagarritasunik gabeko paketeak sistemaren segurtasuna hondatu dezakete.\n"
+"Instalazioarekin jarraitu zertan ari zaren ziur bazaude bakarrik.\n"
+"\n"
 
-#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
-#: src/vscreen/vs_util.cc:212
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:165
+#: src/vscreen/vs_util.cc:202
 msgid "Yes"
 msgstr "Bai"
 
-#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
-#: src/vscreen/vs_util.cc:212
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:165
+#: src/vscreen/vs_util.cc:202
 msgid "No"
 msgstr "Ez"
 
 #: src/cmdline/cmdline_prompt.cc:388
 #, c-format
 msgid "Do you want to ignore this warning and proceed anyway?\n"
-msgstr ""
+msgstr "Ez ikusi egin abisuari eta jarraitu hala ere?\n"
 
 #: src/cmdline/cmdline_prompt.cc:389
-#, fuzzy, c-format
+#, c-format
 msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
-msgstr "Jarraitzeko idatzi \"%s\" esaldia:\n"
+msgstr "Jarraitzeko, sartu \"%s\"; bertan behera uzteko sartu \"%s\":n"
 
 #: src/cmdline/cmdline_prompt.cc:400
 #, c-format
 msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
-msgstr ""
+msgstr "Sarrera ezezaguna. Sartu \"%s\" edo \"%s\".\n"
 
 #: src/cmdline/cmdline_prompt.cc:499
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
-msgstr "Hurrengo paketeak GOMENDATURIK daude baina EZ dira instalatuko:\n"
+msgstr "Ondorengo paketeak GOMENDATUTAKOAK dira, baina EZ dira instalatuko:\n"
 
 #: src/cmdline/cmdline_prompt.cc:505
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
-msgstr "Hurrengo paketeak GOMENDATURIK daude baina EZ dira instalatuko:\n"
+msgstr "Ondorengo paketeak IRADOKITAKOAK dira, baina EZ dira instalatuko: \n"
 
 #: src/cmdline/cmdline_prompt.cc:510
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
-msgstr "Ez dira paketerik instalatu eguneratu edo ezabatuko.\n"
+msgstr "Ez da paketerik instalatuko, bertsio-berrituko edo kenduko.\n"
 
 #: src/cmdline/cmdline_prompt.cc:512
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
-msgstr "%lu pakete eguneratorik, %lu berri instalaturik"
+msgstr "%lu pakete bertsio-berrituta, %lu berriki instalatuta, "
 
 #: src/cmdline/cmdline_prompt.cc:516
 #, c-format
 msgid "%lu reinstalled, "
-msgstr "%lu berrinstalaturik, "
+msgstr "%lu berrinstalatuta, "
 
 #: src/cmdline/cmdline_prompt.cc:518
 #, c-format
 msgid "%lu downgraded, "
-msgstr "%lu atzeraturik, "
+msgstr "%lu aurreko bertsiora itzulita, "
 
 #: src/cmdline/cmdline_prompt.cc:520
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu ezabatu eta %lu ez dira eguneratu.\n"
+msgstr "%lu kentzeko, eta %lu bertsio-berritu gabe.\n"
 
 #: src/cmdline/cmdline_prompt.cc:527
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
-msgstr "%sB/%sB Fitxategi eskuratu behar dira. "
+msgstr "Artxiboetako %sB/%sB eskuratu behar dira. "
 
 #: src/cmdline/cmdline_prompt.cc:530
 #, c-format
 msgid "Need to get %sB of archives. "
-msgstr "%sB Fitxategi eskuratu behar dira. "
+msgstr "Artxiboetako %sB eskuratu behar dira. "
 
 #: src/cmdline/cmdline_prompt.cc:537
 #, c-format
 msgid "After unpacking %sB will be used.\n"
-msgstr "Desenpaketatu ondoren %sB erabiliko dira\n"
+msgstr "Deskonprimitu ondoren, %sB erabiliko dira.\n"
 
 #: src/cmdline/cmdline_prompt.cc:540
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
-msgstr "Desenpaketatu ondoren %sB uztuko dira\n"
+msgstr "Deskonprimitu ondoren, %sB libratuko dira.\n"
 
 #: src/cmdline/cmdline_prompt.cc:578
 #, 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"
+msgstr ""
+"Ez dago paketerik erakusteko -- sartu paketearen izena 'i'-ren azpiko "
+"lerroan.\n"
 
 #: src/cmdline/cmdline_prompt.cc:580
 msgid "Press Return to continue."
-msgstr "Zanpatu return jarraitzeko."
+msgstr "Jarraitzeko, sakatu 'Sartu' tekla."
 
 #: src/cmdline/cmdline_prompt.cc:606
 #, 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"
+"Ez da paketerik aurkitu -- sartu paketeen izenak 'c'-ren azpiko lerroan.\n"
 
 #: src/cmdline/cmdline_prompt.cc:610
 #, fuzzy
@@ -824,7 +829,7 @@
 
 #: src/cmdline/cmdline_prompt.cc:732
 msgid "Do you want to continue? [Y/n/?] "
-msgstr "Jarraitzea nahi al duzu? [Y/n/?]"
+msgstr "Jarraitu nahi duzu? [Y/n/?] "
 
 #: src/cmdline/cmdline_prompt.cc:757
 #, c-format
@@ -834,7 +839,7 @@
 "\n"
 msgstr ""
 "\n"
-"Dependentzi argibideak erakutsiko dira.\n"
+"Mendekotasun-informazioa erakutsiko da.\n"
 "\n"
 
 #: src/cmdline/cmdline_prompt.cc:759
@@ -845,7 +850,7 @@
 "\n"
 msgstr ""
 "\n"
-"Dependentzi argibideak ez da erakutsiko.\n"
+"Mendekotasun-informaziorik ez da erakutsiko.\n"
 "\n"
 
 #: src/cmdline/cmdline_prompt.cc:765
@@ -867,7 +872,7 @@
 "\n"
 msgstr ""
 "\n"
-"Bertsioak ez dira erakutsiko.\n"
+"Bertsiorik ez da erakutsiko.\n"
 "\n"
 
 #: src/cmdline/cmdline_prompt.cc:772
@@ -878,7 +883,7 @@
 "\n"
 msgstr ""
 "\n"
-"Tamaina aldaketeak erakutsiko dira.\n"
+"Tamaina-aldaketak erakutsiko dira.\n"
 "\n"
 
 #: src/cmdline/cmdline_prompt.cc:774
@@ -889,15 +894,14 @@
 "\n"
 msgstr ""
 "\n"
-"Tamaina aldaketeak ez dira erakutsiko.\n"
+"Tamaina-aldaketarik ez da erakutsiko.\n"
 "\n"
 
 #: src/cmdline/cmdline_prompt.cc:797
 #, 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"
+"Erantzun baliogabea. Sartu baliozko komando bat, edo '?' laguntza ikusteko.\n"
 
 #: src/cmdline/cmdline_resolver.cc:93
 #, c-format
@@ -944,7 +948,7 @@
 msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:212
+#: src/cmdline/cmdline_resolver.cc:212 src/cmdline/cmdline_resolver.cc:285
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
@@ -960,7 +964,7 @@
 #: src/cmdline/cmdline_resolver.cc:240 src/generic/apt.cc:142
 #, c-format
 msgid "Unable to open %s for writing"
-msgstr "Ezzinb da %s idazteko ireki"
+msgstr "Ezin da %s idazteko ireki"
 
 #: src/cmdline/cmdline_resolver.cc:245
 #, fuzzy, c-format
@@ -996,290 +1000,294 @@
 #: src/cmdline/cmdline_search.cc:76
 #, c-format
 msgid "search: You must provide at least one search term\n"
-msgstr "bilatu: Zuk beintzat bilaketa patroi bat eman behar duzu\n"
+msgstr "bilatu: bilaketa-termino bat eman behar duzu gutxienez\n"
 
 #: src/cmdline/cmdline_show_broken.cc:113
 #, c-format
 msgid "The following packages have unmet dependencies:\n"
-msgstr "Honako paketeek betegabeko dependentziak dituzte:\n"
+msgstr "Ondorengo paketeetan bete gabeko mendekotasunak daude:\n"
+
+#: src/cmdline/cmdline_show.cc:119 src/cmdline/cmdline_show.cc:305
+#: src/solution_fragment.cc:65
+msgid "<NULL>"
+msgstr ""
 
-#: src/cmdline/cmdline_show.cc:133
+#: src/cmdline/cmdline_show.cc:138
 msgid "not installed"
-msgstr "ez instalaturik"
+msgstr "ez dago instalatuta"
 
-#: src/cmdline/cmdline_show.cc:135 src/pkg_columnizer.cc:231
+#: src/cmdline/cmdline_show.cc:140 src/pkg_columnizer.cc:231
 #: src/pkg_ver_item.cc:225
 msgid "unpacked"
-msgstr "Despaketatua"
+msgstr "deskonprimituta"
 
-#: src/cmdline/cmdline_show.cc:137
+#: src/cmdline/cmdline_show.cc:142
 msgid "partially configured"
-msgstr "erdi konfiguraturik"
+msgstr "erdizka konfiguratuta"
 
-#: src/cmdline/cmdline_show.cc:139
+#: src/cmdline/cmdline_show.cc:144
 msgid "partially installed"
-msgstr "erdi-instalaturik"
+msgstr "erdizka instalatuta"
 
-#: src/cmdline/cmdline_show.cc:141
+#: src/cmdline/cmdline_show.cc:146
 msgid "not installed (configuration files remain)"
-msgstr "ez instalaturtik (konfigurazio fitxategiak daude)"
+msgstr "ez dago instalatuta (konfigurazio-fitxategiak daude)"
 
-#: src/cmdline/cmdline_show.cc:143 src/pkg_columnizer.cc:239
+#: src/cmdline/cmdline_show.cc:148 src/pkg_columnizer.cc:239
 #: src/pkg_ver_item.cc:233
 msgid "installed"
-msgstr "instalaturik"
+msgstr "instalatuta"
 
-#: src/cmdline/cmdline_show.cc:152
+#: src/cmdline/cmdline_show.cc:157
 msgid "not a real package"
-msgstr "ez da pakete erreal bat"
+msgstr "ez da benetako paketea"
 
-#: src/cmdline/cmdline_show.cc:165
+#: src/cmdline/cmdline_show.cc:170
 msgid " [held]"
-msgstr " [hizoztu]"
+msgstr " [mantenduta]"
 
-#: src/cmdline/cmdline_show.cc:174
+#: src/cmdline/cmdline_show.cc:179
 #, c-format
 msgid "%s; version %s will be installed"
-msgstr "%s, %s bertsioa instalatua izango da."
+msgstr "%s; %s bertsioa instalatu egingo da"
 
-#: src/cmdline/cmdline_show.cc:178
+#: src/cmdline/cmdline_show.cc:183
 #, c-format
 msgid "%s; version %s will be installed automatically"
-msgstr "%s, %s bertsioa automatikoki instalatua izango da."
+msgstr "%s; %s bertsioa automatikoki instalatu egingo da"
 
-#: src/cmdline/cmdline_show.cc:184 src/cmdline/cmdline_show.cc:199
+#: src/cmdline/cmdline_show.cc:189 src/cmdline/cmdline_show.cc:204
 #, c-format
 msgid "%s; will be purged"
-msgstr "%s, ezabatu izango da."
+msgstr "%s; kendu egingo da."
 
-#: src/cmdline/cmdline_show.cc:197
+#: src/cmdline/cmdline_show.cc:202
 #, c-format
 msgid "%s; will be purged because nothing depends on it"
-msgstr "%s, ezerk ez du behar eta ezabatu izango da."
+msgstr "%s; kendu egingo da, inork ez baitauka honekiko mendekotasunik."
 
-#: src/cmdline/cmdline_show.cc:204
+#: src/cmdline/cmdline_show.cc:209
 #, c-format
 msgid "%s; will be removed because nothing depends on it"
-msgstr "%s, ezerk ez du behar eta desinstalatua izango da."
+msgstr "%s; kendu egingo da, inork ez baitauka honekiko mendekotasunik."
 
-#: src/cmdline/cmdline_show.cc:206
+#: src/cmdline/cmdline_show.cc:211
 #, c-format
 msgid "%s; will be removed"
-msgstr "%s ezabatu izango da."
+msgstr "%s; kendu egingo da"
 
-#: src/cmdline/cmdline_show.cc:220
+#: src/cmdline/cmdline_show.cc:225
 #, c-format
 msgid "%s%s; will be downgraded [%s -> %s]"
-msgstr "%s%s, atzeratu egingo da [%s -> %s]"
+msgstr "%s%s; aurreko bertsiora itzuliko da [%s -> %s]"
 
-#: src/cmdline/cmdline_show.cc:223
+#: src/cmdline/cmdline_show.cc:228
 #, c-format
 msgid "%s%s; will be upgraded [%s -> %s]"
-msgstr "%s%s, eguneratu egingo da [%s -> %s]"
+msgstr "%s%s; bertsio-berrituko da [%s -> %s]"
 
-#: src/cmdline/cmdline_show.cc:235 src/cmdline/cmdline_show.cc:256
+#: src/cmdline/cmdline_show.cc:240 src/cmdline/cmdline_show.cc:261
 msgid "Package: "
-msgstr "Paketea:"
+msgstr "Paketea: "
 
-#: src/cmdline/cmdline_show.cc:236 src/cmdline/cmdline_show.cc:264
+#: src/cmdline/cmdline_show.cc:241 src/cmdline/cmdline_show.cc:269
 #: src/pkg_columnizer.cc:87
 msgid "State"
 msgstr "Egoera"
 
-#: src/cmdline/cmdline_show.cc:237 src/cmdline/cmdline_show.cc:318
+#: src/cmdline/cmdline_show.cc:242 src/cmdline/cmdline_show.cc:325
 msgid "Provided by"
-msgstr "Nork egina:"
+msgstr "Honek hornitua:"
 
-#: src/cmdline/cmdline_show.cc:258 src/pkg_info_screen.cc:105
+#: src/cmdline/cmdline_show.cc:263 src/pkg_info_screen.cc:105
 msgid "Essential: "
-msgstr "Beharrezkoa: "
+msgstr "Funtsezkoa: "
 
-#: src/cmdline/cmdline_show.cc:258 src/cmdline/cmdline_show.cc:262
-#: src/cmdline/cmdline_show.cc:273 src/pkg_info_screen.cc:105
+#: src/cmdline/cmdline_show.cc:263 src/cmdline/cmdline_show.cc:267
+#: src/cmdline/cmdline_show.cc:278 src/pkg_info_screen.cc:105
 msgid "yes"
-msgstr "Bai"
+msgstr "bai"
 
-#: src/cmdline/cmdline_show.cc:262
+#: src/cmdline/cmdline_show.cc:267
 msgid "New"
 msgstr "Berria"
 
-#: src/cmdline/cmdline_show.cc:267
+#: src/cmdline/cmdline_show.cc:272
 msgid "Forbidden version"
 msgstr "Debekatutako bertsioa"
 
-#: src/cmdline/cmdline_show.cc:271
+#: src/cmdline/cmdline_show.cc:276
 msgid "Automatically installed"
-msgstr "Automatikoki instalaturik"
+msgstr "Automatikoki instalatuta"
 
-#: src/cmdline/cmdline_show.cc:273
+#: src/cmdline/cmdline_show.cc:278
 msgid "no"
 msgstr "ez"
 
-#: src/cmdline/cmdline_show.cc:275
+#: src/cmdline/cmdline_show.cc:280
 msgid "Version: "
-msgstr "Bertsioa:"
+msgstr "Bertsioa: "
 
-#: src/cmdline/cmdline_show.cc:276 src/pkg_info_screen.cc:113
+#: src/cmdline/cmdline_show.cc:281 src/pkg_info_screen.cc:113
 msgid "Priority: "
-msgstr "Lehentasuna:"
+msgstr "Lehentasuna: "
 
-#: src/cmdline/cmdline_show.cc:277 src/cmdline/cmdline_show.cc:279
-#: src/cmdline/cmdline_show.cc:288
+#: src/cmdline/cmdline_show.cc:282 src/cmdline/cmdline_show.cc:284
+#: src/cmdline/cmdline_show.cc:293
 msgid "N/A"
-msgstr "E/G"
+msgstr "E/E"
 
-#: src/cmdline/cmdline_show.cc:278 src/pkg_info_screen.cc:114
+#: src/cmdline/cmdline_show.cc:283 src/pkg_info_screen.cc:114
 msgid "Section: "
-msgstr "Sekzioa:"
+msgstr "Sekzioa: "
 
-#: src/cmdline/cmdline_show.cc:280 src/pkg_info_screen.cc:115
+#: src/cmdline/cmdline_show.cc:285 src/pkg_info_screen.cc:115
 msgid "Maintainer: "
-msgstr "Arduraduna: "
+msgstr "Mantentzailea: "
 
-#: src/cmdline/cmdline_show.cc:283
+#: src/cmdline/cmdline_show.cc:288
 msgid "Uncompressed Size: "
-msgstr "Deskonprimituako Tamaina:"
+msgstr "Konprimitu gabeko tamaina: "
 
-#: src/cmdline/cmdline_show.cc:287
+#: src/cmdline/cmdline_show.cc:292
 msgid "Architecture: "
-msgstr "Arkitektura:"
+msgstr "Arkitektura: "
 
-#: src/cmdline/cmdline_show.cc:289
+#: src/cmdline/cmdline_show.cc:294
 msgid "Compressed Size: "
-msgstr "Komprimituriko Tamaina"
+msgstr "Konprimitutako tamaina: "
 
-#: src/cmdline/cmdline_show.cc:291
+#: src/cmdline/cmdline_show.cc:296
 msgid "Filename: "
-msgstr "Fitxategi Izena:"
+msgstr "Fitxategi-izena: "
 
-#: src/cmdline/cmdline_show.cc:293
+#: src/cmdline/cmdline_show.cc:298
 msgid "MD5sum: "
-msgstr "MD5sum: "
+msgstr "MD5 batura: "
 
-#: src/cmdline/cmdline_show.cc:297 src/cmdline/cmdline_show.cc:299
+#: src/cmdline/cmdline_show.cc:302 src/cmdline/cmdline_show.cc:305
 msgid "Archive"
-msgstr "Fitxategiak"
+msgstr "Artxiboa"
 
-#: src/cmdline/cmdline_show.cc:303
+#: src/cmdline/cmdline_show.cc:310
 msgid "Depends"
-msgstr "Dependentziak"
+msgstr "Mendekotasuna:"
 
-#: src/cmdline/cmdline_show.cc:305
+#: src/cmdline/cmdline_show.cc:312
 msgid "PreDepends"
-msgstr "Aurre-depentziak"
+msgstr "Aurremendekotasuna:"
 
-#: src/cmdline/cmdline_show.cc:307
+#: src/cmdline/cmdline_show.cc:314
 msgid "Recommends"
-msgstr "Gomendatutakoak"
+msgstr "Gomendioa:"
 
-#: src/cmdline/cmdline_show.cc:309
+#: src/cmdline/cmdline_show.cc:316
 msgid "Suggests"
-msgstr "Iradokiak"
+msgstr "Iradokizuna:"
 
-#: src/cmdline/cmdline_show.cc:311
+#: src/cmdline/cmdline_show.cc:318
 msgid "Conflicts"
-msgstr "Gatazkak"
+msgstr "Gatazka:"
 
-#: src/cmdline/cmdline_show.cc:313
+#: src/cmdline/cmdline_show.cc:320
 msgid "Replaces"
-msgstr "Ordeztu"
+msgstr "Ordezten du:"
 
-#: src/cmdline/cmdline_show.cc:315
+#: src/cmdline/cmdline_show.cc:322
 msgid "Obsoletes"
-msgstr "Zaharkiturik"
+msgstr "Zaharkitzea:"
 
-#: src/cmdline/cmdline_show.cc:317
+#: src/cmdline/cmdline_show.cc:324
 msgid "Provides"
-msgstr "Dakar"
+msgstr "Hornitzen du:"
 
-#: src/cmdline/cmdline_show.cc:321 src/pkg_info_screen.cc:97
+#: src/cmdline/cmdline_show.cc:328 src/pkg_info_screen.cc:97
 msgid "Description: "
 msgstr "Azalpena: "
 
 #: src/cmdline/cmdline_simulate.cc:37
 #, c-format
 msgid "Would download/install/remove packages.\n"
-msgstr "Paketea dekargatu/instalatu/ezabatu-ko ditu.\n"
+msgstr "Paketeak deskargatu/instalatu/kenduko ditu.\n"
 
 #: src/cmdline/cmdline_simulate.cc:48
 msgid "Internal Error, Ordering didn't finish"
-msgstr "Barne Errorea, Sailkatzea ez da maitu"
+msgstr "Barne-errorea; ordenatzea ez da amaitu"
 
 #: src/cmdline/cmdline_update.cc:20
 #, c-format
 msgid "E: The update command takes no arguments\n"
-msgstr "E: update komandoak ez du argumentorik\n"
+msgstr "E: Eguneratzeko komandoak ez du argumenturik hartzen\n"
 
 #: src/cmdline/cmdline_util.cc:69
 #, c-format
 msgid "No candidate version found for %s\n"
-msgstr "Ez da %s-rentzat auekrako paketerikm aurkitu\n"
+msgstr "Ez da %s(r)en bertsio hautagairik aurkitu\n"
 
 #: src/cmdline/cmdline_util.cc:83
 #, c-format
 msgid "Unable to find an archive \"%s\" for the package \"%s\"\n"
-msgstr "Ezin \"%s\" fitxategia aurkitu \"%s\" paketearentzat\n"
+msgstr "Ezin da aurkitu \"%s\" artxiboa, \"%s\" paketearentzat\n"
 
 #: src/cmdline/cmdline_util.cc:93
 #, c-format
 msgid "Unable to find a version \"%s\" for the package \"%s\"\n"
-msgstr "Ezin da \"%s\" betrsioa aurkitu \"%s\"paketearentzat.\n"
+msgstr "Ezin da aurkitu \"%s\" bertsioa, \"%s\" paketearentzat\n"
 
 #: src/cmdline/cmdline_util.cc:99
 #, c-format
 msgid "Internal error: invalid value %i passed to cmdline_find_ver!\n"
-msgstr ""
-"Barne errorea:  cmdline_find_ver-ri %i baliogabeko parametroa eman zaio!\n"
+msgstr "Barne-errorea: %i balio baliogabea pasatu da hona: cmdline_find_ver!\n"
 
 #: src/cmdline/cmdline_util.cc:129
 #, c-format
 msgid "You cannot specify both an archive and a version for a package\n"
-msgstr "zuk bai fitxategia bai  paketearen bertsioa ezarri ditzakezu\n"
+msgstr "Ezin dira bai artxiboa eta bai bertsioa zehaztu pakete batentzat\n"
 
-#: src/dep_item.cc:137
+#: src/dep_item.cc:139
 msgid "UNSATISFIED"
-msgstr "BETEGABE"
+msgstr "BETE GABE"
 
-#: src/dep_item.cc:137 src/reason_fragment.cc:247
+#: src/dep_item.cc:139 src/reason_fragment.cc:244
 msgid "UNAVAILABLE"
-msgstr "ESKURAEZINA"
+msgstr "EZ ERABILGARRIA"
 
-#: src/download_bar.cc:56 src/download_list.cc:263 src/download_screen.cc:57
+#: src/download_bar.cc:56 src/download_list.cc:266 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"
+msgstr "Sartu \"%s\" etiketadun diskoa \"%s\" unitatean"
 
-#: src/download_bar.cc:77 src/generic/acqprogress.cc:63
+#: src/download_bar.cc:75 src/generic/acqprogress.cc:63
 msgid "Hit "
-msgstr "Jo "
+msgstr "Atzituta "
 
-#: src/download_bar.cc:90
+#: src/download_bar.cc:88
 msgid "Downloading "
 msgstr "Deskargatzen "
 
-#: src/download_bar.cc:103
+#: src/download_bar.cc:101
 msgid "Got "
-msgstr "Hartu "
+msgstr "Hartuta "
 
-#: src/download_bar.cc:157
+#: src/download_bar.cc:155
 msgid "Downloading..."
-msgstr "Dekargatzen..."
+msgstr "Deskargatzen..."
 
 #: src/download.cc:93
 msgid "Couldn't read list of package sources"
-msgstr "Ezin da jatorri pakete zerrenda irakurri"
+msgstr "Ezin izan da pakete-iturburuen zerrenda irakurri"
 
 #: 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 ?"
+msgstr "Ezin izan da zerrenda-direktorioa blokeatu. root zara?"
 
 #: src/download.cc:111
 msgid "Updating package lists"
-msgstr "Pakete zerrenda eguneratzen"
+msgstr "Pakete-zerrendak eguneratzen"
 
 #: src/download.cc:112
 msgid "View the progress of the package list update"
-msgstr "Pakete zerrenda eguneraketen egoera bistarazi"
+msgstr "Ikusi pakete-zerrendaren eguneraketaren progresioa"
 
 #: src/download.cc:113
 msgid "List Update"
@@ -1287,25 +1295,25 @@
 
 #: src/download.cc:160
 msgid "Couldn't clean out list directories"
-msgstr "Ezin izan dira zerrendako karpetak ezabatu"
+msgstr "Ezin izan dira zerrenda-direktorioak garbitu"
 
-#: src/download.cc:177 src/ui.cc:1153
+#: src/download.cc:177 src/ui.cc:1147
 msgid "Deleting obsolete downloaded files"
-msgstr "Deskargatutako fitxategi zaharkituak ezabatzen"
+msgstr "Zaharkitutako deskargatutako fitxategiak ezabatzen"
 
 #: src/download.cc:182
 #, c-format
 msgid "Deleting obsolete downloaded files\n"
-msgstr "Deskargatutako fitxategi zaharkituak ezabatzen\n"
+msgstr "Zaharkitutako deskargatutako fitxategiak ezabatzen\n"
 
 #: src/download.cc:224
 #, c-format
 msgid "Unable to open %s to log actions"
-msgstr "Ezin da %s ireki ekintzak erregistratzeko"
+msgstr "Ezin izan da %s irakurri ekintzak egunkarian erregistratzeko"
 
 #: src/download.cc:230
 msgid "log report"
-msgstr "Erregistro erreportea"
+msgstr "egunkari-txostena"
 
 #: src/download.cc:231
 #, c-format
@@ -1314,38 +1322,38 @@
 "dpkg problems may not be completed.\n"
 "\n"
 msgstr ""
-"GARRANTZITSUA: Erregistro honek egin nahi diren ekintzak erakusten\n"
-"ditu. Posible da ekintza batzuek dpkg arazorengatik ez osatzea.\n"
+"GARRANTZITSUA: burutu nahi diren ekintzak soilik zerrendatzen dira egunkari\n"
+"honetan; dpkg arazoengatik huts egiten dutenak ez dira burutuko.\n"
 "\n"
 
 #: 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"
+msgstr "%li pakete instalatuko dira, eta %li pakete kenduko dira.\n"
 
 #: src/download.cc:234
 #, c-format
 msgid "%sB of disk space will be used\n"
-msgstr "%sB diska leku erabiliko da\n"
+msgstr "%sB erabiliko dira diskoan\n"
 
 #: src/download.cc:237
 #, c-format
 msgid "%sB bytes of disk space will be freed\n"
-msgstr "%sB bite diska leku hustuko dira\n"
+msgstr "%sB byte libratuko dira diskoan\n"
 
 #: src/download.cc:245
 #, c-format
 msgid "[UPGRADE] %s %s -> %s\n"
-msgstr "[EGUNERATU] %s %s -> %s\n"
+msgstr "[BERTSIO-BERRITU] %s %s -> %s\n"
 
 #: src/download.cc:249
 #, c-format
 msgid "[DOWNGRADE] %s %s -> %s\n"
-msgstr "[ATZERATU] %s %s -> %s\n"
+msgstr "[AURREKO BERTSIORA ITZULI] %s %s -> %s\n"
 
 #: src/download.cc:259
 msgid "REMOVE"
-msgstr "EZABATU"
+msgstr "KENDU"
 
 #: src/download.cc:265
 msgid "INSTALL"
@@ -1357,27 +1365,27 @@
 
 #: src/download.cc:271
 msgid "HOLD"
-msgstr "HIZOZTU"
+msgstr "ATXIKI"
 
 #: src/download.cc:274
 msgid "BROKEN"
-msgstr "APURTURIK"
+msgstr "HAUTSITA"
 
 #: src/download.cc:277
 msgid "REMOVE, NOT USED"
-msgstr "EZABATU, ERABILI GABE"
+msgstr "KENDU, ERABILI GABE"
 
 #: src/download.cc:280
 msgid "REMOVE, DEPENDENCIES"
-msgstr "EZABATU, DEPENDENTZIAK"
+msgstr "KENDU, MENDEKOTASUNAK"
 
 #: src/download.cc:283
 msgid "INSTALL, DEPENDENCIES"
-msgstr "INSTALATU, DEPENDENTZIAK"
+msgstr "INSTALATU, MENDEKOTASUNAK"
 
 #: src/download.cc:286
 msgid "HOLD, DEPENDENCIES"
-msgstr "HIZOZTU, DEPENDENTZIAK"
+msgstr "ATXIKI, MENDEKOTASUNAK"
 
 #: src/download.cc:288
 msgid "????????"
@@ -1397,7 +1405,7 @@
 msgstr ""
 "===============================================================================\n"
 "\n"
-"Erregistro osoa.\n"
+"Egunkarian erregistratzea egin da.\n"
 
 #: src/download.cc:330
 msgid "Downloading packages"
@@ -1405,7 +1413,7 @@
 
 #: src/download.cc:331
 msgid "View the progress of the package download"
-msgstr "Pakete deskargaren aurrerapena ikusi"
+msgstr "Ikusi paketearen deskargaren progresioa"
 
 #: src/download.cc:332
 #, fuzzy
@@ -1414,97 +1422,97 @@
 
 #: src/download.cc:354
 msgid "Internal error: couldn't generate list of packages to download"
-msgstr "Barne errorea: Ezin da deskargatzeko pakete zerrenda sortu"
+msgstr "Barne-errorea: ezin izan da deskargatzeko paketeen zerrenda sortu"
 
 #: src/download.cc:415
 msgid "Unable to correct for unavailable packages"
-msgstr "Ez da gai eskuragarri ez dauden paketeak konpontzeko gai"
+msgstr "Ezin izan dira erabilgarri ez dauden paketeak zuzendu"
 
 #: 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:"
+"Ai! Arazoren bat gertatu da paketeak instalatzean. Berreskuratzen saiatuko "
+"da:"
 
-#: src/download.cc:477 src/pkg_item.cc:432
+#: src/download.cc:477 src/pkg_item.cc:430
 msgid "Press return to continue.\n"
-msgstr "Zanpatu return jarraitzeko.\n"
+msgstr "Jarraitzeko, sakatu Sartu tekla.\n"
 
 #: src/download.cc:508
 msgid ""
 "Could not regain the system lock!  (Perhaps another apt or dpkg is running?)"
 msgstr ""
-"Ezin da blokeo sistema berriz ebatsi (agian beste apt edo dpkg bat "
-"abiarazirik dago?)"
+"Ezin izan da sistema-blokeoa berreskuratu! (Beharbada beste apt edo dpkg bat "
+"exekutatzen ariko da)"
 
-#: src/download_item.cc:66 src/download_item.cc:70 src/download_item.cc:100
+#: src/download_item.cc:70 src/download_item.cc:74 src/download_item.cc:104
 #: src/generic/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
-msgstr "[Lanean]"
+msgstr " [Lanean]"
 
-#: src/download_item.cc:104 src/download_list.cc:283
+#: src/download_item.cc:108 src/download_list.cc:284
 msgid "[Hit]"
-msgstr "[Jo]"
+msgstr "[Atzituta]"
 
-#: src/download_item.cc:104 src/download_list.cc:303
+#: src/download_item.cc:108 src/download_list.cc:304
 msgid "[Downloaded]"
-msgstr "[Deskargaturik]"
+msgstr "[Deskargatuta]"
 
 #: src/download_list.cc:51
 #, c-format
 msgid "Downloaded %sB in %s (%sB/s)."
-msgstr "%sB  %s segundutan (%sB/s) deskargaturik."
+msgstr "%sB deskargatuta - %s (%sB/s)."
 
 #: src/download_list.cc:57
 #, c-format
 msgid "%n%nSome files were not downloaded successfully."
 msgstr ""
 
-#: src/download_list.cc:68
+#: src/download_list.cc:66
 msgid "Continue"
 msgstr "Jarraitu"
 
-#: src/download_list.cc:175 src/download_screen.cc:203
+#: src/download_list.cc:178 src/download_screen.cc:203
 msgid "Total Progress: "
-msgstr "Guzt. Aurrerapenak:"
+msgstr "Progresioa guztira: "
 
-#: src/download_list.cc:194 src/download_screen.cc:218
+#: src/download_list.cc:197 src/download_screen.cc:218
 #, c-format
 msgid " [ %i%% ] (%sB/s, %s remaining)"
-msgstr " [ %i%% ] (%sB/s, %s falta dira)"
+msgstr " [ %% %i ] (%sB/s, %s falta)"
 
-#: src/download_list.cc:196
+#: src/download_list.cc:199
 #, c-format
 msgid " [ %i%% ] (stalled)"
-msgstr " [ %i%% ] (geraturik)"
+msgstr " [ %% %i ] (trabatuta)"
 
-#: src/download_list.cc:198
+#: src/download_list.cc:201
 #, c-format
 msgid " [ %i%% ]"
-msgstr " [ %i%% ]"
+msgstr " [ %% %i ]"
 
-#: src/download_list.cc:323
+#: src/download_list.cc:324
 msgid "[IGNORED]"
-msgstr "[BAZTERTURIK]"
+msgstr "[EZ IKUSI EGINDA]"
 
-#: src/download_list.cc:329
+#: src/download_list.cc:330
 msgid "[ERROR]"
 msgstr "[ERROREA]"
 
 #: src/download_screen.cc:181
 #, c-format
 msgid "Downloaded %sB in %ss (%sB/s)."
-msgstr "%sB  %s segundutan (%sB/s) deskargaturik."
+msgstr "%sB deskargatuta - %ss (%sB/s)."
 
-#: src/edit_pkg_hier.cc:158
+#: src/edit_pkg_hier.cc:176
 msgid "No hierarchy information to edit"
-msgstr "Ez dago editatzeko jerarkia argibiderik"
+msgstr "Hierarkia-informaziorik ez editatzeko"
 
-#: src/edit_pkg_hier.cc:258
+#: src/edit_pkg_hier.cc:276
 msgid "Couldn't open for writing"
-msgstr "Ezin da idazteko ireki"
+msgstr "Ezin izan da idazteko ireki"
 
 #: src/generic/acqprogress.cc:87
 msgid "Get:"
@@ -1512,7 +1520,7 @@
 
 #: src/generic/acqprogress.cc:118
 msgid "Ign "
-msgstr "Ign "
+msgstr "Ez ikusi "
 
 #: src/generic/acqprogress.cc:122
 msgid "Err "
@@ -1521,7 +1529,7 @@
 #: src/generic/acqprogress.cc:142
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr "%sB %s segundutan deskargaturik (%sB/s).\n"
+msgstr "Lortuta: %sB (%s) (%sB/s)\n"
 
 #: src/generic/acqprogress.cc:282
 #, c-format
@@ -1529,114 +1537,114 @@
 "Media Change: Please insert the disc labeled '%s' in the drive '%s' and "
 "press enter\n"
 msgstr ""
-"Medio Aldaketa: Mesedez sar ezazu '%s' izeneko diska '%s' gailuan eta enter "
-"sakatu\n"
+"Euskarri-aldaketa: sartu '%s' etiketadun diskoa '%s' unitatean, eta sakatu "
+"Sartu\n"
 
 #: src/generic/aptcache.cc:253
 msgid "Can't open Aptitude extended state file"
-msgstr "Ezin da Aptitude hedatutako fitxategia ireki"
+msgstr "Ezin da ireki Aptitude egoera-fitxategi hedatua"
 
 #: 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"
+msgstr "Egoera-informazio hedatua irakurtzen"
 
 #: src/generic/aptcache.cc:321 src/generic/aptcache.cc:395
 #: src/generic/aptcache.cc:398
 msgid "Initializing package states"
-msgstr "Pakete egoerak hasieratzen"
+msgstr "Pakete-egoerak hasieratzen"
 
 #: src/generic/aptcache.cc:509
 msgid "Cannot open Aptitude state file"
-msgstr "Ezin da Aptitude egoera fitxategia ireki"
+msgstr "Ezin da Aptitude egoera-fitxategia ireki"
 
 #: 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"
+msgstr "Egoera-informazio hedatua idazten"
 
 #: 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"
+msgstr "Barneko buffer-gainezkatzea \"%s\" paketean egoera-fitxategia idaztean"
 
 #: src/generic/aptcache.cc:559
 msgid "Couldn't write state file"
-msgstr "Ezin da egoera fitxategia idatzi"
+msgstr "Ezin izan da egoera-fitxategia idatzi"
 
 #: src/generic/aptcache.cc:576
 msgid "Error writing state file"
-msgstr "Errorea egoera fitxategia idazterakoan"
+msgstr "Errorea egoera-fitxategia idaztean"
 
 #: src/generic/aptcache.cc:592
 msgid "couldn't replace old state file"
-msgstr "Ezin da egoera fitxategi zaharra aldatu"
+msgstr "ezin izan da egoera-fitxategi zaharra ordeztu"
 
 #: 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"
+msgstr ""
+"Ezin izan dira mendekotasunak zuzendu; pakete batzuk ezin dira instalatu"
 
 #: src/generic/aptcache.cc:1572
 msgid "The list of sources could not be read."
-msgstr "Ezin da jatorri zerrenda irakurri."
+msgstr "Ezin izan da iturburu-zerrenda irakurri."
 
 #: src/generic/aptcache.cc:1579
 msgid "The package lists or status file could not be parsed or opened."
-msgstr "Pakete zerrenda edo egoera fitxategia ezin dira ireki edo analizatu."
+msgstr "Pakete-zerrendak edo egoera-fitxategia ezin dira analizatu edo ireki."
 
 #: src/generic/aptcache.cc:1582
 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"
+"Beharbada pakete-zerrendak eguneratu nahiko dituzu, falta diren fitxategiak "
+"zuzentzeko"
 
 #: src/generic/apt.cc:152
 #, c-format
 msgid "Unable to replace %s with new configuration file"
-msgstr "Ezin da %s konfigurazio fitxategi berriagatik aldatu"
+msgstr "Ezin da %s konfigurazio-fitxategi berriarekin ordeztu"
 
 #: 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"
+"Kontuz: ezin izan da cache-fitxategia blokeatu. Irakurtzeko soilik "
+"irekitzen..."
 
-#: src/generic/matchers.cc:797
+#: src/generic/matchers.cc:798
 msgid "Unmatched '('"
-msgstr "Aurkitu ez den '('"
+msgstr "Itxi gabeko '('"
 
-#: src/generic/matchers.cc:887 src/generic/matchers.cc:968
+#: src/generic/matchers.cc:888 src/generic/matchers.cc:969
 #, c-format
 msgid "Unknown dependency type: %s"
-msgstr "Dependentzi mota ezezaguna: %s"
+msgstr "Mendekotasun-mota ezezaguna: %s"
 
-#: src/generic/matchers.cc:950
+#: src/generic/matchers.cc:951
 #, c-format
 msgid "Unknown action type: %s"
-msgstr "Akzio mota ezezaguna: %s"
+msgstr "Ekintza-mota ezezaguna: %s"
 
-#: src/generic/matchers.cc:1017
+#: src/generic/matchers.cc:1018
 #, c-format
 msgid "Unknown priority %s"
-msgstr "Lehentasun ezezaguna: %s"
+msgstr "%s lehentasun ezezaguna"
 
-#: src/generic/matchers.cc:1039
+#: src/generic/matchers.cc:1040
 #, c-format
 msgid "Unknown pattern type: %c"
-msgstr "Patroi mota ezezaguna: %c"
+msgstr "Eredu-mota ezezaguna: %c"
 
-#: src/generic/matchers.cc:1084
+#: src/generic/matchers.cc:1105
 msgid "Unexpected empty expression"
-msgstr "Espero ez zen espresio hutsa."
+msgstr "Espero gabeko adierazpen hutsa"
 
-#: src/generic/matchers.cc:1119
+#: src/generic/matchers.cc:1143
 msgid "Badly formed expression"
-msgstr "Gaizki eraturako espresioa"
+msgstr "Gaizki osatutako adierazpena"
 
-#: src/generic/matchers.cc:1148
+#: src/generic/matchers.cc:1175
 msgid "Unexpected ')'"
-msgstr "Ez zen itxoiten ')'"
+msgstr "Espero ez zen ')'"
 
 #: src/generic/pkg_acqfile.cc:86
 #, c-format
@@ -1644,240 +1652,247 @@
 "I wasn't able to locate a file for the %s package. This might mean you need "
 "to manually fix this package. (due to missing arch)"
 msgstr ""
-"Ezin dut %s paketearen fitxategi bat aurkitu. Honek agian zuk paketea eskuz "
-"konpondu beharko duzula esan nahi dezake (arkitektura bat falta dela eta)"
+"Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu "
+"beharko duzu paketea. (arkitektura falta delako)"
 
 #: src/generic/pkg_acqfile.cc:134
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
-"Pakete indize fitxategiak ondaturik daude. Ez dago fitxategi izena %s "
+"Paketearen indize-fitxategiak hondatuta daude. 'Filename:' eremurik ez %s "
 "paketearentzat."
 
 #: src/generic/pkg_changelog.cc:105
 msgid "Can't get value of $HOME, using TMPDIR (insecure)"
-msgstr "Ezinda $HOME balioa lortu; TMPDIR erabiltzen (ez ziurra)"
+msgstr "Ezin da $HOME baliorik eskuratu, TMPDIR erabiliz (ez-segurua)"
 
-#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:61
+#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:76
 #, c-format
 msgid "ChangeLog of %s"
-msgstr "%s-n erregistro aldaketak"
+msgstr "%s aldaketen egunkaria"
 
 #: src/generic/pkg_hier.cc:29 src/generic/pkg_hier.cc:50
 #, c-format
 msgid "Warning: group %s is involved in a cycle"
-msgstr "Oharrra: %s taldea bukle baten zati da."
+msgstr "Kontuz: %s taldea ziklo batean sartuta dago"
 
 #: src/generic/pkg_hier.cc:144
 #, c-format
 msgid "Cannot open package hierarchy file %s"
-msgstr "Ezin da pakete jerarkia fitxategi %s ireki"
+msgstr "Ezin da %s pakete-hierarkiako fitxategia ireki"
 
 #: src/generic/pkg_hier.cc:165
 msgid "Global block encountered after first record, ignoring"
 msgstr ""
-"Bloke orokor bataurkiturik lehen erregistroaren ondoren, ez ikusia egiten"
+"Blokeo orokorra aurkitu da lehen erregistroaren ondoren; ez ikusi egingo "
+"zaio..."
 
 #: src/generic/pkg_hier.cc:178
 msgid "Bad record encountered (no Package or Group entry), skipping"
 msgstr ""
-"Baliogabeko erregistroa aurkiturik (pakete edo talde sarrera gabekoak), alde "
-"batetara uzten"
+"Erregistro txarra (Pakete- edo Talde-sarrerarik ez); saltatu egingo da..."
 
 #: src/generic/pkg_hier.cc:180
 #, c-format
 msgid "Bad record encountered (Package=%s, Group=%s), skipping"
 msgstr ""
-"Grabaketa okerra aurkitu da (paketea=%s, Taldea=%s), albo batetara uzten"
+"Erregistro txarra aurkitu da (Paketea=%s, Taldea=%s), saltatu egingo da..."
 
 #: src/generic/pkg_hier.cc:243
 #, c-format
 msgid "Multiple descriptions found for group %s, ignoring one"
-msgstr "%s taldearentzat azalpen anitz aurkiturik, bat ez ikusia egiten"
+msgstr ""
+"Azalpen bat baino gehiago aurkitu dira %s taldearentzat; bati ez ikusi "
+"egingo zaio"
 
 #: src/generic/tasks.cc:295
 msgid "Unable to open /usr/share/tasksel/debian-tasks.desc"
-msgstr "Ezin da /usr/share/tasksel/debian-tasks.desc ireki"
+msgstr "Ezin da ireki /usr/share/tasksel/debian-tasks.desc"
 
 #: src/generic/tasks.cc:302 src/generic/tasks.cc:344 src/generic/tasks.cc:346
 msgid "Reading task descriptions"
-msgstr "Ataza deskribapenak irakurtzen"
+msgstr "Ataza-azalpenak irakurtzen"
 
-#: src/load_config.cc:30
-#, c-format
-msgid "Invalid entry in color definition group: \"%s\""
-msgstr "Kolore ezarpen taldean baliogabeko erregitroa aurkiturik: \"%s\""
+#: src/load_config.cc:42
+#, fuzzy, c-format
+msgid "Unrecognized color name \"%s\""
+msgstr "Ataza ezezagunak"
 
-#: src/load_config.cc:32
-#, c-format
-msgid "Invalid tagless entry in color definition group: \"%s\""
-msgstr "Baliogabeko etiketa gabeko sarrera kolore ezapen taldean: \"%s\""
+#: src/load_config.cc:69
+#, fuzzy, c-format
+msgid "Unrecognized attribute name \"%s\""
+msgstr "Ataza ezezagunak"
 
-#: src/load_config.cc:34
-#, c-format
-msgid "Need exactly two colors in color definition \"%s\""
-msgstr "Zehazki bi kolore behar dira \"%s\" koñore ezarpenean"
+#: src/load_config.cc:106
+#, fuzzy, c-format
+msgid "Invalid entry in style definition group: \"%s\""
+msgstr "Sarrera baliogabea kolore-definizioko taldean: \"%s\""
 
-#: src/load_config.cc:50
-#, c-format
-msgid "Can't parse foreground \"%s\"of color \"%s\""
-msgstr "Ezin da \"%s\" atzekaldeko \"%s\" kolorea analizatu"
+#: src/load_config.cc:108
+#, fuzzy, c-format
+msgid "Invalid tagless entry in style definition group: \"%s\""
+msgstr ""
+"Etiketarik gabeko sarrera baliogabea kolore-definizioko taldean: \"%s\""
 
-#: src/load_config.cc:53
-#, c-format
-msgid "Can't parse background \"%s\" of color \"%s\""
-msgstr "Ezin da \"%s\" -ren \"%s\" atzeko planoko kolorea analizatu"
+#: src/load_config.cc:130
+#, fuzzy, c-format
+msgid "Unknown style attribute %s"
+msgstr "Ekintza-mota ezezaguna: %s"
 
-#: src/load_config.cc:72 src/load_config.cc:74
+#: src/load_config.cc:153 src/load_config.cc:155
 #, c-format
 msgid "Invalid entry in keybinding group: \"%s\""
-msgstr "Baliogabeko erregistroa errefentzi tekla taldean: \"%s\""
+msgstr "Sarrera baliogabea laster-teklen taldean: \"%s\""
 
-#: src/load_config.cc:89
+#: src/load_config.cc:170
 #, c-format
 msgid "Ignoring invalid keybinding \"%s\" -> \"%s\""
-msgstr "Ez ikusia egiten baliogabeko errefentzi tekla \"%s\" -> \"%s\""
+msgstr "Laster-tekla baliogabeari ez ikusi egiten: \"%s\" -> \"%s\""
 
 #: src/load_grouppolicy.cc:54
 #, c-format
 msgid "Bad section name '%s' (use 'none', 'topdir', or 'subdir')"
-msgstr "\"%s\" sekzio izen okerra ('none', 'topdir', or 'subdir' erabili)"
+msgstr "Okerreko sekzio-izena: '%s' (erabili 'none', 'topdir', edo 'subdir')"
 
 #: src/load_grouppolicy.cc:67
 #, c-format
 msgid "Bad passthrough setting '%s' (use 'passthrough' or 'nopassthrough')"
 msgstr ""
-"«passthrough» %s konfigurazio okerra ('passthrough' edo 'nopassthrough' "
-"erabili)"
+"Okerreko passthrough ezarpena: '%s' (erabili 'passthrough' edo "
+"'nopassthrough')"
 
 #: src/load_grouppolicy.cc:75
 msgid "Too many arguments to by-section grouping policy"
-msgstr "Ataletan biltzeko politikan parametro gehiegi"
+msgstr "Argumentu gehiegi sekzioaren arabera taldekatzeko"
 
 #: src/load_grouppolicy.cc:90
 msgid "By-status grouping policies take no arguments"
-msgstr "Egoeraz biltzeko politikak ez ditu argumentorik onartzen"
+msgstr "Egoeraren arabera taldekatzeko arauek ez dute argumenturik hartzen"
 
 #: src/load_grouppolicy.cc:105
 msgid ""
 "Exactly one filter name must be provided as an argument to a filter policy"
 msgstr ""
-"Zehazki izen bat eman behar duzu izenez biltzeko iragazpen politikarentzat"
+"Zehazki iragazki-izen bat eman behar da iragazki-arauaren argumentu gisa"
 
 #: src/load_grouppolicy.cc:118
 #, c-format
 msgid "Bad filter type '%s' (valid types are: 'missing')"
-msgstr "Iragazki mota okerra %s (mota egokiak :'missing')"
+msgstr "Okerreko iragazki-mota: '%s' (baliozko motak: 'missing')"
 
 #: src/load_grouppolicy.cc:129
 msgid "By-mode grouping policies take no arguments"
-msgstr "Motaz biltzeko politikak ez du argumentorik onartzen"
+msgstr "Moduaren arabera taldekatzeko arauek ez dute argumenturik hartzen"
 
 #: src/load_grouppolicy.cc:144
 msgid "First-character grouping policies take no arguments"
-msgstr "Lehen-hizkiz biltzeko politikak ez du argumentorik onartzen"
+msgstr "Lehen karakterearen taldekatze-arauek ez dute argumenturik hartzen"
 
 #: src/load_grouppolicy.cc:159
 msgid "Version-generating grouping policies take no arguments"
-msgstr "«version-generating» biltze politikak ez du argumentorik onartzen"
+msgstr "Bertsio-sorrerako taldekatze-arauek ez dute argumenturik hartzen"
 
 #: src/load_grouppolicy.cc:165
 msgid "Version-generating grouping policies must be the tail of a chain"
-msgstr ""
-"«version-generating» biltze politikak katearen amaiera egon behar dute."
+msgstr "Bertsio-sorrerako taldekatze-arauek kate baten isatsa izan behar dute"
 
 #: src/load_grouppolicy.cc:177
 msgid "Dep-generating grouping policies take no arguments"
-msgstr "«dep-generating» biltze politikak ez du argumentorik onartzen"
+msgstr "Mendekotasun-sorrerako taldekatze-arauek ez dute argumenturik hartzen"
 
 #: src/load_grouppolicy.cc:183
 msgid "Dep-generating grouping policies must be the tail of a chain"
-msgstr "«dep-generating» biltze politikak katearen amaiera egon behar dute."
+msgstr ""
+"Mendekotasun-sorrerako taldekatze-arauek kate baten isatsa izan behar dute"
 
 #: src/load_grouppolicy.cc:195
 msgid "By-priority grouping policies take no arguments"
-msgstr "Lehentasunez biltze politikak ez du argumentorik onartzen"
+msgstr ""
+"Lehentasunaren arabera taldekatzeko arauek ez dute argumenturik hartzen"
 
 #: src/load_grouppolicy.cc:230
 msgid "Task grouping policies take no arguments"
-msgstr "Atazez biltze politikak ez du argumentorik onartzen"
+msgstr "Atazak taldekatzeko arauek ez dute argumenturik hartzen"
 
 #: src/load_grouppolicy.cc:284
 msgid "Invalid zero-length grouping policy name"
-msgstr "Baliogabeko biltzen politika izen hutsa"
+msgstr "Taldekatze-arauaren izen baliogabea, zero luzerakoa"
 
 #: src/load_grouppolicy.cc:302
 msgid "Unmatched '(' in grouping policy description"
-msgstr "Parekorik gabe ( biltze politika azalpenean"
+msgstr "Itxi gabeko '(' taldekatze-arauaren azalpenean"
 
 #: src/load_grouppolicy.cc:329
 #, c-format
 msgid "Invalid grouping policy type '%s'"
-msgstr "Biltze polita mota baliogabea %s"
+msgstr "Taldekatze-arau mota baliogabea: '%s'"
 
 #: src/load_pkgview.cc:57
 msgid "Couldn't parse layout: No column format specified for static item"
 msgstr ""
-"Ezin da aurkezpena analizatu: ez dazutabe formaturik ezarri elementu "
-"estatikoarentzat."
+"Ezin izan da diseinua analizatu: ez da zutabe-formaturik zehaztu elementu "
+"estatikoarentzat"
 
 #: src/load_pkgview.cc:104
 #, c-format
 msgid "Couldn't parse layout: unknown view item type \"%s\""
-msgstr "Ezin da aurkezpena analizatu: ikuspegi \"%s\" modu ezezaguna"
+msgstr ""
+"Ezin izan da diseinua analizatu: \"%s\" ikusteko elementu-mota ezezaguna"
 
 #: src/load_pkgview.cc:111 src/load_pkgview.cc:119
 msgid "Couldn't parse layout: no row number specified"
-msgstr "Ezin da aurkezpena analizatu:  Ez da llerro zenbakirik ezarririk"
+msgstr "Ezin izan da diseinua analizatu: ez da errenkada-zenbakirik zehaztu"
 
 #: src/load_pkgview.cc:127
 msgid "Couldn't parse layout: no width specified"
-msgstr "Ezin da aurkezpena analizatu: Ez sa zabalera ezarri"
+msgstr "Ezin izan da diseinua analizatu: ez da zabalerarik zehaztu"
 
 #: src/load_pkgview.cc:135
 msgid "Couldn't parse layout: no height specified"
-msgstr "Ezin da aurkezpena analizatu: Ez da altuera ezarri"
+msgstr "Ezin izan da diseinua analizatu: ez da altuerarik zehaztu"
 
 #: src/load_pkgview.cc:166 src/load_pkgview.cc:184
 #, c-format
 msgid "Unknown alignment type '%s'"
-msgstr "'%s' Lerrokate mota ezezaguna"
+msgstr "Lerrokatze-mota ezezaguna: '%s'"
 
 #: src/load_sortpolicy.cc:36
 msgid "By-name sorting policies take no arguments"
-msgstr "Izenez biltzeko polititkak ez du argumenturik onartzen"
+msgstr "Izenaren arabera ordenatzeko arauek ez dute argumenturik hartzen"
 
 #: src/load_sortpolicy.cc:49
 msgid "By-installed size sorting policies take no arguments"
-msgstr "Instalatutako tamainaz biltze politika ez du argumentorik onartzen"
+msgstr ""
+"Instalatutako tamainaren arabera ordenatzeko arauek ez dute argumenturik "
+"hartzen"
 
 #: src/load_sortpolicy.cc:62
 msgid "By-priority sorting policies take no arguments"
-msgstr "Prioritatez biltze politika ez du argumentorik onartzen"
+msgstr "Lehentasunaren arabera ordenatzeko arauek ez dute argumenturik hartzen"
 
 #: src/load_sortpolicy.cc:119
 msgid "Invalid zero-length sorting policy name"
-msgstr "Zerlo luze baliogabeaz biltze politika izena"
+msgstr "Ordenatzeko arauaren izen baliogabea, zero luzerakoa"
 
 #: src/load_sortpolicy.cc:137
 msgid "Unmatched '(' in sorting policy description"
-msgstr "Ez da aurkitu '(' biltze politka azalpenean"
+msgstr "Itxi gabeko '(' ordenatze-arauaren azalpenean"
 
 #: src/load_sortpolicy.cc:164
 #, c-format
 msgid "Invalid sorting policy type '%s'"
-msgstr "Baliogabea biltze politika mota:'%s'"
+msgstr "Taldekatze-arau mota baliogabea: '%s'"
 
 #: src/main.cc:69
 #, c-format
 msgid "%s %s compiled at %s %s\n"
-msgstr "%s %s, %s %s-en konpilaturik\n"
+msgstr "%s %s konpilatua -> %s %s\n"
 
 #: src/main.cc:72
 #, c-format
 msgid "Compiler: g++ %s\n"
-msgstr "Kompilatzailea: g++ %s\n"
+msgstr "Konpilatzailea: g++ %s\n"
 
 #: src/main.cc:75
 #, c-format
@@ -1886,7 +1901,7 @@
 "NCurses version: %s\n"
 msgstr ""
 "\n"
-"NCurses bertsioa: %s\n"
+"Ncurses bertsioa: %s\n"
 
 #: src/main.cc:77
 #, c-format
@@ -1918,45 +1933,43 @@
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
 "\n"
 msgstr ""
-"  Ekintzak (ez bada batenbat ematen, aptitude modu interaktibora pasako "
-"da);\n"
-"\n"
+"  Ekintzak (bat ere ez bada zehazten, aptitude modu interaktiboan sartuko "
+"da):\n"
 
 #: src/main.cc:90
 #, c-format
 msgid " install      - Install/upgrade packages\n"
-msgstr " install      - Paketeak instalatu/eguneratu\n"
+msgstr " install      - Instalatu/bertsio-berritu paketeak\n"
 
 #: src/main.cc:91
 #, c-format
 msgid " remove       - Remove packages\n"
-msgstr " remove       - Paketeak ezabatu\n"
+msgstr " remove       - Kendu paketeak\n"
 
 #: src/main.cc:92
 #, c-format
 msgid " purge        - Remove packages and their configuration files\n"
-msgstr " purge        - Paketeak eta haien konfigurazio fitxategiak ezabatu\n"
+msgstr " purge        - Kendu paketeak eta konfigurazio-fitxategiak\n"
 
 #: src/main.cc:93
 #, c-format
 msgid " hold         - Place packages on hold\n"
-msgstr " hold         - Paketeak hizoztu\n"
+msgstr " hold         - Atxiki paketeak\n"
 
 #: src/main.cc:94
 #, c-format
 msgid " unhold       - Cancel a hold command for a package\n"
-msgstr " unhold       - Ezeztatu pakete baten hizoztu komandoa\n"
+msgstr " unhold       - Utzi paketea atxikitzeari\n"
 
 #: src/main.cc:95
 #, c-format
 msgid " markauto     - Mark packages as having been automatically installed\n"
-msgstr ""
-" markauto     - Markatu automatikoki instlatuak izan diren fitxategiak\n"
+msgstr " markauto     - Markatu paketeak automatikoki instalatutako gisa\n"
 
 #: src/main.cc:96
 #, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed\n"
-msgstr " unmarkauto   - Markatu eskus instalaturik izan diren paketeak\n"
+msgstr " unmarkauto   - Markatu paketeak eskuz instalatutako gisa\n"
 
 #: src/main.cc:101
 #, c-format
@@ -1964,18 +1977,20 @@
 " forbid-version - Forbid aptitude from upgrading to a specific package "
 "version.\n"
 msgstr ""
-" forbid-version - aptitude pakete baten bertsio jakin batera eguneratzea "
-"galerazten du.\n"
+" forbid-version - Eragotzi aptitude-ri pakete-bertsio jakin batera "
+"berritzea.\n"
 
 #: src/main.cc:102
 #, c-format
 msgid " update       - Download lists of new/upgradable packages\n"
-msgstr " update       - Pakete berri/eguneragarrien zerrenda deskargatu\n"
+msgstr ""
+" update       - Deskargatu pakete berrien edo bertsio-berritzeko "
+"modukoenzerrendak\n"
 
 #: src/main.cc:103
 #, c-format
 msgid " upgrade      - Perform a safe upgrade\n"
-msgstr " upgrade      - Eguneraketa ziur bat egin\n"
+msgstr " upgrade      - Egin bertsio-berritze segurua\n"
 
 #: src/main.cc:104
 #, c-format
@@ -1983,80 +1998,78 @@
 " dist-upgrade - Perform an upgrade, possibly installing and removing "
 "packages\n"
 msgstr ""
-" dist-upgrade - Eguneraketa bat egin, ziurrenik paketak instalatu eta "
-"ezabatuaz\n"
+" dist-upgrade - Egin eguneratze bat, seguru asko paketeak instalatuz eta "
+"kenduz\n"
 
 #: src/main.cc:105
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\"\n"
-msgstr " forget-new   - Ahaztu zein pakete den \"berria\"\n"
+msgstr " forget-new   - Ahaztu zein pakete diren \"berriak\"\n"
 
 #: src/main.cc:106
 #, 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"
+msgstr ""
+" search       - Bilatu pakete bat izenaren eta/edo adierazpenaren arabera\n"
 
 #: src/main.cc:107
 #, c-format
 msgid " show         - Display detailed information about a package\n"
-msgstr " show         - Bistaratu pakete baten azalpen zehatzak\n"
+msgstr " show         - Bistaratu pakete bati buruzko informazio xehea\n"
 
 #: src/main.cc:108
 #, c-format
 msgid " clean        - Erase downloaded package files\n"
-msgstr " clean        - Ezabatu deskargaturiko pakete fitxategiak\n"
+msgstr " clean        - Ezabatu deskargatutako pakete-fitxategiak\n"
 
 #: src/main.cc:109
 #, c-format
 msgid " autoclean    - Erase old downloaded package files\n"
-msgstr " autoclean    - Ezabatu aurrerago deskargaturiko pakete fitxategiak\n"
+msgstr " autoclean    - Ezabatu deskargatutako pakete-fitxategi zaharrak\n"
 
 #: src/main.cc:110
 #, c-format
 msgid " changelog    - View a package's changelog\n"
-msgstr " changelog    - Pakete baten aldaketa erregistro bistaratu\n"
+msgstr " changelog   - Ikusi paketearen aldaketa egunkaria\n"
 
 #: src/main.cc:111
 #, c-format
 msgid " download     - Download the .deb file for a package\n"
-msgstr " download     - Deskargatu pakete batentzat .deb fitxategia\n"
+msgstr " download     - Deskargatu pakete baten .deb fitxategia\n"
 
 #: src/main.cc:113
 #, c-format
 msgid "  Options:\n"
-msgstr "  (0)aukerak:\n"
+msgstr "  Aukerak:\n"
 
 #: src/main.cc:114
 #, c-format
 msgid " -h             This help text\n"
-msgstr " -h             Laguntza testu hau\n"
+msgstr " -h             Laguntza-testu hau\n"
 
 #: src/main.cc:115
 #, 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"
+msgstr " -s             Simulatu ekintzak, baina ez burutu.\n"
 
 #: src/main.cc:116
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
 msgstr ""
-" -d             Paketeak deskargatu bakarrik, ez ezer ezabatu edo "
-"instalatu.\n"
+" -d             Soilik deskargatu paketeak; ez instalatu edo kendu ezer.\n"
 
 #: src/main.cc:117
 #, c-format
 msgid " -P             Always prompt for confirmation or actions\n"
-msgstr " -P             Beti galdetu berrespen edo ekintzetan\n"
+msgstr " -P             Beti eskatu berrespena\n"
 
 #: src/main.cc:118
 #, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'\n"
 msgstr ""
-" -y             Bai edo ez moduko galdera simpleetan erantzuna baiezkoa "
-"(yes) dela ezarri\n"
+" -y             Bai/ez erantzuneko galdera soilen erantzuna 'bai' izango da\n"
 
 #: src/main.cc:119
 #, c-format
@@ -2064,68 +2077,64 @@
 " -F format      Specify a format for displaying search results; see the "
 "manual\n"
 msgstr ""
-" -F format      Ezarri emaitzetan erabili nahi duzun formatua, manuala "
-"begiratu\n"
+" -F format      Zehaztu bilaketa-emaitzak bistaratzeko formatu bat; ikus "
+"eskuliburua\n"
 
 #: src/main.cc:120
 #, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the manual\n"
 msgstr ""
-" -O ordena       Ezarri bilaketa emaitzak nola sailkatzea nahi duzun, "
-"manuala begiratu\n"
+" -O order       Zehaztu bilaketa-emaitzak nola ordenatuko diren; ikus "
+"eskuliburua\n"
 
 #: src/main.cc:121
 #, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results\n"
-msgstr ""
-" -w width       Ezarri pantaila zabalera bilaketa emaitza formatuetarako\n"
+msgstr " -w width       Zehaztu bilaketa-emaitzak erakusteko zabalera\n"
 
 #: src/main.cc:122
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
-msgstr ""
-"-f              Apurturiko paketeak modu indartuan konpontzen saiatzen da.\n"
+msgstr " -f             Agresiboki saiatu hautsitako paketeak konpontzen.\n"
 
 #: src/main.cc:123
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
-msgstr ""
-" -V             Erakutsi paketeen zein bertsio instalatua izango den.\n"
+msgstr " -V             Erakutsi paketeen zein bertsio instalatuko diren.\n"
 
 #: src/main.cc:124
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
 msgstr ""
-"-D              Erakutsi automatikoki aldatutako paketeen dependentziak.\n"
+" -D             Erakutsi automatikoki aldatutako paketeen mendekotasunak.\n"
 
 #: src/main.cc:125
 #, 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"
+" -Z\t\t    Erakutsi pakete bakoitzaren instalatutako tamainaren aldaketa.\n"
 
 #: src/main.cc:126
 #, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple times)\n"
 msgstr ""
-" -v             Argibide xehetuak erakutsi.(bein baino gehiagotan erabil "
+" -v             Bistaratu informazio gehigarria. (hainbat aldiz eman "
 "daiteke)\n"
 
 #: src/main.cc:127
 #, 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"
+msgstr " -t [release]   Ezarri zein banaketatatik instalatuko diren paketeak\n"
 
 #: src/main.cc:128
 #, 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"
+msgstr " -o key=balioa  'key' aukeraren konfigurazioa ezartzen du zuzenean\n"
 
 #: src/main.cc:129
 #, c-format
@@ -2133,67 +2142,68 @@
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
 "                strong dependencies\n"
 msgstr ""
-" --with(out)-recommends\tEzarri gomendioak(iradokizunak) dependetzia\n"
-"                indartsu bezala erabiltzea ala ez\n"
+" --with(out)-recommends,\tZehaztu gomendioak (iradokizunak) mendekotasun "
+"sendotzat\n"
+"                joko diren ala ez\n"
 
 #: src/main.cc:130
 #, c-format
 msgid " -S fname: Read the aptitude extended status info from fname.\n"
-msgstr "-S fizena: fizena-ren aptitude hedatutako egoera irakurri.\n"
+msgstr ""
+" -S fname: Irakurri aptitude-ren egoera-informazio hedatua fname-tik.\n"
 
 #: src/main.cc:131
 #, c-format
 msgid " -u      : Download new package lists on startup.\n"
-msgstr " -u      : Abiaraztean pakete zerrenda berria deskargatu.\n"
+msgstr " -u      : Deskargatu pakete-zerrenda berriak abioan.\n"
 
 #: src/main.cc:132
 #, c-format
 msgid " -i      : Perform an install run on startup.\n"
-msgstr " -i      : Abiaraztean instalazio bat egin.\n"
+msgstr " -i      : Burutu instalazio-exekuzioa abioan.\n"
 
 #: src/main.cc:134
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
-msgstr "                  Aptitude honek ez ditu Super Behi potererik.\n"
+msgstr "                  Aptitude honek ez dauka Superbehiaren ahalmenik.\n"
 
-#: src/main.cc:255
+#: src/main.cc:252
 #, 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"
+msgstr "-o aukerak key=balioa formako argumentua behar du, %s lortu da"
 
-#: src/main.cc:301 src/main.cc:310
+#: src/main.cc:291 src/main.cc:300
 msgid "WEIRDNESS: unknown option code received\n"
-msgstr "arraroa: aukera ezezagun kodea jasorik\n"
+msgstr "ARRAROA: aukera-kode ezezaguna jaso da\n"
 
-#: src/main.cc:319
+#: src/main.cc:309
 msgid "Only one of -u and -i may be specified\n"
-msgstr "-u eta -i artean bat bakarrik ezarri dezakezu\n"
+msgstr "-u edo -i, bietako bat bakarrik zehatz daiteke\n"
 
-#: src/main.cc:327
+#: src/main.cc:317
 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)"
+"-u eta -i ezin dira zehaztu komando-lerroaren moduan (adib. 'install'ekin)"
 
-#: src/main.cc:348
+#: src/main.cc:338
 msgid "-u and -i may not be specified with a command"
-msgstr "-u eta -i ezin dira komando batekin erabili"
+msgstr "-u eta -i ezin dira zehaztu komando batekin"
 
-#: src/main.cc:405
+#: src/main.cc:395
 #, c-format
 msgid "Unknown command \"%s\"\n"
-msgstr "Komando ezezaguna \"%s\"\n"
+msgstr "Komando ezezaguna: \"%s\"\n"
 
-#: src/main.cc:412 src/main.cc:469
+#: src/main.cc:402 src/main.cc:450
 msgid "Internal error: uncaught 'out of solutions' exception.\n"
 msgstr ""
 
-#: src/main.cc:417 src/main.cc:474
+#: src/main.cc:407 src/main.cc:455
 msgid "Internal error: uncaught 'out of time' exception.\n"
 msgstr ""
 
-#: src/main.cc:424
+#: src/main.cc:414
 #, c-format
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
@@ -2201,20 +2211,20 @@
 #: src/mine/cmine.cc:93
 #, c-format
 msgid "%i/%i mines  %d %s"
-msgstr "%i/%i mina  %d %s"
+msgstr "%i/%i mina %d %s"
 
 #: src/mine/cmine.cc:97 src/mine/cmine.cc:104
 msgid "second"
-msgstr "segundu"
+msgstr "segundo"
 
 #: src/mine/cmine.cc:97 src/mine/cmine.cc:104
 msgid "seconds"
-msgstr "segundu"
+msgstr "segundo"
 
 #: src/mine/cmine.cc:101
 #, c-format
 msgid "Minesweeper    %s in %d %s"
-msgstr "Mina-jokoa    %s %d%s-ean "
+msgstr "Mina-aurkitzailea  %s -- %d %s"
 
 #: src/mine/cmine.cc:102
 msgid "Won"
@@ -2224,193 +2234,192 @@
 msgid "Lost"
 msgstr "Galdu"
 
-#: src/mine/cmine.cc:119 src/ui.cc:1090
+#: src/mine/cmine.cc:119 src/ui.cc:1084
 msgid "Minesweeper"
 msgstr "Mina-aurkitzailea"
 
 #: src/mine/cmine.cc:131 src/mine/cmine.cc:168
 #, c-format
 msgid "Could not open file \"%s\""
-msgstr "Ezin da \"%s\" fitxategia ireki"
+msgstr "Ezin izan da \"%s\" fitxategia ireki"
 
 #: src/mine/cmine.cc:145
 #, c-format
 msgid "Could not load game from %s"
-msgstr "Ezin dira %s-tik jokuak kargatu"
+msgstr "Ezin izan da jokoa kargatu hemendik: %s"
 
 #: src/mine/cmine.cc:195
 msgid "The board height must be a number"
-msgstr "Joko altuera zenbaki bat izan behar da"
+msgstr "Taularen altuerak zenbakia izan behar du"
 
 #: src/mine/cmine.cc:207
 msgid "The board width must be a number"
-msgstr "Joko zabalera zenbaki bat izan behar da"
+msgstr "Taularen zabalerak zenbakia izan behar du"
 
 #: src/mine/cmine.cc:220
 msgid "The number of mines must be a number"
-msgstr "Mina kopurua zenbaki bat izan behar da"
+msgstr "Mina-kopuruak zenbakia izan behar du"
 
-#: src/mine/cmine.cc:240
+#: src/mine/cmine.cc:238
 msgid "Setup custom game"
-msgstr "Joku pertsonalizatua ezarri"
+msgstr "Ezarri joko pertsonalizatua"
 
-#: src/mine/cmine.cc:243
+#: src/mine/cmine.cc:240
 msgid "Height of board: "
-msgstr "Jokoaren altuera - "
+msgstr "Taularen altuera: "
 
-#: src/mine/cmine.cc:247
+#: src/mine/cmine.cc:243
 msgid "Width of board: "
-msgstr "jokoaren zabalera - "
+msgstr "Taularen zabalera: "
 
-#: src/mine/cmine.cc:251
+#: src/mine/cmine.cc:246
 msgid "Number of mines: "
-msgstr "Mina kopurua: "
+msgstr "Mina-kopurua: "
 
-#: src/mine/cmine.cc:316
+#: src/mine/cmine.cc:305
 msgid "Choose difficulty level"
-msgstr "Aukeratu zailtazun maila"
+msgstr "Aukeratu zailtasun-maila"
 
-#: src/mine/cmine.cc:318
+#: src/mine/cmine.cc:307
 msgid "Easy"
-msgstr "Erreza"
+msgstr "Erraza"
 
-#: src/mine/cmine.cc:319
+#: src/mine/cmine.cc:308
 msgid "Medium"
-msgstr "Erdi mailakoa"
+msgstr "Tartekoa"
 
-#: src/mine/cmine.cc:320
+#: src/mine/cmine.cc:309
 msgid "Hard"
-msgstr "zaila"
+msgstr "Zaila"
 
-#: src/mine/cmine.cc:321
+#: src/mine/cmine.cc:310
 msgid "Custom"
-msgstr "Pertsonalizatua"
+msgstr "Pertsonalizatu"
 
-#: src/mine/cmine.cc:411
+#: src/mine/cmine.cc:392
 msgid "You have won."
-msgstr "Zuk irabazi duzu."
+msgstr "Irabazi egin duzu!"
 
-#: src/mine/cmine.cc:414
+#: src/mine/cmine.cc:395
 msgid "You lose!"
-msgstr "Galdu!"
+msgstr "Galdu egin duzu!"
 
-#: src/mine/cmine.cc:419
+#: src/mine/cmine.cc:400
 msgid "You die...  --More--"
-msgstr "Zu hill... --Gehiago--"
+msgstr "Hil egin zara...  --Gehiago--"
 
-#: src/mine/cmine.cc:432
+#: src/mine/cmine.cc:413
 msgid "The spikes were poisoned!  The poison was deadly..  --More--"
-msgstr "Puntak pozondurik zeuden!  Pozoia hilgarria zen...  --Gehiago--"
+msgstr "Iltzeak pozoituta zeuden!  Pozoia hilgarria zen..  -Gehiago--"
 
-#: src/mine/cmine.cc:435
+#: src/mine/cmine.cc:416
 msgid "You land on a set of sharp iron spikes!  --More--"
-msgstr "Burdinezko punta zorrotz multzo batetara erortzen zara!  --Gehiago---"
+msgstr "Burdinazko iltze zorrotz batzuen gainean lurreratu zara!  --Gehiago--"
 
-#: src/mine/cmine.cc:438
+#: src/mine/cmine.cc:419
 msgid "You fall into a pit!  --More--"
-msgstr "Zulo batetara erori zara  --Gehiago--"
+msgstr "Zulo batera erori zara!  --Gehiago--"
 
-#: src/mine/cmine.cc:441
+#: src/mine/cmine.cc:422
 msgid "KABOOM!  You step on a land mine.  --More--"
-msgstr "KABOOM!  Zure oina minaturiko lurrean.  --Gehiago--"
+msgstr "BUM!  Mina bat zapaldu duzu.  -Gehiago--"
 
-#: src/mine/cmine.cc:446
+#: src/mine/cmine.cc:427
 msgid "The dart was poisoned!  The poison was deadly...  --More--"
-msgstr "Dardoak pozondurik zeuden!  Pozoia hilgarria zen...  --Gehiago--"
+msgstr "Dardoa pozoituta zegoen!  Pozoia hilgarria zen..  --Gehiago--"
 
-#: src/mine/cmine.cc:448
+#: src/mine/cmine.cc:429
 msgid ""
 "A little dart shoots out at you!  You are hit by a little dart!  --More--"
-msgstr "Dardo txiki batek jo zaitu!  Dardo hilgarri batek jo zaitu!  --Gehiago"
+msgstr "Dardoa zure kontra!  Dardo txiki batek harrapatu zaitu!  --Gehiago--"
 
-#: src/mine/cmine.cc:452
+#: src/mine/cmine.cc:433
 msgid "You turn to stone... --More--"
-msgstr "Zu hari biurtu zara... --Gehiago--"
+msgstr "Harri bihurtu zara...--Gehiago--"
 
-#: src/mine/cmine.cc:454
+#: src/mine/cmine.cc:435
 msgid "Touching the cockatrice corpse was a fatal mistake.  --More--"
-msgstr "Ankasartze konponezina egin zenuen basiliskoa ikutzean.  --Gehiago--"
+msgstr "Hanka-sartze larria izan da basilisko-gorpua ukitzea.  --Gehiago--"
 
-#: src/mine/cmine.cc:456
+#: src/mine/cmine.cc:437
 msgid "You feel here a cockatrice corpse.  --More--"
-msgstr "Basilisko gorputza sentitzen duzu.  --Gehiago--"
+msgstr "Basilisko-gorpua sentitzen duzu hemen.  --Gehiago--"
 
-#: src/mine/cmine.cc:460
+#: src/mine/cmine.cc:441
 msgid ""
 "Click!  You trigger a rolling boulder trap!  You are hit by a boulder! --"
 "More--"
 msgstr ""
-"Klik!  Arri borobileko trampa aktibatu duzu!  Arriak jo egin zaitu --"
-"Gehiago--"
+"Klik!  Errekarri-tranpa bat aktibatu duzu!  Kolpea hartu duzu! -- Gehiago--"
 
-#: src/mine/cmine.cc:470
+#: src/mine/cmine.cc:451
 msgid "sleep"
 msgstr "lo"
 
-#: src/mine/cmine.cc:473
+#: src/mine/cmine.cc:454
 msgid "striking"
-msgstr "greban"
+msgstr "kolpeka"
 
-#: src/mine/cmine.cc:476
+#: src/mine/cmine.cc:457
 msgid "death"
-msgstr "hil"
+msgstr "heriotza"
 
-#: src/mine/cmine.cc:479
+#: src/mine/cmine.cc:460
 msgid "polymorph"
-msgstr "polimorfikoa"
+msgstr "polimorfoa"
 
-#: src/mine/cmine.cc:482
+#: src/mine/cmine.cc:463
 msgid "magic missile"
-msgstr "misil majikoa"
+msgstr "misil magikoa"
 
-#: src/mine/cmine.cc:485
+#: src/mine/cmine.cc:466
 msgid "secret door detection"
-msgstr "ate sekretu atzematea"
+msgstr "ate sekretuaren detekzioa"
 
-#: src/mine/cmine.cc:488
+#: src/mine/cmine.cc:469
 msgid "invisibility"
-msgstr "ikustezina"
+msgstr "ikusezintasuna"
 
-#: src/mine/cmine.cc:491
+#: src/mine/cmine.cc:472
 msgid "cold"
 msgstr "hotza"
 
-#: src/mine/cmine.cc:497
+#: src/mine/cmine.cc:478
 #, c-format
 msgid "Your wand of %s breaks apart and explodes!  --More--"
-msgstr "Zure %s barita magikoa apurtu eta mila zati egin da! --Gehiago--"
+msgstr "Zure makila magikoa (%s) hautsi eta lehertu egin da!  --Gehiago--"
 
-#: src/mine/cmine.cc:503
+#: src/mine/cmine.cc:484
 msgid "You are jolted by a surge of electricity!  --More--"
-msgstr "Elektrizitate deskarga batek jo zaitu!  --Gehiago--"
+msgstr "Deskarga elektriko batek jo zaitu!  --Gehiago--"
 
-#: src/mine/cmine.cc:607
+#: src/mine/cmine.cc:588
 msgid "Enter the filename to load: "
-msgstr "Sartu kargatu behar den fitxategiu izena: "
+msgstr "Sartu kargatu beharreko fitxategi-izena: "
 
-#: src/mine/cmine.cc:614
+#: src/mine/cmine.cc:595
 msgid "Enter the filename to save: "
-msgstr "Sartu gorde behar den fitxategiu izena: "
+msgstr "Sartu gorde beharreko fitxategi-izena: "
 
-#: src/mine/cmine.cc:624
+#: src/mine/cmine.cc:605
 msgid "mine-help.txt"
-msgstr "mina-laguntza.txt"
+msgstr "mine-help.txt"
 
 #: src/pkg_columnizer.cc:81
 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:1670
+#: src/pkg_columnizer.cc:84 src/ui.cc:1662
 msgid "Package"
 msgstr "Paketea"
 
 #: src/pkg_columnizer.cc:85
 msgid "InstSz"
-msgstr "InstTa"
+msgstr "InstTam"
 
 #: src/pkg_columnizer.cc:86
 msgid "DebSz"
-msgstr "DebTa"
+msgstr "DebTam"
 
 #: src/pkg_columnizer.cc:88
 msgid "Action"
@@ -2426,7 +2435,7 @@
 
 #: src/pkg_columnizer.cc:91
 msgid "CandVer"
-msgstr "KandBer"
+msgstr "HautagBer"
 
 #: src/pkg_columnizer.cc:92
 msgid "LongState"
@@ -2438,7 +2447,7 @@
 
 #: src/pkg_columnizer.cc:94
 msgid "Maintainer"
-msgstr "Arduraduna"
+msgstr "Mantentzailea"
 
 #: src/pkg_columnizer.cc:95
 msgid "Priority"
@@ -2446,7 +2455,7 @@
 
 #: src/pkg_columnizer.cc:96
 msgid "Section"
-msgstr "Atala"
+msgstr "Sekzioa"
 
 #: src/pkg_columnizer.cc:97
 msgid "RC"
@@ -2454,7 +2463,7 @@
 
 #: src/pkg_columnizer.cc:98
 msgid "Auto"
-msgstr "Auto"
+msgstr "Automatikoa"
 
 #: src/pkg_columnizer.cc:99
 msgid "Tag"
@@ -2470,24 +2479,24 @@
 
 #: src/pkg_columnizer.cc:104
 msgid "#Broken"
-msgstr "#Apurtua"
+msgstr "#Hautsita"
 
 #: src/pkg_columnizer.cc:105
 msgid "DiskUsage"
-msgstr "DiskaErabilera"
+msgstr "Disko-erabilera"
 
 #: src/pkg_columnizer.cc:106
 msgid "DownloadSize"
-msgstr "DeskargaTamaina"
+msgstr "Deskarga-tamaina"
 
 #: src/pkg_columnizer.cc:126 src/pkg_columnizer.cc:138 src/pkg_ver_item.cc:103
 #: src/pkg_ver_item.cc:168
 msgid "<N/A>"
-msgstr "<E/G>"
+msgstr "<E/E>"
 
 #: src/pkg_columnizer.cc:168 src/pkg_columnizer.cc:179
 msgid "<none>"
-msgstr "<batez>"
+msgstr "<bat ere ez>"
 
 #: src/pkg_columnizer.cc:219 src/pkg_grouppolicy.cc:222
 msgid "virtual"
@@ -2495,19 +2504,19 @@
 
 #: src/pkg_columnizer.cc:226 src/pkg_ver_item.cc:212 src/pkg_ver_item.cc:220
 msgid "purged"
-msgstr "garbiturik"
+msgstr "purgatuta"
 
 #: src/pkg_columnizer.cc:233 src/pkg_ver_item.cc:227
 msgid "half-config"
-msgstr "erdi-konfiguraturik"
+msgstr "erdi-konfiguratuta"
 
 #: src/pkg_columnizer.cc:235 src/pkg_ver_item.cc:229
 msgid "half-install"
-msgstr "erdi-instalaturik"
+msgstr "erdi-instalatuta"
 
 #: src/pkg_columnizer.cc:237 src/pkg_ver_item.cc:231
 msgid "config-files"
-msgstr "config-fitxategiak"
+msgstr "konfigurazio-fitxategiak"
 
 #: src/pkg_columnizer.cc:241 src/pkg_columnizer.cc:525 src/pkg_ver_item.cc:235
 msgid "ERROR"
@@ -2515,11 +2524,11 @@
 
 #: src/pkg_columnizer.cc:288 src/pkg_ver_item.cc:293
 msgid "hold"
-msgstr "hizoztua"
+msgstr "atxiki"
 
 #: src/pkg_columnizer.cc:293
 msgid "purge"
-msgstr "garbitu"
+msgstr "purgatu"
 
 #: src/pkg_columnizer.cc:293 src/pkg_ver_item.cc:317
 msgid "delete"
@@ -2527,12 +2536,12 @@
 
 #: src/pkg_columnizer.cc:295 src/pkg_ver_item.cc:215 src/pkg_ver_item.cc:299
 msgid "broken"
-msgstr "apurturik"
+msgstr "hautsita"
 
 #: src/pkg_columnizer.cc:297 src/pkg_ver_item.cc:303 src/pkg_ver_item.cc:310
 #: src/pkg_ver_item.cc:319
 msgid "install"
-msgstr "instalaturik"
+msgstr "instalatu"
 
 #: src/pkg_columnizer.cc:299
 msgid "reinstall"
@@ -2540,12 +2549,12 @@
 
 #: src/pkg_columnizer.cc:301
 msgid "upgrade"
-msgstr "eguneratu"
+msgstr "bertsio-berritu"
 
 #: src/pkg_columnizer.cc:303 src/pkg_columnizer.cc:305 src/pkg_ver_item.cc:305
 #: src/pkg_ver_item.cc:312 src/pkg_ver_item.cc:321 src/pkg_ver_item.cc:324
 msgid "none"
-msgstr "batere ez"
+msgstr "bat ere ez"
 
 #: src/pkg_columnizer.cc:333 src/pkg_columnizer.cc:354
 #: src/pkg_columnizer.cc:361 src/pkg_grouppolicy.cc:216
@@ -2556,23 +2565,23 @@
 
 #: src/pkg_columnizer.cc:341 src/pkg_ver_item.cc:353
 msgid "Imp"
-msgstr "Beha"
+msgstr "Gar."
 
 #: src/pkg_columnizer.cc:343 src/pkg_ver_item.cc:355
 msgid "Req"
-msgstr "Esk"
+msgstr "Beh."
 
 #: src/pkg_columnizer.cc:345 src/pkg_ver_item.cc:357
 msgid "Std"
-msgstr "Std"
+msgstr "Estd."
 
 #: src/pkg_columnizer.cc:347 src/pkg_ver_item.cc:359
 msgid "Opt"
-msgstr "Auk"
+msgstr "Auk."
 
 #: src/pkg_columnizer.cc:349 src/pkg_ver_item.cc:361
 msgid "Xtr"
-msgstr "Ext"
+msgstr "Xtr"
 
 #: src/pkg_columnizer.cc:351 src/pkg_ver_item.cc:363
 msgid "ERR"
@@ -2581,22 +2590,22 @@
 #: src/pkg_columnizer.cc:373
 #, c-format
 msgid "#Broken: %ld"
-msgstr "#Apurtua: %ld"
+msgstr "#Hautsita: %ld"
 
 #: src/pkg_columnizer.cc:388
 #, c-format
 msgid "Will use %sB of disk space"
-msgstr "%sB disko leku erabiliko dira"
+msgstr "Diskoan %sB hartuko dira"
 
 #: src/pkg_columnizer.cc:396
 #, c-format
 msgid "Will free %sB of disk space"
-msgstr "%sB disko leku hustuko dira"
+msgstr "Diskoan %sB libratuko dira"
 
 #: src/pkg_columnizer.cc:410
 #, c-format
 msgid "DL Size: %sB"
-msgstr "Desk. Tamaina %sB"
+msgstr "DL tamaina: %sB"
 
 #: src/pkg_columnizer.cc:480
 msgid "HN too long"
@@ -2604,7 +2613,7 @@
 
 #: src/pkg_columnizer.cc:654
 msgid "Internal error: Default column string is unparsable"
-msgstr "Barne errorea: Lehentsitako zutabe katea analiza ezina da"
+msgstr "Barne-errorea: zutabe-kate lehenetsia ez da analizagarria"
 
 #: src/pkg_grouppolicy.cc:150
 msgid ""
@@ -2613,10 +2622,10 @@
 "other packages. These packages provide an easy way to select a predefined "
 "set of packages for a specialized task."
 msgstr ""
-"Atazek zure ordenagailua zeregin bat betetzeko prestatzen dute\n"
-"  'Atazak' sekzioko paketeek ez dute fitxategirik, bakarrik beste pakete "
-"batzuenganako dependentziak. Pakete hauek zeregin jakin batetarako bildutako "
-"pakete batzuk instalatzeko era erraz eta azkarra ematen dute."
+"Ordenagailua ataza jakin bat egiteko konfiguratzen duten paketeak\n"
+"'Atazak' sekzioko paketeek ez dute fitxategirik: beste pakete batzuen mende "
+"egoten dira, besterik gabe. Pakete horiei esker, oso erraz hauta daiteke "
+"ataza espezializatu bat egiteko pakete-multzo bat."
 
 #: src/pkg_grouppolicy.cc:152
 msgid ""
@@ -2624,9 +2633,9 @@
 " No section is given for these packages. Perhaps there is an error in the "
 "Packages file?"
 msgstr ""
-"Atal gabeko Paketeak\n"
-" Ez dago atalik pakete hauek sartzeko. Agian errore bat dago pakete "
-"fitxategian?"
+"Sekzio deklaraturik gabeko paketeak\n"
+" Ez da sekziorik zehaztu pakete horientzat. Beharbada errorea egongo da "
+"Packages fitxategian?"
 
 #: src/pkg_grouppolicy.cc:154
 msgid ""
@@ -2635,10 +2644,11 @@
 "such as installing software, managing users, configuring and monitoring your "
 "system, examining network traffic, and so on."
 msgstr ""
-"Kudeaketarako lanabesak (softwarea instalatu, erabiltzaileak kudeatu, etab)\n"
-" Admin ataleko paketeak softwarea instalatu, erabiltzaileak kudeatu, zure "
-"sistema konfiguratu etamonitorizatu, sare trafikoa aztertu eta antzeko "
-"lanetarako aukera ematen dute."
+"Utilitate administratiboak (software-instalazioa, erabiltzaile-"
+"kudeaketa...)\n"
+" 'Admin' sekzioko paketeak ataza administratiboak egiteko erabiltzen dira. "
+"Adibidez: software-instalazioa, erabiltzaile-kudeaketa, sistemaren "
+"konfigurazioa eta kontrola, sare-trafikoaren azterketa, eta abar."
 
 #: src/pkg_grouppolicy.cc:156
 msgid ""
@@ -2646,17 +2656,17 @@
 " Packages in the 'alien' section were created by the 'alien' program from a "
 "non-Debian package format such as RPM"
 msgstr ""
-"Beste formatu batetatik bihurturiko paketeak (rpm, tgz, etab)\n"
-" 'alien' ataleko paketea debian pakete formatutik kanpo sortutak paketeak "
-"(RPM adibidez) alien lanabesa erabiliaz sortutakoak dira."
+"Bestelako formatuetatik bihurtutako paketeak (rpm, tgz, etab.)\n"
+" 'Alien' sekzioko paketeak 'alien' programa batek sortutakoak izaten dira,"
+"Debian-ena ez den pakete-formatu batetik abiatuta (RPM formatutik, adibidez)"
 
 #: src/pkg_grouppolicy.cc:157
 msgid ""
 "The Debian base system\n"
 " Packages in the 'base' section are part of the initial system installation."
 msgstr ""
-"Debian Oinarrizko Sistema\n"
-" 'base' ataleko paketeak hasierako debian instalatzailearen parte dira."
+"Debian oinarrizko sistema\n"
+" 'Base' sekzioko paketeak hasierako sistema-instalazioari dagozkio."
 
 #: src/pkg_grouppolicy.cc:158
 #, fuzzy
@@ -2686,14 +2696,14 @@
 " It includes compilers, debugging tools, programmer's editors, source "
 "processing tools, and other things related to software development."
 msgstr ""
-"Software garapenerako programa eta tresnak\n"
-" 'devel' ataleko paketeak software berri idazteko edo egina dagoen "
-"softwarean lan egiteko dira. Programadore ez diren edo softwarea konpilatzen "
-"ez eduten erabiultzaileek ziurrenik ez dituzte atal honetako paketeak "
-"beharko.\n"
-" \n"
-" Konpiladoreak, arazpen tresnak, programatze editoreak, jatorriak "
-"prozesatzeko tresnak eta antzeko beste batzu dakartza."
+"Softwarea garatzeko utilitateak eta programak\n"
+" 'Devel' sekzioko paketeak software berria idazteko eta lehendik dagoen "
+"softwarea lantzeko erabiltzen dira. Euren softwarea konpilatzen ez duten "
+"programatzaileek seguru asko ez dute beharko sekzio honetako softwarerik.\n"
+" .\n"
+" Konpilatzaileak, arazteko tresnak, programatzaileentzako editoreak, "
+"iturburuak prozesatzeko tresnak, eta software-garapenarekin lotutako beste "
+"hainbat elementu eskaintzen ditu."
 
 #: src/pkg_grouppolicy.cc:160
 msgid ""
@@ -2701,9 +2711,9 @@
 " Packages in the 'doc' section document parts of the Debian system, or are "
 "viewers for documentation formats."
 msgstr ""
-"Dokumetazioa eta dokumentazioa ikusteko programa bereziak\n"
-" 'doc' ataleko paketean Debian sistemako dokumentazio zatiak, edo dokumentu "
-"hauen formatu irakurleak dira."
+"Dokumentazioa eta dokumentazioa ikusteko programa bereziak\n"
+" 'Doc' sekzioko paketeek Debian sistemako zatiak dokumentatzen dituzte, edo "
+"dokumentazio-formatuak ikusteko balio dute."
 
 #: src/pkg_grouppolicy.cc:161
 msgid ""
@@ -2712,10 +2722,10 @@
 "are not necessarily word processors, although some word processors may be "
 "found in this section."
 msgstr ""
-"Testua editore eta prozezatzaileak\n"
-"  Atal honetako paketak ASCII testuak editatzeko aukera ematen dute. Ez dira "
-"zergatik testu prozesatzaileak izan behar, baina testu prozesadore batzu "
-"atal honetan aurki daitezke."
+"Testu-editoreak eta testu-prozesadoreak\n"
+" 'Editors' sekzioko paketeekin ASCII testu arrunta edita dezakezu. Ez dute "
+"zertan derrigorrez testu-prozesadoreak izan behar, baina, nolanahi ere, "
+"testu-prozesadore batzuk aurkituko dituzu sekzio honetan."
 
 #: src/pkg_grouppolicy.cc:162
 msgid ""
@@ -2723,9 +2733,10 @@
 " Packages in the 'electronics' section include circuit design tools, "
 "simulators and assemblers for microcontrollers, and other related software."
 msgstr ""
-"Zirukuito eta elektronikan lan egiteko programak\n"
-" 'electronics' ataleko paketeak zirkuituak diseinatzeko tresnak, "
-"simuladoreak, mikorkontroladoreentzat ensanbaldorak  eta hanekoak dira.dira"
+"Zirkuituak eta elektronika lantzeko programak\n"
+" 'Electronics' sekzioko paketeen artean ondorengoak aurkituko dituzu: "
+"zirkuituak diseinatzeko tresnak, mikrokontroladoreen simuladoreak eta "
+"mihiztatzaileak, eta antzeko softwarea."
 
 #: src/pkg_grouppolicy.cc:163
 msgid ""
@@ -2734,11 +2745,11 @@
 "Embedded devices are specialized hardware devices with much less power than "
 "a typical desktop system: for instance, a PDA, a cell phone, or a Tivo."
 msgstr ""
-"Sistema integratuetarako programak\n"
-" 'embedded' ataleko programak sistema integratuetan abiarazteko prestaturik "
-"daude. Sistema integratuak mahaigaineko sistema batek baino potentzia "
-"murritzagoko hardware gailu bereziak dira: adib, PDA bat, telefono mugikor "
-"bat..."
+"Sistema kapsulatuen programak\n"
+" 'Embedded' sekzioko paketeak gailu kapsulatuetan exekutatzeko dira. Ohiko "
+"mahaigaineko sistema batek baino ahalmen askoz txikiagoa duten hardware-"
+"gailu espezializatuak dira gailu kapsulatuak. Adibidez: PDAk, telefono "
+"mugikorrak, edo Tivo-ak."
 
 #: src/pkg_grouppolicy.cc:164
 msgid ""
@@ -2747,18 +2758,18 @@
 "environment for Linux.  Packages in the 'gnome' section are part of the "
 "GNOME environment or closely integrated into it."
 msgstr ""
-"GNOME Idazmahai sistema\n"
-" GNOME linux ingurunean idazmahai erabilterraz bat osatzen duen software "
-"bilduma bat da. 'gnome' ataleko paketeak GNOME inguruneko zatiak edo "
-"honekiko integraturiko programak dira."
+"GNOME mahaigaineko sistema\n"
+" GNOME software-bilduma bat da, Linux-erako mahaigaineko ingurune "
+"erabilerraz bat eskaintzen duena. 'Gnome' sekzioko paketeak GNOME "
+"inguruneari dagozkio, edo ingurune horretan integratuta daude."
 
 #: src/pkg_grouppolicy.cc:165
 msgid ""
 "Games, toys, and fun programs\n"
 " Packages in the 'games' section are meant primarily for entertainment."
 msgstr ""
-"Joko, jolas eta programa dibertigarriak\n"
-" joko ataleko paketeak bereiziki entretenigarriak dira."
+"Jokoak, jostailuak, edo dibertitzeko programak\n"
+" 'Games' sekzioko paketeak batez ere dibertsiora zuzendutakoak izaten dira."
 
 #: src/pkg_grouppolicy.cc:166
 msgid ""
@@ -2768,11 +2779,11 @@
 "hardware (such as video cards, scanners, and digital cameras), and "
 "programming tools for handling graphics."
 msgstr ""
-"Fitxategi grafikoak sortu, ikusi eta editatzeko tresnak\n"
-" 'graphics' ataleko paketeak irudi fitxatewgi ikusleak, irudi prozezatze eta "
-"editatze softwarea, hardware grafikoarekin (bideo txartelak, eskanerrak eta "
-"kamera digitalak bezalkoak) lan egiteko softwarea, eta grafikoak kudeatzeko "
-"programazio tresnak dira."
+"Grafiko-fitxategiak sortzeko, ikusteko eta editatzeko utilitateak\n"
+" 'Graphics' sekzioko paketeen artean ondorengoak aurkituko dituzu: irudiak "
+"prozesatzeko eta manipulatzeko softwarea, grafiko-hardwarearekin (hala nola "
+"bideo-txartelak, eskanerrak, eta kamera digitalak) interakzioan erabiltzeko "
+"softwarea , eta grafikoak lantzeko programazio-tresnak."
 
 #: src/pkg_grouppolicy.cc:167
 msgid ""
@@ -2780,9 +2791,9 @@
 " Packages in the 'hamradio' section are meant primarily for ham radio "
 "operators."
 msgstr ""
-"Irratifrekuentzia operadoreentzat softwarea\n"
-" 'hamradio' ataleko paketeak irratifrekuenzioa operadoreentzat daude "
-"pentsaturik."
+"Irrati-amateurrentzako softwarea\n"
+" 'Hamradio' sekzioan batez ere irrati-amateurrentzako paketeak aurkituko "
+"dituzu."
 
 #: src/pkg_grouppolicy.cc:168
 msgid ""
@@ -2790,9 +2801,10 @@
 " Packages in the 'interpreters' section include interpreters for languages "
 "like Python, Perl, and Ruby, and libraries for these same languages."
 msgstr ""
-"Interpretaturiko hizkuntzentzat interpreteak\n"
-" 'interpeters' ataleko paketeak Python, Perl eta Ruby antzerako hizkuntz "
-"interpretatuentzat interpreteak eta hizkuntza hauetako liburutegiak dira."
+"Interpretatutako lengoaientzako interpretatzaileak\n"
+" 'Interpreters' sekzioko paketeen artean, besteak beste, Python, Perl eta "
+"Ruby lengoaientzako interpretatzaileak eta lengoaia horien liburutegiak "
+"aurkituko dituzu."
 
 #: src/pkg_grouppolicy.cc:169
 msgid ""
@@ -2801,10 +2813,10 @@
 "environment for Linux.  Packages in the 'kde' section are part of the KDE "
 "environment or closely integrated into it."
 msgstr ""
-"KDE Idazmahai sistema\n"
-" KDE linux ingurunean idazmahai erabilterraz bat osatzen duen software "
-"bilduma bat da. 'kde' ataleko paketeak KDE inguruneko zatiak edo honekiko "
-"integraturiko programak dira."
+"KDE mahaigaineko sistema\n"
+" KDE software-bilduma bat da, Linux-erako mahaigaineko ingurune erabilerraz "
+"bat eskaintzen duena. 'Kde' sekzioko paketeak KDE inguruneari dagozkio, edo "
+"ingurune horretan integratuta daude."
 
 #: src/pkg_grouppolicy.cc:170
 msgid ""
@@ -2813,10 +2825,11 @@
 "programs that use libraries in the 'libs' section.  You don't need packages "
 "from this section unless you want to compile software yourself."
 msgstr ""
-"Liburutegiak garatzeko fitxategiak\n"
-" 'libdevel' ataleko apketeak 'lib' ataletako programak erabiltzen dituzten "
-"liburutegia eraikitzeko beharrezko fitxategia dituzte.  Zuk zure kabuz "
-"softwarea konpilatzeko ez bada ez duzu software hau behar."
+"Liburutegientzako garapen-fitxategiak\n"
+" 'Libdevel' sekzioko paketeen artean, besteak beste, 'libs' sekzioko "
+"liburutegiak erabiltzen dituzten programak sortzeko behar diren fitxategiak "
+"aurkituko dituzu. Zuk zeuk softwarerik konpilatu nahi ez baduzu behintzat, "
+"ez duzu sekzio honetako paketerik beharko."
 
 #: src/pkg_grouppolicy.cc:171
 msgid ""
@@ -2826,11 +2839,11 @@
 "explicitly install a package from this section; the package system will "
 "install them as required to fulfill dependencies."
 msgstr ""
-"Software rutina bilduma\n"
-" 'libs' ataleko paketeek ordenagilu honetan instalatutako softwarrari behar "
-"dituen lanabesak ematen dizkio. Normalean zuk ez zenuke atal honetako "
-"paketerik eskuz aukeratu behar, pakete sistemak dependentziak betetzeko "
-"behar direnean instalatuko ditu."
+"Software-errutinen bildumak\n"
+" 'libs' sekzioko paketeek ordenagailuko gainerako softwareak behar duen "
+"funtzionalitatea eskaintzen dute. Salbuespen bakar batzuetan izan ezik, ez "
+"duzu sekzio honetako paketerik instalatu beharrik izango; pakete-sistemak "
+"berak instalatuko ditu, mendekotasunak gauzatzeko behar diren neurrian."
 
 #: src/pkg_grouppolicy.cc:172
 msgid ""
@@ -2840,11 +2853,11 @@
 "don't need to install packages from this section explicitly; the package "
 "system will install them if they are required."
 msgstr ""
-"Perl interprete eta liburutegiak\n"
-" 'perl' ataleko paketeak Perl programazio hizkuntza eta hirugarrenek eginiko "
-"honentzako liburutegiak dira. Zu ez bazara perl programatzailea ez dituzu "
-"pakete hauek atal honetan aukeratu beharko. Sistemak behar izan ezkero "
-"automatikoki instalatuko ditu."
+"Perl interpretatzailea eta liburutegiak\n"
+" 'Perl' sekzioko paketeek Perl programazio-lengoaia eta beronentzako beste "
+"batzuen liburutegiak hornitzen dituzte. Perl programatzailea ez bazara, ez "
+"daukazu sekzio honetako paketerik instalatu beharrik; nolanahi ere, pakete-"
+"sistemak instalatu egingo ditu, beharrezkoak izanez gero."
 
 #: src/pkg_grouppolicy.cc:173
 msgid ""
@@ -2854,11 +2867,11 @@
 "you don't need to install packages from this section explicitly; the package "
 "system will install them if they are required."
 msgstr ""
-"Phyton interprete eta liburutegiak\n"
-" 'phyton' ataleko paketeak Phyton programazio hizkuntza eta hirugarrenek "
-"eginiko honentzako liburutegiak dira. Zu ez bazara Phyton programatzailea ez "
-"dituzu pakete hauek atal honetan aukeratu beharko. Sistemak behar izan "
-"ezkero automatikoki instalatuko ditu."
+"Python interpretatzailea eta liburutegiak\n"
+" 'Python' sekzioko paketeek Python programazio-lengoaia eta beronentzako "
+"beste batzuen liburutegiak hornitzen dituzte. Python programatzailea ez "
+"bazara, ez daukazu sekzio honetako paketerik instalatu beharrik; nolanahi "
+"ere, pakete-sistemak instalatu egingo ditu, beharrezkoak izanez gero."
 
 #: src/pkg_grouppolicy.cc:174
 msgid ""
@@ -2867,10 +2880,10 @@
 "daemons, mailing list software, and spam filters, as well as various other "
 "software related to electronic mail."
 msgstr ""
-"Eposta mezuak idatzi, bidali eta bideratze programak\n"
-" 'mail' taleko apeketak eposta irakurleak, eposta bideratze deabruak, eposta "
-"zerrenda softwarea eta zabor-posta (spam) iruzkinak eta hauek "
-"erlazionaturiko softwarea dira"
+"Posta elektronikoko mezuak idazteko, bidaltzeko eta bideratzeko programak\n"
+" 'Mail' sekzioko paketeen artean aurkituko dituzu, besteak beste, posta-"
+"irakurleak, posta-garraiatzaileak, daemon-ak, posta-zerrenden softwarea eta "
+"spam-iragazkiak, eta posta elektronikoarekin lotutako beste hainbat software."
 
 #: src/pkg_grouppolicy.cc:175
 msgid ""
@@ -2879,18 +2892,19 @@
 "mathematical computation (similar to Mathematica), symbolic algebra "
 "packages, and programs to visualize mathematical objects."
 msgstr ""
-"Zenabki analisi eta matematikekin zerikusia duten paketeak\n"
-" 'math' ataleko paketeak kalkuladora, matematik konputazio hizkuntzak "
-"(Mathematica antzekoak), algebra seinu paketeak eta objetu matematikoak "
-"ikusteko programak dira."
+"Zenbakizko analisiarekin eta matematikarekin lotutako softwarea\n"
+" 'Math' sekzioko paketeen artean aurkituko dituzu, besteak beste, "
+"kalkulagailuak, konputazio matematikorako lengoaiak (Mathematica-ren "
+"antzekoak), algebra sinbolikoko paketeak, eta objektu matematikoak ikusteko "
+"programak."
 
 #: src/pkg_grouppolicy.cc:176
 msgid ""
 "Miscellaneous software\n"
 " Packages in the 'misc' section have too unusual a function to be classified."
 msgstr ""
-"Bestelako Softwarea\n"
-" 'misc' ataleko paketeak sailkatzeko funtzio arraroegia dute."
+"Askotariko softwarea\n"
+" 'Misc' sekzioko paketeak funtzio berezikoak izaten dira, sailkatzeko zailak."
 
 #: src/pkg_grouppolicy.cc:177
 msgid ""
@@ -2899,10 +2913,11 @@
 "protocols, tools to manipulate and debug low-level network protocols, IM "
 "systems, and other network-related software."
 msgstr ""
-"Zenbait sare zerbitzu eskaini eta aerabiltzeko progarmak\n"
-" 'net' ataleko paketeak protokolo anitzentzako zerbitzari eta bezeroak , "
-"sare protokolo baxuak eraldatu eta arazteko lanabesak, eta sareei buruzko "
-"beste zenbait software dira."
+"Konektatzeko eta hainbat zerbitzu hornitzeko programak\n"
+" 'net' sekzioko paketeen artean aurkituko dituzu, besteak beste, hainbat "
+"protokolotarako bezeroak eta zerbitzariak, behe-mailako sare-protokoloak "
+"manipulatzeko eta arazteko tresnak, Berehalako Mezularitzako sistemak eta "
+"sareekin lotutako bestelako softwarea."
 
 #: src/pkg_grouppolicy.cc:178
 msgid ""
@@ -2910,9 +2925,10 @@
 " Packages in the 'news' section are related to the Usenet distributed news "
 "system.  They include news readers and news servers."
 msgstr ""
-"Usenet bezero eta zerbitzariak\n"
-" 'news' ataleko paketeek Usenet banatutako berri-taldeen inguruko softwarea "
-"dira. Berri-talde irakurle eta zerbitzariak barne."
+"Usenet bezeroak eta zerbitzariak\n"
+" 'news' sekzioko paketeak Usenet bidez banatzen diren berri-sistemei lotuta "
+"daude. Berri-irakurleak eta berri-zerbitzariak aurkituko dituzu pakete "
+"hauetan."
 
 #: src/pkg_grouppolicy.cc:179
 msgid ""
@@ -2926,13 +2942,13 @@
 "to fulfill dependencies."
 msgstr ""
 "Liburutegi zaharkituak\n"
-" òldlibs' ataleko paketeak zaharkiturik daude eta ez lituzke software "
-"berriak erabili beharko. Konpatibilitate arrazoiak direla eta edo Debianek "
-"oraindik behar dituelako banatzen dira.\n"
+" 'Oldlibs' sekzioko paketeak zaharkituta egoten dira, eta software berriak "
+"ez lituzke erabili beharko. Bateragarritasuna bermatzeko hornitzen dira, edo "
+"Debian-ek banatutako softwareak oraindik behar dituelako.\n"
 " .\n"
-" Oso kasu arrarotan ezik zuk ez zenuke eskuz atal honetako paketerik "
-"instalatu beharko, pakete kudeaketa sistemak instalatuko ditu behar izanez "
-"gero."
+" Salbuespen bakar batzuetan izan ezik, ez duzu sekzio honetako paketerik "
+"instalatu beharrik izango; pakete-sistemak mendekotasunak gauzatzeko behar "
+"diren neurrian instalatuko ditu."
 
 #: src/pkg_grouppolicy.cc:180
 msgid ""
@@ -2944,13 +2960,13 @@
 " .\n"
 " It is worth noting that CD burning software is included in THIS section."
 msgstr ""
-"Emuladoreak eta kanpo fitxategi ststemak irakurtzeko softwarea\n"
-" 'othersfs' ataleko paketeak hardware edo sistema abiarazleak emulatzen "
-"dituzte eta hardware plataforma eta sistema abiarazle desberdinen artean "
-"datuak bidaltzeko tresnak dira (adib. DOS disketean irakurtzeko lanabesak, "
-"eta PalmPilot-ekin harremanetan jartzeko tresnak).\n"
+"Emulatzaileak eta fitxategi-sistema arrotzak irakurtzeko softwarea\n"
+" 'Otherosfs' sekzioko paketeek hardwarea eta sistema eragileak emulatzen "
+"dituzte, eta sistema eragile eta hardware-plataforma desberdinen artean "
+"datuak transferitzeko tresnak hornitzen dituzte. (Adibidez, DOS disketeak "
+"irakurtzeko utilitateak, edo Palm Pilot-ekin komunikatzeko utilitateak)\n"
 " .\n"
-" CD-ak grabatzeko softwarea hemen dagoela esan behar da."
+" OHARRA: CDak grabatzeko softwarea ere sekzio HONETAN egoten da."
 
 #: src/pkg_grouppolicy.cc:181
 msgid ""
@@ -2959,8 +2975,9 @@
 "chemistry, as well as other science-related software."
 msgstr ""
 "Lan zientifikorako softwarea\n"
-" 'science' ataleko paketeak astronomia, biologia, kimika eta beste zenbait "
-"zienzi buruzko softwarea dira."
+" 'science' sekzioko paketeen artean aurkituko dituzu, besteak beste, "
+"astronomia, biologia eta kimikarako tresnak, eta zientziarekin lotutako "
+"bestelako softwarea."
 
 #: src/pkg_grouppolicy.cc:182
 msgid ""
@@ -2968,8 +2985,9 @@
 " Packages in the 'shells' section include programs providing a command-line "
 "interface."
 msgstr ""
-"Komando shella-k eta beste kontsola inguruneak\n"
-" 'shell' ataleko paketeak komando intefazea gaitzen duten softwarea dakar."
+"Komandoen shell-ak eta kontsola-ingurune alternatiboak\n"
+" 'Shells' sekzioko paketeen artean ,besteak beste, komando-lerroko "
+"interfazea hornitzen duten programak aurkituko dituzu."
 
 #: src/pkg_grouppolicy.cc:183
 msgid ""
@@ -2979,11 +2997,12 @@
 "programs to generate musical notation, drivers for sound hardware, and sound "
 "processing software."
 msgstr ""
-"Soinua entzuneta egiteko tresnak\n"
-" 'soun' ataleko paketeak soinua erreproduzitzaileak, grabatzaileak, "
-"birkodeaketaliak eta formatu anitzetako kodeatzaileak, nahasle eta bolumen "
-"kontrolak, MIDI sekuentzia jole eta notazio musikala egiteko programak, "
-"Soinu hardwarearentzako driberrak, eta audioa prozesatzeko softwarea dakar."
+"Soinua erreproduzitzeko eta grabatzeko utilitateak\n"
+" 'Sound' sekzioko paketeen artean ondorengoak aurkituko dituzu: soinu-"
+"erreproduzigailuak, grabagailuak, eta formatu askotako kodetzaileak, "
+"nahastaileak eta bolumen-kontrolak, MIDI sekuentziadoreak eta musika-"
+"notazioa sortzeko programak, soinu-hardwarearentzako kontrolatzaileak eta "
+"soinua prozesatzeko softwarea."
 
 #: src/pkg_grouppolicy.cc:184
 msgid ""
@@ -2993,12 +3012,12 @@
 "designed for TeX, utilities to convert TeX and TeX output files to various "
 "formats, TeX fonts, and other software related to TeX."
 msgstr ""
-"TeX letra-tipo sistema\n"
-" 'tex' ataleko paketeak TeX-ekin erlazionaturik daude, kalitate handiko "
-"letra-tipo irteerak sortzeko sistema. Honek TeX bera, TeX paketeak, TeX-"
-"entzat diseinaturiko editoreak, TeX eta TeX ireteerak beste formatu "
-"batzutara biurtzko tresnak, TeX letra-tipoak eta erlazionaturiko beste "
-"zenbait software dakar."
+"TeX tipografia-sistema\n"
+" 'Tex' sekzioko paketeak TeX-ekin lotuta daude. Sistema hori kalitate oneko "
+"irteera tipografikoak sortzeko erabiltzen da. TeX bera, TeX paketeak, TeX-"
+"erako diseinatutako editoreak, TeX fitxategiak beste formatu batzuetara "
+"bihurtzeko utilitateak, TeX letra-tipoak, eta TeX-en inguruko bestelako "
+"softwarea eskaintzen ditu."
 
 #: src/pkg_grouppolicy.cc:185
 msgid ""
@@ -3009,11 +3028,12 @@
 "formatters and pretty-printers, and other software which operates on plain "
 "text."
 msgstr ""
-"Testua prozesatzeko tresnak\n"
-" 'text' ataleko paketeakm testu iruzkin eta prozesadoreak, ortografia "
-"arakatzaileak, hiztegi programak, karaktere kodifikatu eta testu fitxategi "
-"formatu artean aldatzekoak, testu formatu egileak eta erlazionaturiko beste "
-"zenbait software dira."
+"Testua prozesatzeko utilitateak\n"
+" 'Text' sekzioko paketeen artean ondorengoak aurkiko dituzu: testu-"
+"iragazkiak eta testu-prozesadoreak, ortografia-zuzentzaileak, hiztegi-"
+"programak, karaktere-kodeketen eta testu-fitxategi formatuen arteko "
+"bihurketak egiteko utilitateak (adib. Unix eta DOS), testu-formateatzaileak "
+"eta testu arrunta lantzeko bestelako softwarea."
 
 #: src/pkg_grouppolicy.cc:186
 msgid ""
@@ -3021,8 +3041,8 @@
 " Packages in the 'utils' section are utilities whose purpose is too unique "
 "to be classified."
 msgstr ""
-"Zenbait sistema lanabes\n"
-" 'utils' ataleko paketeak sailkatzeko eginkizun zehatzegi bat daukate."
+"Hainbat sistema-utilitate\n"
+" 'Utils' sekzioan funtzio bereziko utilitateak aurkituko dituzu."
 
 #: src/pkg_grouppolicy.cc:187
 msgid ""
@@ -3031,11 +3051,11 @@
 "proxies, software to write CGI scripts or Web-based programs, pre-written "
 "Web-based programs, and other software related to the World Wide Web."
 msgstr ""
-"Web kudeatzaileak, zerbitzariak, proxiak et beste zenbait tresna\n"
-" 'web' ataleko programak besteak beste web kudeatzaileak, web zerbitzari eta "
-"proxiak, CGI skriptak idazteko programak edo Web-ean oinarritutako "
-"programak, aurre idatzitako web oinarritutako programak eta Webari "
-"erlazionaturiko beste zenbait tresna dira."
+"Web arakatzaileak, zerbitzariak, proxy-ak eta bestelako tresnak\n"
+" 'Web' sekzioko paketeen artean ondorengoak aurkituko dituzu: web "
+"arakatzaileak, web zerbitzariak eta proxy-ak, CGI script-ak edo web-ean "
+"oinarritutako programak idazteko softwarea, aurrez idatzitako web oinarriko "
+"programak, eta World Wide Web-ekin lotutako bestelako softwarea."
 
 #: src/pkg_grouppolicy.cc:188
 msgid ""
@@ -3044,10 +3064,11 @@
 "system, window managers, utility programs for X, and miscellaneous programs "
 "with an X GUI which were placed here because they didn't fit anywhere else."
 msgstr ""
-"X window sistema eta erlazionaturiko softwarea\n"
-" 'x11' atalak X window sistemarako pakete nagusia du, leiho kudeatzaileak, X-"
-"etarako lagungarri programak, eta beste X interfaze duren eta beste inon "
-"kokatu ezin ziren programa dakartza."
+"X leiho-sistema eta inguruko softwarea\n"
+" 'x11' sekzioko paketeen artean ondorengoak aurkituko dituzu: X leiho-"
+"sistemaren nukleo-paketeak, leiho-kudeatzaileak, X-en utilitate-programak "
+"eta X GUI duten hainbat programa, beste inon ondo egokitzen ez zirelako "
+"hemen sartutakoak."
 
 #: src/pkg_grouppolicy.cc:190
 msgid ""
@@ -3063,16 +3084,17 @@
 " For more information about what Debian considers to be Free Software, see "
 "http://www.debian.org/social_contract#guidelines"
 msgstr ""
-"Debian ez den softwarea behar duten Programak\n"
-" 'contrib' ataleko programak ez dira Debianen zati.\n"
+"Debian-ekoa ez den softwarearen mendeko programak\n"
+" 'Contrib' sekzioko paketeak ez dira, berez, Debian-ekoak.\n"
 " .\n"
-" Pakete hauek software librea dira, baina DEbianen zati ez den softwarea "
-"behar dute.  Hau software hori librea ez delako, baina 'non-free' atalean "
-"enpaketaturik dagoelako, Deabianek ezin duela software libre bezala banatu "
-"edo (gutxiengotan) software hori ez dagoelako enpaketaturik oraindik.\n"
+" Pakete hauek Software Librekoak dira, baina Debian-ekoa ez den softwarearen "
+"mendekoak. Izan liteke Software Librea ez delako, baina artxiboko non-free "
+"sekzio ez-librean paketatuta dagoelako, Debian-ek ezin duelako banatu inola "
+"ere, edo (oso gutxitan gertatzen bada ere) oraindik inork ez duelako "
+"paketatu.\n"
 " .\n"
-" Debianek zerri deitzen dion Software libre jakiteko eta hantzeko "
-"gauzetarako joan:http://www.debian.org/social_contract"
+" Debian-ek Software Libretzat zer jotzen duen zehazkiago jakiteko, ikus: "
+"http://www.debian.org/social_contract#guidelines"
 
 #: src/pkg_grouppolicy.cc:191
 msgid ""
@@ -3083,12 +3105,12 @@
 " For more information about what Debian considers to be Free Software, see "
 "http://www.debian.org/social_contract#guidelines"
 msgstr ""
-"Debian oinarrizko fitxategiak\n"
-" Debian banaketa 'main' ataleko paketeez osatzen da. 'main' atalean dagoen "
-"software guztia software librea da. \n"
+"Debian artxibo nagusia\n"
+" Debian banaketa 'main' sekzio nagusiko paketeek osatzen dute. 'Main'eko "
+"pakete guztiak Software Librea dira.\n"
 " .\n"
-"Debianek zerri deitzen dion Software libre jakiteko eta hantzeko gauzetarako "
-"joan:http://www.debian.org/social_contract"
+" Debian-ek Software Libretzat zer jotzen duen zehazkiago jakiteko, ikus: "
+"http://www.debian.org/social_contract#guidelines"
 
 #: src/pkg_grouppolicy.cc:192
 msgid ""
@@ -3102,16 +3124,15 @@
 "changes in export policies. Most packages which were formerly found in this "
 "section, therefore, are now in 'main'."
 msgstr ""
-"Esportazio kontrolak direla eta AEB-tik kanpora kokatutako programak\n"
-" 'non-US'  ataleko programek ziurrenik kriptografia dute, eta batebatek "
-"patentaturiko algoritmoak. Hau dela eta ezin dira AEB-rik kanpora esportatu. "
-"Arazo hau konpontzeko fitxategi hauek \"Mundu libreko\" zerbitzarietan daude "
-"kokaturik.\n"
+"AEBetatik at biltegiratutako programak, esportazio-kontrolen ondorioz\n"
+" 'non-US'eko paketeetan seguru asko kriptografia aurkituko duzu, hau da, "
+"patentatutako algoritmo batzuk. Horregatik, ezin dira Estatu Batuetatik "
+"esportatu, eta, beraz, \"mundu libre\"ko zerbitzari batean gordetzen dira.\n"
 " .\n"
-" Oharra. DEbian proiektuak eta abogatuekin AEB-n eginiko esportazio arau "
-"aldaketak begiratu ondoren software hauetako batzu 'main' atalean sartzen "
-"ari da. Hau dela eta atal honetan aurkitzen ziren pakete gehienak orain "
-"'main' atalean daude."
+" Oharra: software kriptografikoa AEBetan oinarritutako artxiboetan sartzen "
+"ari da Debian proiektua, esportazio-politiketako lege-adituei azken "
+"aldaketen inguruko kontsulta egin ondoren. Beraz, lehen sekzio honetan "
+"egoten ziren pakete gehienak orain 'main' sekzioan daude."
 
 #: src/pkg_grouppolicy.cc:193
 #, fuzzy
@@ -3142,9 +3163,10 @@
 " These packages do not exist; they are names other packages use to require "
 "or provide some functionality."
 msgstr ""
-"Pakete Birtualak\n"
-" Pakete hauek ez dira esistitzen; hauen izenak beste pakete batzuek "
-"erabiltzen dituzte funtzio batenbat eskatu edo emateko."
+"Pakete birtualak\n"
+" Pakete hauek ez dira existitzen; izen hutsak dira. Beste pakete batzuek "
+"funtzionalitateren bat eskatzeko edo eskaintzeko erabiltzen dituzte izen "
+"horiek."
 
 #: src/pkg_grouppolicy.cc:210
 msgid "Tasks/Tasks"
@@ -3164,24 +3186,24 @@
 
 #: src/pkg_grouppolicy.cc:233
 msgid "main"
-msgstr "main"
+msgstr "nagusia"
 
 #: src/pkg_grouppolicy.cc:318
 msgid ""
 "Security Updates\n"
 " Security updates for these packages are available from security.debian.org."
 msgstr ""
-"Segurtasun eguneraketak\n"
-" Security.debian.org-en pakete hauentzako segurtasun eguneraketak daude "
-"eskuragarri."
+"Segurtasun Eguneratzeak\n"
+" Pakete hauen segurtasun-eguneratzeak security.debian.org gunean aurkituko "
+"dituzu."
 
 #: src/pkg_grouppolicy.cc:319
 msgid ""
 "Upgradable Packages\n"
 " A newer version of these packages is available."
 msgstr ""
-"Pakete eguneragarriak\n"
-" Paketea hauen bertsio berriago bat dago eskuragarri."
+"Bertsio-berritu daitezkeen paketeak\n"
+" Pakete hauen bertsio berriago bat erabilgarri dago."
 
 #: src/pkg_grouppolicy.cc:320
 #, fuzzy
@@ -3201,16 +3223,16 @@
 "Installed Packages\n"
 " These packages are currently installed on your computer."
 msgstr ""
-"Instalaturiko Paketeak\n"
-"-Pakete hauek instalaturik daude zure ordenagailuan."
+"Instalatutako paketeak\n"
+" Pakete hauek instalatuta dituzu ordenagailuan."
 
 #: src/pkg_grouppolicy.cc:322
 msgid ""
 "Not Installed Packages\n"
 " These packages are not installed on your computer."
 msgstr ""
-"Instalaturik Ez dauden Paketeak\n"
-"-Pakete hauek ez daude instalaturik zure ordenagailuan."
+"Instalatu gabeko paketeak\n"
+" Pakete hauek ez dituzu instalatuta ordenagailuan."
 
 #: src/pkg_grouppolicy.cc:323
 msgid ""
@@ -3219,10 +3241,10 @@
 "available from any apt source.  They may be obsolete and removed from the "
 "archive, or you may have built a private version of them yourself."
 msgstr ""
-"Zaharkiturik edo lokalki sortutako Paketeak\n"
-" Paketea hauek dagoeneko zure ordenagailuan instalaturik daude, baina ez "
-"daude eskuragarr apt bidez. Ziurrenik zaharkiturik geratu dira eta ezaba "
-"ditzazkezu edo zuk eskuz sortutako pakete bertsio bat sortu zenuen."
+"Pakete zaharkituak eta lokalki sortuak\n"
+" Une honetan pakete hauek instalatuta dituzu ordenagailuan, baina ez daude "
+"erabilgarri ezein apt iturburutatik. Beharbada zaharkituta egongo dira eta "
+"artxibotik kenduko ziren, edo euren bertsio pribatu bat konpilatuko zenuen."
 
 #: src/pkg_grouppolicy.cc:324
 msgid ""
@@ -3230,9 +3252,10 @@
 " These packages do not exist; they are names other packages use to require "
 "or provide some functionality."
 msgstr ""
-"Pakete-Birtualak\n"
-" Pakete hauek ez dira esistitzen; hauen izenak beste pakete batzuek "
-"erabiltzen dituzte funtzio batenbat eskatu edo emateko."
+"Pakete birtualak\n"
+" Pakete hauek ez dira existitzen; izen hutsak dira. Beste pakete batzuek "
+"funtzionalitateren bat eskatzeko edo eskaintzeko erabiltzen dituzte izen "
+"horiek."
 
 #: src/pkg_grouppolicy.cc:471
 msgid ""
@@ -3241,10 +3264,10 @@
 "provide full functionality in some other programs that you are installing or "
 "upgrading."
 msgstr ""
-"Beste pakete batzuek aholkatutako paketeak\n"
-" Paketea hauek ez idra beharrezkoak zure sistemak egoki funtzionatzeko, "
-"baina instalatzen edo eguneratzen ari zaren pakete batenbatek osoki "
-"funtzionatzeko beharrezkoak ditu"
+"Beste pakete batzuek gomendatutako paketeak\n"
+" Pakete hauek ez dira beharrezkoak zure sistemak behar bezala "
+"funtzionatzeko, baina instalatzen (edo eguneratzen) ari zaren programa "
+"batzuen funtzionalitatea hobetu dezakete."
 
 #: src/pkg_grouppolicy.cc:491
 msgid ""
@@ -3253,10 +3276,10 @@
 "properly, but they may provide enhanced functionality for some programs that "
 "you are currently installing."
 msgstr ""
-"Beste pakete batzuek aholkatutako paketeak\n"
-" Paketea hauek ez idra beharrezkoak zure sistemak egoki funtzionatzeko, "
-"baina berauek funtzio hedatu batenbat eman dezakete dagoeneko instalatzen "
-"ari zaren pakete batenbati."
+"Beste pakete batzuek iradokitako paketeak\n"
+" Pakete hauek ez dira beharrezkoak zure sistemak behar bezala "
+"funtzionatzeko, baina instalatzen ari zaren programa batzuen "
+"funtzionalitatea hobetu dezakete."
 
 #: src/pkg_grouppolicy.cc:518
 msgid ""
@@ -3267,11 +3290,12 @@
 " The presence of this tree probably indicates that something is broken, "
 "either on your system or in the Debian archive."
 msgstr ""
-"Dependentziak betegabeko paketeak\n"
-" Pakete hauen dependentzi beharrak ez dira bete instalazio burutzerakoan.\n"
+"Bete gabeko mendekotasunak dituzten paketeak\n"
+" Pakete hauen mendekotasun-eskakizunak bete gabe geratuko dira instalazioa "
+"amaitutakoan.\n"
 " .\n"
-" Atal hau egoteak zure sisteman edo Debian fitxategi sisteman zerbait "
-"apurturik dagoela adierazten du."
+" Zuhaitz hau agertzeak seguru asko esan nahi izango du, zerbait hautsita "
+"dagoela zure sisteman edo Debian artxiboan."
 
 #: src/pkg_grouppolicy.cc:519
 msgid ""
@@ -3280,10 +3304,11 @@
 "to fulfill dependencies, and the planned action will result in no installed "
 "package declaring an 'important' dependency on them.\n"
 msgstr ""
-"Denbora luzean erabiliak izan ez direlako ezabatu egingo diren paketeak\n"
-"Paketea hauek automatikoki dependentzia batenbat betetzeko instalatuak izan "
-"ziren eta plantatutako ekintzak ez duenez pakete hauteriko dependentzia "
-"garrantzitsuik uzten, ezabatu egingo dira.\n"
+"Jada erabiltzen ez direlako kenduko diren paketeak\n"
+" Pakete hauek ezabatu egingo dira; izan ere, automatikoki instalatu ziren "
+"mendekotasunak betetzeko, eta egin nahi den ekintzaren ondorioz, ez da "
+"instalatutako pakete bat ere geratuko horien mendekotasun "
+"'garrantzitsua'duenik.\n"
 
 #: src/pkg_grouppolicy.cc:520
 msgid ""
@@ -3291,9 +3316,9 @@
 " These packages could be upgraded, but they have been kept in their current "
 "state to avoid breaking dependencies."
 msgstr ""
-"Dauden egoeran utziko diren paketeak\n"
-"  Pakete hauek eguneratu daitezke baina dependentzi batenbat ez "
-"buskatzearren ez dira eguneratuko."
+"Automatikoki uneko egoeran atxikiko diren paketeak\n"
+" Pakete hauek bertsio-berritu litezke, baina uneko egoeran mantenduko dira, "
+"mendekotasunik ez hausteko."
 
 #: src/pkg_grouppolicy.cc:521
 msgid ""
@@ -3301,9 +3326,9 @@
 " These packages are being installed because they are required by another "
 "package you have chosen for installation."
 msgstr ""
-"Dependentziak betetzeko automatikoki instalatuko diren paketeak\n"
-" Pakete hauek zuk instalatzeko aukeratu duzun beste pakete batenbatek behar "
-"ditu, beraz automatikoki instalatuak izango dira."
+"Mendekotasunak betetzeko automatikoki instalatuko diren paketeak\n"
+" Instalatzeko aukeratu duzun beste pakete batek behar dituelako instalatuko "
+"dira pakete hauek."
 
 #: src/pkg_grouppolicy.cc:522
 msgid ""
@@ -3311,10 +3336,9 @@
 " These packages are being deleted because one or more of their dependencies "
 "is no longer available, or because another package conflicts with them."
 msgstr ""
-"Betegabeko dependentziak direla eta ezabatuko diren paketeak\n"
-" Paketea hauek beren depenedentzietako bat edo gehiago dagoeneko eskuragarri "
-"ez daudenez  edo beste pakete batekin liskarra dutelako ezabatuak izango "
-"dira."
+"Mendekotasunak ez betetzeagatik ezabatuko diren paketeak\n"
+" Euren mendekotasun bat edo gehiago jada erabilgarri ez dagoelako, edo beste "
+"pakete batekin gatazka dutelako ezabatuko dira pakete hauek."
 
 #: src/pkg_grouppolicy.cc:523
 msgid ""
@@ -3322,9 +3346,9 @@
 " An older version of these packages than is currently installed will be "
 "installed."
 msgstr ""
-"Atzeratu egingo diren paketeak\n"
-" Pakete hauentzako instalaturik dagoena baino bertsio zaharrago bat "
-"instalatuko da."
+"Aurreko bertsiora itzultzeko paketeak\n"
+" Une honetan instalatutakoa baino bertsio zaharrago batera itzuliko dira "
+"pakete hauek."
 
 #: src/pkg_grouppolicy.cc:524
 msgid ""
@@ -3332,17 +3356,17 @@
 " These packages could be upgraded, but you have asked for them to be held at "
 "their current version."
 msgstr ""
-"Hizoztutako paketeak\n"
-" Pakete hauek eguneratu daitezke baina zuk hizotuak dituzunez ez dira "
-"eguneratuak izango."
+"Atxikitako paketeak\n"
+" Pakete hauek bertsio-berritu daitezke, baina uneko bertsioan mantentzea "
+"eskatu duzu."
 
 #: src/pkg_grouppolicy.cc:525
 msgid ""
 "Packages to be reinstalled\n"
 " These packages will be reinstalled."
 msgstr ""
-"Berrinstalatuko diren paketea\n"
-" Pakete hauek berrinstalatu egingo dira."
+"Berrinstalatzeko paketeak\n"
+" Pakete hauek berriro instalatuko dira."
 
 #: src/pkg_grouppolicy.cc:526
 msgid ""
@@ -3350,25 +3374,24 @@
 " These packages have been manually selected for installation on your "
 "computer."
 msgstr ""
-"Instalatu egingo diren Paketeak-\n"
-"-Pakete hauek zure ordenagailuan instalatuak izan daitezen eskuz aukeraturik "
-"daude."
+"Instalatzeko paketeak\n"
+" Pakete hauek eskuz hautatu dituzu, ordenagailuan instalatzeko."
 
 #: src/pkg_grouppolicy.cc:527
 msgid ""
 "Packages to be removed\n"
 " These packages have been manually selected for removal."
 msgstr ""
-"Ezabatzeko Paketeak\n"
-"-Pakete hauek ezabatzeko eskuz aukeratuak daude."
+"Kentzeko paketeak\n"
+" Pakete hauek eskuz hautatu dituzu kentzeko."
 
 #: src/pkg_grouppolicy.cc:528
 msgid ""
 "Packages to be upgraded\n"
 " These packages will be upgraded to a newer version."
 msgstr ""
-"Eguneratu behar diren Paketeak-\n"
-" Pakete hauek bertsio berriago batetara eguneratuko dira."
+"Bertsio-berritzeko paketeak\n"
+" Pakete hauek bertsio-berritu egingo dira."
 
 #: src/pkg_grouppolicy.cc:643
 msgid "unknown"
@@ -3377,11 +3400,11 @@
 #: src/pkg_grouppolicy.cc:654
 #, c-format
 msgid "Priority %s"
-msgstr "Lehentasuna %s"
+msgstr "Lehentasuna: %s"
 
 #: src/pkg_grouppolicy.cc:880
 msgid "End-user"
-msgstr "Erabiltzaile aplikazioak"
+msgstr "Amaierako erabiltzailea"
 
 #: src/pkg_grouppolicy.cc:881
 msgid "Servers"
@@ -3389,23 +3412,23 @@
 
 #: src/pkg_grouppolicy.cc:882
 msgid "Development"
-msgstr "Garatzaileak"
+msgstr "Garapena"
 
 #: src/pkg_grouppolicy.cc:883
 msgid "Localization"
-msgstr "Kokapena"
+msgstr "Lokalizazioa"
 
 #: src/pkg_grouppolicy.cc:884
 msgid "Hardware Support"
-msgstr "Hardware Onarpena"
+msgstr "Hardware euskarria"
 
 #: src/pkg_grouppolicy.cc:885
 msgid "Miscellaneous"
-msgstr "Bestelakoak"
+msgstr "Hainbat"
 
 #: src/pkg_grouppolicy.cc:886
 msgid "Unrecognized tasks"
-msgstr "Ataza Ezezagunak"
+msgstr "Ataza ezezagunak"
 
 #: src/pkg_grouppolicy.cc:937
 msgid ""
@@ -3414,30 +3437,30 @@
 "predefined set of packages for a particular purpose."
 msgstr ""
 "\n"
-" Atazek eskatutako eginkizuna betetzen duten pakete aukeraketa bat "
-"instalatzeko aukera ematen dute"
+" Xede jakin baterako aurrez definitutako pakete-multzo bat erraz hautatzeko "
+"modua ematen duten pakete-multzoak dira atazak."
 
 #: src/pkg_info_screen.cc:116
 msgid "Compressed size: "
-msgstr "Komprimituriko tamaina: "
+msgstr "Konprimitutako tamaina: "
 
 #: src/pkg_info_screen.cc:117
 msgid "Uncompressed size: "
-msgstr "Deskonprimitutako tamaina:"
+msgstr "Konprimitu gabeko tamaina: "
 
 #: src/pkg_info_screen.cc:118
 msgid "Source Package: "
-msgstr "Iturburu Paketea: "
+msgstr "Iturburu-paketea: "
 
 #: src/pkg_info_screen.cc:128
 #, c-format
 msgid "Package names provided by %s"
-msgstr "%s-k dakartzan pakete izenak"
+msgstr "Honek hornitutako pakete-izenak: %s"
 
 #: src/pkg_info_screen.cc:138
 #, c-format
 msgid "Packages which depend on %s"
-msgstr "%s-z behar duten paketeak"
+msgstr "Honen mendeko paketeak: %s"
 
 #: src/pkg_info_screen.cc:143
 msgid "Versions"
@@ -3445,7 +3468,7 @@
 
 #: 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"
+msgstr "Bai, badakit oso ideia txarra dela"
 
 #: src/pkg_item.cc:80
 #, fuzzy, c-format
@@ -3458,52 +3481,52 @@
 "Ziur al zaude ezabatu nahi duzula?\n"
 "%s idatzi ziur bazaude."
 
-#: src/pkg_item.cc:222 src/pkg_ver_item.cc:625
+#: src/pkg_item.cc:220 src/pkg_ver_item.cc:626
 #, c-format
 msgid "Information about %s"
-msgstr "%s-ri buruz argibideak"
+msgstr "Honi buruzko informazioa: %s"
 
-#: src/pkg_item.cc:224 src/pkg_ver_item.cc:627
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:628
 #, c-format
 msgid "%s info"
 msgstr ""
 
-#: src/pkg_item.cc:310
+#: src/pkg_item.cc:308
 #, fuzzy, c-format
 msgid "Available versions of %s"
 msgstr "Honen bertsio erabilgarriak:"
 
-#: src/pkg_item.cc:313
+#: src/pkg_item.cc:311
 #, fuzzy, c-format
 msgid "%s versions"
 msgstr "Bertsioak"
 
-#: src/pkg_item.cc:325 src/pkg_ver_item.cc:655
+#: src/pkg_item.cc:323 src/pkg_ver_item.cc:656
 #, c-format
 msgid "Dependencies of %s"
-msgstr "%s-ren dependentziak"
+msgstr "%s - mendekotasunak"
 
-#: src/pkg_item.cc:327 src/pkg_ver_item.cc:657
+#: src/pkg_item.cc:325 src/pkg_ver_item.cc:658
 #, c-format
 msgid "%s deps"
 msgstr ""
 
-#: src/pkg_item.cc:338 src/pkg_ver_item.cc:667
+#: src/pkg_item.cc:336 src/pkg_ver_item.cc:668
 #, c-format
 msgid "Packages depending on %s"
-msgstr "%s behar duten paketeak"
+msgstr "Honen mendeko paketeak: %s"
 
-#: src/pkg_item.cc:340 src/pkg_ver_item.cc:669
+#: src/pkg_item.cc:338 src/pkg_ver_item.cc:670
 #, c-format
 msgid "%s reverse deps"
 msgstr ""
 
-#: src/pkg_item.cc:392 src/pkg_ver_item.cc:707
+#: src/pkg_item.cc:390 src/pkg_ver_item.cc:708
 #, c-format
 msgid "Reporting a bug in %s:\n"
-msgstr "%s-n arazo baten berri ematen\n"
+msgstr "%s(e)ko erroreen berri ematen:\n"
 
-#: src/pkg_item.cc:414
+#: src/pkg_item.cc:412
 #, fuzzy
 msgid ""
 "You are not root and I cannot find any way to become root.  To reconfigure "
@@ -3515,23 +3538,23 @@
 "edo login paketa instalatu edo aptitude root\n"
 "bezala abiarazi."
 
-#: src/pkg_item.cc:422
+#: src/pkg_item.cc:420
 #, c-format
 msgid "Reconfiguring %s\n"
-msgstr "%s berkonfiguratzen\n"
+msgstr "%s birkonfiguratzen\n"
 
-#: src/pkg_item.cc:447
+#: src/pkg_item.cc:445
 msgid "Hierarchy editor"
-msgstr "Jerarkia editorea"
+msgstr "Hierarkia-editorea"
 
-#: src/pkg_item.cc:447
+#: src/pkg_item.cc:445
 #, fuzzy
 msgid "Hierarchy Editor"
 msgstr "Jerarkia editorea"
 
 #: src/pkg_tree.cc:325
 msgid "Search for: "
-msgstr "Bilatu hau:"
+msgstr "Bilatu hau: "
 
 #: src/pkg_tree.cc:568
 msgid "All Packages"
@@ -3539,257 +3562,256 @@
 
 #: src/pkg_tree.cc:581 src/pkg_tree.cc:590
 msgid "Building view"
-msgstr "Ikuspegia eraikitzen"
+msgstr "Ikuspegi-eraikitzea"
 
 #: src/pkg_tree.cc:632
 #, c-format
 msgid "No packages matched the pattern \"%s\"."
-msgstr "\"%s\" patroia betetzen duen paketerik ez da aurkitu."
+msgstr "Ez dago \"%s\" ereduarekin bat datorren paketerik."
 
 #: src/pkg_tree.cc:654
 msgid "Enter the new package tree limit: "
-msgstr "Sartu pakete zuhaitz limite berria: "
+msgstr "Sartu pakete-zuhaitzaren muga berria: "
 
 #: 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:"
+msgstr "Sartu ikuspegi honetan paketeak taldekatzeko mekanismo berria: "
 
 #: 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:"
+msgstr "Sartu ikuspegi honetan paketeak ordenatzeko mekanismo berria: "
 
-#: src/pkg_view.cc:344
+#: src/pkg_view.cc:359
 msgid "make_package_view: error in arguments -- two main widgets??"
-msgstr "make_package_view: errorea argumentuetan -- bi partaide nagusi??"
+msgstr "make_package_view: errorea argumentuetan - bi trepeta nagusi??"
 
-#: src/pkg_view.cc:350
+#: src/pkg_view.cc:365
 msgid ""
 "make_package_view: error in arguments -- bad column list for static item"
 msgstr ""
-"make_package_view: errorea argumentutan -- zutabe zerrenda edo elementu "
-"estatiko okerra"
+"make_package_view: errorea argumentuetan - zutabe-zerrenda okerra elementu "
+"estatikoarentzat"
 
-#: src/pkg_view.cc:443
+#: src/pkg_view.cc:458
 msgid "make_package_view: bad argument!"
-msgstr "make_package_view: argumentu okerra!"
+msgstr "make_package_view: okerreko argumentua!"
 
-#: src/pkg_view.cc:495
+#: src/pkg_view.cc:510
 msgid "make_package_view: no main widget found"
-msgstr "make_package_view: Ez da oinarrizko lanabesa aurkitu"
+msgstr "make_package_view: ez da trepeta nagusirik aurkitu"
 
 #: src/reason_fragment.cc:30
 msgid "depends on"
-msgstr "behar du"
+msgstr "honen mendekoa da:"
 
 #: src/reason_fragment.cc:32
 msgid "pre-depends on"
-msgstr "aurretik behar du"
+msgstr "honen aurremendekoa da:"
 
 #: src/reason_fragment.cc:34
 msgid "suggests"
-msgstr "iradokiri"
+msgstr "hau iradokitzen du:"
 
 #: src/reason_fragment.cc:35
 msgid "recommends"
-msgstr "gomendaturik"
+msgstr "hau gomendatzen du:"
 
 #: src/reason_fragment.cc:37
 msgid "conflicts with"
-msgstr "ez dator bat honekin:"
+msgstr "gatazkan dago honekin:"
 
 #: src/reason_fragment.cc:39
 msgid "replaces"
-msgstr "aldaturik"
+msgstr "hau ordezten du:"
 
 #: src/reason_fragment.cc:40
 msgid "obsoletes"
-msgstr "zaharkiturik"
+msgstr "hau zaharkitzen du:"
 
 #: src/reason_fragment.cc:166
 #, c-format
 msgid " (provided by %F)"
-msgstr " (%F-k dakar)"
+msgstr " (honek hornitua: %F)"
 
-#: src/reason_fragment.cc:278
+#: src/reason_fragment.cc:275
 #, c-format
 msgid "%F%s %F %F"
 msgstr "%F%s %F %F"
 
-#: src/reason_fragment.cc:327
+#: src/reason_fragment.cc:324
 msgid ""
 "If you select a package, an explanation of its current state will appear in "
 "this space."
 msgstr ""
-"Zuk paketea bat aukeratzean bere egoeraren argibideak hemen agertu beharko "
-"lirateke."
+"Pakete bat hautatzen baduzu, paketearen uneko egoeraren azalpen bat agertuko "
+"da hemen."
 
-#: src/reason_fragment.cc:361
+#: src/reason_fragment.cc:358
 msgid ""
 "%B%s%b was installed automatically;  it is being removed because all of the "
 "packages which depend upon it are being removed:"
 msgstr ""
-"%B%s%b automatikoki instalatu zen;  eta orain ezabatua izango da berarekiko "
-"dependentziak zituzten pakete guztiak ezabatuak izango direlako."
+"%B%s%b automatikoki instalatu zen;  kendu egingo da, haren mendeko pakete "
+"guztiak ere kendu egingo baitira:"
 
-#: src/reason_fragment.cc:365
+#: src/reason_fragment.cc:362
 msgid "%B%s%b will be automatically removed because of dependency errors:"
-msgstr "%B%s%b dependentzia erroreak direla eta ezabatua izango da:"
+msgstr "%B%s%b automatikoki kenduko da, mendekotasun-erroreen ondorioz:"
 
-#: src/reason_fragment.cc:369
+#: src/reason_fragment.cc:366
 msgid ""
 "%B%s%b will be automatically installed to satisfy the following dependencies:"
 msgstr ""
-"%B%s%b automatikoki instalatua izango da hurrengo dependentziak betetzeko:"
+"%B%s%b automatikoki instalatuko da, ondorengo mendekotasunak betetzeko:"
 
-#: src/reason_fragment.cc:375 src/reason_fragment.cc:387
+#: src/reason_fragment.cc:372 src/reason_fragment.cc:384
 msgid ""
 "%B%s%b cannot be upgraded now, but if it could be, it would still be held at "
 "version %B%s%b."
 msgstr ""
-"%B%s%b ezin da orain eguneratu, baina ahal izatekotan ere, %B%s%b bertsioan "
-"mantendu beharko zen."
+"%B%s%b ezin da orain bertsio-berritu, baina bertsio-berritzea posible izango "
+"balitz ere, %B%s%b bertsioan mantenduko litzateke."
 
-#: src/reason_fragment.cc:378
+#: src/reason_fragment.cc:375
 msgid ""
 "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the "
 "following dependencies:"
 msgstr ""
-"%B%s%b ezin da  %B%s%b bertsiora eguneratu, hurrengo dependentziak ez "
-"buskatzearren:"
+"%B%s%b ez da %B%s%b bertsiora berrituko, ondorengo mendekotasunak hauts ez "
+"daitezen:"
 
-#: src/reason_fragment.cc:390
+#: src/reason_fragment.cc:387
 msgid "%B%s%b is currently installed."
-msgstr "%B%s%b dagoeneko instalaturik dago."
+msgstr "%B%s%b instalatuta daukazu."
 
-#: src/reason_fragment.cc:396
+#: src/reason_fragment.cc:393
 msgid "%B%s%b is not currently installed."
-msgstr "%B%s%b ez dago instalaturik."
+msgstr "%B%s%b ez daukazu instalatuta."
 
-#: src/reason_fragment.cc:404
+#: src/reason_fragment.cc:401
 msgid "Some dependencies of %B%s%b are not satisfied:"
-msgstr "%B%s%b-ren dependentzi batzuek ez daude beterik:"
+msgstr "%B%s%b - mendekotasun batzuk ez zaizkio betetzen:"
 
-#: src/reason_fragment.cc:408
+#: src/reason_fragment.cc:405
 msgid "%B%s%b will be downgraded."
-msgstr "%B%s%b atzeratu egingo da."
+msgstr "%B%s%b aurreko bertsiora itzuliko da."
 
-#: src/reason_fragment.cc:415
+#: src/reason_fragment.cc:412
 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b."
-msgstr "%B%s%b ez da eguneratuko %B%s%b bertsio debekatura."
+msgstr "%B%s%b ez da berrituko debekatutako %B%s%b bertsiora."
 
-#: src/reason_fragment.cc:419
+#: src/reason_fragment.cc:416
 msgid ""
 "%B%s%b could be upgraded to version %B%s%b, but it is being held at version %"
 "B%s%b."
 msgstr ""
-"%B%s%b paketea %B%s%b bertsiora eguneratu daiteke, baina %B%s%b bertsioan "
-"hizozturik dago."
+"%B%s%b berritu liteke %B%s%b bertsiora, baina %B%s%b bertsioan atxikita dago."
 
-#: src/reason_fragment.cc:426
+#: src/reason_fragment.cc:423
 msgid "%B%s%b will be re-installed."
-msgstr "%B%s%b berrinstalatua izango da."
+msgstr "%B%s%b berriro instalatuko da."
 
-#: src/reason_fragment.cc:430
+#: src/reason_fragment.cc:427
 msgid "%B%s%b will be installed."
-msgstr "%B%s%b instalatua izango da."
+msgstr "%B%s%b instalatu egingo da."
 
-#: src/reason_fragment.cc:434
+#: src/reason_fragment.cc:431
 msgid "%B%s%b will be removed."
-msgstr "%B%s%b ezabatu izango da."
+msgstr "%B%s%b kendu egingo da."
 
-#: src/reason_fragment.cc:439
+#: src/reason_fragment.cc:436
 msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b."
-msgstr "%B%s%b eguneratu izango da %B%s%b bertsiotik %B%s%b bertsiora."
+msgstr "%B%s%b berritu egingo da %B%s%b bertsiotik %B%s%b bertsiora."
 
-#: src/reason_fragment.cc:475
+#: src/reason_fragment.cc:472
 msgid ""
 "The following packages depend on %B%s%b and will be broken by its removal:"
 msgstr ""
-"Hurrengo paketeek %B%s%b behar dute eta apurturik egongo dira hau ezabatzen "
-"bada:"
+"Ondorengo paketeak %B%s%b(r)en mendekoak dira, eta hautsi egingo dira hori "
+"kentzean:"
 
-#: src/reason_fragment.cc:478
+#: src/reason_fragment.cc:475
 msgid "The following packages depend on %B%s%b and are broken:"
-msgstr "Hurrengo paketeek %B%s%b behar dute eta apurturik daude:"
+msgstr "Ondorengo paketeak %B%s%b(r)en mendekoak dira, eta hautsita daude:"
 
-#: src/reason_fragment.cc:485
+#: src/reason_fragment.cc:482
 msgid ""
 "The following packages conflict with %B%s%b and will be broken by its "
 "installation:"
 msgstr ""
-"Hurrengo paketeek %B%s%b paketarekin liskarra dute eta hau instalatzerako "
-"buskatu litezke:"
+"Ondorengo paketeek gatazka dute %B%s%b(r)ekin, eta hautsi egingo dira hori "
+"instalatzean:"
 
-#: src/reason_fragment.cc:518
+#: src/reason_fragment.cc:515
 msgid ""
 "The following packages depend on a version of %B%s%b other than the "
 "currently installed version of %B%s%b, or conflict with the currently "
 "installed version:"
 msgstr ""
-"Hurrengo programek instalaturik dagoen  %B%s%b -ren beste %B%s%b bertsio bat "
-"behar dute,edo instalaturik dagoen bertsioarekin liskarra dute:"
+"Ondorengo paketeak %B%s%b(r)en beste bertsio baten mendekoak dira, ez unean "
+"instalatuta dagoen %B%s%b bertsioaren mendekoak, edo gatazkan daude "
+"instalatuta daukazun bertsioarekin:"
 
-#: src/reason_fragment.cc:522
+#: src/reason_fragment.cc:519
 msgid ""
 "The following packages conflict with %B%s%b, or depend on a version of it "
 "which is not going to be installed."
 msgstr ""
-"Hurrengo bertsioa %B%s%b-rekin liskarra du, edo instalatua izango ez den "
-"beste bertsio bat behar du."
+"Ondorengo paketeak gatazkan daude %B%s%b(r)en bertsio batekin, edo "
+"instalatuko ez den bertsio baten mendekoak dira."
 
-#: src/reason_fragment.cc:526
+#: src/reason_fragment.cc:523
 msgid "The following packages conflict with %B%s%b:"
-msgstr "Hurrengo paketeek %B%s%b-rekin liskarra dute:"
+msgstr "Ondorengo paketeak gatazkan daude %B%s%b(r)ekin:"
 
-#: src/reason_fragment.cc:531
+#: src/reason_fragment.cc:528
 msgid ""
 "The following packages depend on a version of %B%s%b other than the "
 "currently installed version of %B%s%b:"
 msgstr ""
-"Hurrengo paketeek %B%s%b -ren bertsio bat behar dute,  instalturik dagoena %B"
-"%s%b da:"
+"Ondorengo paketeak %B%s%b(r)en beste bertsio baten mendekoak dira, ez unean "
+"instalatuta dagoen %B%s%b bertsioaren mendekoak:"
 
-#: src/reason_fragment.cc:535
+#: src/reason_fragment.cc:532
 msgid ""
 "The following packages depend on a version of %B%s%b which is not going to "
 "be installed."
-msgstr "Hurrengo paketeek instatuko ez den %B%s%b bertsio bat behar dute."
+msgstr ""
+"Ondorengo paketeak instalatuko ez den %B%s%b bertsio baten mendekoak dira."
 
-#: src/reason_fragment.cc:541
+#: src/reason_fragment.cc:538
 msgid "upgraded"
-msgstr "eguneraturik"
+msgstr "bertsio-berritzen"
 
-#: src/reason_fragment.cc:541
+#: src/reason_fragment.cc:538
 msgid "downgraded"
-msgstr "atzeraturik"
+msgstr "aurreko bertsiora itzultzen"
 
-#: src/reason_fragment.cc:547
+#: src/reason_fragment.cc:544
 msgid ""
 "The following packages depend on the currently installed version of %B%s%b (%"
 "B%s%b), or conflict with the version it will be %s to (%B%s%b), and will be "
 "broken if it is %s."
 msgstr ""
-"Hurrengo pakettek instalatutako %B%s%b (%B%s%b) bwerioa behar dute, edo (%B%s"
-"%b) %s egin behar den bertsioarekin liskarra dute eta %s egiten bada buskatu "
-"egin litezke"
+"Ondorengo paketeak instalatuta daukazun %B%s%b (%B%s%b) bertsioaren "
+"mendekoak dira, edo gatazkan daude %s denean izango den bertsioarekin (%B%s%"
+"b), eta hautsi egingo dira %s bada."
 
-#: src/reason_fragment.cc:554
+#: src/reason_fragment.cc:551
 msgid ""
 "The following packages conflict with version %B%s%b of %B%s%b, and will be "
 "broken if it is %s."
 msgstr ""
-"Hurrengo paketeak %B%s%b bertsiodun %B%s%b pakerearekin liskarra dute, eta "
-"buskatu litezke hau %s egingo balitz."
+"Ondorengo paketeak gatazkan daude %B%s%b bertsioarekin (%B%s%b), eta hautsi "
+"egingo dira %s bada."
 
-#: src/reason_fragment.cc:559
+#: src/reason_fragment.cc:556
 msgid ""
 "The following packages depend on version %B%s%b of %B%s%b, and will be "
 "broken if it is %s."
 msgstr ""
-"Hurrengo paketeak %B%s%b bertsiodun %B%s%b pakerea behar dute, eta buskatu "
-"litezke hau %s egingo balitz."
+"Ondorengo paketeak %B%s%b bertsioaren (%B%s%b) mendekoak dira, eta hautsi "
+"egingo dira %s bada."
 
 #: src/solution_dialog.cc:74
 msgid "The package cache is not available."
@@ -3830,38 +3852,43 @@
 msgid "Close"
 msgstr "(^C)Itxi"
 
-#: src/solution_fragment.cc:125
+#: src/solution_fragment.cc:134
 #, fuzzy
 msgid "%BRemove%b the following packages:%n"
 msgstr "Hurrengo paketeak APURTURIK daude:"
 
-#: src/solution_fragment.cc:135
+#: src/solution_fragment.cc:144
 #, fuzzy
 msgid "%BInstall%b the following packages:%n"
 msgstr "Hurrengo paketeak APURTURIK daude:"
 
-#: src/solution_fragment.cc:148
+#: src/solution_fragment.cc:157
 msgid "%BKeep%b the following packages at their current version:%n"
 msgstr ""
 
-#: src/solution_fragment.cc:161
+#: src/solution_fragment.cc:164
+#, fuzzy
+msgid "Not Installed"
+msgstr "ez dago instalatuta"
+
+#: src/solution_fragment.cc:177
 #, fuzzy
 msgid "%BUpgrade%b the following packages:%n"
 msgstr "Hurrengo paketeak APURTURIK daude:"
 
-#: src/solution_fragment.cc:176
+#: src/solution_fragment.cc:192
 #, fuzzy
 msgid "%BDowngrade%b the following packages:%n"
 msgstr "Paketeak deskargatzen"
 
-#: src/solution_fragment.cc:190
+#: src/solution_fragment.cc:206
 #, c-format
 msgid "Score is %d"
 msgstr ""
 
 #: src/trust.cc:17 src/trust.cc:19
 msgid "WARNING"
-msgstr ""
+msgstr "ABISUA"
 
 #: src/trust.cc:18
 msgid ""
@@ -3869,10 +3896,13 @@
 "package could allow a malicious individual to damage or take control of your "
 "system."
 msgstr ""
+"%F: %s(r)en bertsio honek %Bfidagarritasunik gabeko iturburu%bkoa da  Pakate "
+"hau instalatuz sisteman izugarrizko kalteak edo beraren kontrolaz jabetzea "
+"baimendu dezake."
 
 #: src/ui.cc:165
 msgid "Er, there aren't any errors, this shouldn't have happened.."
-msgstr "Er, hemen ez dago errorerik,hau ezen gertatu beharko.."
+msgstr "Ez dago errorerik. Horrelakorik ez zuen gertatu behar..."
 
 #: src/ui.cc:171
 msgid "E:"
@@ -3882,43 +3912,45 @@
 msgid "W:"
 msgstr ""
 
-#: src/ui.cc:194
+#: src/ui.cc:193
 msgid "Search for:"
-msgstr "Bilatu honentzat:"
+msgstr "Bilatu hau:"
 
-#: src/ui.cc:262
+#: src/ui.cc:258
 msgid "You already are root!"
-msgstr "Zu dagoeneko root zara!"
+msgstr "Dagoeneko root zara!"
 
-#: src/ui.cc:360
+#: src/ui.cc:356
 msgid ""
 "Subprocess exited with an error -- did you type your password correctly?"
-msgstr "Azpiprozesua errore batez amaitu da - pasahitz egokia erabili al duzu?"
+msgstr "Azpiprozesua errore batekin amaitu da - Ondo idatzi duzu pasahitza?"
 
-#: src/ui.cc:388
+#: src/ui.cc:384
 msgid "Loading cache"
-msgstr "Katxea kargatzen"
+msgstr "Cachea kargatzen"
 
-#: src/ui.cc:410
+#: src/ui.cc:406
 msgid "Really quit Aptitude?"
-msgstr "Benetan Aptitude itxi?"
+msgstr "Ziur zaude Aptitude-tik irten nahi duzula?"
 
-#: src/ui.cc:489
+#: src/ui.cc:485
 msgid "Really discard your personal settings and reload the defaults?"
-msgstr "Benetan zure ezarpen pertsonalñak ezabatu eta lehentsietara itzuli?"
+msgstr ""
+"Ziur zaude ezarpen pertsonalak baztertu eta lehenetsiak birkargatu nahi "
+"dituzula?"
 
-#: src/ui.cc:589 src/ui.cc:591 src/ui.cc:619 src/ui.cc:621
+#: src/ui.cc:585 src/ui.cc:587 src/ui.cc:615 src/ui.cc:617
 msgid "Packages"
 msgstr "Paketeak"
 
-#: src/ui.cc:590 src/ui.cc:620
+#: src/ui.cc:586 src/ui.cc:616
 msgid "View available packages and choose actions to perform"
-msgstr "Pakete eskuragarriak ikusi eta egibeharreko ekintzak aukeratu"
+msgstr "Ikusi pakete erabilgarriak, eta aukeratu egin nahi dituzun ekintzak"
 
-#: src/ui.cc:667
+#: src/ui.cc:663
 #, fuzzy
 msgid ""
-"%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
+"Aptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
 "BABSOLUTELY NO WARRANTY%b; for details see 'license' in the Help menu.  This "
 "is free software, and you are welcome to redistribute it under certain "
 "conditions; see 'license' for details."
@@ -3931,61 +3963,69 @@
 "lizentzia ikusi ditzazkezu. Hau Software librea da eta zenbait egoeratan "
 "(lizentzia ikusi xehetasunetarako) banatzeko aukera duzu."
 
-#: src/ui.cc:688
+#: src/ui.cc:684
 msgid "help.txt"
 msgstr "help.txt"
 
-#: src/ui.cc:704
+#: src/ui.cc:700
 msgid "README"
-msgstr "IRAKURRI"
+msgstr "README"
 
-#: src/ui.cc:786
+#: src/ui.cc:782
 msgid ""
-"%C%BWARNING%b: untrusted versions of the following packages will be "
-"installed!%n%nUntrusted packages could %Bcompromise your system's security%"
-"b.  You should only proceed with the installation if you are certain that "
-"this is what you want to do.%n%n"
+"%BWARNING%b: untrusted versions of the following packages will be installed!%"
+"n%nUntrusted packages could %Bcompromise your system's security%b.  You "
+"should only proceed with the installation if you are certain that this is "
+"what you want to do.%n%n"
 msgstr ""
+"%BABISUA%b: fidagarritasunik gabeko honako paketeen bertsioak instalatuko "
+"dira! %n%nFidagarritasunik gabeko paketeek %Bsistemako segurtasuna hondatu "
+"dezakete%b. Jarraitu instalazioarekin baldin eta zer egiten ari zaren ziur "
+"bazaude bakarrik .%n%n"
 
-#: src/ui.cc:800
+#: src/ui.cc:788
 #, fuzzy
+msgid "  %S*%N %s [version %s]%n"
+msgstr "Bertsioak"
+
+#: src/ui.cc:795
 msgid "Really Continue"
-msgstr "Jarraitu"
+msgstr "Jarraitu benetan"
 
-#: src/ui.cc:802
+#: src/ui.cc:797
 msgid "Abort Installation"
-msgstr ""
+msgstr "Bertan behera utzi instalazioa"
 
-#: src/ui.cc:863
+#: src/ui.cc:858
 msgid "Preview of package installation"
-msgstr "Pakete instalazioaren aurreikuspena"
+msgstr "Pakete-instalazioaren aurrebista"
 
-#: src/ui.cc:864
+#: src/ui.cc:859
 msgid "View and/or adjust the actions that will be performed"
-msgstr "Egingo diren ekintzak bistarazi eta/edo ezarri"
+msgstr "Ikusi edota egokitu landuko diren ekintzak"
 
-#: src/ui.cc:865
+#: src/ui.cc:860
 #, fuzzy
 msgid "Preview"
 msgstr "(^P)Aurrekoa"
 
-#: src/ui.cc:901
+#: src/ui.cc:896
 #, fuzzy
 msgid "Some packages were broken and have been fixed:"
 msgstr "Zenbait pakiete apurturik zeuden eta konponduak izan dira"
 
-#: src/ui.cc:907
+#: src/ui.cc:902
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:913
-#, c-format
+#: src/ui.cc:908
+#, fuzzy, c-format
 msgid ""
-"Ran out of time while trying to resolver dependencies (press \"%s\" to try "
+"Ran out of time while trying to resolve dependencies (press \"%s\" to try "
 "harder)"
-msgstr ""
+msgstr "Minak aurkitzen saiatzen denbora pasa"
 
-#: src/ui.cc:959
+#: src/ui.cc:954
 #, fuzzy
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
@@ -3994,24 +4034,24 @@
 "Paketak instalu/ezabatzeak zuk une honetan ez dituzun kudeatzaiuile\n"
 "baimenak behar ditu. Root kontura aldatu nahi al duzu?\n"
 
-#: src/ui.cc:962 src/ui.cc:1078
+#: src/ui.cc:957 src/ui.cc:1072
 msgid "Become root"
-msgstr "Root biurtu"
+msgstr "Root bihurtu"
 
-#: src/ui.cc:964 src/ui.cc:1080
+#: src/ui.cc:959 src/ui.cc:1074
 msgid "Don't become root"
-msgstr "Ez root biurtu"
+msgstr "Ez bihurtu root"
 
-#: src/ui.cc:969 src/ui.cc:1085
+#: src/ui.cc:964 src/ui.cc:1079
 msgid "A package-list update or install run is already taking place."
 msgstr ""
-"Pakete zerrenda eguneraketa edo instalaketa bat abiarazirik dago dagoeneko."
+"Pakete-zerrenda baten eguneratzea edo instalazioa dagoeneko egiten ari da."
 
-#: src/ui.cc:996
+#: src/ui.cc:991
 msgid "No packages are scheduled to be installed, removed, or upgraded."
-msgstr "Ez dago paketerik instalatu, ezabatu edo eguneratzeko aukeraturik."
+msgstr "Ez dago instalatzeko, kentzeko edo bertsio-berritzeko paketerik."
 
-#: src/ui.cc:1002
+#: src/ui.cc:997
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -4023,7 +4063,7 @@
 "Zenbait pakete eguneratu daitezke baina zuk ez duzu eguneraketa aukeratu.\n"
 "\"U\" erabili danak eguneraketarako prestatzeko."
 
-#: src/ui.cc:1074
+#: src/ui.cc:1069
 #, fuzzy
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
@@ -4033,112 +4073,112 @@
 "ditu.\n"
 "Root kontura aldatu nahi al duzu?\n"
 
-#: src/ui.cc:1090 src/ui.cc:1377
+#: src/ui.cc:1084 src/ui.cc:1371
 msgid "Waste time trying to find mines"
-msgstr "Minak aurkitzen saiatzen denbora pasa"
+msgstr "Denbora pasa mina bila"
 
-#: src/ui.cc:1097 src/ui.cc:1150
+#: src/ui.cc:1091 src/ui.cc:1144
 msgid "Cleaning while a download is in progress is not allowed"
-msgstr "Deskarga bat abiarazirik dagoenean ez da garbitzerik onartzen"
+msgstr "Deskarga bat egiten ari den bitartean ezin da garbitu"
 
-#: src/ui.cc:1100
+#: src/ui.cc:1094
 msgid "Deleting downloaded files"
-msgstr "Deskargaturiko fitxategiak ezabatzen"
+msgstr "Deskargatutako fitxategiak ezabatzen"
 
-#: src/ui.cc:1114
+#: src/ui.cc:1108
 msgid "Downloaded package files have been deleted"
-msgstr "Deskargaturiko pakete fitxategiak ezabatuak izan dira"
+msgstr "Deskargatutako pakete-fitxategiak ezabatu egin dira"
 
-#: src/ui.cc:1175
+#: src/ui.cc:1169
 #, 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:1247
+#: src/ui.cc:1241
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1252 src/ui.cc:1283
+#: src/ui.cc:1246 src/ui.cc:1277
 #, fuzzy
 msgid "Ran out of time while trying to find a solution."
 msgstr "Minak aurkitzen saiatzen denbora pasa"
 
-#: src/ui.cc:1277
+#: src/ui.cc:1271
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1307
+#: src/ui.cc:1301
 #, fuzzy, c-format
 msgid "Unable to open %s"
 msgstr "Ezzinb da %s idazteko ireki"
 
-#: src/ui.cc:1313
+#: src/ui.cc:1307
 msgid "Error while dumping resolver state"
 msgstr ""
 
-#: src/ui.cc:1323
+#: src/ui.cc:1317
 msgid "File to which the resolver state should be dumped:"
 msgstr ""
 
-#: src/ui.cc:1353
+#: src/ui.cc:1347
 msgid "^Install/remove packages"
-msgstr "^Paketeak Instalatu/Ezabatu"
+msgstr "^Instalatu/kendu paketeak"
 
-#: src/ui.cc:1354
+#: src/ui.cc:1348
 msgid "Perform all pending installs and removals"
-msgstr "Egin falta diren instalaketa eta ezabaketak"
+msgstr "Instalatzeko/kentzeko dauden pakete guztiak instalatu/kendu"
 
-#: src/ui.cc:1356
+#: src/ui.cc:1350
 msgid "^Update package list"
-msgstr "^Eguneratu pakete Zerrenda"
+msgstr "^Eguneratu pakete-zerrenda"
 
-#: src/ui.cc:1357
+#: src/ui.cc:1351
 msgid "Check for new versions of packages"
-msgstr "Arakatu paketeen bertsio berrien bila"
+msgstr "Paketeen bertsio berririk dagoen begiratu"
 
-#: src/ui.cc:1360
+#: src/ui.cc:1354
 msgid "^Forget new packages"
-msgstr "(^F) Ahaztu pakete berriak"
+msgstr "^Ahaztu pakete berriak"
 
-#: src/ui.cc:1361
+#: src/ui.cc:1355
 msgid "Forget which packages are \"new\""
-msgstr "Ahaztu zein pakete diren \"berriak\""
+msgstr "Ahaztu zein diren pakete \"berriak\""
 
-#: src/ui.cc:1364
+#: src/ui.cc:1358
 msgid "^Clean package cache"
-msgstr "(^C) Garbitu pakete katxea"
+msgstr "^Garbitu paketeen cachea"
 
-#: src/ui.cc:1365
+#: src/ui.cc:1359
 msgid "Delete package files which were previously downloaded"
-msgstr "Ezabatu lehen deskargaturiko pakete fitxategiak"
+msgstr "Lehen deskargatutako pakete-fitxategiak ezabatu"
 
-#: src/ui.cc:1368
+#: src/ui.cc:1362
 msgid "Clean ^obsolete files"
-msgstr "Garbitu zaharkiturik^o fitxategiak"
+msgstr "Garbitu fitxategi ^zaharkituak"
 
-#: src/ui.cc:1369
+#: src/ui.cc:1363
 msgid "Delete package files which can no longer be downloaded"
-msgstr "Ezabatu dafoenekeo deskargatu ezin diren fitxategiak"
+msgstr "Jada deskargatu ezin diren pakete-fitxategiak ezabatu"
 
-#: src/ui.cc:1372
+#: src/ui.cc:1366
 msgid "Mark ^Upgradable"
-msgstr "Eguneragarri Markat^u"
+msgstr "Markatu ^Berritu daitekeena"
 
-#: src/ui.cc:1373
+#: src/ui.cc:1367
 msgid "Mark all upgradable packages which are not held for upgrade"
-msgstr "Markatu hizozturik ez dauden pakete eguneragarri guzitak eguneratzeko"
+msgstr "Bertsio-berritu daitezkeen paketeak, atxikita ez daudenak, markatu"
 
-#: src/ui.cc:1376
+#: src/ui.cc:1370
 msgid "^Play Minesweeper"
-msgstr "(^P) Mina aurkitzailera jolastu"
+msgstr "^Jokatu mina-aurkitzailean"
 
-#: src/ui.cc:1379
+#: src/ui.cc:1373
 msgid "^Become root"
-msgstr "(^B) Root biurtu"
+msgstr "^Root bihurtu"
 
-#: src/ui.cc:1380
+#: src/ui.cc:1374
 #, fuzzy
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
@@ -4147,80 +4187,83 @@
 "Root bihurtzeko 'su' abiarazi.  Honek programa berabiarazi du\n"
 "baina ezarpenak gordeko dira."
 
-#: src/ui.cc:1383
+#: src/ui.cc:1377
 msgid "^Reload package cache"
-msgstr "^(R) PAkete katxea berritu"
+msgstr "^Birkargatu pakete-cachea"
 
-#: src/ui.cc:1384
+#: src/ui.cc:1378
 msgid "Reload the package cache"
-msgstr "Pakete katxea Berritu."
+msgstr "Paketeen cachea birkargatu."
 
-#: src/ui.cc:1390
+#: src/ui.cc:1384
 msgid "^Quit"
-msgstr "^(Q) Irten"
+msgstr "^Irten"
 
-#: src/ui.cc:1391
+#: src/ui.cc:1385
 msgid "Exit the program"
-msgstr "Programatik irten"
+msgstr "Irten programatik"
 
-#: src/ui.cc:1397 src/ui.cc:1669
+#: src/ui.cc:1391 src/ui.cc:1661
 msgid "Undo"
 msgstr "Desegin"
 
-#: src/ui.cc:1398
+#: src/ui.cc:1392
 msgid "Undo the last package operation or group of operations"
-msgstr "Desegin azke patekete ekintza edo ekintza taldea"
+msgstr "Azken pakete-eragiketa edo eragiketa-multzoa desegin"
 
-#: src/ui.cc:1405
+#: src/ui.cc:1399
 msgid "^Install"
 msgstr "^Instalatu"
 
-#: src/ui.cc:1406
+#: src/ui.cc:1400
 msgid "Flag the currently selected package for installation or upgrade"
-msgstr "Aukeratutako paketea instalatu edo eguneratzeko markatu"
+msgstr ""
+"Jarri bandera unean hautatutako paketeei, instalatzeko edo bertsio-berritzeko"
 
-#: src/ui.cc:1409
+#: src/ui.cc:1403
 msgid "^Remove"
-msgstr "^Ezabatu"
+msgstr "^Kendu"
 
-#: src/ui.cc:1410
+#: src/ui.cc:1404
 msgid "Flag the currently selected package for removal"
-msgstr "Aukeratutako paketea ezabatzeko markatu"
+msgstr "Jarri bandera unean hautatutako paketeei, kentzeko"
 
-#: src/ui.cc:1413
+#: src/ui.cc:1407
 msgid "^Purge"
-msgstr "^Garbitu"
+msgstr "^Purgatu"
 
-#: src/ui.cc:1414
+#: src/ui.cc:1408
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
-msgstr "Aukeratutako paketea eta bere konfigurazioak ezabatzeko markatu"
+msgstr ""
+"Jarri bandera unean hautatutako paketeei eta beraien konfigurazioko "
+"fitxategiei, kentzeko"
 
-#: src/ui.cc:1417
+#: src/ui.cc:1411
 msgid "^Keep"
 msgstr "^Mantendu"
 
-#: src/ui.cc:1418
+#: src/ui.cc:1412
 msgid "Cancel any action on the selected package"
-msgstr "Aukeratutako paketean edozein ekintza ezeztatu"
+msgstr "Bertan behera utzi hautatutako paketeen ekintza"
 
-#: src/ui.cc:1421
+#: src/ui.cc:1415
 msgid "^Hold"
-msgstr "^Hizoztu"
+msgstr "^Heldu"
 
-#: src/ui.cc:1422
+#: src/ui.cc:1416
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
 msgstr ""
-"Aukeratutako paketean edozein ekintza ezeztatu eta aurreragotako "
-"eguneraketez babestu"
+"Bertan behera utzi hautattutako paketearen ekintza, eta babestu etorkizuneko "
+"bertsio-berritzetik."
 
-#: src/ui.cc:1425
+#: src/ui.cc:1419
 msgid "Mark ^Auto"
-msgstr "^Auto markatu"
+msgstr "Markatu ^Auto"
 
-#: src/ui.cc:1426
+#: src/ui.cc:1420
 #, fuzzy
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
@@ -4229,11 +4272,11 @@
 "Markatu aukeratutako paketea automatiko instalatu balitz bezala;\n"
 "beste paketerik behar ez duenean automatikoki ezabatua izango da"
 
-#: src/ui.cc:1429
+#: src/ui.cc:1423
 msgid "Mark ^Manual"
-msgstr "Markatau ^Manuala"
+msgstr "Markatu ^Eskuz"
 
-#: src/ui.cc:1430
+#: src/ui.cc:1424
 #, fuzzy
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
@@ -4242,11 +4285,11 @@
 "Markatu aukeratutako paketea eskuz instalatua izan balitz bezala;\n"
 "berau ez da ezabatuko zuk eskuz ezabatu artean"
 
-#: src/ui.cc:1433
+#: src/ui.cc:1427
 msgid "^Forbid Version"
-msgstr "^Debekatutako Bertsioa"
+msgstr "^Debekatutako bertsioa"
 
-#: src/ui.cc:1434
+#: src/ui.cc:1428
 #, fuzzy
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
@@ -4255,233 +4298,234 @@
 "Debekatu aukeratutako paketearen aukerako bertsioa instalatzea;\n"
 "bertsio berragoak era arruntean kudeatuko dira"
 
-#: src/ui.cc:1438
+#: src/ui.cc:1432
 msgid "I^nformation"
 msgstr "I^nformazioa"
 
-#: src/ui.cc:1439
+#: src/ui.cc:1433
 msgid "Display more information about the selected package"
-msgstr "Aukeratutako paketeren argibide gehiago bistaratu"
+msgstr "Bistaratu hautatutako paketeari buruzko informazio xehea"
 
-#: src/ui.cc:1442
+#: src/ui.cc:1436
 msgid "^Changelog"
-msgstr "^Aldaketa Erregistroa"
+msgstr "^Aldaketa-egunkaria"
 
-#: src/ui.cc:1443
+#: src/ui.cc:1437
 msgid "Display the Debian changelog of the selected package"
-msgstr "Bistarazi aukeratutako paketearen aldaketa erregistroa"
+msgstr "Bistaratu hautatutako paketearen Debian-eko aldakaten egunkaria"
 
-#: src/ui.cc:1450
+#: src/ui.cc:1444
 msgid "^Find"
 msgstr "^Bilatu"
 
-#: src/ui.cc:1451
+#: src/ui.cc:1445
 msgid "Search for a package"
-msgstr "Pakete bat bilatu"
+msgstr "Bilatu paketea"
 
-#: src/ui.cc:1454
+#: src/ui.cc:1448
 msgid "Find ^Again"
-msgstr "Bilatu ^Berriz"
+msgstr "Bilatu be^rriro"
 
-#: src/ui.cc:1455
+#: src/ui.cc:1449
 msgid "Repeat the last search"
-msgstr "Azken bilaketa errepikatu"
+msgstr "Errepikatu azken bilaketa"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1453
 msgid "^Limit Display"
-msgstr "^Bistaratze Mugatu"
+msgstr "M^ugatu bistaratzea"
 
-#: src/ui.cc:1460
+#: src/ui.cc:1454
 msgid "Apply a filter to the package list"
-msgstr "Pakete zerrendari iragazi bat ezarri"
+msgstr "Ezarri iragazkia pakete-zerrendari"
 
-#: src/ui.cc:1463
+#: src/ui.cc:1457
 msgid "^Un-Limit Display"
-msgstr "^Bistaratze Muga kendu"
+msgstr "^Garbitu bistaratzea"
 
-#: src/ui.cc:1464
+#: src/ui.cc:1458
 msgid "Remove the filter from the package list"
-msgstr "Pakete zerrendari iragazia kendu"
+msgstr "Kendu iragazkia pakete-zerrendari"
 
-#: src/ui.cc:1468
+#: src/ui.cc:1462
 msgid "Find ^Broken"
-msgstr "^Bilatu Apurtua"
+msgstr "Bilatu ^hautsitakoa"
 
-#: src/ui.cc:1469
+#: src/ui.cc:1463
 msgid "Find the next package with unsatisfied dependencies"
-msgstr "Bilatu betegabeko dependentziak dituen hurrengo paketea"
+msgstr "Bilatu hurrengo paketea, bete gabeko mendekotasunak dituena"
 
-#: src/ui.cc:1476
+#: src/ui.cc:1470
 msgid "^UI options"
 msgstr "^UI aukerak"
 
-#: src/ui.cc:1477
+#: src/ui.cc:1471
 msgid "Change the settings which affect the user interface"
-msgstr "Erabiltzaile interfazeari dagozkion ezarpenak aldatu."
+msgstr "Erabiltzaile-interfazean eragina duten ezarpenak aldatu"
 
-#: src/ui.cc:1480
+#: src/ui.cc:1474
 msgid "^Dependency handling"
-msgstr "^Dependentzi kudeaketa"
+msgstr "^Mendekotasunak maneiatzea"
 
-#: src/ui.cc:1481
+#: src/ui.cc:1475
 msgid "Change the settings which affect how package dependencies are handled"
-msgstr "Pakete dependentziak kudeatzeko eraren ezarpenak aldatu"
+msgstr ""
+"Pakete-mendekotasunak maneiatzeko moduan eragina duten ezarpenak aldatu"
 
-#: src/ui.cc:1484
+#: src/ui.cc:1478
 msgid "^Miscellaneous"
-msgstr "(^M) Bestelakoak"
+msgstr "^Hainbat"
 
-#: src/ui.cc:1485
+#: src/ui.cc:1479
 msgid "Change miscellaneous program settings"
-msgstr "Programaren beste ezarpen batzuk aldatu"
+msgstr "Hainbat programa-ezarpen aldatu"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1484
 msgid "^Revert options"
-msgstr "Auke^rak Atzeratu"
+msgstr "^Desegin aukerak"
 
-#: src/ui.cc:1491
+#: src/ui.cc:1485
 msgid "Reset all settings to the system defaults"
-msgstr "Berezarri ezarpen guztiak sistema lehenetsietara"
+msgstr "Leheneratu ezarpen guztiak sistemaren lehenespenetara"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1496
 msgid "^Next"
-msgstr "Hurre^ngoa"
+msgstr "^Hurrengoa"
 
-#: src/ui.cc:1503
+#: src/ui.cc:1497
 msgid "View next display"
-msgstr "Ikusi hurrengo leihoa"
+msgstr "Hurrengo pantaila ikusi"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1500
 msgid "^Prev"
-msgstr "(^P)Aurrekoa"
+msgstr "^Aurrekoa"
 
-#: src/ui.cc:1507
+#: src/ui.cc:1501
 msgid "View previous display"
-msgstr "Ikusi aurreko leihoa"
+msgstr "Aurreko pantaila ikusi"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1504
 msgid "^Close"
-msgstr "(^C)Itxi"
+msgstr "^Itxi"
 
-#: src/ui.cc:1511
+#: src/ui.cc:1505
 msgid "Close this display"
-msgstr "Itxi leiho hau"
+msgstr "Pantaila hau itxi"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1510
 msgid "New Package ^View"
-msgstr "(^V) Paketea Berriak Ikusi"
+msgstr "Pakete ^Ikuspegi berria"
 
-#: src/ui.cc:1517
+#: src/ui.cc:1511
 msgid "Create a new default package view"
-msgstr "Pakete bistaratze berri bat sortu"
+msgstr "Pakete-ikuspegi lehenetsi berri bat sortu"
 
-#: src/ui.cc:1520
+#: src/ui.cc:1514
 msgid "New Categorical ^Browser"
-msgstr "Sailkapen ^Berria Ikusi"
+msgstr "Kategoria ^Arakatzaile berri bat"
 
-#: src/ui.cc:1522
+#: src/ui.cc:1516
 msgid "Browse packages by category"
-msgstr "Paketeak sailez bistarazi."
+msgstr "Paketeak kategoriaka arakatu"
 
-#: src/ui.cc:1530
+#: src/ui.cc:1524
 msgid "^About"
-msgstr "(^A)Honi buruz"
+msgstr "^Honi buruz..."
 
-#: src/ui.cc:1531
+#: src/ui.cc:1525
 msgid "View information about this program"
-msgstr "Programa honi buruzko argibideak ikusi"
+msgstr "Programa honi buruzko informazioa ikusi"
 
-#: src/ui.cc:1534
+#: src/ui.cc:1528
 msgid "^Help"
-msgstr "(^H)Laguntza"
+msgstr "^Laguntza"
 
-#: src/ui.cc:1535
+#: src/ui.cc:1529
 msgid "View the on-line help"
-msgstr "Ikusi sare bidezko laguntza"
+msgstr "Lineako laguntza ikusi"
 
-#: src/ui.cc:1537
+#: src/ui.cc:1531
 msgid "User's ^Manual"
-msgstr "Erabiltzailearen ^Manuala"
+msgstr "Erabiltzailearen ^Eskuliburua"
 
-#: src/ui.cc:1538
+#: src/ui.cc:1532
 msgid "View the detailed program manual"
-msgstr "Ikusi programaren manual zehaztua"
+msgstr "Programaren eskuliburu xehatua ikusi"
 
-#: src/ui.cc:1541
+#: src/ui.cc:1535
 msgid "^FAQ"
 msgstr "^FAQ"
 
-#: src/ui.cc:1542
+#: src/ui.cc:1536
 msgid "View a list of frequently asked questions"
-msgstr "Ikusi sarriago galdetutako galderen zerrenda?"
+msgstr "Maiz egiten diren galderen zerrenda bat ikusi"
 
-#: src/ui.cc:1545
+#: src/ui.cc:1539
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1546
+#: src/ui.cc:1540
 #, fuzzy
 msgid "View the important changes made in each version of "
 msgstr "Begiratu programen bertsio bakoitzean eginiko aldaketa garrantzitsuak"
 
-#: src/ui.cc:1549
+#: src/ui.cc:1543
 msgid "^License"
 msgstr "^Lizentzia"
 
-#: src/ui.cc:1550
+#: src/ui.cc:1544
 msgid "View the terms under which you may copy the program"
-msgstr "Begiratu zein egoeratan zuk programa kopiatu dezakezun"
+msgstr "Programa kopiatzeko bete beharreko baldintzak ikusi"
 
-#: src/ui.cc:1668
+#: src/ui.cc:1660
 msgid "Actions"
 msgstr "Ekintzak"
 
-#: src/ui.cc:1671
+#: src/ui.cc:1663
 msgid "Search"
 msgstr "Bilatu"
 
-#: src/ui.cc:1672
+#: src/ui.cc:1664
 msgid "Options"
 msgstr "Aukerak"
 
-#: src/ui.cc:1673
+#: src/ui.cc:1665
 msgid "Views"
 msgstr "Ikuspegiak"
 
-#: src/ui.cc:1674
+#: src/ui.cc:1666
 msgid "Help"
 msgstr "Laguntza"
 
-#: src/ui.cc:1734
+#: src/ui.cc:1726
 #, 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"
+"%s: Menua  %s: Laguntza  %s: Irten  %s: Eguneratu  %s: Deskargatu/Instalatu/"
+"Kendu paketeak"
 
-#: src/ui.cc:2003 src/vscreen/vscreen.cc:281
+#: src/ui.cc:1996 src/vscreen/vscreen.cc:281
 msgid "yes_key"
-msgstr "Bai_gakoa"
+msgstr "bai_gakoa"
 
-#: src/ui.cc:2004 src/vscreen/vscreen.cc:282
+#: src/ui.cc:1997 src/vscreen/vscreen.cc:282
 msgid "no_key"
 msgstr "ez_gakoa"
 
-#: src/view_changelog.cc:46
+#: src/view_changelog.cc:61
 msgid "You can only view changelogs of official Debian packages."
-msgstr ""
-"Debian pakete ofizialen aldaketa erregistroa bakarrik bistaratu dezakezu"
+msgstr "Debian-eko pakete ofizialen aldaketen egunkaria bakarrik ikus dezakezu"
 
-#: src/view_changelog.cc:52
+#: src/view_changelog.cc:67
 msgid "Downloading Changelog"
-msgstr "Deskargatzen Erregistro aldaketak"
+msgstr "Aldaketen egunkaria deskargatzen"
 
-#: src/view_changelog.cc:54
+#: src/view_changelog.cc:69
 #, fuzzy
 msgid "Download Changelog"
 msgstr "Deskargatzen Erregistro aldaketak"
 
-#: src/view_changelog.cc:63
+#: src/view_changelog.cc:78
 #, c-format
 msgid "%s changes"
 msgstr ""
@@ -4489,22 +4533,22 @@
 #: src/vscreen/vscreen.cc:119
 #, c-format
 msgid "Ouch!  Got SIGTERM, dying..\n"
-msgstr "Ouch!  SIGTERM jasorik, hiltzen..\n"
+msgstr "Ene! SIGTERM jaso dut, amaitzen..\n"
 
 #: src/vscreen/vscreen.cc:122
 #, c-format
 msgid "Ouch!  Got SIGSEGV, dying..\n"
-msgstr "Ouch!  SIGSEGV jasorik, hiltzen..\n"
+msgstr "Ene! SIGSEV jaso dut, amaitzen..\n"
 
 #: src/vscreen/vscreen.cc:125
 #, c-format
 msgid "Ouch!  Got SIGABRT, dying..\n"
-msgstr "Ouch!  SIGABRT jasorik, hiltzen..\n"
+msgstr "Ene! SIGABRT jaso dut, amaitzen..\n"
 
 #: src/vscreen/vscreen.cc:128
 #, c-format
 msgid "Ouch!  Got SIGQUIT, dying..\n"
-msgstr "Ouch!  SIGQUIT jasorik ,hiltzen..\n"
+msgstr "Ene! SIGQUIT jaso dut, amaitzen..\n"
 
 #~ msgid ""
 #~ "Commands:\n"
@@ -4533,30 +4577,29 @@
 #~ "  = : Hold\n"
 #~ msgstr ""
 #~ "Komandoak:\n"
-#~ "  y: instalazioarekin jarraitu\n"
-#~ "  n: instalazioa eten eta irten\n"
-#~ "  i: ikusi pakete bat edo gehiagoren argibideak\n"
-#~ "     pakete izenak 'i' ondoren ipini\n"
-#~ "  c: ikusi pakete bat edo gehiagoren aldaketa erregistroa\n"
-#~ "     pakete izenak 'i' ondoren ipini\n"
-#~ "  d: Dependentzi argibide bistaratzea aldatu\n"
-#~ "  s: Pakete tamaina bistaratzea aldatu\n"
-#~ "  v:  Bertsio bistaratzea aldatu\n"
-#~ "  e: sar interfaze grafiko osoan\n"
-#~ "\n"
-#~ "  Zuk paketeen gain egiteko ekintza taldearen aldaketak ezarri "
-#~ "ditzazkezu.\n"
-#~ "  Hau egiteko, sar ekintza karaktere bat pakete edo patroi bat edo "
-#~ "gehiagoz \n"
-#~ "jarraitua. Ekintza pakete guztietan egingo da. (ekintza gehigarriak ere "
-#~ "ezarri\n"
-#~ "ditzazkezu eta hauek pakete guztietan egingo dira)\n"
+#~ "  y: jarraitu instalazioarekin\n"
+#~ "  n: abortatu eta irten\n"
+#~ "  i: erakutsi pakete bati (edo gehiagori) buruzko informazioa\n"
+#~ "     pakete-izenak 'i'-ren ondoren joan behar dute\n"
+#~ "  c: erakutsi pakete baten (edo gehiagoren) Debian-eko \n"
+#~ "     aldaketen egunkaria;\n"
+#~ "     pakete-izenak 'c'-ren ondoren joan behar dute\n"
+#~ "  d: erakutsi/ezkutatu mendekotasun-informazioa\n"
+#~ "  s: erakutsi/ezkutatu pakete-tamainen aldaketak\n"
+#~ "  v: erakutsi/ezkutatu bertsioa\n"
+#~ "  e: sartu interfaze bisual osoan\n"
 #~ "\n"
+#~ "  Pakete-ekintzen multzoan ere aldaketak egin ditzakezu.\n"
+#~ "  Horretarako, idatzi ekintza-karaktere bat, eta jarraian pakete-izen "
+#~ "edo\n"
+#~ "-eredu bat edo gehiago. Ekintza pakete guztiei aplikatuko zaie. (ekintza\n"
+#~ "gehiago zehatz ditzakezu; ekintza bakoitza jarraian dituen paketeei\n"
+#~ "aplikatuko zaie)\n"
 #~ "Ekintzak:\n"
 #~ "  + : Instalatu\n"
-#~ "  - : Ezabatu\n"
-#~ "  _ : Garbitu\n"
-#~ "  = : Hizoztu\n"
+#~ "  - : Kendu\n"
+#~ "  _ : Purgatu\n"
+#~ "  = : Atxiki\n"
 
 #~ msgid ""
 #~ "Some packages had unmet dependencies.  This may mean that you have\n"
@@ -4565,30 +4608,208 @@
 #~ "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"
+#~ "Pakete batzuetan bete gabeko mendekotasunak daude. Beharbada ezinezko\n"
+#~ "egoera bat eskatuko zenuen, edo, banaketa ezegonkorra erabiltzen ari\n"
+#~ "bazara, beharrezko pakete batzuk ez ziren sortuko oraindik, edo \n"
+#~ "Sarrerakoetan (Incoming) egoten jarraituko dute.\n"
 #~ "\n"
 
 #~ msgid ""
 #~ "Please insert the following disc into the drive \"%s\":\n"
 #~ "%s"
 #~ msgstr ""
-#~ "Mesedez sar hurrengo diska \"%s\" irakulean : \n"
+#~ "Sartu ondorengo diskoa \"%s\" unitatean:\n"
 #~ "%s"
 
+#~ msgid "Need exactly two colors in color definition \"%s\""
+#~ msgstr "Zehazki bi kolore behar dira kolore-definizioan: \"%s\""
+
+#~ msgid "Can't parse foreground \"%s\"of color \"%s\""
+#~ msgstr "Ezin da \"%2$s\" kolorearen \"%1$s\" aurreko planoa analizatu"
+
+#~ msgid "Can't parse background \"%s\" of color \"%s\""
+#~ msgstr "Ezin da \"%s\" kolorearen \"%s\" atzeko planoa analizatu"
+
 #~ msgid "Invalid option for interactive mode: -s\n"
-#~ msgstr "Eukera baliogabeamodu interkatiboan: -s\n"
+#~ msgstr "Aukera baliogabea modu interaktiborako: -s\n"
+
+#~ 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."
+#~ msgstr ""
+#~ "Fax-modem eta antzeko komunikazio-gailuentzako programak\n"
+#~ " 'Comm' sekzioko paketeak modemak eta bestelako komunikazio-gailuak "
+#~ "kontrolatzeko erabiltzen dira. Multzo horretan sartzen da, halaber, fax-"
+#~ "modemak kontrolatzeko softwarea (adib. Internetera konektatzeko deiak "
+#~ "egiteko PPP edo xede horretarako egindako programak (zmodem/kermit), "
+#~ "telefono mugikorrak kontrolatzeko softwarea, FidoNet duten interfazeak, "
+#~ "eta BBS exekutatzen dutenak."
+
+#~ 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"
+#~ " .\n"
+#~ " For more information about what Debian considers to be Free Software, "
+#~ "see http://www.debian.org/social_contract#guidelines"
+#~ msgstr ""
+#~ "Software librea ez diren programak\n"
+#~ " 'non-free' sekzioko paketeak ez dira Debian-ekoak.\n"
+#~ " .\n"
+#~ " Pakete hauek ez dute betetzen Debian-en Software Libreko Gidalerroen "
+#~ "(ikus behean) eskakizunetako bat edo gehiago. Sekzio honetako programen "
+#~ "lizentzia irakurri egin beharko zenuke, nahi bezala erabiltzeko baimena "
+#~ "baduzula ziurtatzeko.\n"
+#~ " .\n"
+#~ " Debian-ek Software Libretzat zer jotzen duen zehazkiago jakiteko, ikus:"
+#~ "http://www.debian.org/social_contract#guidelines"
+
+#~ 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)"
+#~ msgstr ""
+#~ "Pakete berriak\n"
+#~ " Pakete hauek Debian-en gehitu dira, pakete \"berrien\" zerrenda garbitu "
+#~ "zenuen azken aldiaz geroztik. (zerrenda hau husteko, aukeratu \"Ahaztu "
+#~ "pakete berriak\" 'Ekintzak' menuan"
+
+#~ msgid ""
+#~ "%s is an essential package!\n"
+#~ "\n"
+#~ "Are you sure you want to remove it?\n"
+#~ "Type '%s' if you are."
+#~ msgstr ""
+#~ "%s funtsezko pakete bat da!\n"
+#~ "\n"
+#~ "Ziur zaude kendu nahi duzula?\n"
+#~ "Ziur bazaude, idatzi '%s'."
+
+#~ msgid "Available versions of "
+#~ msgstr "Bertsio erabilgarriak: "
+
+#~ 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."
+#~ msgstr ""
+#~ "Ez zara root, eta ezin dut root bihurtzeko\n"
+#~ "modurik aurkitu. Pakete hau birkonfiguratzeko,\n"
+#~ "instalatu 'menu' paketea, 'login' paketea,\n"
+#~ "edo exekutatu aptitude root gisa."
 
 #~ msgid "Information about "
-#~ msgstr "Informazioa honi buruz: "
+#~ msgstr "Honi buruzko informazioa: "
+
+#~ msgid ""
+#~ "Aptitude %s\n"
+#~ "\n"
+#~ "Copyright 2000 Daniel Burrows.\n"
+#~ "\n"
+#~ "aptitude comes with ABSOLUTELY NO WARRANTY; for details see 'license' in "
+#~ "the\n"
+#~ "Help menu.  This is free software, and you are welcome to redistribute "
+#~ "it\n"
+#~ "under certain conditions; see 'license' for details."
+#~ msgstr ""
+#~ "Aptitude %s\n"
+#~ "\n"
+#~ "Copyright 2000 Daniel Burrows.\n"
+#~ "\n"
+#~ "Aptitude-k ez du inolako BERMERIK; xehetasun gehiago nahi izanez gero, "
+#~ "ikus lizentzia\n"
+#~ "Laguntza menuan. Hau software librea da, eta baldintza jakin batzuk "
+#~ "betez\n"
+#~ "birbana dezakezu; xehetasun gehiago nahi izanez gero, ikus 'lizentzia'."
+
+#~ msgid "Some packages were broken and have been fixed"
+#~ msgstr "Pakete batzuk hautsita zeuden, eta konpondu egin dira"
 
 #~ msgid "Some broken packages could not be fixed!"
-#~ msgstr "Buskatutako zenbait pakete ezin dira konpondu!"
+#~ msgstr "Hautsitako pakete batzuk ezin izan dira konpondu!"
+
+#~ msgid "Some packages are broken.  Try to fix them?"
+#~ msgstr "Pakete batzuk hautsita daude. Konpontzen saiatu nahi duzu?"
+
+#~ msgid ""
+#~ "Installing/removing packages requires administrative privileges, which\n"
+#~ "you currently do not have.  Would you like to change to the root "
+#~ "account?\n"
+#~ msgstr ""
+#~ "Paketeak instalatu/kendu ahal izateko, administratzaile-pribilegioak "
+#~ "behar\n"
+#~ "dira, eta zuk ez daukazu horrelakorik. Root kontura aldatu nahi duzu?\n"
+
+#~ msgid ""
+#~ "No packages will be installed, removed or upgraded.\n"
+#~ "\n"
+#~ "Some packages could be upgraded, but you have not chosen to upgrade "
+#~ "them.\n"
+#~ "Type \"U\" to prepare an upgrade."
+#~ msgstr ""
+#~ "Ez da paketerik instalatuko, kenduko edo bertsio-berrituko.\n"
+#~ "\n"
+#~ "Pakete batzuk bertsio-berri daitezke, baina ez duzu berritzea aukeratu.\n"
+#~ "Bertsio-berritze bat prestatzeko, idatzi \"U\"."
+
+#~ 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"
+#~ msgstr ""
+#~ "Pakete-zerrendak eguneratzeko, administratzaile-pribilegioak behar dira,\n"
+#~ "eta zuk ez daukazu horrelakorik. Root kontura aldatu nahi duzu?\n"
+
+#~ msgid "Obsolete downloaded package files have been deleted"
+#~ msgstr "Deskargatutako pakete-fitxategi zaharkituak ezabatu egin dira"
+
+#~ msgid ""
+#~ "Run 'su' to become root; this will restart the program, but your\n"
+#~ "settings will be preserved"
+#~ msgstr ""
+#~ "Root bihurtzeko, exekutatu 'su'. Horrela programa berrabiaraziko da, "
+#~ "baina\n"
+#~ "zure ezarpenak mantenduta."
+
+#~ msgid ""
+#~ "Mark the selected package as having been automatically installed;\n"
+#~ "it will automatically be removed if no other packages depend on it"
+#~ msgstr ""
+#~ "Markatu hautatutako paketea automatikoki instalatuta egon balitz bezala;\n"
+#~ "honek automatikoki kenduko du beste pakete batek honen gain "
+#~ "mendekotasunik ez badu"
+
+#~ msgid ""
+#~ "Mark the selected package as having been manually installed;\n"
+#~ "it will not be removed unless you manually remove it"
+#~ msgstr ""
+#~ "Markatu hautatutako paketea eskuz instalatuta egon balitz bezala;\n"
+#~ "honek ez du paketea kenduko, baldin eta zeuk eskuz ez baduzu kentzen"
+
+#~ msgid ""
+#~ "Forbid the candidate version of the selected package from being "
+#~ "installed;\n"
+#~ "newer versions of the package will be installed as usual"
+#~ msgstr ""
+#~ "Debekatu hautatutako paketearen bertsio hautagaia instalatua izatetik;\n"
+#~ "paketearen bertsio berriagoak beti bezala instalatuko dira"
 
 #~ msgid "^ChangeLog"
-#~ msgstr "(^C) Erregistroa"
+#~ msgstr "^Aldaketen egunkaria"
+
+#~ msgid "View the important changes made in each version of the program"
+#~ msgstr "Programaren bertsio bakoitzean egindako aldaketa nagusiak ikusi"
 
 #~ 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	Sun Jun 12 21:04:47 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-05-01 14:08-0400\n"
+"POT-Creation-Date: 2005-06-12 22:42+0200\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"
@@ -150,14 +150,14 @@
 msgid "Automatically remove unused packages matching this filter"
 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:219 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
-#: src/vscreen/vs_util.cc:328
+#: src/apt_options.cc:240 src/mine/cmine.cc:249 src/mine/cmine.cc:312
+#: src/ui.cc:215 src/vscreen/vs_util.cc:77 src/vscreen/vs_util.cc:90
+#: src/vscreen/vs_util.cc:264 src/vscreen/vs_util.cc:298
 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:328
+#: src/apt_options.cc:241 src/download_list.cc:69 src/mine/cmine.cc:250
+#: src/mine/cmine.cc:313 src/vscreen/vs_util.cc:298
 msgid "Cancel"
 msgstr "Peruuta"
 
@@ -238,15 +238,15 @@
 msgid "%s: Previous"
 msgstr ""
 
-#: src/broken_indicator.cc:233
+#: src/broken_indicator.cc:232
 #, c-format
-msgid "%CSolution search failed.  %s: try harder"
+msgid "Solution search failed.  %s: try harder"
 msgstr ""
 
-#: src/broken_indicator.cc:239
-#, c-format
-msgid "%CUnable to resolve dependencies."
-msgstr ""
+#: src/broken_indicator.cc:237
+#, fuzzy
+msgid "Unable to resolve dependencies."
+msgstr "En pysty kirjoittamaan tiedostoon %s"
 
 #: src/cmdline/cmdline_action.cc:36
 #, c-format
@@ -615,13 +615,13 @@
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
-#: src/vscreen/vs_util.cc:212
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:165
+#: src/vscreen/vs_util.cc:202
 msgid "Yes"
 msgstr "Kyllä"
 
-#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
-#: src/vscreen/vs_util.cc:212
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:165
+#: src/vscreen/vs_util.cc:202
 msgid "No"
 msgstr "Ei"
 
@@ -931,7 +931,7 @@
 msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:212
+#: src/cmdline/cmdline_resolver.cc:212 src/cmdline/cmdline_resolver.cc:285
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
@@ -988,196 +988,201 @@
 msgid "The following packages have unmet dependencies:\n"
 msgstr "Näillä paketeilla on tyydyttämättömiä riippuvuuksia:\n"
 
-#: src/cmdline/cmdline_show.cc:133
+#: src/cmdline/cmdline_show.cc:119 src/cmdline/cmdline_show.cc:305
+#: src/solution_fragment.cc:65
+msgid "<NULL>"
+msgstr ""
+
+#: src/cmdline/cmdline_show.cc:138
 msgid "not installed"
 msgstr "ei asennettu"
 
-#: src/cmdline/cmdline_show.cc:135 src/pkg_columnizer.cc:231
+#: src/cmdline/cmdline_show.cc:140 src/pkg_columnizer.cc:231
 #: src/pkg_ver_item.cc:225
 msgid "unpacked"
 msgstr "purettu"
 
-#: src/cmdline/cmdline_show.cc:137
+#: src/cmdline/cmdline_show.cc:142
 msgid "partially configured"
 msgstr "asetus kesken"
 
-#: src/cmdline/cmdline_show.cc:139
+#: src/cmdline/cmdline_show.cc:144
 msgid "partially installed"
 msgstr "osittain asennettu"
 
-#: src/cmdline/cmdline_show.cc:141
+#: src/cmdline/cmdline_show.cc:146
 msgid "not installed (configuration files remain)"
 msgstr "ei asennettu (asetustiedostot ovat olemassa)"
 
-#: src/cmdline/cmdline_show.cc:143 src/pkg_columnizer.cc:239
+#: src/cmdline/cmdline_show.cc:148 src/pkg_columnizer.cc:239
 #: src/pkg_ver_item.cc:233
 msgid "installed"
 msgstr "asennettu"
 
-#: src/cmdline/cmdline_show.cc:152
+#: src/cmdline/cmdline_show.cc:157
 msgid "not a real package"
 msgstr "ei oikea paketti"
 
-#: src/cmdline/cmdline_show.cc:165
+#: src/cmdline/cmdline_show.cc:170
 msgid " [held]"
 msgstr " [jäissä]"
 
-#: src/cmdline/cmdline_show.cc:174
+#: src/cmdline/cmdline_show.cc:179
 #, c-format
 msgid "%s; version %s will be installed"
 msgstr "%s; versio %s asennetaan"
 
-#: src/cmdline/cmdline_show.cc:178
+#: src/cmdline/cmdline_show.cc:183
 #, c-format
 msgid "%s; version %s will be installed automatically"
 msgstr "%s; versio %s asennetaan automaattisesti"
 
-#: src/cmdline/cmdline_show.cc:184 src/cmdline/cmdline_show.cc:199
+#: src/cmdline/cmdline_show.cc:189 src/cmdline/cmdline_show.cc:204
 #, c-format
 msgid "%s; will be purged"
 msgstr "%s; siivotaan"
 
-#: src/cmdline/cmdline_show.cc:197
+#: src/cmdline/cmdline_show.cc:202
 #, c-format
 msgid "%s; will be purged because nothing depends on it"
 msgstr "%s; siivotaan, koska mikään ei riipu siitä"
 
-#: src/cmdline/cmdline_show.cc:204
+#: src/cmdline/cmdline_show.cc:209
 #, c-format
 msgid "%s; will be removed because nothing depends on it"
 msgstr "%s; poistetaan, koska mikään ei riipu siitä"
 
-#: src/cmdline/cmdline_show.cc:206
+#: src/cmdline/cmdline_show.cc:211
 #, c-format
 msgid "%s; will be removed"
 msgstr "%s; poistetaan."
 
-#: src/cmdline/cmdline_show.cc:220
+#: src/cmdline/cmdline_show.cc:225
 #, c-format
 msgid "%s%s; will be downgraded [%s -> %s]"
 msgstr "%s%s; vanhennetaan [%s -> %s]"
 
-#: src/cmdline/cmdline_show.cc:223
+#: src/cmdline/cmdline_show.cc:228
 #, c-format
 msgid "%s%s; will be upgraded [%s -> %s]"
 msgstr "%s%s; päivitetään [%s -> %s]"
 
-#: src/cmdline/cmdline_show.cc:235 src/cmdline/cmdline_show.cc:256
+#: src/cmdline/cmdline_show.cc:240 src/cmdline/cmdline_show.cc:261
 msgid "Package: "
 msgstr "Paketti: "
 
-#: src/cmdline/cmdline_show.cc:236 src/cmdline/cmdline_show.cc:264
+#: src/cmdline/cmdline_show.cc:241 src/cmdline/cmdline_show.cc:269
 #: src/pkg_columnizer.cc:87
 msgid "State"
 msgstr "Tila"
 
-#: src/cmdline/cmdline_show.cc:237 src/cmdline/cmdline_show.cc:318
+#: src/cmdline/cmdline_show.cc:242 src/cmdline/cmdline_show.cc:325
 msgid "Provided by"
 msgstr "Kattavat"
 
-#: src/cmdline/cmdline_show.cc:258 src/pkg_info_screen.cc:105
+#: src/cmdline/cmdline_show.cc:263 src/pkg_info_screen.cc:105
 msgid "Essential: "
 msgstr "Välttämätön: "
 
-#: src/cmdline/cmdline_show.cc:258 src/cmdline/cmdline_show.cc:262
-#: src/cmdline/cmdline_show.cc:273 src/pkg_info_screen.cc:105
+#: src/cmdline/cmdline_show.cc:263 src/cmdline/cmdline_show.cc:267
+#: src/cmdline/cmdline_show.cc:278 src/pkg_info_screen.cc:105
 msgid "yes"
 msgstr "on"
 
-#: src/cmdline/cmdline_show.cc:262
+#: src/cmdline/cmdline_show.cc:267
 msgid "New"
 msgstr "Uusi"
 
-#: src/cmdline/cmdline_show.cc:267
+#: src/cmdline/cmdline_show.cc:272
 msgid "Forbidden version"
 msgstr "Estetty versio"
 
-#: src/cmdline/cmdline_show.cc:271
+#: src/cmdline/cmdline_show.cc:276
 msgid "Automatically installed"
 msgstr "Automaattisesti asennettu"
 
-#: src/cmdline/cmdline_show.cc:273
+#: src/cmdline/cmdline_show.cc:278
 msgid "no"
 msgstr "ei"
 
-#: src/cmdline/cmdline_show.cc:275
+#: src/cmdline/cmdline_show.cc:280
 msgid "Version: "
 msgstr "Versio: "
 
-#: src/cmdline/cmdline_show.cc:276 src/pkg_info_screen.cc:113
+#: src/cmdline/cmdline_show.cc:281 src/pkg_info_screen.cc:113
 msgid "Priority: "
 msgstr "Tärkeys: "
 
-#: src/cmdline/cmdline_show.cc:277 src/cmdline/cmdline_show.cc:279
-#: src/cmdline/cmdline_show.cc:288
+#: src/cmdline/cmdline_show.cc:282 src/cmdline/cmdline_show.cc:284
+#: src/cmdline/cmdline_show.cc:293
 msgid "N/A"
 msgstr "???"
 
-#: src/cmdline/cmdline_show.cc:278 src/pkg_info_screen.cc:114
+#: src/cmdline/cmdline_show.cc:283 src/pkg_info_screen.cc:114
 msgid "Section: "
 msgstr "Ryhmä: "
 
-#: src/cmdline/cmdline_show.cc:280 src/pkg_info_screen.cc:115
+#: src/cmdline/cmdline_show.cc:285 src/pkg_info_screen.cc:115
 msgid "Maintainer: "
 msgstr "Vastuuhenkilö: "
 
-#: src/cmdline/cmdline_show.cc:283
+#: src/cmdline/cmdline_show.cc:288
 msgid "Uncompressed Size: "
 msgstr "Koko purettuna: "
 
-#: src/cmdline/cmdline_show.cc:287
+#: src/cmdline/cmdline_show.cc:292
 msgid "Architecture: "
 msgstr "Arkkitehtuuri: "
 
-#: src/cmdline/cmdline_show.cc:289
+#: src/cmdline/cmdline_show.cc:294
 msgid "Compressed Size: "
 msgstr "Koko pakattuna: "
 
-#: src/cmdline/cmdline_show.cc:291
+#: src/cmdline/cmdline_show.cc:296
 msgid "Filename: "
 msgstr "Tiedosto: "
 
-#: src/cmdline/cmdline_show.cc:293
+#: src/cmdline/cmdline_show.cc:298
 msgid "MD5sum: "
 msgstr "MD5-summa: "
 
-#: src/cmdline/cmdline_show.cc:297 src/cmdline/cmdline_show.cc:299
+#: src/cmdline/cmdline_show.cc:302 src/cmdline/cmdline_show.cc:305
 msgid "Archive"
 msgstr "Arkisto"
 
-#: src/cmdline/cmdline_show.cc:303
+#: src/cmdline/cmdline_show.cc:310
 msgid "Depends"
 msgstr "Riippuvuudet"
 
-#: src/cmdline/cmdline_show.cc:305
+#: src/cmdline/cmdline_show.cc:312
 msgid "PreDepends"
 msgstr "Esiriippuvuudet"
 
-#: src/cmdline/cmdline_show.cc:307
+#: src/cmdline/cmdline_show.cc:314
 msgid "Recommends"
 msgstr "Suosittelut"
 
-#: src/cmdline/cmdline_show.cc:309
+#: src/cmdline/cmdline_show.cc:316
 msgid "Suggests"
 msgstr "Ehdotukset"
 
-#: src/cmdline/cmdline_show.cc:311
+#: src/cmdline/cmdline_show.cc:318
 msgid "Conflicts"
 msgstr "Ristiriidat"
 
-#: src/cmdline/cmdline_show.cc:313
+#: src/cmdline/cmdline_show.cc:320
 msgid "Replaces"
 msgstr "Korvaavuudet"
 
-#: src/cmdline/cmdline_show.cc:315
+#: src/cmdline/cmdline_show.cc:322
 msgid "Obsoletes"
 msgstr "Täydet korvaavuudet"
 
-#: src/cmdline/cmdline_show.cc:317
+#: src/cmdline/cmdline_show.cc:324
 msgid "Provides"
 msgstr "Katetut"
 
-#: src/cmdline/cmdline_show.cc:321 src/pkg_info_screen.cc:97
+#: src/cmdline/cmdline_show.cc:328 src/pkg_info_screen.cc:97
 msgid "Description: "
 msgstr "Kuvaus: "
 
@@ -1220,32 +1225,32 @@
 msgid "You cannot specify both an archive and a version for a package\n"
 msgstr "Et voi määrittää sekä arkistoa että versiota paketista\n"
 
-#: src/dep_item.cc:137
+#: src/dep_item.cc:139
 msgid "UNSATISFIED"
 msgstr "TYYDYTTÄMÄTÖN"
 
-#: src/dep_item.cc:137 src/reason_fragment.cc:247
+#: src/dep_item.cc:139 src/reason_fragment.cc:244
 msgid "UNAVAILABLE"
 msgstr "EI SAATAVILLA"
 
-#: src/download_bar.cc:56 src/download_list.cc:263 src/download_screen.cc:57
+#: src/download_bar.cc:56 src/download_list.cc:266 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_bar.cc:77 src/generic/acqprogress.cc:63
+#: src/download_bar.cc:75 src/generic/acqprogress.cc:63
 msgid "Hit "
 msgstr "Löytyi "
 
-#: src/download_bar.cc:90
+#: src/download_bar.cc:88
 msgid "Downloading "
 msgstr "Nouto: "
 
-#: src/download_bar.cc:103
+#: src/download_bar.cc:101
 msgid "Got "
 msgstr "Noudettu: "
 
-#: src/download_bar.cc:157
+#: src/download_bar.cc:155
 msgid "Downloading..."
 msgstr "Noudan..."
 
@@ -1273,7 +1278,7 @@
 msgid "Couldn't clean out list directories"
 msgstr "En pystynyt siivoamaan listahakemistoja"
 
-#: src/download.cc:177 src/ui.cc:1153
+#: src/download.cc:177 src/ui.cc:1147
 msgid "Deleting obsolete downloaded files"
 msgstr "Poistan vanhentuneita tiedostoja"
 
@@ -1410,7 +1415,7 @@
 "Ack!  Something bad happened while installing packages.  Trying to recover:"
 msgstr "Oih!  Jotain ikävää tapahtui asennuksessa.  Yritän toipua:"
 
-#: src/download.cc:477 src/pkg_item.cc:432
+#: src/download.cc:477 src/pkg_item.cc:430
 msgid "Press return to continue.\n"
 msgstr "Paina return jatkaaksesi.\n"
 
@@ -1420,17 +1425,17 @@
 msgstr ""
 "En saanut järjestelmälukitusta!  (Ehkä apt tai dpkg on ajossa muualta?)"
 
-#: src/download_item.cc:66 src/download_item.cc:70 src/download_item.cc:100
+#: src/download_item.cc:70 src/download_item.cc:74 src/download_item.cc:104
 #: src/generic/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr " [Toimin]"
 
-#: src/download_item.cc:104 src/download_list.cc:283
+#: src/download_item.cc:108 src/download_list.cc:284
 msgid "[Hit]"
 msgstr "[Ohi]"
 
-#: src/download_item.cc:104 src/download_list.cc:303
+#: src/download_item.cc:108 src/download_list.cc:304
 msgid "[Downloaded]"
 msgstr "[Noudettu]"
 
@@ -1444,34 +1449,34 @@
 msgid "%n%nSome files were not downloaded successfully."
 msgstr ""
 
-#: src/download_list.cc:68
+#: src/download_list.cc:66
 msgid "Continue"
 msgstr "Jatka"
 
-#: src/download_list.cc:175 src/download_screen.cc:203
+#: src/download_list.cc:178 src/download_screen.cc:203
 msgid "Total Progress: "
 msgstr "Edistyminen: "
 
-#: src/download_list.cc:194 src/download_screen.cc:218
+#: src/download_list.cc:197 src/download_screen.cc:218
 #, c-format
 msgid " [ %i%% ] (%sB/s, %s remaining)"
 msgstr " [ %i%% ] (%sB/s, %s jäljellä)"
 
-#: src/download_list.cc:196
+#: src/download_list.cc:199
 #, c-format
 msgid " [ %i%% ] (stalled)"
 msgstr " [ %i%% ] (seisoksissa)"
 
-#: src/download_list.cc:198
+#: src/download_list.cc:201
 #, c-format
 msgid " [ %i%% ]"
 msgstr " [ %i%% ]"
 
-#: src/download_list.cc:323
+#: src/download_list.cc:324
 msgid "[IGNORED]"
 msgstr "[SIVUUTETTU]"
 
-#: src/download_list.cc:329
+#: src/download_list.cc:330
 msgid "[ERROR]"
 msgstr "[VIRHE]"
 
@@ -1480,11 +1485,11 @@
 msgid "Downloaded %sB in %ss (%sB/s)."
 msgstr "Noudin %sB ajassa %ss (%sB/s)."
 
-#: src/edit_pkg_hier.cc:158
+#: src/edit_pkg_hier.cc:176
 msgid "No hierarchy information to edit"
 msgstr "Muokattavaa hierarkiatietoa ei ole"
 
-#: src/edit_pkg_hier.cc:258
+#: src/edit_pkg_hier.cc:276
 msgid "Couldn't open for writing"
 msgstr "En pysty kirjoittamaan tiedostoon"
 
@@ -1579,39 +1584,39 @@
 msgstr ""
 "Varoitus: varaston lukitus epäonnistui, joten siihen ei nyt voi kirjoittaa"
 
-#: src/generic/matchers.cc:797
+#: src/generic/matchers.cc:798
 msgid "Unmatched '('"
 msgstr "Pariton '('"
 
-#: src/generic/matchers.cc:887 src/generic/matchers.cc:968
+#: src/generic/matchers.cc:888 src/generic/matchers.cc:969
 #, c-format
 msgid "Unknown dependency type: %s"
 msgstr "Tuntematon riippuvuuslaji: %s"
 
-#: src/generic/matchers.cc:950
+#: src/generic/matchers.cc:951
 #, c-format
 msgid "Unknown action type: %s"
 msgstr "Tuntematon toimi: %s"
 
-#: src/generic/matchers.cc:1017
+#: src/generic/matchers.cc:1018
 #, c-format
 msgid "Unknown priority %s"
 msgstr "Tuntematon tärkeys %s"
 
-#: src/generic/matchers.cc:1039
+#: src/generic/matchers.cc:1040
 #, c-format
 msgid "Unknown pattern type: %c"
 msgstr "Tuntematon hahmotyyppi: %c"
 
-#: src/generic/matchers.cc:1084
+#: src/generic/matchers.cc:1105
 msgid "Unexpected empty expression"
 msgstr "Virheellisesti tyhjä lauseke"
 
-#: src/generic/matchers.cc:1119
+#: src/generic/matchers.cc:1143
 msgid "Badly formed expression"
 msgstr "Virheellinen lauseke"
 
-#: src/generic/matchers.cc:1148
+#: src/generic/matchers.cc:1175
 msgid "Unexpected ')'"
 msgstr "Pariton ')'"
 
@@ -1635,7 +1640,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:61
+#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:76
 #, c-format
 msgid "ChangeLog of %s"
 msgstr "%s:n muutosloki"
@@ -1676,37 +1681,37 @@
 msgid "Reading task descriptions"
 msgstr "Luen tehtäväkuvauksia"
 
-#: src/load_config.cc:30
-#, c-format
-msgid "Invalid entry in color definition group: \"%s\""
-msgstr "Virheellinen alkio \"%s\" värimäärittelyryhmässä"
+#: src/load_config.cc:42
+#, fuzzy, c-format
+msgid "Unrecognized color name \"%s\""
+msgstr "Tunnistamattomat tehtävät"
 
-#: src/load_config.cc:32
-#, c-format
-msgid "Invalid tagless entry in color definition group: \"%s\""
-msgstr "Virheellinen merkitsemätön alkio \"%s\" värimäärittelyryhmässä"
+#: src/load_config.cc:69
+#, fuzzy, c-format
+msgid "Unrecognized attribute name \"%s\""
+msgstr "Tunnistamattomat tehtävät"
 
-#: src/load_config.cc:34
-#, c-format
-msgid "Need exactly two colors in color definition \"%s\""
-msgstr "Värimäärittelyyn \"%s\" tarvitaan täsmälleen kaksi väriä"
+#: src/load_config.cc:106
+#, fuzzy, c-format
+msgid "Invalid entry in style definition group: \"%s\""
+msgstr "Virheellinen alkio \"%s\" värimäärittelyryhmässä"
 
-#: src/load_config.cc:50
-#, c-format
-msgid "Can't parse foreground \"%s\"of color \"%s\""
-msgstr "En ymmärrä edustaa \"%s\" värille \"%s\""
+#: src/load_config.cc:108
+#, fuzzy, c-format
+msgid "Invalid tagless entry in style definition group: \"%s\""
+msgstr "Virheellinen merkitsemätön alkio \"%s\" värimäärittelyryhmässä"
 
-#: src/load_config.cc:53
-#, c-format
-msgid "Can't parse background \"%s\" of color \"%s\""
-msgstr "En ymmärrä taustaa \"%s\" värille \"%s\""
+#: src/load_config.cc:130
+#, fuzzy, c-format
+msgid "Unknown style attribute %s"
+msgstr "Tuntematon toimi: %s"
 
-#: src/load_config.cc:72 src/load_config.cc:74
+#: src/load_config.cc:153 src/load_config.cc:155
 #, c-format
 msgid "Invalid entry in keybinding group: \"%s\""
 msgstr "Virheellinen alkio \"%s\" näppäinsidontaryhmässä"
 
-#: src/load_config.cc:89
+#: src/load_config.cc:170
 #, c-format
 msgid "Ignoring invalid keybinding \"%s\" -> \"%s\""
 msgstr "Sivuutan virheellisen näppäinsidonnan \"%s\" -> \"%s\""
@@ -1978,7 +1983,7 @@
 #: src/main.cc:110
 #, c-format
 msgid " changelog    - View a package's changelog\n"
-msgstr " changelog   - Näytä paketin muutosloki\n"
+msgstr " muutosloki   - Näytä paketin muutosloki\n"
 
 #: src/main.cc:111
 #, c-format
@@ -2108,42 +2113,42 @@
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                      Tällä aptitudella ei ole Lehmävoimia.\n"
 
-#: src/main.cc:255
+#: src/main.cc:252
 #, 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:301 src/main.cc:310
+#: src/main.cc:291 src/main.cc:300
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr "OUTOA: tuntematon valitsin\n"
 
-#: src/main.cc:319
+#: src/main.cc:309
 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:327
+#: src/main.cc:317
 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:348
+#: src/main.cc:338
 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:405
+#: src/main.cc:395
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr "Tuntematon komento \"%s\"\n"
 
-#: src/main.cc:412 src/main.cc:469
+#: src/main.cc:402 src/main.cc:450
 msgid "Internal error: uncaught 'out of solutions' exception.\n"
 msgstr ""
 
-#: src/main.cc:417 src/main.cc:474
+#: src/main.cc:407 src/main.cc:455
 msgid "Internal error: uncaught 'out of time' exception.\n"
 msgstr ""
 
-#: src/main.cc:424
+#: src/main.cc:414
 #, c-format
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
@@ -2174,7 +2179,7 @@
 msgid "Lost"
 msgstr "Häviö"
 
-#: src/mine/cmine.cc:119 src/ui.cc:1090
+#: src/mine/cmine.cc:119 src/ui.cc:1084
 msgid "Minesweeper"
 msgstr "Miinaharava"
 
@@ -2200,147 +2205,147 @@
 msgid "The number of mines must be a number"
 msgstr "Miinojen lukumäärän on oltava luku"
 
-#: src/mine/cmine.cc:240
+#: src/mine/cmine.cc:238
 msgid "Setup custom game"
 msgstr "Valmistele oma peli"
 
-#: src/mine/cmine.cc:243
+#: src/mine/cmine.cc:240
 msgid "Height of board: "
 msgstr "Laudan korkeus: "
 
-#: src/mine/cmine.cc:247
+#: src/mine/cmine.cc:243
 msgid "Width of board: "
 msgstr "Laudan leveys: "
 
-#: src/mine/cmine.cc:251
+#: src/mine/cmine.cc:246
 msgid "Number of mines: "
 msgstr "Miinojen lukumäärä: "
 
-#: src/mine/cmine.cc:316
+#: src/mine/cmine.cc:305
 msgid "Choose difficulty level"
 msgstr "Valitse vaikeustaso"
 
-#: src/mine/cmine.cc:318
+#: src/mine/cmine.cc:307
 msgid "Easy"
 msgstr "Helppo"
 
-#: src/mine/cmine.cc:319
+#: src/mine/cmine.cc:308
 msgid "Medium"
 msgstr "Keskitaso"
 
-#: src/mine/cmine.cc:320
+#: src/mine/cmine.cc:309
 msgid "Hard"
 msgstr "Vaikea"
 
-#: src/mine/cmine.cc:321
+#: src/mine/cmine.cc:310
 msgid "Custom"
 msgstr "Oma"
 
-#: src/mine/cmine.cc:411
+#: src/mine/cmine.cc:392
 msgid "You have won."
 msgstr "Voitit."
 
-#: src/mine/cmine.cc:414
+#: src/mine/cmine.cc:395
 msgid "You lose!"
 msgstr "Hävisit!"
 
-#: src/mine/cmine.cc:419
+#: src/mine/cmine.cc:400
 msgid "You die...  --More--"
 msgstr "Kuoolee...  --Lisää--"
 
-#: src/mine/cmine.cc:432
+#: src/mine/cmine.cc:413
 msgid "The spikes were poisoned!  The poison was deadly..  --More--"
 msgstr "Piikeissä oli myrkkyä!  Myrkky tappaa..  --Lisää--"
 
-#: src/mine/cmine.cc:435
+#: src/mine/cmine.cc:416
 msgid "You land on a set of sharp iron spikes!  --More--"
 msgstr "Putoat teräviin rautapiikkeihin!  --Lisää--"
 
-#: src/mine/cmine.cc:438
+#: src/mine/cmine.cc:419
 msgid "You fall into a pit!  --More--"
 msgstr "Putoat kuoppaan!  --Lisää--"
 
-#: src/mine/cmine.cc:441
+#: src/mine/cmine.cc:422
 msgid "KABOOM!  You step on a land mine.  --More--"
 msgstr "JUTUM!  Astut maamiinaan.  --Lisää--"
 
-#: src/mine/cmine.cc:446
+#: src/mine/cmine.cc:427
 msgid "The dart was poisoned!  The poison was deadly...  --More--"
 msgstr "Tikassa oli myrkkyä!  Myrkky tappaa...  --Lisää--"
 
-#: src/mine/cmine.cc:448
+#: src/mine/cmine.cc:429
 msgid ""
 "A little dart shoots out at you!  You are hit by a little dart!  --More--"
 msgstr "Pieni tikka laukeaa!  Pieni tikka osuu sinuun!  --Lisää--"
 
-#: src/mine/cmine.cc:452
+#: src/mine/cmine.cc:433
 msgid "You turn to stone... --More--"
 msgstr "Kivetyt... --Lisää--"
 
-#: src/mine/cmine.cc:454
+#: src/mine/cmine.cc:435
 msgid "Touching the cockatrice corpse was a fatal mistake.  --More--"
 msgstr "Ei olisi pitänyt koskea kukkoliskon raatoon.  --Lisää--"
 
-#: src/mine/cmine.cc:456
+#: src/mine/cmine.cc:437
 msgid "You feel here a cockatrice corpse.  --More--"
 msgstr "Tunnet kukkoliskon raadon.  --Lisää--"
 
-#: src/mine/cmine.cc:460
+#: src/mine/cmine.cc:441
 msgid ""
 "Click!  You trigger a rolling boulder trap!  You are hit by a boulder! --"
 "More--"
 msgstr "Klik!  Laukaiset murkula-ansan!  Murkula osuu sinuun! --Lisää--"
 
-#: src/mine/cmine.cc:470
+#: src/mine/cmine.cc:451
 msgid "sleep"
 msgstr "nukutus"
 
-#: src/mine/cmine.cc:473
+#: src/mine/cmine.cc:454
 msgid "striking"
 msgstr "isku"
 
-#: src/mine/cmine.cc:476
+#: src/mine/cmine.cc:457
 msgid "death"
 msgstr "kuoleman"
 
-#: src/mine/cmine.cc:479
+#: src/mine/cmine.cc:460
 msgid "polymorph"
 msgstr "muodonmuutos"
 
-#: src/mine/cmine.cc:482
+#: src/mine/cmine.cc:463
 msgid "magic missile"
 msgstr "taikanuoli"
 
-#: src/mine/cmine.cc:485
+#: src/mine/cmine.cc:466
 msgid "secret door detection"
 msgstr "salaoventunnistus"
 
-#: src/mine/cmine.cc:488
+#: src/mine/cmine.cc:469
 msgid "invisibility"
 msgstr "näkymättömyys"
 
-#: src/mine/cmine.cc:491
+#: src/mine/cmine.cc:472
 msgid "cold"
 msgstr "kylmyys"
 
-#: src/mine/cmine.cc:497
+#: src/mine/cmine.cc:478
 #, c-format
 msgid "Your wand of %s breaks apart and explodes!  --More--"
 msgstr "Sinun %ssauvasi hajoaa ja jysähtää!  --Lisää--"
 
-#: src/mine/cmine.cc:503
+#: src/mine/cmine.cc:484
 msgid "You are jolted by a surge of electricity!  --More--"
 msgstr "Sähköshokkihoitoa pesee!  --Lisää--"
 
-#: src/mine/cmine.cc:607
+#: src/mine/cmine.cc:588
 msgid "Enter the filename to load: "
 msgstr "Syötä ladattavan tiedoston nimi: "
 
-#: src/mine/cmine.cc:614
+#: src/mine/cmine.cc:595
 msgid "Enter the filename to save: "
 msgstr "Syötä tallennustiedoston nimi: "
 
-#: src/mine/cmine.cc:624
+#: src/mine/cmine.cc:605
 msgid "mine-help.txt"
 msgstr "mine-help-fi.txt"
 
@@ -2349,7 +2354,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:1670
+#: src/pkg_columnizer.cc:84 src/ui.cc:1662
 msgid "Package"
 msgstr "Paketti"
 
@@ -3405,52 +3410,52 @@
 "Oletko aivan varma, että haluat poistaa sen?\n"
 "Kirjoita '%s' jos olet."
 
-#: src/pkg_item.cc:222 src/pkg_ver_item.cc:625
+#: src/pkg_item.cc:220 src/pkg_ver_item.cc:626
 #, c-format
 msgid "Information about %s"
 msgstr "%s:n tiedot"
 
-#: src/pkg_item.cc:224 src/pkg_ver_item.cc:627
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:628
 #, c-format
 msgid "%s info"
 msgstr ""
 
-#: src/pkg_item.cc:310
+#: src/pkg_item.cc:308
 #, fuzzy, c-format
 msgid "Available versions of %s"
 msgstr "Saatavilla olevat versiot paketista "
 
-#: src/pkg_item.cc:313
+#: src/pkg_item.cc:311
 #, fuzzy, c-format
 msgid "%s versions"
 msgstr "Versiot"
 
-#: src/pkg_item.cc:325 src/pkg_ver_item.cc:655
+#: src/pkg_item.cc:323 src/pkg_ver_item.cc:656
 #, c-format
 msgid "Dependencies of %s"
 msgstr "%s:n riippuvuudet"
 
-#: src/pkg_item.cc:327 src/pkg_ver_item.cc:657
+#: src/pkg_item.cc:325 src/pkg_ver_item.cc:658
 #, c-format
 msgid "%s deps"
 msgstr ""
 
-#: src/pkg_item.cc:338 src/pkg_ver_item.cc:667
+#: src/pkg_item.cc:336 src/pkg_ver_item.cc:668
 #, c-format
 msgid "Packages depending on %s"
 msgstr "%s:sta riippuvat paketit"
 
-#: src/pkg_item.cc:340 src/pkg_ver_item.cc:669
+#: src/pkg_item.cc:338 src/pkg_ver_item.cc:670
 #, c-format
 msgid "%s reverse deps"
 msgstr ""
 
-#: src/pkg_item.cc:392 src/pkg_ver_item.cc:707
+#: src/pkg_item.cc:390 src/pkg_ver_item.cc:708
 #, c-format
 msgid "Reporting a bug in %s:\n"
 msgstr "Ilmoitetaan viasta paketissa %s:\n"
 
-#: src/pkg_item.cc:414
+#: src/pkg_item.cc:412
 #, fuzzy
 msgid ""
 "You are not root and I cannot find any way to become root.  To reconfigure "
@@ -3462,16 +3467,16 @@
 "asenna menu- tai login-paketti tai aja\n"
 "aptitudea root-tunnuksella."
 
-#: src/pkg_item.cc:422
+#: src/pkg_item.cc:420
 #, c-format
 msgid "Reconfiguring %s\n"
 msgstr "Asetan uudelleen pakettia %s\n"
 
-#: src/pkg_item.cc:447
+#: src/pkg_item.cc:445
 msgid "Hierarchy editor"
 msgstr "Hierarkiamuokkain"
 
-#: src/pkg_item.cc:447
+#: src/pkg_item.cc:445
 #, fuzzy
 msgid "Hierarchy Editor"
 msgstr "Hierarkiamuokkain"
@@ -3505,22 +3510,22 @@
 msgid "Enter the new package sorting mechanism for this display: "
 msgstr "Syötä uusi pakettien lajittelutapa tälle näytölle: "
 
-#: src/pkg_view.cc:344
+#: src/pkg_view.cc:359
 msgid "make_package_view: error in arguments -- two main widgets??"
 msgstr "make_package_view: virhe argumenteissa -- kaksi päähärpätintä??"
 
-#: src/pkg_view.cc:350
+#: src/pkg_view.cc:365
 msgid ""
 "make_package_view: error in arguments -- bad column list for static item"
 msgstr ""
 "make_package_view: virhe argumenteissa -- väärä sarakelista kiinteälle "
 "alkiolle"
 
-#: src/pkg_view.cc:443
+#: src/pkg_view.cc:458
 msgid "make_package_view: bad argument!"
 msgstr "make_package_view: tuhma argumentti!"
 
-#: src/pkg_view.cc:495
+#: src/pkg_view.cc:510
 msgid "make_package_view: no main widget found"
 msgstr "make_package_view: päähärpätintä ei löydy"
 
@@ -3565,12 +3570,12 @@
 msgstr " (%F kattaa)"
 
 # Left as is on purpose, at least for now - JJK
-#: src/reason_fragment.cc:278
+#: src/reason_fragment.cc:275
 #, c-format
 msgid "%F%s %F %F"
 msgstr "%F%s %F %F"
 
-#: src/reason_fragment.cc:327
+#: src/reason_fragment.cc:324
 msgid ""
 "If you select a package, an explanation of its current state will appear in "
 "this space."
@@ -3578,7 +3583,7 @@
 "Kun valitset paketin, selitys sen tämänhetkisestä tilasta annetaan tässä "
 "tilassa."
 
-#: src/reason_fragment.cc:361
+#: src/reason_fragment.cc:358
 msgid ""
 "%B%s%b was installed automatically;  it is being removed because all of the "
 "packages which depend upon it are being removed:"
@@ -3586,16 +3591,16 @@
 "%B%s%b asennettiin automaattisesti;  se poistetaan nyt, koska kaikki siitä "
 "riippuvat paketit poistetaan myös:"
 
-#: src/reason_fragment.cc:365
+#: src/reason_fragment.cc:362
 msgid "%B%s%b will be automatically removed because of dependency errors:"
 msgstr "%B%s%b poistetaan automaattisesti riippuvuusristiriitojen takia:"
 
-#: src/reason_fragment.cc:369
+#: src/reason_fragment.cc:366
 msgid ""
 "%B%s%b will be automatically installed to satisfy the following dependencies:"
 msgstr "%B%s%b asennetaan automaattisesti seuraavien riippuvuuksien takia:"
 
-#: src/reason_fragment.cc:375 src/reason_fragment.cc:387
+#: src/reason_fragment.cc:372 src/reason_fragment.cc:384
 msgid ""
 "%B%s%b cannot be upgraded now, but if it could be, it would still be held at "
 "version %B%s%b."
@@ -3603,7 +3608,7 @@
 "%B%s%b ei ole nyt päivitettävissä, mutta vaikka se olisikin, se jätettäisiin "
 "odottamaan versioon %B%s%b."
 
-#: src/reason_fragment.cc:378
+#: src/reason_fragment.cc:375
 msgid ""
 "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the "
 "following dependencies:"
@@ -3611,27 +3616,27 @@
 "Pakettia %B%s%b ei päivitetä versioon %B%s%b, koska tämä rikkoisi seuraavat "
 "riippuvuudet:"
 
-#: src/reason_fragment.cc:390
+#: src/reason_fragment.cc:387
 msgid "%B%s%b is currently installed."
 msgstr "Paketti %B%s%b on asennettu."
 
-#: src/reason_fragment.cc:396
+#: src/reason_fragment.cc:393
 msgid "%B%s%b is not currently installed."
 msgstr "Pakettia %B%s%b ei ole asennettu."
 
-#: src/reason_fragment.cc:404
+#: src/reason_fragment.cc:401
 msgid "Some dependencies of %B%s%b are not satisfied:"
 msgstr "Paketin %B%s%b kaikkia riippuvuuksia ei ole tyydytetty:"
 
-#: src/reason_fragment.cc:408
+#: src/reason_fragment.cc:405
 msgid "%B%s%b will be downgraded."
 msgstr "Paketti %B%s%b vanhennetaan."
 
-#: src/reason_fragment.cc:415
+#: src/reason_fragment.cc:412
 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b."
 msgstr "Pakettia %B%s%b ei päivitetä estettyyn versioon %B%s%b."
 
-#: src/reason_fragment.cc:419
+#: src/reason_fragment.cc:416
 msgid ""
 "%B%s%b could be upgraded to version %B%s%b, but it is being held at version %"
 "B%s%b."
@@ -3639,32 +3644,32 @@
 "Paketin %B%s%b voisi päivittää versioon %B%s%b, mutta se on jäädytetty "
 "versioon %B%s%b."
 
-#: src/reason_fragment.cc:426
+#: src/reason_fragment.cc:423
 msgid "%B%s%b will be re-installed."
 msgstr "%B%s%b asennetaan uudelleen."
 
-#: src/reason_fragment.cc:430
+#: src/reason_fragment.cc:427
 msgid "%B%s%b will be installed."
 msgstr "%B%s%b asennetaan."
 
-#: src/reason_fragment.cc:434
+#: src/reason_fragment.cc:431
 msgid "%B%s%b will be removed."
 msgstr "%B%s%b poistetaan."
 
-#: src/reason_fragment.cc:439
+#: src/reason_fragment.cc:436
 msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b."
 msgstr "%B%s%b päivitetään versiosta %B%s%b versioon %B%s%b."
 
-#: src/reason_fragment.cc:475
+#: src/reason_fragment.cc:472
 msgid ""
 "The following packages depend on %B%s%b and will be broken by its removal:"
 msgstr "Nämä paketit riippuvat paketista %B%s%b ja rikkoutuvat sen poistosta:"
 
-#: src/reason_fragment.cc:478
+#: src/reason_fragment.cc:475
 msgid "The following packages depend on %B%s%b and are broken:"
 msgstr "Nämä paketit riippuvat paketista %B%s%b ja ovat hajalla:"
 
-#: src/reason_fragment.cc:485
+#: src/reason_fragment.cc:482
 msgid ""
 "The following packages conflict with %B%s%b and will be broken by its "
 "installation:"
@@ -3672,7 +3677,7 @@
 "Nämä paketit ovat ristiriidassa paketin %B%s%b kanssa ja hajoavat, jos se "
 "asennetaan:"
 
-#: src/reason_fragment.cc:518
+#: src/reason_fragment.cc:515
 msgid ""
 "The following packages depend on a version of %B%s%b other than the "
 "currently installed version of %B%s%b, or conflict with the currently "
@@ -3682,7 +3687,7 @@
 "asennettuna oleva %B%s%b tai ovat ristiriidassa tällä hetkellä asennetun "
 "version kanssa:"
 
-#: src/reason_fragment.cc:522
+#: src/reason_fragment.cc:519
 msgid ""
 "The following packages conflict with %B%s%b, or depend on a version of it "
 "which is not going to be installed."
@@ -3690,11 +3695,11 @@
 "Nämä paketit ovat ristiriidassa paketin %B%s%b kanssa tai riippuvat sen "
 "sellaisesta versiosta, jota ei olla asentamassa."
 
-#: src/reason_fragment.cc:526
+#: src/reason_fragment.cc:523
 msgid "The following packages conflict with %B%s%b:"
 msgstr "Nämä paketit ovat ristiriidassa paketin %B%s%b kanssa:"
 
-#: src/reason_fragment.cc:531
+#: src/reason_fragment.cc:528
 msgid ""
 "The following packages depend on a version of %B%s%b other than the "
 "currently installed version of %B%s%b:"
@@ -3702,7 +3707,7 @@
 "Nämä paketit riippuvat paketin %B%s%b versiosta, joka ei ole tällä hetkellä "
 "asennettu versio %B%s%b:"
 
-#: src/reason_fragment.cc:535
+#: src/reason_fragment.cc:532
 msgid ""
 "The following packages depend on a version of %B%s%b which is not going to "
 "be installed."
@@ -3710,11 +3715,11 @@
 "Nämä paketit riippuvat paketin %B%s%b sellaisesta versiosta, jota ei olla "
 "asentamassa."
 
-#: src/reason_fragment.cc:541
+#: src/reason_fragment.cc:538
 msgid "upgraded"
 msgstr "päivitys"
 
-#: src/reason_fragment.cc:541
+#: src/reason_fragment.cc:538
 msgid "downgraded"
 msgstr "vanhennus"
 
@@ -3722,7 +3727,7 @@
 # Well, my attempt should sort of work; just don't use the above "upgraded"
 # and "downgraded" anywhere else.
 # JJK
-#: src/reason_fragment.cc:547
+#: src/reason_fragment.cc:544
 msgid ""
 "The following packages depend on the currently installed version of %B%s%b (%"
 "B%s%b), or conflict with the version it will be %s to (%B%s%b), and will be "
@@ -3731,7 +3736,7 @@
 "Seuraavat paketit riippuvat paketin %B%s%b asennetusta versiosta %B%s%b tai "
 "ovat ristiriidassa version %B%4$s%b kanssa, johon %3$s tehdään."
 
-#: src/reason_fragment.cc:554
+#: src/reason_fragment.cc:551
 msgid ""
 "The following packages conflict with version %B%s%b of %B%s%b, and will be "
 "broken if it is %s."
@@ -3739,7 +3744,7 @@
 "Nämä paketit ovat ristiriidassa paketin %B%2$s%b version %B%1$s%b kanssa ja "
 "hajoavat jos %s tehdään."
 
-#: src/reason_fragment.cc:559
+#: src/reason_fragment.cc:556
 msgid ""
 "The following packages depend on version %B%s%b of %B%s%b, and will be "
 "broken if it is %s."
@@ -3786,31 +3791,36 @@
 msgid "Close"
 msgstr "^Lopeta"
 
-#: src/solution_fragment.cc:125
+#: src/solution_fragment.cc:134
 #, fuzzy
 msgid "%BRemove%b the following packages:%n"
 msgstr "Nämä paketit ovat RIKKI:"
 
-#: src/solution_fragment.cc:135
+#: src/solution_fragment.cc:144
 #, fuzzy
 msgid "%BInstall%b the following packages:%n"
 msgstr "Nämä paketit ovat RIKKI:"
 
-#: src/solution_fragment.cc:148
+#: src/solution_fragment.cc:157
 msgid "%BKeep%b the following packages at their current version:%n"
 msgstr ""
 
-#: src/solution_fragment.cc:161
+#: src/solution_fragment.cc:164
+#, fuzzy
+msgid "Not Installed"
+msgstr "ei asennettu"
+
+#: src/solution_fragment.cc:177
 #, fuzzy
 msgid "%BUpgrade%b the following packages:%n"
 msgstr "Nämä paketit ovat RIKKI:"
 
-#: src/solution_fragment.cc:176
+#: src/solution_fragment.cc:192
 #, fuzzy
 msgid "%BDowngrade%b the following packages:%n"
 msgstr "Noudan paketteja"
 
-#: src/solution_fragment.cc:190
+#: src/solution_fragment.cc:206
 #, c-format
 msgid "Score is %d"
 msgstr ""
@@ -3838,43 +3848,43 @@
 msgid "W:"
 msgstr ""
 
-#: src/ui.cc:194
+#: src/ui.cc:193
 msgid "Search for:"
 msgstr "Etsi mitä? "
 
-#: src/ui.cc:262
+#: src/ui.cc:258
 msgid "You already are root!"
 msgstr "Olet jo root!"
 
-#: src/ui.cc:360
+#: src/ui.cc:356
 msgid ""
 "Subprocess exited with an error -- did you type your password correctly?"
 msgstr "Lapsiprosessi palautti virhekoodin -- kirjoititko salasanan oikein?"
 
-#: src/ui.cc:388
+#: src/ui.cc:384
 msgid "Loading cache"
 msgstr "Lataan varastoa"
 
-#: src/ui.cc:410
+#: src/ui.cc:406
 msgid "Really quit Aptitude?"
 msgstr "Haluatko varmasti lopettaa?"
 
-#: src/ui.cc:489
+#: src/ui.cc:485
 msgid "Really discard your personal settings and reload the defaults?"
 msgstr "Haluatko varmasti hylätä omat asetuksesi ja korvata ne oletuksilla?"
 
-#: src/ui.cc:589 src/ui.cc:591 src/ui.cc:619 src/ui.cc:621
+#: src/ui.cc:585 src/ui.cc:587 src/ui.cc:615 src/ui.cc:617
 msgid "Packages"
 msgstr "Paketit"
 
-#: src/ui.cc:590 src/ui.cc:620
+#: src/ui.cc:586 src/ui.cc:616
 msgid "View available packages and choose actions to perform"
 msgstr "Selaa saatavilla olevia paketteja ja suorita toimenpiteitä"
 
-#: src/ui.cc:667
+#: src/ui.cc:663
 #, fuzzy
 msgid ""
-"%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
+"Aptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
 "BABSOLUTELY NO WARRANTY%b; for details see 'license' in the Help menu.  This "
 "is free software, and you are welcome to redistribute it under certain "
 "conditions; see 'license' for details."
@@ -3887,61 +3897,66 @@
 "Avustus-valikosta.  Tämä on vapaa ohjelma, joten saat vapaasti levittää\n"
 "sitä tietyin rajoituksin; 'lisenssi' antaa tarkemmat tiedot (englanniksi)."
 
-#: src/ui.cc:688
+#: src/ui.cc:684
 msgid "help.txt"
 msgstr "help-fi.txt"
 
-#: src/ui.cc:704
+#: src/ui.cc:700
 msgid "README"
 msgstr "README"
 
-#: src/ui.cc:786
+#: src/ui.cc:782
 msgid ""
-"%C%BWARNING%b: untrusted versions of the following packages will be "
-"installed!%n%nUntrusted packages could %Bcompromise your system's security%"
-"b.  You should only proceed with the installation if you are certain that "
-"this is what you want to do.%n%n"
+"%BWARNING%b: untrusted versions of the following packages will be installed!%"
+"n%nUntrusted packages could %Bcompromise your system's security%b.  You "
+"should only proceed with the installation if you are certain that this is "
+"what you want to do.%n%n"
 msgstr ""
 
-#: src/ui.cc:800
+#: src/ui.cc:788
+#, fuzzy
+msgid "  %S*%N %s [version %s]%n"
+msgstr "Versiot"
+
+#: src/ui.cc:795
 #, fuzzy
 msgid "Really Continue"
 msgstr "Jatka"
 
-#: src/ui.cc:802
+#: src/ui.cc:797
 msgid "Abort Installation"
 msgstr ""
 
-#: src/ui.cc:863
+#: src/ui.cc:858
 msgid "Preview of package installation"
 msgstr "Pakettien asennuksen esikatselu"
 
-#: src/ui.cc:864
+#: src/ui.cc:859
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Näytä toiminnot, jotka suoritetaan, ja muuta niitä"
 
-#: src/ui.cc:865
+#: src/ui.cc:860
 #, fuzzy
 msgid "Preview"
 msgstr "^Edellinen"
 
-#: src/ui.cc:901
+#: src/ui.cc:896
 #, fuzzy
 msgid "Some packages were broken and have been fixed:"
 msgstr "Jotkut paketit olivat rikki, mutta ovat nyt kunnossa"
 
-#: src/ui.cc:907
+#: src/ui.cc:902
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:913
-#, c-format
+#: src/ui.cc:908
+#, fuzzy, c-format
 msgid ""
-"Ran out of time while trying to resolver dependencies (press \"%s\" to try "
+"Ran out of time while trying to resolve dependencies (press \"%s\" to try "
 "harder)"
-msgstr ""
+msgstr "Hukkaa aikaa etsimällä miinoja"
 
-#: src/ui.cc:959
+#: src/ui.cc:954
 #, fuzzy
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
@@ -3950,23 +3965,23 @@
 "Pakettien asentaminen ja poisto vaativat ylläpitäjän oikeudet, joita\n"
 "sinulla ei ole.  Haluatko vaihtaa root-tunnukselle?\n"
 
-#: src/ui.cc:962 src/ui.cc:1078
+#: src/ui.cc:957 src/ui.cc:1072
 msgid "Become root"
 msgstr "Vaihda root-tunnukselle"
 
-#: src/ui.cc:964 src/ui.cc:1080
+#: src/ui.cc:959 src/ui.cc:1074
 msgid "Don't become root"
 msgstr "Älä vaihda root-tunnukselle"
 
-#: src/ui.cc:969 src/ui.cc:1085
+#: src/ui.cc:964 src/ui.cc:1079
 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:996
+#: src/ui.cc:991
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "Mitään paketteja ei asenneta, päivitetä tai poisteta."
 
-#: src/ui.cc:1002
+#: src/ui.cc:997
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -3978,7 +3993,7 @@
 "Jotkin paketit olisi mahdollista päivittää.\n"
 "Paina \"U\" päivittääksesi nämä."
 
-#: src/ui.cc:1074
+#: src/ui.cc:1069
 #, fuzzy
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
@@ -3987,113 +4002,113 @@
 "Pakettilistojen päivitys vaatii ylläpitäjän oikeudet, joita sinulla\n"
 "ei ole.  Haluatko vaihtaa root-tunnukselle?\n"
 
-#: src/ui.cc:1090 src/ui.cc:1377
+#: src/ui.cc:1084 src/ui.cc:1371
 msgid "Waste time trying to find mines"
 msgstr "Hukkaa aikaa etsimällä miinoja"
 
-#: src/ui.cc:1097 src/ui.cc:1150
+#: src/ui.cc:1091 src/ui.cc:1144
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "Puhdistusta ei voi tehdä noudon aikana"
 
-#: src/ui.cc:1100
+#: src/ui.cc:1094
 msgid "Deleting downloaded files"
 msgstr "Poistan noudettuja tiedostoja"
 
-#: src/ui.cc:1114
+#: src/ui.cc:1108
 msgid "Downloaded package files have been deleted"
 msgstr "Noudetut pakettitiedostot on poistettu"
 
-#: src/ui.cc:1175
+#: src/ui.cc:1169
 #, fuzzy, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr "Vanhentuneet pakettitiedostot on poistettu"
 
-#: src/ui.cc:1247
+#: src/ui.cc:1241
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1252 src/ui.cc:1283
+#: src/ui.cc:1246 src/ui.cc:1277
 #, fuzzy
 msgid "Ran out of time while trying to find a solution."
 msgstr "Hukkaa aikaa etsimällä miinoja"
 
-#: src/ui.cc:1277
+#: src/ui.cc:1271
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1307
+#: src/ui.cc:1301
 #, fuzzy, c-format
 msgid "Unable to open %s"
 msgstr "En pysty kirjoittamaan tiedostoon %s"
 
-#: src/ui.cc:1313
+#: src/ui.cc:1307
 msgid "Error while dumping resolver state"
 msgstr ""
 
-#: src/ui.cc:1323
+#: src/ui.cc:1317
 msgid "File to which the resolver state should be dumped:"
 msgstr ""
 
-#: src/ui.cc:1353
+#: src/ui.cc:1347
 msgid "^Install/remove packages"
 msgstr "^Asenna/poista paketteja"
 
-#: src/ui.cc:1354
+#: src/ui.cc:1348
 msgid "Perform all pending installs and removals"
 msgstr "Suorita kaikki määritetyt asennukset ja poistot"
 
-#: src/ui.cc:1356
+#: src/ui.cc:1350
 msgid "^Update package list"
 msgstr "^Päivitä pakettilista"
 
-#: src/ui.cc:1357
+#: src/ui.cc:1351
 msgid "Check for new versions of packages"
 msgstr "Päivitä saatavilla olevien pakettien lista"
 
-#: src/ui.cc:1360
+#: src/ui.cc:1354
 msgid "^Forget new packages"
 msgstr "^Unohda uudet paketit"
 
-#: src/ui.cc:1361
+#: src/ui.cc:1355
 msgid "Forget which packages are \"new\""
 msgstr "Tyhjennä uusien pakettien lista"
 
-#: src/ui.cc:1364
+#: src/ui.cc:1358
 msgid "^Clean package cache"
 msgstr "Puhdista ^koko pakettivarasto"
 
-#: src/ui.cc:1365
+#: src/ui.cc:1359
 msgid "Delete package files which were previously downloaded"
 msgstr "Poista aiemmin noudetut pakettitiedostot"
 
-#: src/ui.cc:1368
+#: src/ui.cc:1362
 msgid "Clean ^obsolete files"
 msgstr "Puhdista ^vanhentuneet tiedostot"
 
-#: src/ui.cc:1369
+#: src/ui.cc:1363
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Poista pakettitiedostot, joita ei enää voi noutaa"
 
-#: src/ui.cc:1372
+#: src/ui.cc:1366
 msgid "Mark ^Upgradable"
 msgstr "^Merkitse päivitykset"
 
-#: src/ui.cc:1373
+#: src/ui.cc:1367
 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:1376
+#: src/ui.cc:1370
 msgid "^Play Minesweeper"
 msgstr "Pelaa miina^haravaa"
 
-#: src/ui.cc:1379
+#: src/ui.cc:1373
 msgid "^Become root"
 msgstr "Vaihda ^root-tunnukselle"
 
-#: src/ui.cc:1380
+#: src/ui.cc:1374
 #, fuzzy
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
@@ -4102,78 +4117,78 @@
 "Vaihda root-tunnukselle komennolla 'su'.  Tämä käynnistää ohjelman\n"
 "uudelleen, mutta asetuksesi säilyvät nykyisellään."
 
-#: src/ui.cc:1383
+#: src/ui.cc:1377
 msgid "^Reload package cache"
 msgstr "Lataa ^pakettivarasto uudelleen"
 
-#: src/ui.cc:1384
+#: src/ui.cc:1378
 msgid "Reload the package cache"
 msgstr "Lataa pakettivarasto uudelleen muistiin."
 
-#: src/ui.cc:1390
+#: src/ui.cc:1384
 msgid "^Quit"
 msgstr "^Lopeta"
 
-#: src/ui.cc:1391
+#: src/ui.cc:1385
 msgid "Exit the program"
 msgstr "Poistu ohjelmasta"
 
-#: src/ui.cc:1397 src/ui.cc:1669
+#: src/ui.cc:1391 src/ui.cc:1661
 msgid "Undo"
 msgstr "Peruuta"
 
-#: src/ui.cc:1398
+#: src/ui.cc:1392
 msgid "Undo the last package operation or group of operations"
 msgstr "Peruuta viimeisin suoritettu toimi tai toimiryhmä"
 
-#: src/ui.cc:1405
+#: src/ui.cc:1399
 msgid "^Install"
 msgstr "^Asenna"
 
-#: src/ui.cc:1406
+#: src/ui.cc:1400
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "Merkitse valittu paketti asennettavaksi tai päivitettäväksi"
 
-#: src/ui.cc:1409
+#: src/ui.cc:1403
 msgid "^Remove"
 msgstr "^Poista"
 
-#: src/ui.cc:1410
+#: src/ui.cc:1404
 msgid "Flag the currently selected package for removal"
 msgstr "Merkitse valittu paketti poistettavaksi"
 
-#: src/ui.cc:1413
+#: src/ui.cc:1407
 msgid "^Purge"
 msgstr "^Siivoa"
 
-#: src/ui.cc:1414
+#: src/ui.cc:1408
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr "Merkitse valittu paketti asetustiedostoineen poistettavaksi"
 
-#: src/ui.cc:1417
+#: src/ui.cc:1411
 msgid "^Keep"
 msgstr "Pala^uta"
 
-#: src/ui.cc:1418
+#: src/ui.cc:1412
 msgid "Cancel any action on the selected package"
 msgstr "Peruuta valitulle paketille määritetyt toiminnot"
 
-#: src/ui.cc:1421
+#: src/ui.cc:1415
 msgid "^Hold"
 msgstr "^Jäädytä"
 
-#: src/ui.cc:1422
+#: src/ui.cc:1416
 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:1425
+#: src/ui.cc:1419
 msgid "Mark ^Auto"
 msgstr "^Merkitse Automaatti"
 
-#: src/ui.cc:1426
+#: src/ui.cc:1420
 #, fuzzy
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
@@ -4182,11 +4197,11 @@
 "Merkitse valittu paketti automaattisesti asennetuksi; se poistetaan,\n"
 "jos mikään muu paketti ei riipu siitä"
 
-#: src/ui.cc:1429
+#: src/ui.cc:1423
 msgid "Mark ^Manual"
 msgstr "Merkitse ^Käsin"
 
-#: src/ui.cc:1430
+#: src/ui.cc:1424
 #, fuzzy
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
@@ -4195,11 +4210,11 @@
 "Merkitse valittu paketti käsin asennetuksi; sitä ei poisteta, ellet\n"
 "poista sitä käsin"
 
-#: src/ui.cc:1433
+#: src/ui.cc:1427
 msgid "^Forbid Version"
 msgstr "^Estä versio"
 
-#: src/ui.cc:1434
+#: src/ui.cc:1428
 #, fuzzy
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
@@ -4208,231 +4223,231 @@
 "Estä valitun paketin ehdolla olevan version asennus; paketin uudemmat\n"
 "versiot asennetaan normaalisti"
 
-#: src/ui.cc:1438
+#: src/ui.cc:1432
 msgid "I^nformation"
 msgstr "^Tiedot"
 
-#: src/ui.cc:1439
+#: src/ui.cc:1433
 msgid "Display more information about the selected package"
 msgstr "Näytä lisätietoa valitusta paketista"
 
-#: src/ui.cc:1442
+#: src/ui.cc:1436
 msgid "^Changelog"
 msgstr "Muutos^loki"
 
-#: src/ui.cc:1443
+#: src/ui.cc:1437
 msgid "Display the Debian changelog of the selected package"
 msgstr "Näytä valitun paketin Debian-muutosloki"
 
-#: src/ui.cc:1450
+#: src/ui.cc:1444
 msgid "^Find"
 msgstr "^Etsi"
 
-#: src/ui.cc:1451
+#: src/ui.cc:1445
 msgid "Search for a package"
 msgstr "Etsi pakettia"
 
-#: src/ui.cc:1454
+#: src/ui.cc:1448
 msgid "Find ^Again"
 msgstr "Etsi ^Uudestaan"
 
-#: src/ui.cc:1455
+#: src/ui.cc:1449
 msgid "Repeat the last search"
 msgstr "Toista edellinen haku"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1453
 msgid "^Limit Display"
 msgstr "^Rajoita Näkymä"
 
-#: src/ui.cc:1460
+#: src/ui.cc:1454
 msgid "Apply a filter to the package list"
 msgstr "Rajoita näkyvien pakettien listaa suodattimella"
 
-#: src/ui.cc:1463
+#: src/ui.cc:1457
 msgid "^Un-Limit Display"
 msgstr "^Laajenna Näkymä"
 
-#: src/ui.cc:1464
+#: src/ui.cc:1458
 msgid "Remove the filter from the package list"
 msgstr "Poista pakettilistan suodatin"
 
-#: src/ui.cc:1468
+#: src/ui.cc:1462
 msgid "Find ^Broken"
 msgstr "^Hae rikkinäiset"
 
-#: src/ui.cc:1469
+#: src/ui.cc:1463
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Etsi seuraava paketti, jonka riippuvuudet eivät ole kunnossa"
 
-#: src/ui.cc:1476
+#: src/ui.cc:1470
 msgid "^UI options"
 msgstr "^Käyttöliittymä"
 
-#: src/ui.cc:1477
+#: src/ui.cc:1471
 msgid "Change the settings which affect the user interface"
 msgstr "Muuta käyttöliittymään vaikuttavia asetuksia"
 
-#: src/ui.cc:1480
+#: src/ui.cc:1474
 msgid "^Dependency handling"
 msgstr "^Riippuvuuksien käsittely"
 
-#: src/ui.cc:1481
+#: src/ui.cc:1475
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr "Muuta pakettien riippuvuuksien käsittelyyn vaikuttavia asetuksia"
 
-#: src/ui.cc:1484
+#: src/ui.cc:1478
 msgid "^Miscellaneous"
 msgstr "^Sekalaista"
 
-#: src/ui.cc:1485
+#: src/ui.cc:1479
 msgid "Change miscellaneous program settings"
 msgstr "Muuta sekalaisia asetuksia"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1484
 msgid "^Revert options"
 msgstr "^Palauta oletukset"
 
-#: src/ui.cc:1491
+#: src/ui.cc:1485
 msgid "Reset all settings to the system defaults"
 msgstr "Palauta kaikki asetukset ohjelman oletusasetuksiin"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1496
 msgid "^Next"
 msgstr "^Seuraava"
 
-#: src/ui.cc:1503
+#: src/ui.cc:1497
 msgid "View next display"
 msgstr "Siirry seuraavaan näyttöön"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1500
 msgid "^Prev"
 msgstr "^Edellinen"
 
-#: src/ui.cc:1507
+#: src/ui.cc:1501
 msgid "View previous display"
 msgstr "Siirry edelliseen näyttöön"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1504
 msgid "^Close"
 msgstr "^Lopeta"
 
-#: src/ui.cc:1511
+#: src/ui.cc:1505
 msgid "Close this display"
 msgstr "Sulje tämä näyttö"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1510
 msgid "New Package ^View"
 msgstr "Uusi paketti^näkymä"
 
-#: src/ui.cc:1517
+#: src/ui.cc:1511
 msgid "Create a new default package view"
 msgstr "Luo uusi oletusnäkymä"
 
-#: src/ui.cc:1520
+#: src/ui.cc:1514
 msgid "New Categorical ^Browser"
 msgstr "^Uusi luokkaselain"
 
-#: src/ui.cc:1522
+#: src/ui.cc:1516
 msgid "Browse packages by category"
 msgstr "Selaa paketteja luokittain"
 
-#: src/ui.cc:1530
+#: src/ui.cc:1524
 msgid "^About"
 msgstr "^Tietoja"
 
-#: src/ui.cc:1531
+#: src/ui.cc:1525
 msgid "View information about this program"
 msgstr "Tietoja tästä ohjelmasta"
 
-#: src/ui.cc:1534
+#: src/ui.cc:1528
 msgid "^Help"
 msgstr "^Pika-apu"
 
-#: src/ui.cc:1535
+#: src/ui.cc:1529
 msgid "View the on-line help"
 msgstr "Selaa sisäänrakennettua avustustekstiä"
 
-#: src/ui.cc:1537
+#: src/ui.cc:1531
 msgid "User's ^Manual"
 msgstr "^Käyttöohje"
 
-#: src/ui.cc:1538
+#: src/ui.cc:1532
 msgid "View the detailed program manual"
 msgstr "Näytä ohjelman varsinainen käyttöohje"
 
-#: src/ui.cc:1541
+#: src/ui.cc:1535
 msgid "^FAQ"
 msgstr "^UKK"
 
-#: src/ui.cc:1542
+#: src/ui.cc:1536
 msgid "View a list of frequently asked questions"
 msgstr "Näytä usein kysyttyjä kysymyksiä vastauksineen"
 
-#: src/ui.cc:1545
+#: src/ui.cc:1539
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1546
+#: src/ui.cc:1540
 #, fuzzy
 msgid "View the important changes made in each version of "
 msgstr "Näytä ohjelman eri versioissa tehdyt muutokset"
 
-#: src/ui.cc:1549
+#: src/ui.cc:1543
 msgid "^License"
 msgstr "^Lisenssi"
 
-#: src/ui.cc:1550
+#: src/ui.cc:1544
 msgid "View the terms under which you may copy the program"
 msgstr "Näytä ohjelman kopiointiehdot"
 
-#: src/ui.cc:1668
+#: src/ui.cc:1660
 msgid "Actions"
 msgstr "Toiminnot"
 
-#: src/ui.cc:1671
+#: src/ui.cc:1663
 msgid "Search"
 msgstr "Haku"
 
-#: src/ui.cc:1672
+#: src/ui.cc:1664
 msgid "Options"
 msgstr "Asetukset"
 
-#: src/ui.cc:1673
+#: src/ui.cc:1665
 msgid "Views"
 msgstr "Näkymät"
 
-#: src/ui.cc:1674
+#: src/ui.cc:1666
 msgid "Help"
 msgstr "Apu"
 
-#: src/ui.cc:1734
+#: src/ui.cc:1726
 #, 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:2003 src/vscreen/vscreen.cc:281
+#: src/ui.cc:1996 src/vscreen/vscreen.cc:281
 msgid "yes_key"
 msgstr "kyllä"
 
-#: src/ui.cc:2004 src/vscreen/vscreen.cc:282
+#: src/ui.cc:1997 src/vscreen/vscreen.cc:282
 msgid "no_key"
 msgstr "ei"
 
-#: src/view_changelog.cc:46
+#: src/view_changelog.cc:61
 msgid "You can only view changelogs of official Debian packages."
 msgstr "Vain virallisten Debian-pakettien muutoslokit ovat saatavilla."
 
-#: src/view_changelog.cc:52
+#: src/view_changelog.cc:67
 msgid "Downloading Changelog"
 msgstr "Noudan muutoslokia"
 
-#: src/view_changelog.cc:54
+#: src/view_changelog.cc:69
 #, fuzzy
 msgid "Download Changelog"
 msgstr "Noudan muutoslokia"
 
-#: src/view_changelog.cc:63
+#: src/view_changelog.cc:78
 #, c-format
 msgid "%s changes"
 msgstr ""
@@ -4530,18 +4545,190 @@
 #~ "%s"
 #~ msgstr "Aseta asemaan \"%s\" levyke nimeltä \"%s\""
 
+#~ msgid "Need exactly two colors in color definition \"%s\""
+#~ msgstr "Värimäärittelyyn \"%s\" tarvitaan täsmälleen kaksi väriä"
+
+#~ msgid "Can't parse foreground \"%s\"of color \"%s\""
+#~ msgstr "En ymmärrä edustaa \"%s\" värille \"%s\""
+
+#~ msgid "Can't parse background \"%s\" of color \"%s\""
+#~ msgstr "En ymmärrä taustaa \"%s\" värille \"%s\""
+
 #~ msgid "Invalid option for interactive mode: -s\n"
 #~ msgstr "Sopimaton valitsin vuorovaikutteiseen tilaan: -s\n"
 
+#~ 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."
+#~ msgstr ""
+#~ "Faksimodeemien ja muiden tiedonsiirtolaitteiden tarvitsemat ohjelmat\n"
+#~ " Comm-ryhmän paketit soveltuvat modeemien ja muiden "
+#~ "tiedonsiirtolaitteiden hallintaan.  Tämä käsittää faksimodeemien "
+#~ "hallintaohjelmistot (esimerkiksi PPP:n käyttö Internet-yhteyteen "
+#~ "puhelinlinjan välityksellä) sekä myös matkapuhelinten hallintaohjelmia, "
+#~ "FidoNet-liittymän ja BBS-ohjelmistoja."
+
+#~ 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"
+#~ " .\n"
+#~ " For more information about what Debian considers to be Free Software, "
+#~ "see http://www.debian.org/social_contract#guidelines"
+#~ msgstr ""
+#~ "Epävapaat ohjelmat\n"
+#~ " Non-free-ryhmän paketit eivät kuulu Debianiin.\n"
+#~ " .\n"
+#~ " Nämä ohjelmat eivät täytä Debianin vapaaohjelmistoille asettamia "
+#~ "ehtoja.  Näiden ohjelmien käyttö vaatii kunkin ohjelman lisenssin "
+#~ "lukemisen sen varmistamiseksi, että ohjelman käyttö aiotulla tavalla on "
+#~ "sallittua.\n"
+#~ " .\n"
+#~ " Saadaksesi lisätietoa, miten Debian ratkaisee ohjelmien vapauden, katso "
+#~ "http://www.debian.org/social_contract#guidelines"
+
+#~ 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)"
+#~ msgstr ""
+#~ "Uudet paketit\n"
+#~ " Nämä paketit on lisätty Debianiin sen jälkeen kun viimeksi tyhjensit "
+#~ "uusien pakettien listan.  Valitse \"Unohda uudet paketit\" Toiminnot-"
+#~ "valikosta tyhjentääksesi tämän listan."
+
+#~ msgid ""
+#~ "%s is an essential package!\n"
+#~ "\n"
+#~ "Are you sure you want to remove it?\n"
+#~ "Type '%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."
+
+#~ msgid "Available versions of "
+#~ msgstr "Saatavilla olevat versiot paketista "
+
+#~ 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."
+#~ 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."
+
 #~ msgid "Information about "
 #~ msgstr "Tiedot paketista "
 
+#~ msgid ""
+#~ "Aptitude %s\n"
+#~ "\n"
+#~ "Copyright 2000 Daniel Burrows.\n"
+#~ "\n"
+#~ "aptitude comes with ABSOLUTELY NO WARRANTY; for details see 'license' in "
+#~ "the\n"
+#~ "Help menu.  This is free software, and you are welcome to redistribute "
+#~ "it\n"
+#~ "under certain conditions; see 'license' for details."
+#~ msgstr ""
+#~ "Aptitude %s\n"
+#~ "\n"
+#~ "Tehnyt Daniel Burrows vuonna 2000.\n"
+#~ "\n"
+#~ "Aptitudella EI OLE TAKUUTA; yksityiskohdat näet valitsemalla 'lisenssi'\n"
+#~ "Avustus-valikosta.  Tämä on vapaa ohjelma, joten saat vapaasti levittää\n"
+#~ "sitä tietyin rajoituksin; 'lisenssi' antaa tarkemmat tiedot (englanniksi)."
+
+#~ msgid "Some packages were broken and have been fixed"
+#~ msgstr "Jotkut paketit olivat rikki, mutta ovat nyt kunnossa"
+
 #~ msgid "Some broken packages could not be fixed!"
 #~ msgstr "Joitain rikkinäisiä paketteja ei pystynyt korjaamaan!"
 
+#~ msgid "Some packages are broken.  Try to fix them?"
+#~ msgstr "Jotkut paketit ovat rikki.  Yritänkö korjata ne?"
+
+#~ msgid ""
+#~ "Installing/removing packages requires administrative privileges, which\n"
+#~ "you currently do not have.  Would you like to change to the root "
+#~ "account?\n"
+#~ msgstr ""
+#~ "Pakettien asentaminen ja poisto vaativat ylläpitäjän oikeudet, joita\n"
+#~ "sinulla ei ole.  Haluatko vaihtaa root-tunnukselle?\n"
+
+#~ msgid ""
+#~ "No packages will be installed, removed or upgraded.\n"
+#~ "\n"
+#~ "Some packages could be upgraded, but you have not chosen to upgrade "
+#~ "them.\n"
+#~ "Type \"U\" to prepare an upgrade."
+#~ msgstr ""
+#~ "Mitään paketteja ei asenneta, poisteta tai päivitetä.\n"
+#~ "\n"
+#~ "Jotkin paketit olisi mahdollista päivittää.\n"
+#~ "Paina \"U\" päivittääksesi nämä."
+
+#~ 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"
+#~ msgstr ""
+#~ "Pakettilistojen päivitys vaatii ylläpitäjän oikeudet, joita sinulla\n"
+#~ "ei ole.  Haluatko vaihtaa root-tunnukselle?\n"
+
+#~ msgid "Obsolete downloaded package files have been deleted"
+#~ msgstr "Vanhentuneet pakettitiedostot on poistettu"
+
+#~ msgid ""
+#~ "Run 'su' to become root; this will restart the program, but your\n"
+#~ "settings will be preserved"
+#~ msgstr ""
+#~ "Vaihda root-tunnukselle komennolla 'su'.  Tämä käynnistää ohjelman\n"
+#~ "uudelleen, mutta asetuksesi säilyvät nykyisellään."
+
+#~ msgid ""
+#~ "Mark the selected package as having been automatically installed;\n"
+#~ "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ä"
+
+#~ msgid ""
+#~ "Mark the selected package as having been manually installed;\n"
+#~ "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"
+
+#~ msgid ""
+#~ "Forbid the candidate version of the selected package from being "
+#~ "installed;\n"
+#~ "newer versions of the package will be installed as usual"
+#~ msgstr ""
+#~ "Estä valitun paketin ehdolla olevan version asennus; paketin uudemmat\n"
+#~ "versiot asennetaan normaalisti"
+
 #~ msgid "^ChangeLog"
 #~ msgstr "^Muutosloki"
 
+#~ msgid "View the important changes made in each version of the program"
+#~ msgstr "Näytä ohjelman eri versioissa tehdyt muutokset"
+
 #~ msgid "Go away, I'm trying to think.\n"
 #~ msgstr "Mene pois, yritän ajatella.\n"
 
@@ -4707,6 +4894,9 @@
 #~ msgid "Installed Packages"
 #~ msgstr "Asennetut paketit"
 
+#~ msgid "Not Installed Packages"
+#~ msgstr "Asentamattomat paketit"
+
 #~ msgid "Obsolete and Locally Created Packages"
 #~ msgstr "Vanhentuneet ja itsetehdyt paketit"
 

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	Sun Jun 12 21:04:47 2005
@@ -10,9 +10,9 @@
 msgstr ""
 "Project-Id-Version: aptitude 0.2.14.1\n"
 "Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-05-01 14:08-0400\n"
+"POT-Creation-Date: 2005-06-12 22:42+0200\n"
 "PO-Revision-Date: 2005-05-25 20:42+0200\n"
-"Last-Translator: Christian Perrier <bubulle at debian.org>\n"
+"Last-Translator: Jean-Luc Coulon <jean-luc.coulon at wanadoo.fr>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
@@ -152,14 +152,14 @@
 msgid "Automatically remove unused packages matching this filter"
 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:219 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
-#: src/vscreen/vs_util.cc:328
+#: src/apt_options.cc:240 src/mine/cmine.cc:249 src/mine/cmine.cc:312
+#: src/ui.cc:215 src/vscreen/vs_util.cc:77 src/vscreen/vs_util.cc:90
+#: src/vscreen/vs_util.cc:264 src/vscreen/vs_util.cc:298
 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:328
+#: src/apt_options.cc:241 src/download_list.cc:69 src/mine/cmine.cc:250
+#: src/mine/cmine.cc:313 src/vscreen/vs_util.cc:298
 msgid "Cancel"
 msgstr "Abandon"
 
@@ -240,15 +240,15 @@
 msgid "%s: Previous"
 msgstr ""
 
-#: src/broken_indicator.cc:233
+#: src/broken_indicator.cc:232
 #, c-format
-msgid "%CSolution search failed.  %s: try harder"
+msgid "Solution search failed.  %s: try harder"
 msgstr ""
 
-#: src/broken_indicator.cc:239
-#, c-format
-msgid "%CUnable to resolve dependencies."
-msgstr ""
+#: src/broken_indicator.cc:237
+#, fuzzy
+msgid "Unable to resolve dependencies."
+msgstr "Impossible d'ouvrir %s en écriture"
 
 #: src/cmdline/cmdline_action.cc:36
 #, c-format
@@ -641,13 +641,13 @@
 "que c'est bien votre intention.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
-#: src/vscreen/vs_util.cc:212
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:165
+#: src/vscreen/vs_util.cc:202
 msgid "Yes"
 msgstr "Oui"
 
-#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
-#: src/vscreen/vs_util.cc:212
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:165
+#: src/vscreen/vs_util.cc:202
 msgid "No"
 msgstr "Non"
 
@@ -966,7 +966,7 @@
 msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:212
+#: src/cmdline/cmdline_resolver.cc:212 src/cmdline/cmdline_resolver.cc:285
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
@@ -1025,196 +1025,201 @@
 msgid "The following packages have unmet dependencies:\n"
 msgstr "Les paquets suivants ont des dépendances non satisfaites :\n"
 
-#: src/cmdline/cmdline_show.cc:133
+#: src/cmdline/cmdline_show.cc:119 src/cmdline/cmdline_show.cc:305
+#: src/solution_fragment.cc:65
+msgid "<NULL>"
+msgstr ""
+
+#: src/cmdline/cmdline_show.cc:138
 msgid "not installed"
 msgstr "non installé"
 
-#: src/cmdline/cmdline_show.cc:135 src/pkg_columnizer.cc:231
+#: src/cmdline/cmdline_show.cc:140 src/pkg_columnizer.cc:231
 #: src/pkg_ver_item.cc:225
 msgid "unpacked"
 msgstr "dépaqueté"
 
-#: src/cmdline/cmdline_show.cc:137
+#: src/cmdline/cmdline_show.cc:142
 msgid "partially configured"
 msgstr "partiellement configuré"
 
-#: src/cmdline/cmdline_show.cc:139
+#: src/cmdline/cmdline_show.cc:144
 msgid "partially installed"
 msgstr "partiellement installé"
 
-#: src/cmdline/cmdline_show.cc:141
+#: src/cmdline/cmdline_show.cc:146
 msgid "not installed (configuration files remain)"
 msgstr "non installé (restent les fichiers de configuration)"
 
-#: src/cmdline/cmdline_show.cc:143 src/pkg_columnizer.cc:239
+#: src/cmdline/cmdline_show.cc:148 src/pkg_columnizer.cc:239
 #: src/pkg_ver_item.cc:233
 msgid "installed"
 msgstr "installé"
 
-#: src/cmdline/cmdline_show.cc:152
+#: src/cmdline/cmdline_show.cc:157
 msgid "not a real package"
 msgstr "n'est pas un paquet réel"
 
-#: src/cmdline/cmdline_show.cc:165
+#: src/cmdline/cmdline_show.cc:170
 msgid " [held]"
 msgstr " [gardé]"
 
-#: src/cmdline/cmdline_show.cc:174
+#: src/cmdline/cmdline_show.cc:179
 #, c-format
 msgid "%s; version %s will be installed"
 msgstr "%s ; la version %s sera installée"
 
-#: src/cmdline/cmdline_show.cc:178
+#: src/cmdline/cmdline_show.cc:183
 #, c-format
 msgid "%s; version %s will be installed automatically"
 msgstr "%s ; la version %s sera installée automatiquement"
 
-#: src/cmdline/cmdline_show.cc:184 src/cmdline/cmdline_show.cc:199
+#: src/cmdline/cmdline_show.cc:189 src/cmdline/cmdline_show.cc:204
 #, c-format
 msgid "%s; will be purged"
 msgstr "%s ; sera purgé"
 
-#: src/cmdline/cmdline_show.cc:197
+#: src/cmdline/cmdline_show.cc:202
 #, c-format
 msgid "%s; will be purged because nothing depends on it"
 msgstr "%s ; sera purgé car rien n'en dépend"
 
-#: src/cmdline/cmdline_show.cc:204
+#: src/cmdline/cmdline_show.cc:209
 #, c-format
 msgid "%s; will be removed because nothing depends on it"
 msgstr "%s ; sera enlevé car rien n'en dépend"
 
-#: src/cmdline/cmdline_show.cc:206
+#: src/cmdline/cmdline_show.cc:211
 #, c-format
 msgid "%s; will be removed"
 msgstr "%s ; sera enlevé"
 
-#: src/cmdline/cmdline_show.cc:220
+#: src/cmdline/cmdline_show.cc:225
 #, c-format
 msgid "%s%s; will be downgraded [%s -> %s]"
 msgstr "%s%s ; sera remis à une version antérieure [%s -> %s]"
 
-#: src/cmdline/cmdline_show.cc:223
+#: src/cmdline/cmdline_show.cc:228
 #, c-format
 msgid "%s%s; will be upgraded [%s -> %s]"
 msgstr "%s%s sera mis à jour [%s -> %s]"
 
-#: src/cmdline/cmdline_show.cc:235 src/cmdline/cmdline_show.cc:256
+#: src/cmdline/cmdline_show.cc:240 src/cmdline/cmdline_show.cc:261
 msgid "Package: "
 msgstr "Paquet : "
 
-#: src/cmdline/cmdline_show.cc:236 src/cmdline/cmdline_show.cc:264
+#: src/cmdline/cmdline_show.cc:241 src/cmdline/cmdline_show.cc:269
 #: src/pkg_columnizer.cc:87
 msgid "State"
 msgstr "État"
 
-#: src/cmdline/cmdline_show.cc:237 src/cmdline/cmdline_show.cc:318
+#: src/cmdline/cmdline_show.cc:242 src/cmdline/cmdline_show.cc:325
 msgid "Provided by"
 msgstr "Fourni par "
 
-#: src/cmdline/cmdline_show.cc:258 src/pkg_info_screen.cc:105
+#: src/cmdline/cmdline_show.cc:263 src/pkg_info_screen.cc:105
 msgid "Essential: "
 msgstr "Essentiel : "
 
-#: src/cmdline/cmdline_show.cc:258 src/cmdline/cmdline_show.cc:262
-#: src/cmdline/cmdline_show.cc:273 src/pkg_info_screen.cc:105
+#: src/cmdline/cmdline_show.cc:263 src/cmdline/cmdline_show.cc:267
+#: src/cmdline/cmdline_show.cc:278 src/pkg_info_screen.cc:105
 msgid "yes"
 msgstr "oui"
 
-#: src/cmdline/cmdline_show.cc:262
+#: src/cmdline/cmdline_show.cc:267
 msgid "New"
 msgstr "Nouveau"
 
-#: src/cmdline/cmdline_show.cc:267
+#: src/cmdline/cmdline_show.cc:272
 msgid "Forbidden version"
 msgstr "Version interdite"
 
-#: src/cmdline/cmdline_show.cc:271
+#: src/cmdline/cmdline_show.cc:276
 msgid "Automatically installed"
 msgstr "Automatiquement installé"
 
-#: src/cmdline/cmdline_show.cc:273
+#: src/cmdline/cmdline_show.cc:278
 msgid "no"
 msgstr "non"
 
-#: src/cmdline/cmdline_show.cc:275
+#: src/cmdline/cmdline_show.cc:280
 msgid "Version: "
 msgstr "Version : "
 
-#: src/cmdline/cmdline_show.cc:276 src/pkg_info_screen.cc:113
+#: src/cmdline/cmdline_show.cc:281 src/pkg_info_screen.cc:113
 msgid "Priority: "
 msgstr "Priorité : "
 
-#: src/cmdline/cmdline_show.cc:277 src/cmdline/cmdline_show.cc:279
-#: src/cmdline/cmdline_show.cc:288
+#: src/cmdline/cmdline_show.cc:282 src/cmdline/cmdline_show.cc:284
+#: src/cmdline/cmdline_show.cc:293
 msgid "N/A"
 msgstr "N/A"
 
-#: src/cmdline/cmdline_show.cc:278 src/pkg_info_screen.cc:114
+#: src/cmdline/cmdline_show.cc:283 src/pkg_info_screen.cc:114
 msgid "Section: "
 msgstr "Section : "
 
-#: src/cmdline/cmdline_show.cc:280 src/pkg_info_screen.cc:115
+#: src/cmdline/cmdline_show.cc:285 src/pkg_info_screen.cc:115
 msgid "Maintainer: "
 msgstr "Responsable : "
 
-#: src/cmdline/cmdline_show.cc:283
+#: src/cmdline/cmdline_show.cc:288
 msgid "Uncompressed Size: "
 msgstr "Taille décompressée : "
 
-#: src/cmdline/cmdline_show.cc:287
+#: src/cmdline/cmdline_show.cc:292
 msgid "Architecture: "
 msgstr "Architecture : "
 
-#: src/cmdline/cmdline_show.cc:289
+#: src/cmdline/cmdline_show.cc:294
 msgid "Compressed Size: "
 msgstr "Taille compressée : "
 
-#: src/cmdline/cmdline_show.cc:291
+#: src/cmdline/cmdline_show.cc:296
 msgid "Filename: "
 msgstr "Nom de fichier : "
 
-#: src/cmdline/cmdline_show.cc:293
+#: src/cmdline/cmdline_show.cc:298
 msgid "MD5sum: "
 msgstr "Somme MD5 : "
 
-#: src/cmdline/cmdline_show.cc:297 src/cmdline/cmdline_show.cc:299
+#: src/cmdline/cmdline_show.cc:302 src/cmdline/cmdline_show.cc:305
 msgid "Archive"
 msgstr "Archive"
 
-#: src/cmdline/cmdline_show.cc:303
+#: src/cmdline/cmdline_show.cc:310
 msgid "Depends"
 msgstr "Dépend"
 
-#: src/cmdline/cmdline_show.cc:305
+#: src/cmdline/cmdline_show.cc:312
 msgid "PreDepends"
 msgstr "Pré-dépend"
 
-#: src/cmdline/cmdline_show.cc:307
+#: src/cmdline/cmdline_show.cc:314
 msgid "Recommends"
 msgstr "Recommande"
 
-#: src/cmdline/cmdline_show.cc:309
+#: src/cmdline/cmdline_show.cc:316
 msgid "Suggests"
 msgstr "Suggère"
 
-#: src/cmdline/cmdline_show.cc:311
+#: src/cmdline/cmdline_show.cc:318
 msgid "Conflicts"
 msgstr "Est en conflit"
 
-#: src/cmdline/cmdline_show.cc:313
+#: src/cmdline/cmdline_show.cc:320
 msgid "Replaces"
 msgstr "Remplace"
 
-#: src/cmdline/cmdline_show.cc:315
+#: src/cmdline/cmdline_show.cc:322
 msgid "Obsoletes"
 msgstr "Rend obsolète"
 
-#: src/cmdline/cmdline_show.cc:317
+#: src/cmdline/cmdline_show.cc:324
 msgid "Provides"
 msgstr "Fournit"
 
-#: src/cmdline/cmdline_show.cc:321 src/pkg_info_screen.cc:97
+#: src/cmdline/cmdline_show.cc:328 src/pkg_info_screen.cc:97
 msgid "Description: "
 msgstr "Description : "
 
@@ -1260,33 +1265,33 @@
 "Vous ne pouvez pas spécifier à la fois une archive et une version pour un "
 "paquet\n"
 
-#: src/dep_item.cc:137
+#: src/dep_item.cc:139
 msgid "UNSATISFIED"
 msgstr "NON SATISFAITE"
 
-#: src/dep_item.cc:137 src/reason_fragment.cc:247
+#: src/dep_item.cc:139 src/reason_fragment.cc:244
 msgid "UNAVAILABLE"
 msgstr "NON DISPONIBLE"
 
-#: src/download_bar.cc:56 src/download_list.cc:263 src/download_screen.cc:57
+#: src/download_bar.cc:56 src/download_list.cc:266 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_bar.cc:77 src/generic/acqprogress.cc:63
+#: src/download_bar.cc:75 src/generic/acqprogress.cc:63
 msgid "Hit "
 msgstr "Atteint "
 
-#: src/download_bar.cc:90
+#: src/download_bar.cc:88
 msgid "Downloading "
 msgstr "Téléchargement "
 
-#: src/download_bar.cc:103
+#: src/download_bar.cc:101
 msgid "Got "
 msgstr "Reçu "
 
-#: src/download_bar.cc:157
+#: src/download_bar.cc:155
 msgid "Downloading..."
 msgstr "Téléchargement..."
 
@@ -1314,7 +1319,7 @@
 msgid "Couldn't clean out list directories"
 msgstr "Impossible de nettoyer l'index des listes"
 
-#: src/download.cc:177 src/ui.cc:1153
+#: src/download.cc:177 src/ui.cc:1147
 msgid "Deleting obsolete downloaded files"
 msgstr "Effacement des fichiers téléchargés périmés"
 
@@ -1454,7 +1459,7 @@
 "Ouille ! Quelque chose ne s'est pas bien passé lors de l'installation des "
 "paquets. Tentative de réparation : "
 
-#: src/download.cc:477 src/pkg_item.cc:432
+#: src/download.cc:477 src/pkg_item.cc:430
 msgid "Press return to continue.\n"
 msgstr "Appuyez sur Entrée pour continuer.\n"
 
@@ -1465,17 +1470,17 @@
 "Impossible de récupérer le verrou système ! (il est possible qu'un autre "
 "processus apt ou dpkg soit en cours)"
 
-#: src/download_item.cc:66 src/download_item.cc:70 src/download_item.cc:100
+#: src/download_item.cc:70 src/download_item.cc:74 src/download_item.cc:104
 #: src/generic/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr " [En cours]"
 
-#: src/download_item.cc:104 src/download_list.cc:283
+#: src/download_item.cc:108 src/download_list.cc:284
 msgid "[Hit]"
 msgstr "[Atteint]"
 
-#: src/download_item.cc:104 src/download_list.cc:303
+#: src/download_item.cc:108 src/download_list.cc:304
 msgid "[Downloaded]"
 msgstr "[Téléchargé]"
 
@@ -1489,34 +1494,34 @@
 msgid "%n%nSome files were not downloaded successfully."
 msgstr ""
 
-#: src/download_list.cc:68
+#: src/download_list.cc:66
 msgid "Continue"
 msgstr "Continuer"
 
-#: src/download_list.cc:175 src/download_screen.cc:203
+#: src/download_list.cc:178 src/download_screen.cc:203
 msgid "Total Progress: "
 msgstr "État d'avancement : "
 
-#: src/download_list.cc:194 src/download_screen.cc:218
+#: src/download_list.cc:197 src/download_screen.cc:218
 #, c-format
 msgid " [ %i%% ] (%sB/s, %s remaining)"
 msgstr " [ %i%% ] (%so/s, il reste %s)"
 
-#: src/download_list.cc:196
+#: src/download_list.cc:199
 #, c-format
 msgid " [ %i%% ] (stalled)"
 msgstr " [ %i%% ] (bloqué)"
 
-#: src/download_list.cc:198
+#: src/download_list.cc:201
 #, c-format
 msgid " [ %i%% ]"
 msgstr " [ %i%% ]"
 
-#: src/download_list.cc:323
+#: src/download_list.cc:324
 msgid "[IGNORED]"
 msgstr "[IGNORÉ]"
 
-#: src/download_list.cc:329
+#: src/download_list.cc:330
 msgid "[ERROR]"
 msgstr "[ERREUR]"
 
@@ -1525,11 +1530,11 @@
 msgid "Downloaded %sB in %ss (%sB/s)."
 msgstr "%so téléchargés en %ss (%so/s)."
 
-#: src/edit_pkg_hier.cc:158
+#: src/edit_pkg_hier.cc:176
 msgid "No hierarchy information to edit"
 msgstr "Aucune information de hiérarchie à éditer"
 
-#: src/edit_pkg_hier.cc:258
+#: src/edit_pkg_hier.cc:276
 msgid "Couldn't open for writing"
 msgstr "Ouverture impossible en écriture"
 
@@ -1634,39 +1639,39 @@
 "Attention : le fichier cache ne peut être verrouillé.\n"
 "   Ouverture du fichier en lecture seule."
 
-#: src/generic/matchers.cc:797
+#: src/generic/matchers.cc:798
 msgid "Unmatched '('"
 msgstr "« ( » non équilibrée"
 
-#: src/generic/matchers.cc:887 src/generic/matchers.cc:968
+#: src/generic/matchers.cc:888 src/generic/matchers.cc:969
 #, c-format
 msgid "Unknown dependency type: %s"
 msgstr "Type de dépendance inconnu : %s"
 
-#: src/generic/matchers.cc:950
+#: src/generic/matchers.cc:951
 #, c-format
 msgid "Unknown action type: %s"
 msgstr "Type d'action inconnu : %s"
 
-#: src/generic/matchers.cc:1017
+#: src/generic/matchers.cc:1018
 #, c-format
 msgid "Unknown priority %s"
 msgstr "Priorité %s inconnue"
 
-#: src/generic/matchers.cc:1039
+#: src/generic/matchers.cc:1040
 #, c-format
 msgid "Unknown pattern type: %c"
 msgstr "Type de modèle inconnu : %c"
 
-#: src/generic/matchers.cc:1084
+#: src/generic/matchers.cc:1105
 msgid "Unexpected empty expression"
 msgstr "Expression vide"
 
-#: src/generic/matchers.cc:1119
+#: src/generic/matchers.cc:1143
 msgid "Badly formed expression"
 msgstr "Expression mal formulée"
 
-#: src/generic/matchers.cc:1148
+#: src/generic/matchers.cc:1175
 msgid "Unexpected ')'"
 msgstr "« ) » mal placée"
 
@@ -1692,7 +1697,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:61
+#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:76
 #, c-format
 msgid "ChangeLog of %s"
 msgstr "Liste des modifications de %s"
@@ -1739,41 +1744,39 @@
 msgid "Reading task descriptions"
 msgstr "Lecture des descriptions de tâches"
 
-#: src/load_config.cc:30
-#, c-format
-msgid "Invalid entry in color definition group: \"%s\""
+#: src/load_config.cc:42
+#, fuzzy, c-format
+msgid "Unrecognized color name \"%s\""
+msgstr "Tâches inconnues"
+
+#: src/load_config.cc:69
+#, fuzzy, c-format
+msgid "Unrecognized attribute name \"%s\""
+msgstr "Tâches inconnues"
+
+#: src/load_config.cc:106
+#, fuzzy, c-format
+msgid "Invalid entry in style definition group: \"%s\""
 msgstr "Entrée invalide dans le groupe de définition des couleurs : « %s »"
 
-#: src/load_config.cc:32
-#, c-format
-msgid "Invalid tagless entry in color definition group: \"%s\""
+#: src/load_config.cc:108
+#, fuzzy, c-format
+msgid "Invalid tagless entry in style definition group: \"%s\""
 msgstr ""
 "Entrée sans marqueur invalide dans la définition des couleurs du groupe : « %"
 "s »"
 
-#: src/load_config.cc:34
-#, c-format
-msgid "Need exactly two colors in color definition \"%s\""
-msgstr ""
-"Exactement deux couleurs sont nécessaires dans la définition des couleurs « %"
-"s »"
-
-#: src/load_config.cc:50
-#, c-format
-msgid "Can't parse foreground \"%s\"of color \"%s\""
-msgstr "Couleur d'écriture « %s » incompréhensible pour la couleur « %s »"
-
-#: src/load_config.cc:53
-#, c-format
-msgid "Can't parse background \"%s\" of color \"%s\""
-msgstr "Couleur du fond d'écran « %s » incompréhensible pour la couleur « %s »"
+#: src/load_config.cc:130
+#, fuzzy, c-format
+msgid "Unknown style attribute %s"
+msgstr "Type d'action inconnu : %s"
 
-#: src/load_config.cc:72 src/load_config.cc:74
+#: src/load_config.cc:153 src/load_config.cc:155
 #, c-format
 msgid "Invalid entry in keybinding group: \"%s\""
 msgstr "Entrée invalide dans le groupe de raccourci clavier : « %s »"
 
-#: src/load_config.cc:89
+#: src/load_config.cc:170
 #, c-format
 msgid "Ignoring invalid keybinding \"%s\" -> \"%s\""
 msgstr "Raccourci clavier invalide « %s » -> « %s » ignoré"
@@ -2215,44 +2218,44 @@
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                 Cet aptitude n'a pas de « Super Cow Powers ».\n"
 
-#: src/main.cc:255
+#: src/main.cc:252
 #, 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:301 src/main.cc:310
+#: src/main.cc:291 src/main.cc:300
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr "BIZARRERIE : un code d'option inconnu a été reçu\n"
 
-#: src/main.cc:319
+#: src/main.cc:309
 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:327
+#: src/main.cc:317
 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:348
+#: src/main.cc:338
 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:405
+#: src/main.cc:395
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr "Commande inconnue « %s »\n"
 
-#: src/main.cc:412 src/main.cc:469
+#: src/main.cc:402 src/main.cc:450
 msgid "Internal error: uncaught 'out of solutions' exception.\n"
 msgstr ""
 
-#: src/main.cc:417 src/main.cc:474
+#: src/main.cc:407 src/main.cc:455
 msgid "Internal error: uncaught 'out of time' exception.\n"
 msgstr ""
 
-#: src/main.cc:424
+#: src/main.cc:414
 #, c-format
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
@@ -2283,7 +2286,7 @@
 msgid "Lost"
 msgstr "perdu"
 
-#: src/mine/cmine.cc:119 src/ui.cc:1090
+#: src/mine/cmine.cc:119 src/ui.cc:1084
 msgid "Minesweeper"
 msgstr "Démineur"
 
@@ -2309,99 +2312,99 @@
 msgid "The number of mines must be a number"
 msgstr "Le nombre de mines doit être un nombre"
 
-#: src/mine/cmine.cc:240
+#: src/mine/cmine.cc:238
 msgid "Setup custom game"
 msgstr "Paramétrer un jeu personnalisé"
 
-#: src/mine/cmine.cc:243
+#: src/mine/cmine.cc:240
 msgid "Height of board: "
 msgstr "Hauteur du champ : "
 
-#: src/mine/cmine.cc:247
+#: src/mine/cmine.cc:243
 msgid "Width of board: "
 msgstr "Largeur du champ : "
 
-#: src/mine/cmine.cc:251
+#: src/mine/cmine.cc:246
 msgid "Number of mines: "
 msgstr "Nombre de mines : "
 
-#: src/mine/cmine.cc:316
+#: src/mine/cmine.cc:305
 msgid "Choose difficulty level"
 msgstr "Choisir le niveau de difficulté"
 
-#: src/mine/cmine.cc:318
+#: src/mine/cmine.cc:307
 msgid "Easy"
 msgstr "Facile"
 
-#: src/mine/cmine.cc:319
+#: src/mine/cmine.cc:308
 msgid "Medium"
 msgstr "Intermédiaire"
 
-#: src/mine/cmine.cc:320
+#: src/mine/cmine.cc:309
 msgid "Hard"
 msgstr "Difficile"
 
-#: src/mine/cmine.cc:321
+#: src/mine/cmine.cc:310
 msgid "Custom"
 msgstr "Personnalisé"
 
-#: src/mine/cmine.cc:411
+#: src/mine/cmine.cc:392
 msgid "You have won."
 msgstr "Vous avez gagné."
 
-#: src/mine/cmine.cc:414
+#: src/mine/cmine.cc:395
 msgid "You lose!"
 msgstr "Vous avez perdu !"
 
-#: src/mine/cmine.cc:419
+#: src/mine/cmine.cc:400
 msgid "You die...  --More--"
 msgstr "Vous êtes mort... --Recommencer--"
 
-#: src/mine/cmine.cc:432
+#: src/mine/cmine.cc:413
 msgid "The spikes were poisoned!  The poison was deadly..  --More--"
 msgstr ""
 "Les pointes étaient empoisonnées ! Le poison était mortel...--Recommencer--"
 
-#: src/mine/cmine.cc:435
+#: src/mine/cmine.cc:416
 msgid "You land on a set of sharp iron spikes!  --More--"
 msgstr ""
 "Vous avez atterri sur une zone de piques métalliques pointues ! --"
 "Recommencer--"
 
-#: src/mine/cmine.cc:438
+#: src/mine/cmine.cc:419
 msgid "You fall into a pit!  --More--"
 msgstr "Vous êtes tombé dans un puits ! --Recommencer--"
 
-#: src/mine/cmine.cc:441
+#: src/mine/cmine.cc:422
 msgid "KABOOM!  You step on a land mine.  --More--"
 msgstr "Badaboum ! Vous avez marché sur une mine. --Recommencer--"
 
-#: src/mine/cmine.cc:446
+#: src/mine/cmine.cc:427
 msgid "The dart was poisoned!  The poison was deadly...  --More--"
 msgstr ""
 "La pointe était empoisonnée ! Le poison était mortel... --Recommencer--"
 
-#: src/mine/cmine.cc:448
+#: src/mine/cmine.cc:429
 msgid ""
 "A little dart shoots out at you!  You are hit by a little dart!  --More--"
 msgstr ""
 "On vous a lancé une fléchette ! Vous avez été touché par une flé\tchette ! --"
 "Recommencer--"
 
-#: src/mine/cmine.cc:452
+#: src/mine/cmine.cc:433
 msgid "You turn to stone... --More--"
 msgstr "Vous vous êtes changé en roc... --Recommencer--"
 
-#: src/mine/cmine.cc:454
+#: src/mine/cmine.cc:435
 msgid "Touching the cockatrice corpse was a fatal mistake.  --More--"
 msgstr ""
 "Toucher le cadavre du cockatrice était une erreur fatale. --Recommencer--"
 
-#: src/mine/cmine.cc:456
+#: src/mine/cmine.cc:437
 msgid "You feel here a cockatrice corpse.  --More--"
 msgstr "Vous avez senti ici le cadavre d'un cockatrice. --Recommencer--"
 
-#: src/mine/cmine.cc:460
+#: src/mine/cmine.cc:441
 msgid ""
 "Click!  You trigger a rolling boulder trap!  You are hit by a boulder! --"
 "More--"
@@ -2409,57 +2412,57 @@
 "Clic ! Vous avez déclenché un piège à rocher roulant ! Vous avez été touché "
 "par un rocher ! --Recommencer--"
 
-#: src/mine/cmine.cc:470
+#: src/mine/cmine.cc:451
 msgid "sleep"
 msgstr "sommeil"
 
-#: src/mine/cmine.cc:473
+#: src/mine/cmine.cc:454
 msgid "striking"
 msgstr "combat"
 
-#: src/mine/cmine.cc:476
+#: src/mine/cmine.cc:457
 msgid "death"
 msgstr "mort"
 
-#: src/mine/cmine.cc:479
+#: src/mine/cmine.cc:460
 msgid "polymorph"
 msgstr "polymorphe"
 
-#: src/mine/cmine.cc:482
+#: src/mine/cmine.cc:463
 msgid "magic missile"
 msgstr "missile magique"
 
-#: src/mine/cmine.cc:485
+#: src/mine/cmine.cc:466
 msgid "secret door detection"
 msgstr "détection de porte secrète"
 
-#: src/mine/cmine.cc:488
+#: src/mine/cmine.cc:469
 msgid "invisibility"
 msgstr "invisibilité"
 
-#: src/mine/cmine.cc:491
+#: src/mine/cmine.cc:472
 msgid "cold"
 msgstr "froid"
 
-#: src/mine/cmine.cc:497
+#: src/mine/cmine.cc:478
 #, c-format
 msgid "Your wand of %s breaks apart and explodes!  --More--"
 msgstr ""
 "Votre baguette magique de %s s'est brisée et a explosé ! --Recommencer--"
 
-#: src/mine/cmine.cc:503
+#: src/mine/cmine.cc:484
 msgid "You are jolted by a surge of electricity!  --More--"
 msgstr "Vous avez été secoué par une décharge électrique ! --Recommencer--"
 
-#: src/mine/cmine.cc:607
+#: src/mine/cmine.cc:588
 msgid "Enter the filename to load: "
 msgstr "Entrez le nom du fichier à charger : "
 
-#: src/mine/cmine.cc:614
+#: src/mine/cmine.cc:595
 msgid "Enter the filename to save: "
 msgstr "Entrer le nom du fichier à enregistrer : "
 
-#: src/mine/cmine.cc:624
+#: src/mine/cmine.cc:605
 msgid "mine-help.txt"
 msgstr "mine-help-fr.txt"
 
@@ -2467,7 +2470,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:1670
+#: src/pkg_columnizer.cc:84 src/ui.cc:1662
 msgid "Package"
 msgstr "Paquet"
 
@@ -3565,52 +3568,52 @@
 "Êtes-vous sûr de vouloir le supprimer ?\n"
 "Dans ce cas, entrez « %s »."
 
-#: src/pkg_item.cc:222 src/pkg_ver_item.cc:625
+#: src/pkg_item.cc:220 src/pkg_ver_item.cc:626
 #, c-format
 msgid "Information about %s"
 msgstr "Informations à propos de %s"
 
-#: src/pkg_item.cc:224 src/pkg_ver_item.cc:627
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:628
 #, c-format
 msgid "%s info"
 msgstr ""
 
-#: src/pkg_item.cc:310
+#: src/pkg_item.cc:308
 #, fuzzy, c-format
 msgid "Available versions of %s"
 msgstr "Versions disponibles de "
 
-#: src/pkg_item.cc:313
+#: src/pkg_item.cc:311
 #, fuzzy, c-format
 msgid "%s versions"
 msgstr "Versions"
 
-#: src/pkg_item.cc:325 src/pkg_ver_item.cc:655
+#: src/pkg_item.cc:323 src/pkg_ver_item.cc:656
 #, c-format
 msgid "Dependencies of %s"
 msgstr "Dépendances de %s"
 
-#: src/pkg_item.cc:327 src/pkg_ver_item.cc:657
+#: src/pkg_item.cc:325 src/pkg_ver_item.cc:658
 #, c-format
 msgid "%s deps"
 msgstr ""
 
-#: src/pkg_item.cc:338 src/pkg_ver_item.cc:667
+#: src/pkg_item.cc:336 src/pkg_ver_item.cc:668
 #, c-format
 msgid "Packages depending on %s"
 msgstr "Paquets dépendants de %s"
 
-#: src/pkg_item.cc:340 src/pkg_ver_item.cc:669
+#: src/pkg_item.cc:338 src/pkg_ver_item.cc:670
 #, c-format
 msgid "%s reverse deps"
 msgstr ""
 
-#: src/pkg_item.cc:392 src/pkg_ver_item.cc:707
+#: src/pkg_item.cc:390 src/pkg_ver_item.cc:708
 #, c-format
 msgid "Reporting a bug in %s:\n"
 msgstr "Rapporter un bogue dans %s :\n"
 
-#: src/pkg_item.cc:414
+#: src/pkg_item.cc:412
 #, fuzzy
 msgid ""
 "You are not root and I cannot find any way to become root.  To reconfigure "
@@ -3622,16 +3625,16 @@
 "installer le paquet menu et le paquet login,\n"
 "ou lancer aptitude en tant qu'administrateur."
 
-#: src/pkg_item.cc:422
+#: src/pkg_item.cc:420
 #, c-format
 msgid "Reconfiguring %s\n"
 msgstr "Reconfiguration %s\n"
 
-#: src/pkg_item.cc:447
+#: src/pkg_item.cc:445
 msgid "Hierarchy editor"
 msgstr "Éditeur de hiérarchie"
 
-#: src/pkg_item.cc:447
+#: src/pkg_item.cc:445
 #, fuzzy
 msgid "Hierarchy Editor"
 msgstr "Éditeur de hiérarchie"
@@ -3666,23 +3669,23 @@
 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_view.cc:344
+#: src/pkg_view.cc:359
 msgid "make_package_view: error in arguments -- two main widgets??"
 msgstr ""
 "make_package_view : erreur dans les arguments -- deux widgets principaux ? "
 
-#: src/pkg_view.cc:350
+#: src/pkg_view.cc:365
 msgid ""
 "make_package_view: error in arguments -- bad column list for static item"
 msgstr ""
 "make_package_view : erreur dans les arguments -- liste « column » incorrecte "
 "pour une entrée statique"
 
-#: src/pkg_view.cc:443
+#: src/pkg_view.cc:458
 msgid "make_package_view: bad argument!"
 msgstr "make_package_view : argument incorrect ! "
 
-#: src/pkg_view.cc:495
+#: src/pkg_view.cc:510
 msgid "make_package_view: no main widget found"
 msgstr "make_package_view : le widget principal n'a pas été trouvé"
 
@@ -3719,12 +3722,12 @@
 msgid " (provided by %F)"
 msgstr "(fourni par %F)"
 
-#: src/reason_fragment.cc:278
+#: src/reason_fragment.cc:275
 #, c-format
 msgid "%F%s %F %F"
 msgstr "%F %s %F %F"
 
-#: src/reason_fragment.cc:327
+#: src/reason_fragment.cc:324
 msgid ""
 "If you select a package, an explanation of its current state will appear in "
 "this space."
@@ -3732,7 +3735,7 @@
 "Si vous sélectionnez un paquet, une explication de son état courant "
 "apparaîtra à cet endroit."
 
-#: src/reason_fragment.cc:361
+#: src/reason_fragment.cc:358
 msgid ""
 "%B%s%b was installed automatically;  it is being removed because all of the "
 "packages which depend upon it are being removed:"
@@ -3740,19 +3743,19 @@
 "%B%s%b a été installé automatiquement ; il va être enlevé parce que tous les "
 "paquets qui en dépendent vont être supprimés : "
 
-#: src/reason_fragment.cc:365
+#: src/reason_fragment.cc:362
 msgid "%B%s%b will be automatically removed because of dependency errors:"
 msgstr ""
 "%B%s%b sera automatiquement enlevé en raison d'erreurs de dépendances : "
 
-#: src/reason_fragment.cc:369
+#: src/reason_fragment.cc:366
 msgid ""
 "%B%s%b will be automatically installed to satisfy the following dependencies:"
 msgstr ""
 "%B%s%b sera automatiquement installé pour satisfaire les dépendances "
 "suivantes : "
 
-#: src/reason_fragment.cc:375 src/reason_fragment.cc:387
+#: src/reason_fragment.cc:372 src/reason_fragment.cc:384
 msgid ""
 "%B%s%b cannot be upgraded now, but if it could be, it would still be held at "
 "version %B%s%b."
@@ -3760,7 +3763,7 @@
 "%B%s%b ne peut pas être mis à jour maintenant, mais s'il le pouvait, il "
 "serait cependant maintenu à la version %B%s%b."
 
-#: src/reason_fragment.cc:378
+#: src/reason_fragment.cc:375
 msgid ""
 "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the "
 "following dependencies:"
@@ -3768,27 +3771,27 @@
 "%B%s%b ne sera pas mis à jour vers la version %B%s%b pour éviter de casser "
 "les dépendances suivantes : "
 
-#: src/reason_fragment.cc:390
+#: src/reason_fragment.cc:387
 msgid "%B%s%b is currently installed."
 msgstr "%B%s%b est actuellement installé."
 
-#: src/reason_fragment.cc:396
+#: src/reason_fragment.cc:393
 msgid "%B%s%b is not currently installed."
 msgstr "%B%s%b n'est pas actuellement installé."
 
-#: src/reason_fragment.cc:404
+#: src/reason_fragment.cc:401
 msgid "Some dependencies of %B%s%b are not satisfied:"
 msgstr "Certaines dépendances de %B%s%b ne sont pas satisfaites."
 
-#: src/reason_fragment.cc:408
+#: src/reason_fragment.cc:405
 msgid "%B%s%b will be downgraded."
 msgstr "%B%s%b sera réinstallé avec une version antérieure."
 
-#: src/reason_fragment.cc:415
+#: src/reason_fragment.cc:412
 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b."
 msgstr "%B%s%b ne sera pas mis à jour depuis la version interdite %B%s%b."
 
-#: src/reason_fragment.cc:419
+#: src/reason_fragment.cc:416
 msgid ""
 "%B%s%b could be upgraded to version %B%s%b, but it is being held at version %"
 "B%s%b."
@@ -3796,34 +3799,34 @@
 "%B%s%b pourrait être mis à jour vers la version %B%s%b, mais il sera "
 "conservé à la version %B%s%b."
 
-#: src/reason_fragment.cc:426
+#: src/reason_fragment.cc:423
 msgid "%B%s%b will be re-installed."
 msgstr "%B%s%b sera réinstallé."
 
-#: src/reason_fragment.cc:430
+#: src/reason_fragment.cc:427
 msgid "%B%s%b will be installed."
 msgstr "%B%s%b sera installé."
 
-#: src/reason_fragment.cc:434
+#: src/reason_fragment.cc:431
 msgid "%B%s%b will be removed."
 msgstr "%B%s%b sera enlevé."
 
-#: src/reason_fragment.cc:439
+#: src/reason_fragment.cc:436
 msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b."
 msgstr "%B%s%b sera mis à jour de la version %B%s%b vers la version %B%s%b."
 
-#: src/reason_fragment.cc:475
+#: src/reason_fragment.cc:472
 msgid ""
 "The following packages depend on %B%s%b and will be broken by its removal:"
 msgstr ""
 "Les paquets suivants dépendent de %B%s%b et seront cassés par sa "
 "suppression :"
 
-#: src/reason_fragment.cc:478
+#: src/reason_fragment.cc:475
 msgid "The following packages depend on %B%s%b and are broken:"
 msgstr "Les paquets suivants dépendent de %B%s%b et sont cassés :"
 
-#: src/reason_fragment.cc:485
+#: src/reason_fragment.cc:482
 msgid ""
 "The following packages conflict with %B%s%b and will be broken by its "
 "installation:"
@@ -3831,7 +3834,7 @@
 "Les paquets suivants sont en conflit avec %B%s%b et seront cassés par son "
 "installation :"
 
-#: src/reason_fragment.cc:518
+#: src/reason_fragment.cc:515
 msgid ""
 "The following packages depend on a version of %B%s%b other than the "
 "currently installed version of %B%s%b, or conflict with the currently "
@@ -3841,7 +3844,7 @@
 "de %B%s%B actuellement installée ou sont en conflit avec la version "
 "actuellement installée :"
 
-#: src/reason_fragment.cc:522
+#: src/reason_fragment.cc:519
 msgid ""
 "The following packages conflict with %B%s%b, or depend on a version of it "
 "which is not going to be installed."
@@ -3849,11 +3852,11 @@
 "Les paquets suivants sont en conflit avec %B%s%b ou dépendent d'une version "
 "de celui-ci qui n'est pas destinée à être installée."
 
-#: src/reason_fragment.cc:526
+#: src/reason_fragment.cc:523
 msgid "The following packages conflict with %B%s%b:"
 msgstr "Les paquets suivants sont en conflit avec %B%s%b :"
 
-#: src/reason_fragment.cc:531
+#: src/reason_fragment.cc:528
 msgid ""
 "The following packages depend on a version of %B%s%b other than the "
 "currently installed version of %B%s%b:"
@@ -3861,7 +3864,7 @@
 "Les paquets suivants dépendent d'une version de %B%s%b différente de la "
 "version actuellement installée de %B%s%b :"
 
-#: src/reason_fragment.cc:535
+#: src/reason_fragment.cc:532
 msgid ""
 "The following packages depend on a version of %B%s%b which is not going to "
 "be installed."
@@ -3869,15 +3872,15 @@
 "Les paquets suivants dépendent de la version de %B%s%b qui n'est pas sur le "
 "point d'être installée."
 
-#: src/reason_fragment.cc:541
+#: src/reason_fragment.cc:538
 msgid "upgraded"
 msgstr "mis à jour"
 
-#: src/reason_fragment.cc:541
+#: src/reason_fragment.cc:538
 msgid "downgraded"
 msgstr "réinstallés vers une version antérieure"
 
-#: src/reason_fragment.cc:547
+#: src/reason_fragment.cc:544
 msgid ""
 "The following packages depend on the currently installed version of %B%s%b (%"
 "B%s%b), or conflict with the version it will be %s to (%B%s%b), and will be "
@@ -3887,7 +3890,7 @@
 "b (%B%s%b) ou sont en conflit avec la version qui sera %s vers (%B%s%b) et "
 "seront cassés s'il est %s"
 
-#: src/reason_fragment.cc:554
+#: src/reason_fragment.cc:551
 msgid ""
 "The following packages conflict with version %B%s%b of %B%s%b, and will be "
 "broken if it is %s."
@@ -3895,7 +3898,7 @@
 "Les paquets suivants sont en conflit avec la version %B%s%b de %B%s%b et "
 "seront cassés s'il est %s."
 
-#: src/reason_fragment.cc:559
+#: src/reason_fragment.cc:556
 msgid ""
 "The following packages depend on version %B%s%b of %B%s%b, and will be "
 "broken if it is %s."
@@ -3942,31 +3945,36 @@
 msgid "Close"
 msgstr "^Fermer"
 
-#: src/solution_fragment.cc:125
+#: src/solution_fragment.cc:134
 #, fuzzy
 msgid "%BRemove%b the following packages:%n"
 msgstr "Les paquets suivants sont CASSÉS : "
 
-#: src/solution_fragment.cc:135
+#: src/solution_fragment.cc:144
 #, fuzzy
 msgid "%BInstall%b the following packages:%n"
 msgstr "Les paquets suivants sont CASSÉS : "
 
-#: src/solution_fragment.cc:148
+#: src/solution_fragment.cc:157
 msgid "%BKeep%b the following packages at their current version:%n"
 msgstr ""
 
-#: src/solution_fragment.cc:161
+#: src/solution_fragment.cc:164
+#, fuzzy
+msgid "Not Installed"
+msgstr "non installé"
+
+#: src/solution_fragment.cc:177
 #, fuzzy
 msgid "%BUpgrade%b the following packages:%n"
 msgstr "Les paquets suivants sont CASSÉS : "
 
-#: src/solution_fragment.cc:176
+#: src/solution_fragment.cc:192
 #, fuzzy
 msgid "%BDowngrade%b the following packages:%n"
 msgstr "Téléchargement des paquets"
 
-#: src/solution_fragment.cc:190
+#: src/solution_fragment.cc:206
 #, c-format
 msgid "Score is %d"
 msgstr ""
@@ -3997,47 +4005,47 @@
 msgid "W:"
 msgstr ""
 
-#: src/ui.cc:194
+#: src/ui.cc:193
 msgid "Search for:"
 msgstr "Recherche de : "
 
-#: src/ui.cc:262
+#: src/ui.cc:258
 msgid "You already are root!"
 msgstr "Vous êtes déjà root !"
 
-#: src/ui.cc:360
+#: src/ui.cc:356
 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:388
+#: src/ui.cc:384
 msgid "Loading cache"
 msgstr " Chargement du cache "
 
-#: src/ui.cc:410
+#: src/ui.cc:406
 msgid "Really quit Aptitude?"
 msgstr " Voulez-vous vraiment quitter Aptitude ? "
 
-#: src/ui.cc:489
+#: src/ui.cc:485
 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:589 src/ui.cc:591 src/ui.cc:619 src/ui.cc:621
+#: src/ui.cc:585 src/ui.cc:587 src/ui.cc:615 src/ui.cc:617
 msgid "Packages"
 msgstr "Paquets"
 
-#: src/ui.cc:590 src/ui.cc:620
+#: src/ui.cc:586 src/ui.cc:616
 msgid "View available packages and choose actions to perform"
 msgstr "Afficher les paquets disponibles et choisir les actions à effectuer"
 
-#: src/ui.cc:667
+#: src/ui.cc:663
 #, fuzzy
 msgid ""
-"%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
+"Aptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
 "BABSOLUTELY NO WARRANTY%b; for details see 'license' in the Help menu.  This "
 "is free software, and you are welcome to redistribute it under certain "
 "conditions; see 'license' for details."
@@ -4051,65 +4059,71 @@
 "êtes encouragé à le redistribuer sous certaines conditions ; consulter la\n"
 "« licence » pour plus de détails."
 
-#: src/ui.cc:688
+#: src/ui.cc:684
 msgid "help.txt"
 msgstr "help-fr.txt"
 
-#: src/ui.cc:704
+#: src/ui.cc:700
 msgid "README"
 msgstr "README"
 
-#: src/ui.cc:786
-#, fuzzy
+#: src/ui.cc:782
 msgid ""
-"%C%BWARNING%b: untrusted versions of the following packages will be "
-"installed!%n%nUntrusted packages could %Bcompromise your system's security%"
-"b.  You should only proceed with the installation if you are certain that "
-"this is what you want to do.%n%n"
+"%BWARNING%b: untrusted versions of the following packages will be installed!%"
+"n%nUntrusted packages could %Bcompromise your system's security%b.  You "
+"should only proceed with the installation if you are certain that this is "
+"what you want to do.%n%n"
 msgstr ""
 "%BATTENTION%b : des versions non certifiées des paquets qui suivent vont "
 "être installées.%n%nDes paquets non certifiés peuvent %Bcompromettre la "
 "sécurité de votre système%b. Vous ne devez poursuivre leur installation que "
 "si vous êtes certain de ce que vous faites."
 
-#: src/ui.cc:800
+#: src/ui.cc:788
+#, fuzzy
+msgid "  %S*%N %s [version %s]%n"
+msgstr "Versions"
+
+#: src/ui.cc:795
 msgid "Really Continue"
 msgstr "Continuer malgré tout"
 
-#: src/ui.cc:802
+#: src/ui.cc:797
 msgid "Abort Installation"
 msgstr "Abandon de l'installation"
 
-#: src/ui.cc:863
+#: src/ui.cc:858
 msgid "Preview of package installation"
 msgstr "Pré-visualisation de l'installation des paquets"
 
-#: src/ui.cc:864
+#: src/ui.cc:859
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Voir ou modifier les actions qui seront effectuées"
 
-#: src/ui.cc:865
+#: src/ui.cc:860
 #, fuzzy
 msgid "Preview"
 msgstr "^Précédent"
 
-#: src/ui.cc:901
+#: src/ui.cc:896
 #, 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:907
+#: src/ui.cc:902
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:913
-#, c-format
+#: src/ui.cc:908
+#, fuzzy, c-format
 msgid ""
-"Ran out of time while trying to resolver dependencies (press \"%s\" to try "
+"Ran out of time while trying to resolve dependencies (press \"%s\" to try "
 "harder)"
 msgstr ""
+"Passer le temps en essayant de trouver les mines\n"
+"(il y a certainement mieux à faire)"
 
-#: src/ui.cc:959
+#: src/ui.cc:954
 #, fuzzy
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
@@ -4119,25 +4133,25 @@
 "d'administration que vous n'avez pas pour le moment. Voulez-vous\n"
 "utiliser le compte administrateur ?\n"
 
-#: src/ui.cc:962 src/ui.cc:1078
+#: src/ui.cc:957 src/ui.cc:1072
 msgid "Become root"
 msgstr "Devenir administrateur"
 
-#: src/ui.cc:964 src/ui.cc:1080
+#: src/ui.cc:959 src/ui.cc:1074
 msgid "Don't become root"
 msgstr "Ne pas devenir administrateur"
 
-#: src/ui.cc:969 src/ui.cc:1085
+#: src/ui.cc:964 src/ui.cc:1079
 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:996
+#: src/ui.cc:991
 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:1002
+#: src/ui.cc:997
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -4149,7 +4163,7 @@
 "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:1074
+#: src/ui.cc:1069
 #, fuzzy
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
@@ -4159,121 +4173,121 @@
 "que vous n'avez pas pour le moment. Voulez-vous utiliser le compte\n"
 "administrateur ?\n"
 
-#: src/ui.cc:1090 src/ui.cc:1377
+#: src/ui.cc:1084 src/ui.cc:1371
 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:1097 src/ui.cc:1150
+#: src/ui.cc:1091 src/ui.cc:1144
 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:1100
+#: src/ui.cc:1094
 msgid "Deleting downloaded files"
 msgstr "Effacement des fichiers téléchargés"
 
-#: src/ui.cc:1114
+#: src/ui.cc:1108
 msgid "Downloaded package files have been deleted"
 msgstr " Les fichiers téléchargés ont été effacés "
 
-#: src/ui.cc:1175
+#: src/ui.cc:1169
 #, 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:1247
+#: src/ui.cc:1241
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1252 src/ui.cc:1283
+#: src/ui.cc:1246 src/ui.cc:1277
 #, 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:1277
+#: src/ui.cc:1271
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1307
+#: src/ui.cc:1301
 #, fuzzy, c-format
 msgid "Unable to open %s"
 msgstr "Impossible d'ouvrir %s en écriture"
 
-#: src/ui.cc:1313
+#: src/ui.cc:1307
 msgid "Error while dumping resolver state"
 msgstr ""
 
-#: src/ui.cc:1323
+#: src/ui.cc:1317
 msgid "File to which the resolver state should be dumped:"
 msgstr ""
 
-#: src/ui.cc:1353
+#: src/ui.cc:1347
 msgid "^Install/remove packages"
 msgstr "^Installer/enlever des paquets"
 
-#: src/ui.cc:1354
+#: src/ui.cc:1348
 msgid "Perform all pending installs and removals"
 msgstr ""
 "Effectuer toutes les actions d'installation ou de suppression demandées"
 
-#: src/ui.cc:1356
+#: src/ui.cc:1350
 msgid "^Update package list"
 msgstr "^Mettre à jour les listes de paquets"
 
-#: src/ui.cc:1357
+#: src/ui.cc:1351
 msgid "Check for new versions of packages"
 msgstr "Vérifier s'il existe de nouvelles versions des paquets"
 
-#: src/ui.cc:1360
+#: src/ui.cc:1354
 msgid "^Forget new packages"
 msgstr "^Oublier les nouveaux paquets"
 
-#: src/ui.cc:1361
+#: src/ui.cc:1355
 msgid "Forget which packages are \"new\""
 msgstr "Oublier quels paquets sont « nouveaux »"
 
-#: src/ui.cc:1364
+#: src/ui.cc:1358
 msgid "^Clean package cache"
 msgstr "^Nettoyer le cache des paquets"
 
-#: src/ui.cc:1365
+#: src/ui.cc:1359
 msgid "Delete package files which were previously downloaded"
 msgstr "Effacer les fichiers de paquets précédemment téléchargés"
 
-#: src/ui.cc:1368
+#: src/ui.cc:1362
 msgid "Clean ^obsolete files"
 msgstr "Nettoyer les fichiers ^périmés"
 
-#: src/ui.cc:1369
+#: src/ui.cc:1363
 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:1372
+#: src/ui.cc:1366
 msgid "Mark ^Upgradable"
 msgstr "Marquer comme étant susceptible de mise à ^jour"
 
-#: src/ui.cc:1373
+#: src/ui.cc:1367
 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:1376
+#: src/ui.cc:1370
 msgid "^Play Minesweeper"
 msgstr "Jouer au ^démineur"
 
-#: src/ui.cc:1379
+#: src/ui.cc:1373
 msgid "^Become root"
 msgstr "Devenir ^administrateur"
 
-#: src/ui.cc:1380
+#: src/ui.cc:1374
 #, fuzzy
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
@@ -4282,70 +4296,70 @@
 "Utilisez la commande « su » pour devenir administrateur.\n"
 "Cela relancera le programme mais vos préférences seront conservées"
 
-#: src/ui.cc:1383
+#: src/ui.cc:1377
 msgid "^Reload package cache"
 msgstr "^Recharger le cache des paquets"
 
-#: src/ui.cc:1384
+#: src/ui.cc:1378
 msgid "Reload the package cache"
 msgstr "Recharger le cache des paquets"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1384
 msgid "^Quit"
 msgstr "^Quitter"
 
-#: src/ui.cc:1391
+#: src/ui.cc:1385
 msgid "Exit the program"
 msgstr "Quitter le programme"
 
-#: src/ui.cc:1397 src/ui.cc:1669
+#: src/ui.cc:1391 src/ui.cc:1661
 msgid "Undo"
 msgstr "Annuler"
 
-#: src/ui.cc:1398
+#: src/ui.cc:1392
 msgid "Undo the last package operation or group of operations"
 msgstr "Annuler la dernière opération ou groupe d'opérations sur les paquets"
 
-#: src/ui.cc:1405
+#: src/ui.cc:1399
 msgid "^Install"
 msgstr "^Installer"
 
-#: src/ui.cc:1406
+#: src/ui.cc:1400
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "Marquer le paquet sélectionné pour installation ou mise à jour"
 
-#: src/ui.cc:1409
+#: src/ui.cc:1403
 msgid "^Remove"
 msgstr "^Supprimer"
 
-#: src/ui.cc:1410
+#: src/ui.cc:1404
 msgid "Flag the currently selected package for removal"
 msgstr "Marquer le paquet sélectionné pour suppression"
 
-#: src/ui.cc:1413
+#: src/ui.cc:1407
 msgid "^Purge"
 msgstr "^Purger"
 
-#: src/ui.cc:1414
+#: src/ui.cc:1408
 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:1417
+#: src/ui.cc:1411
 msgid "^Keep"
 msgstr "^Garder"
 
-#: src/ui.cc:1418
+#: src/ui.cc:1412
 msgid "Cancel any action on the selected package"
 msgstr "Annuler toute action sur le paquet sélectionné"
 
-#: src/ui.cc:1421
+#: src/ui.cc:1415
 msgid "^Hold"
 msgstr "G^eler"
 
-#: src/ui.cc:1422
+#: src/ui.cc:1416
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -4353,11 +4367,11 @@
 "Annuler toute action sur le paquet sélectionné et refuser toute mise à jour "
 "ultérieure"
 
-#: src/ui.cc:1425
+#: src/ui.cc:1419
 msgid "Mark ^Auto"
 msgstr "Marquer ^automatique"
 
-#: src/ui.cc:1426
+#: src/ui.cc:1420
 #, fuzzy
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
@@ -4366,11 +4380,11 @@
 "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:1429
+#: src/ui.cc:1423
 msgid "Mark ^Manual"
 msgstr "Marquer ^manuel"
 
-#: src/ui.cc:1430
+#: src/ui.cc:1424
 #, fuzzy
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
@@ -4379,11 +4393,11 @@
 "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:1433
+#: src/ui.cc:1427
 msgid "^Forbid Version"
 msgstr "^Interdire version"
 
-#: src/ui.cc:1434
+#: src/ui.cc:1428
 #, fuzzy
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
@@ -4392,205 +4406,205 @@
 "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:1438
+#: src/ui.cc:1432
 msgid "I^nformation"
 msgstr "I^nformation"
 
-#: src/ui.cc:1439
+#: src/ui.cc:1433
 msgid "Display more information about the selected package"
 msgstr "Afficher plus d'informations sur le paquet sélectionné"
 
-#: src/ui.cc:1442
+#: src/ui.cc:1436
 msgid "^Changelog"
 msgstr "Liste des ^modifications"
 
-#: src/ui.cc:1443
+#: src/ui.cc:1437
 msgid "Display the Debian changelog of the selected package"
 msgstr ""
 "Afficher la liste des modifications (« changelog ») du paquet sélectionné"
 
-#: src/ui.cc:1450
+#: src/ui.cc:1444
 msgid "^Find"
 msgstr "^Rechercher"
 
-#: src/ui.cc:1451
+#: src/ui.cc:1445
 msgid "Search for a package"
 msgstr "Rechercher un paquet"
 
-#: src/ui.cc:1454
+#: src/ui.cc:1448
 msgid "Find ^Again"
 msgstr "Rechercher ^encore"
 
-#: src/ui.cc:1455
+#: src/ui.cc:1449
 msgid "Repeat the last search"
 msgstr "Recommencer la recherche précédente"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1453
 msgid "^Limit Display"
 msgstr "Affichage ^restreint"
 
-#: src/ui.cc:1460
+#: src/ui.cc:1454
 msgid "Apply a filter to the package list"
 msgstr "Filtrer la liste des paquets"
 
-#: src/ui.cc:1463
+#: src/ui.cc:1457
 msgid "^Un-Limit Display"
 msgstr "Affichage ^complet"
 
-#: src/ui.cc:1464
+#: src/ui.cc:1458
 msgid "Remove the filter from the package list"
 msgstr "Supprimer le filtre de la liste des paquets"
 
-#: src/ui.cc:1468
+#: src/ui.cc:1462
 msgid "Find ^Broken"
 msgstr "Rechercher ^cassés"
 
-#: src/ui.cc:1469
+#: src/ui.cc:1463
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Rechercher le prochain paquet avec des dépendances non satisfaites"
 
-#: src/ui.cc:1476
+#: src/ui.cc:1470
 msgid "^UI options"
 msgstr "Options de l'Interface ^Utilisateur"
 
-#: src/ui.cc:1477
+#: src/ui.cc:1471
 msgid "Change the settings which affect the user interface"
 msgstr "Modifier les paramètres qui affectent l'interface utilisateur"
 
-#: src/ui.cc:1480
+#: src/ui.cc:1474
 msgid "^Dependency handling"
 msgstr "^Gestion des Dépendances"
 
-#: src/ui.cc:1481
+#: src/ui.cc:1475
 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:1484
+#: src/ui.cc:1478
 msgid "^Miscellaneous"
 msgstr "^Divers"
 
-#: src/ui.cc:1485
+#: src/ui.cc:1479
 msgid "Change miscellaneous program settings"
 msgstr "^Modifier divers paramètres du programme"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1484
 msgid "^Revert options"
 msgstr "^Revenir aux valeurs précédentes des options"
 
-#: src/ui.cc:1491
+#: src/ui.cc:1485
 msgid "Reset all settings to the system defaults"
 msgstr "Remettre tous les paramètres à leurs valeurs par défaut"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1496
 msgid "^Next"
 msgstr "^Suivant"
 
-#: src/ui.cc:1503
+#: src/ui.cc:1497
 msgid "View next display"
 msgstr "Affichage de l'écran suivant"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1500
 msgid "^Prev"
 msgstr "^Précédent"
 
-#: src/ui.cc:1507
+#: src/ui.cc:1501
 msgid "View previous display"
 msgstr "Affichage de l'écran précédant"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1504
 msgid "^Close"
 msgstr "^Fermer"
 
-#: src/ui.cc:1511
+#: src/ui.cc:1505
 msgid "Close this display"
 msgstr "Fermer cet écran"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1510
 msgid "New Package ^View"
 msgstr "Nouvelle ^Vue des Paquets"
 
-#: src/ui.cc:1517
+#: src/ui.cc:1511
 msgid "Create a new default package view"
 msgstr "Créer une nouvelle vue par défaut des paquets"
 
-#: src/ui.cc:1520
+#: src/ui.cc:1514
 msgid "New Categorical ^Browser"
 msgstr "Nouvelle vue par ^Catégories"
 
-#: src/ui.cc:1522
+#: src/ui.cc:1516
 msgid "Browse packages by category"
 msgstr "Parcourir les paquets par catégorie"
 
-#: src/ui.cc:1530
+#: src/ui.cc:1524
 msgid "^About"
 msgstr "A ^propos"
 
-#: src/ui.cc:1531
+#: src/ui.cc:1525
 msgid "View information about this program"
 msgstr "Afficher l'information à propos de ce programme"
 
-#: src/ui.cc:1534
+#: src/ui.cc:1528
 msgid "^Help"
 msgstr "^Aide"
 
-#: src/ui.cc:1535
+#: src/ui.cc:1529
 msgid "View the on-line help"
 msgstr "Afficher l'aide en ligne d'Aptitude"
 
-#: src/ui.cc:1537
+#: src/ui.cc:1531
 msgid "User's ^Manual"
 msgstr "^Manuel Utilisateur"
 
-#: src/ui.cc:1538
+#: src/ui.cc:1532
 msgid "View the detailed program manual"
 msgstr "Afficher le manuel d'utilisation détaillé"
 
-#: src/ui.cc:1541
+#: src/ui.cc:1535
 msgid "^FAQ"
 msgstr "^FAQ"
 
-#: src/ui.cc:1542
+#: src/ui.cc:1536
 msgid "View a list of frequently asked questions"
 msgstr "Afficher la liste des questions souvent posées"
 
-#: src/ui.cc:1545
+#: src/ui.cc:1539
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1546
+#: src/ui.cc:1540
 #, fuzzy
 msgid "View the important changes made in each version of "
 msgstr "Afficher les changements importants de chaque version du programme"
 
-#: src/ui.cc:1549
+#: src/ui.cc:1543
 msgid "^License"
 msgstr "^Licence"
 
-#: src/ui.cc:1550
+#: src/ui.cc:1544
 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:1668
+#: src/ui.cc:1660
 msgid "Actions"
 msgstr "Actions"
 
-#: src/ui.cc:1671
+#: src/ui.cc:1663
 msgid "Search"
 msgstr "Rechercher"
 
-#: src/ui.cc:1672
+#: src/ui.cc:1664
 msgid "Options"
 msgstr "Options"
 
-#: src/ui.cc:1673
+#: src/ui.cc:1665
 msgid "Views"
 msgstr "Vues"
 
-#: src/ui.cc:1674
+#: src/ui.cc:1666
 msgid "Help"
 msgstr "Aide"
 
-#: src/ui.cc:1734
+#: src/ui.cc:1726
 #, c-format
 msgid ""
 "%s: Menu  %s: Help  %s: Quit  %s: Update  %s: Download/Install/Remove Pkgs"
@@ -4598,30 +4612,30 @@
 "%s : Menu  %s : Aide  %s : Quitter  %s : M-à-J  %s : Téléch./Inst./Suppr. "
 "Pqts"
 
-#: src/ui.cc:2003 src/vscreen/vscreen.cc:281
+#: src/ui.cc:1996 src/vscreen/vscreen.cc:281
 msgid "yes_key"
 msgstr "o"
 
-#: src/ui.cc:2004 src/vscreen/vscreen.cc:282
+#: src/ui.cc:1997 src/vscreen/vscreen.cc:282
 msgid "no_key"
 msgstr "n"
 
-#: src/view_changelog.cc:46
+#: src/view_changelog.cc:61
 msgid "You can only view changelogs of official Debian packages."
 msgstr ""
 "Vous ne pouvez afficher les fichiers de suivi de modifications que pour les "
 "paquets Debian officiels."
 
-#: src/view_changelog.cc:52
+#: src/view_changelog.cc:67
 msgid "Downloading Changelog"
 msgstr "Téléchargement du fichier « Changelog »"
 
-#: src/view_changelog.cc:54
+#: src/view_changelog.cc:69
 #, fuzzy
 msgid "Download Changelog"
 msgstr "Téléchargement du fichier « Changelog »"
 
-#: src/view_changelog.cc:63
+#: src/view_changelog.cc:78
 #, c-format
 msgid "%s changes"
 msgstr ""
@@ -4720,18 +4734,214 @@
 #~ "Veuillez insérer le disque suivant dans le lecteur « %s » :\n"
 #~ "%s"
 
+#~ msgid "Need exactly two colors in color definition \"%s\""
+#~ msgstr ""
+#~ "Exactement deux couleurs sont nécessaires dans la définition des couleurs "
+#~ "« %s »"
+
+#~ msgid "Can't parse foreground \"%s\"of color \"%s\""
+#~ msgstr "Couleur d'écriture « %s » incompréhensible pour la couleur « %s »"
+
+#~ msgid "Can't parse background \"%s\" of color \"%s\""
+#~ msgstr ""
+#~ "Couleur du fond d'écran « %s » incompréhensible pour la couleur « %s »"
+
 #~ msgid "Invalid option for interactive mode: -s\n"
 #~ msgstr "Option incorrecte en mode interactif : -s\n"
 
+#~ 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."
+#~ msgstr ""
+#~ "Programmes pour modem-fax et autres appareils de communication\n"
+#~ " Les paquets dans la section « comm » sont utilisés pour piloter des "
+#~ "modems et d'autres appareils de communication. Ceci inclut les logiciels "
+#~ "de commande pour les modem-fax, par exemple : PPP pour les liaisons "
+#~ "internet par le réseau téléphonique commuté, des programmes initialement "
+#~ "prévus dans ce but (zmodem/kermit) ainsi que des programmes pour "
+#~ "contrôler les téléphones cellulaires, l'interface avec FidoNet et faire "
+#~ "tourner une BBS."
+
+#~ 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"
+#~ " .\n"
+#~ " For more information about what Debian considers to be Free Software, "
+#~ "see http://www.debian.org/social_contract#guidelines"
+#~ msgstr ""
+#~ "Programmes qui ne sont pas libres\n"
+#~ " Les paquets de la section « non-free » ne font pas partie de Debian.\n"
+#~ " .\n"
+#~ " Ces paquets ne remplissent pas une ou plusieurs conditions de la Debian "
+#~ "Free Software Guidelines (voir ci-dessous). Vous devriez lire la licence "
+#~ "des programmes de cette section afin d'être sûr que vous êtes autorisé à "
+#~ "les utiliser de la manière dont vous le prévoyez.\n"
+#~ " .\n"
+#~ " Pour plus d'information concernant ce que Debian considère comme un "
+#~ "logiciel libre, consulter http://www.debian.org/social_contract#guidelines"
+
+#~ 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)"
+#~ msgstr ""
+#~ "Nouveaux paquets\n"
+#~ " Ces paquets ont été ajoutés à Debian depuis la dernière fois que vous "
+#~ "avez nettoyé la liste des paquets « nouveaux » (Choisir « oublier les "
+#~ "nouveaux paquets » depuis le menu Actions pour vider cette liste)"
+
+#~ msgid ""
+#~ "%s is an essential package!\n"
+#~ "\n"
+#~ "Are you sure you want to remove it?\n"
+#~ "Type '%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 »."
+
+#~ msgid "Available versions of "
+#~ msgstr "Versions disponibles de "
+
+#~ 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."
+#~ 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."
+
 #~ msgid "Information about "
 #~ msgstr "Informations à propos de "
 
+#~ msgid ""
+#~ "Aptitude %s\n"
+#~ "\n"
+#~ "Copyright 2000 Daniel Burrows.\n"
+#~ "\n"
+#~ "aptitude comes with ABSOLUTELY NO WARRANTY; for details see 'license' in "
+#~ "the\n"
+#~ "Help menu.  This is free software, and you are welcome to redistribute "
+#~ "it\n"
+#~ "under certain conditions; see 'license' for details."
+#~ msgstr ""
+#~ "Aptitude %s\n"
+#~ "\n"
+#~ "Copyright 2000 Daniel Burrows.\n"
+#~ "\n"
+#~ "Aptitude est fourni ABSOLUMENT SANS AUCUNE GARANTIE ; pour plus de "
+#~ "détails\n"
+#~ "voir « licence » dans le menu d'Aide. Ceci est un logiciel libre et vous\n"
+#~ "êtes encouragé à le redistribuer sous certaines conditions ; consulter "
+#~ "la\n"
+#~ "« licence » pour plus de détails."
+
+#~ msgid "Some packages were broken and have been fixed"
+#~ msgstr "Certains paquets étaient cassés et ont été réparés"
+
 #~ msgid "Some broken packages could not be fixed!"
 #~ msgstr "Certains paquets cassés n'ont pas pu être réparés !"
 
+#~ msgid "Some packages are broken.  Try to fix them?"
+#~ msgstr "Certains paquets sont cassés. Faut-il essayer de les réparer ?"
+
+#~ msgid ""
+#~ "Installing/removing packages requires administrative privileges, which\n"
+#~ "you currently do not have.  Would you like to change to the root "
+#~ "account?\n"
+#~ 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"
+
+#~ msgid ""
+#~ "No packages will be installed, removed or upgraded.\n"
+#~ "\n"
+#~ "Some packages could be upgraded, but you have not chosen to upgrade "
+#~ "them.\n"
+#~ "Type \"U\" to prepare an upgrade."
+#~ msgstr ""
+#~ "Aucun paquet ne sera installé, enlevé ou mis à jour.\n"
+#~ "\n"
+#~ "Certains paquets pourraient être mis à jour mais vous avez choisi de ne "
+#~ "pas\n"
+#~ "le faire. Entrez « U » pour préparer une mise à jour."
+
+#~ 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"
+#~ 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"
+
+#~ msgid "Obsolete downloaded package files have been deleted"
+#~ msgstr " Les fichiers téléchargés de paquets périmés ont été effacés "
+
+#~ msgid ""
+#~ "Run 'su' to become root; this will restart the program, but your\n"
+#~ "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"
+
+#~ msgid ""
+#~ "Mark the selected package as having been automatically installed;\n"
+#~ "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"
+
+#~ msgid ""
+#~ "Mark the selected package as having been manually installed;\n"
+#~ "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"
+
+#~ msgid ""
+#~ "Forbid the candidate version of the selected package from being "
+#~ "installed;\n"
+#~ "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"
+
 #~ msgid "^ChangeLog"
 #~ msgstr "Liste des ^modifications"
 
+#~ msgid "View the important changes made in each version of the program"
+#~ msgstr "Afficher les changements importants de chaque version du programme"
+
+#, fuzzy
+#~ msgid ""
+#~ "%C%BWARNING%b: untrusted versions of the following packages will be "
+#~ "installed!%n%nUntrusted packages could %Bcompromise your system's security"
+#~ "%b.  You should only proceed with the installation if you are certain "
+#~ "that this is what you want to do.%n%n"
+#~ msgstr ""
+#~ "%BATTENTION%b : des versions non certifiées des paquets qui suivent vont "
+#~ "être installées.%n%nDes paquets non certifiés peuvent %Bcompromettre la "
+#~ "sécurité de votre système%b. Vous ne devez poursuivre leur installation "
+#~ "que si vous êtes certain de ce que vous faites."
+
 #~ msgid "Should I go ahead and install the packages anyway?\n"
 #~ msgstr "Faut-il continuer et installer les paquets malgré tout ?\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	Sun Jun 12 21:04:47 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-05-01 14:08-0400\n"
+"POT-Creation-Date: 2005-06-12 22:42+0200\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"
@@ -146,14 +146,14 @@
 msgid "Automatically remove unused packages matching this filter"
 msgstr ""
 
-#: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:219 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
-#: src/vscreen/vs_util.cc:328
+#: src/apt_options.cc:240 src/mine/cmine.cc:249 src/mine/cmine.cc:312
+#: src/ui.cc:215 src/vscreen/vs_util.cc:77 src/vscreen/vs_util.cc:90
+#: src/vscreen/vs_util.cc:264 src/vscreen/vs_util.cc:298
 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:328
+#: src/apt_options.cc:241 src/download_list.cc:69 src/mine/cmine.cc:250
+#: src/mine/cmine.cc:313 src/vscreen/vs_util.cc:298
 #, fuzzy
 msgid "Cancel"
 msgstr "VerCand"
@@ -234,15 +234,15 @@
 msgid "%s: Previous"
 msgstr ""
 
-#: src/broken_indicator.cc:233
+#: src/broken_indicator.cc:232
 #, c-format
-msgid "%CSolution search failed.  %s: try harder"
+msgid "Solution search failed.  %s: try harder"
 msgstr ""
 
-#: src/broken_indicator.cc:239
-#, c-format
-msgid "%CUnable to resolve dependencies."
-msgstr ""
+#: src/broken_indicator.cc:237
+#, fuzzy
+msgid "Unable to resolve dependencies."
+msgstr "Non se puido abrir %s para rexistra-las accións"
 
 #: src/cmdline/cmdline_action.cc:36
 #, c-format
@@ -590,13 +590,13 @@
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
-#: src/vscreen/vs_util.cc:212
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:165
+#: src/vscreen/vs_util.cc:202
 msgid "Yes"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
-#: src/vscreen/vs_util.cc:212
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:165
+#: src/vscreen/vs_util.cc:202
 msgid "No"
 msgstr ""
 
@@ -884,7 +884,7 @@
 msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:212
+#: src/cmdline/cmdline_resolver.cc:212 src/cmdline/cmdline_resolver.cc:285
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
@@ -937,207 +937,212 @@
 msgid "The following packages have unmet dependencies:\n"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:133
+#: src/cmdline/cmdline_show.cc:119 src/cmdline/cmdline_show.cc:305
+#: src/solution_fragment.cc:65
+msgid "<NULL>"
+msgstr ""
+
+#: src/cmdline/cmdline_show.cc:138
 #, fuzzy
 msgid "not installed"
 msgstr "instalado"
 
-#: src/cmdline/cmdline_show.cc:135 src/pkg_columnizer.cc:231
+#: src/cmdline/cmdline_show.cc:140 src/pkg_columnizer.cc:231
 #: src/pkg_ver_item.cc:225
 msgid "unpacked"
 msgstr "desempaquetado"
 
-#: src/cmdline/cmdline_show.cc:137
+#: src/cmdline/cmdline_show.cc:142
 msgid "partially configured"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:139
+#: src/cmdline/cmdline_show.cc:144
 #, fuzzy
 msgid "partially installed"
 msgstr "instalado"
 
-#: src/cmdline/cmdline_show.cc:141
+#: src/cmdline/cmdline_show.cc:146
 msgid "not installed (configuration files remain)"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:143 src/pkg_columnizer.cc:239
+#: src/cmdline/cmdline_show.cc:148 src/pkg_columnizer.cc:239
 #: src/pkg_ver_item.cc:233
 msgid "installed"
 msgstr "instalado"
 
-#: src/cmdline/cmdline_show.cc:152
+#: src/cmdline/cmdline_show.cc:157
 #, fuzzy
 msgid "not a real package"
 msgstr "Paquetes Novos"
 
-#: src/cmdline/cmdline_show.cc:165
+#: src/cmdline/cmdline_show.cc:170
 msgid " [held]"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:174
+#: src/cmdline/cmdline_show.cc:179
 #, fuzzy, c-format
 msgid "%s; version %s will be installed"
 msgstr "Paquetes para instalar"
 
-#: src/cmdline/cmdline_show.cc:178
+#: src/cmdline/cmdline_show.cc:183
 #, c-format
 msgid "%s; version %s will be installed automatically"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:184 src/cmdline/cmdline_show.cc:199
+#: src/cmdline/cmdline_show.cc:189 src/cmdline/cmdline_show.cc:204
 #, fuzzy, c-format
 msgid "%s; will be purged"
 msgstr "Paquetes para reinstalar"
 
-#: src/cmdline/cmdline_show.cc:197
+#: src/cmdline/cmdline_show.cc:202
 #, c-format
 msgid "%s; will be purged because nothing depends on it"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:204
+#: src/cmdline/cmdline_show.cc:209
 #, fuzzy, c-format
 msgid "%s; will be removed because nothing depends on it"
 msgstr "Paquetes instalados para satisface-las dependencias"
 
-#: src/cmdline/cmdline_show.cc:206
+#: src/cmdline/cmdline_show.cc:211
 #, fuzzy, c-format
 msgid "%s; will be removed"
 msgstr "Paquetes para reinstalar"
 
-#: src/cmdline/cmdline_show.cc:220
+#: src/cmdline/cmdline_show.cc:225
 #, c-format
 msgid "%s%s; will be downgraded [%s -> %s]"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:223
+#: src/cmdline/cmdline_show.cc:228
 #, c-format
 msgid "%s%s; will be upgraded [%s -> %s]"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:235 src/cmdline/cmdline_show.cc:256
+#: src/cmdline/cmdline_show.cc:240 src/cmdline/cmdline_show.cc:261
 #, fuzzy
 msgid "Package: "
 msgstr "Paquete"
 
-#: src/cmdline/cmdline_show.cc:236 src/cmdline/cmdline_show.cc:264
+#: src/cmdline/cmdline_show.cc:241 src/cmdline/cmdline_show.cc:269
 #: src/pkg_columnizer.cc:87
 msgid "State"
 msgstr "Estado"
 
-#: src/cmdline/cmdline_show.cc:237 src/cmdline/cmdline_show.cc:318
+#: src/cmdline/cmdline_show.cc:242 src/cmdline/cmdline_show.cc:325
 msgid "Provided by"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:258 src/pkg_info_screen.cc:105
+#: src/cmdline/cmdline_show.cc:263 src/pkg_info_screen.cc:105
 msgid "Essential: "
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:258 src/cmdline/cmdline_show.cc:262
-#: src/cmdline/cmdline_show.cc:273 src/pkg_info_screen.cc:105
+#: src/cmdline/cmdline_show.cc:263 src/cmdline/cmdline_show.cc:267
+#: src/cmdline/cmdline_show.cc:278 src/pkg_info_screen.cc:105
 msgid "yes"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:262
+#: src/cmdline/cmdline_show.cc:267
 msgid "New"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:267
+#: src/cmdline/cmdline_show.cc:272
 msgid "Forbidden version"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:271
+#: src/cmdline/cmdline_show.cc:276
 #, fuzzy
 msgid "Automatically installed"
 msgstr "Descargando e instalando os paquetes"
 
-#: src/cmdline/cmdline_show.cc:273
+#: src/cmdline/cmdline_show.cc:278
 #, fuzzy
 msgid "no"
 msgstr "nada"
 
-#: src/cmdline/cmdline_show.cc:275
+#: src/cmdline/cmdline_show.cc:280
 #, fuzzy
 msgid "Version: "
 msgstr "Versións"
 
-#: src/cmdline/cmdline_show.cc:276 src/pkg_info_screen.cc:113
+#: src/cmdline/cmdline_show.cc:281 src/pkg_info_screen.cc:113
 msgid "Priority: "
 msgstr "Prioridade: "
 
-#: src/cmdline/cmdline_show.cc:277 src/cmdline/cmdline_show.cc:279
-#: src/cmdline/cmdline_show.cc:288
+#: src/cmdline/cmdline_show.cc:282 src/cmdline/cmdline_show.cc:284
+#: src/cmdline/cmdline_show.cc:293
 #, fuzzy
 msgid "N/A"
 msgstr "<N/D>"
 
-#: src/cmdline/cmdline_show.cc:278 src/pkg_info_screen.cc:114
+#: src/cmdline/cmdline_show.cc:283 src/pkg_info_screen.cc:114
 msgid "Section: "
 msgstr "Sección: "
 
-#: src/cmdline/cmdline_show.cc:280 src/pkg_info_screen.cc:115
+#: src/cmdline/cmdline_show.cc:285 src/pkg_info_screen.cc:115
 msgid "Maintainer: "
 msgstr "Mantedor: "
 
-#: src/cmdline/cmdline_show.cc:283
+#: src/cmdline/cmdline_show.cc:288
 #, fuzzy
 msgid "Uncompressed Size: "
 msgstr "Tamaño descomprimido: "
 
-#: src/cmdline/cmdline_show.cc:287
+#: src/cmdline/cmdline_show.cc:292
 msgid "Architecture: "
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:289
+#: src/cmdline/cmdline_show.cc:294
 #, fuzzy
 msgid "Compressed Size: "
 msgstr "Tamaño comprimido: "
 
-#: src/cmdline/cmdline_show.cc:291
+#: src/cmdline/cmdline_show.cc:296
 msgid "Filename: "
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:293
+#: src/cmdline/cmdline_show.cc:298
 msgid "MD5sum: "
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:297 src/cmdline/cmdline_show.cc:299
+#: src/cmdline/cmdline_show.cc:302 src/cmdline/cmdline_show.cc:305
 msgid "Archive"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:303
+#: src/cmdline/cmdline_show.cc:310
 msgid "Depends"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:305
+#: src/cmdline/cmdline_show.cc:312
 msgid "PreDepends"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:307
+#: src/cmdline/cmdline_show.cc:314
 #, fuzzy
 msgid "Recommends"
 msgstr "Sección"
 
-#: src/cmdline/cmdline_show.cc:309
+#: src/cmdline/cmdline_show.cc:316
 msgid "Suggests"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:311
+#: src/cmdline/cmdline_show.cc:318
 msgid "Conflicts"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:313
+#: src/cmdline/cmdline_show.cc:320
 msgid "Replaces"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:315
+#: src/cmdline/cmdline_show.cc:322
 msgid "Obsoletes"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:317
+#: src/cmdline/cmdline_show.cc:324
 msgid "Provides"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:321 src/pkg_info_screen.cc:97
+#: src/cmdline/cmdline_show.cc:328 src/pkg_info_screen.cc:97
 #, fuzzy
 msgid "Description: "
 msgstr "Descrición"
@@ -1181,32 +1186,32 @@
 msgid "You cannot specify both an archive and a version for a package\n"
 msgstr ""
 
-#: src/dep_item.cc:137
+#: src/dep_item.cc:139
 msgid "UNSATISFIED"
 msgstr ""
 
-#: src/dep_item.cc:137 src/reason_fragment.cc:247
+#: src/dep_item.cc:139 src/reason_fragment.cc:244
 msgid "UNAVAILABLE"
 msgstr ""
 
-#: src/download_bar.cc:56 src/download_list.cc:263 src/download_screen.cc:57
+#: src/download_bar.cc:56 src/download_list.cc:266 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_bar.cc:77 src/generic/acqprogress.cc:63
+#: src/download_bar.cc:75 src/generic/acqprogress.cc:63
 msgid "Hit "
 msgstr "Prema "
 
-#: src/download_bar.cc:90
+#: src/download_bar.cc:88
 msgid "Downloading "
 msgstr "Descargando "
 
-#: src/download_bar.cc:103
+#: src/download_bar.cc:101
 msgid "Got "
 msgstr "Recibido "
 
-#: src/download_bar.cc:157
+#: src/download_bar.cc:155
 msgid "Downloading..."
 msgstr "Descargando..."
 
@@ -1234,7 +1239,7 @@
 msgid "Couldn't clean out list directories"
 msgstr "Non se puideron limpa-los directorios de listas"
 
-#: src/download.cc:177 src/ui.cc:1153
+#: src/download.cc:177 src/ui.cc:1147
 msgid "Deleting obsolete downloaded files"
 msgstr ""
 
@@ -1373,7 +1378,7 @@
 msgstr ""
 "¡Ag! Ocorreu algo malo cando se instalaban os paquetes. Tentando recuperar:"
 
-#: src/download.cc:477 src/pkg_item.cc:432
+#: src/download.cc:477 src/pkg_item.cc:430
 msgid "Press return to continue.\n"
 msgstr "Prema Intro para continuar.\n"
 
@@ -1382,17 +1387,17 @@
 "Could not regain the system lock!  (Perhaps another apt or dpkg is running?)"
 msgstr ""
 
-#: src/download_item.cc:66 src/download_item.cc:70 src/download_item.cc:100
+#: src/download_item.cc:70 src/download_item.cc:74 src/download_item.cc:104
 #: src/generic/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr " [Traballando]"
 
-#: src/download_item.cc:104 src/download_list.cc:283
+#: src/download_item.cc:108 src/download_list.cc:284
 msgid "[Hit]"
 msgstr "[Atopado]"
 
-#: src/download_item.cc:104 src/download_list.cc:303
+#: src/download_item.cc:108 src/download_list.cc:304
 msgid "[Downloaded]"
 msgstr "[Descargado]"
 
@@ -1406,34 +1411,34 @@
 msgid "%n%nSome files were not downloaded successfully."
 msgstr ""
 
-#: src/download_list.cc:68
+#: src/download_list.cc:66
 msgid "Continue"
 msgstr ""
 
-#: src/download_list.cc:175 src/download_screen.cc:203
+#: src/download_list.cc:178 src/download_screen.cc:203
 msgid "Total Progress: "
 msgstr "Progreso Total: "
 
-#: src/download_list.cc:194 src/download_screen.cc:218
+#: src/download_list.cc:197 src/download_screen.cc:218
 #, c-format
 msgid " [ %i%% ] (%sB/s, %s remaining)"
 msgstr " [ %i%% ] (%sB/s, faltan %s)"
 
-#: src/download_list.cc:196
+#: src/download_list.cc:199
 #, c-format
 msgid " [ %i%% ] (stalled)"
 msgstr ""
 
-#: src/download_list.cc:198
+#: src/download_list.cc:201
 #, c-format
 msgid " [ %i%% ]"
 msgstr ""
 
-#: src/download_list.cc:323
+#: src/download_list.cc:324
 msgid "[IGNORED]"
 msgstr ""
 
-#: src/download_list.cc:329
+#: src/download_list.cc:330
 #, fuzzy
 msgid "[ERROR]"
 msgstr "ERRO"
@@ -1443,11 +1448,11 @@
 msgid "Downloaded %sB in %ss (%sB/s)."
 msgstr "Descargáronse %sB en %ss (%sB/s). Prema unha tecla para continuar..."
 
-#: src/edit_pkg_hier.cc:158
+#: src/edit_pkg_hier.cc:176
 msgid "No hierarchy information to edit"
 msgstr ""
 
-#: src/edit_pkg_hier.cc:258
+#: src/edit_pkg_hier.cc:276
 #, fuzzy
 msgid "Couldn't open for writing"
 msgstr "Non se puido abrir %s para rexistra-las accións"
@@ -1549,39 +1554,39 @@
 msgid "Warning: could not lock the cache file.  Opening in read-only mode"
 msgstr ""
 
-#: src/generic/matchers.cc:797
+#: src/generic/matchers.cc:798
 msgid "Unmatched '('"
 msgstr ""
 
-#: src/generic/matchers.cc:887 src/generic/matchers.cc:968
+#: src/generic/matchers.cc:888 src/generic/matchers.cc:969
 #, c-format
 msgid "Unknown dependency type: %s"
 msgstr ""
 
-#: src/generic/matchers.cc:950
+#: src/generic/matchers.cc:951
 #, c-format
 msgid "Unknown action type: %s"
 msgstr ""
 
-#: src/generic/matchers.cc:1017
+#: src/generic/matchers.cc:1018
 #, fuzzy, c-format
 msgid "Unknown priority %s"
 msgstr "Prioridade: "
 
-#: src/generic/matchers.cc:1039
+#: src/generic/matchers.cc:1040
 #, c-format
 msgid "Unknown pattern type: %c"
 msgstr ""
 
-#: src/generic/matchers.cc:1084
+#: src/generic/matchers.cc:1105
 msgid "Unexpected empty expression"
 msgstr ""
 
-#: src/generic/matchers.cc:1119
+#: src/generic/matchers.cc:1143
 msgid "Badly formed expression"
 msgstr ""
 
-#: src/generic/matchers.cc:1148
+#: src/generic/matchers.cc:1175
 msgid "Unexpected ')'"
 msgstr ""
 
@@ -1602,7 +1607,7 @@
 msgid "Can't get value of $HOME, using TMPDIR (insecure)"
 msgstr ""
 
-#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:61
+#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:76
 #, fuzzy, c-format
 msgid "ChangeLog of %s"
 msgstr "Rexistro de modificacións de "
@@ -1643,38 +1648,38 @@
 msgid "Reading task descriptions"
 msgstr ""
 
-#: src/load_config.cc:30
+#: src/load_config.cc:42
 #, c-format
-msgid "Invalid entry in color definition group: \"%s\""
-msgstr "Entrada non válida no grupo de definición de cores: \"%s\""
+msgid "Unrecognized color name \"%s\""
+msgstr ""
 
-#: src/load_config.cc:32
+#: src/load_config.cc:69
 #, c-format
-msgid "Invalid tagless entry in color definition group: \"%s\""
+msgid "Unrecognized attribute name \"%s\""
 msgstr ""
-"Entrada sen etiqueta non válida no grupo de definición de cores: \"%s\""
 
-#: src/load_config.cc:34
-#, c-format
-msgid "Need exactly two colors in color definition \"%s\""
-msgstr "Precísanse exactamente dúas cores na definición de cores \"%s\""
+#: src/load_config.cc:106
+#, fuzzy, c-format
+msgid "Invalid entry in style definition group: \"%s\""
+msgstr "Entrada non válida no grupo de definición de cores: \"%s\""
 
-#: src/load_config.cc:50
+#: src/load_config.cc:108
 #, fuzzy, c-format
-msgid "Can't parse foreground \"%s\"of color \"%s\""
-msgstr "Non se puido analiza-la cor de primeiro plano da cor \"%s\""
+msgid "Invalid tagless entry in style definition group: \"%s\""
+msgstr ""
+"Entrada sen etiqueta non válida no grupo de definición de cores: \"%s\""
 
-#: src/load_config.cc:53
+#: src/load_config.cc:130
 #, fuzzy, c-format
-msgid "Can't parse background \"%s\" of color \"%s\""
-msgstr "Non se puido analiza-la cor de fondo da cor \"%s\""
+msgid "Unknown style attribute %s"
+msgstr "Prioridade: "
 
-#: src/load_config.cc:72 src/load_config.cc:74
+#: src/load_config.cc:153 src/load_config.cc:155
 #, c-format
 msgid "Invalid entry in keybinding group: \"%s\""
 msgstr "Entrada non válida no grupo de asignacións de teclas: \"%s\""
 
-#: src/load_config.cc:89
+#: src/load_config.cc:170
 #, c-format
 msgid "Ignoring invalid keybinding \"%s\" -> \"%s\""
 msgstr "Ignórase a asignación de teclas non válida \"%s\" -> \"%s\""
@@ -2059,42 +2064,42 @@
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr ""
 
-#: src/main.cc:255
+#: src/main.cc:252
 #, c-format
 msgid "-o requires an argument of the form key=value, got %s"
 msgstr ""
 
-#: src/main.cc:301 src/main.cc:310
+#: src/main.cc:291 src/main.cc:300
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr ""
 
-#: src/main.cc:319
+#: src/main.cc:309
 msgid "Only one of -u and -i may be specified\n"
 msgstr ""
 
-#: src/main.cc:327
+#: src/main.cc:317
 msgid ""
 "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgstr ""
 
-#: src/main.cc:348
+#: src/main.cc:338
 msgid "-u and -i may not be specified with a command"
 msgstr ""
 
-#: src/main.cc:405
+#: src/main.cc:395
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr ""
 
-#: src/main.cc:412 src/main.cc:469
+#: src/main.cc:402 src/main.cc:450
 msgid "Internal error: uncaught 'out of solutions' exception.\n"
 msgstr ""
 
-#: src/main.cc:417 src/main.cc:474
+#: src/main.cc:407 src/main.cc:455
 msgid "Internal error: uncaught 'out of time' exception.\n"
 msgstr ""
 
-#: src/main.cc:424
+#: src/main.cc:414
 #, c-format
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
@@ -2126,7 +2131,7 @@
 msgid "Lost"
 msgstr ""
 
-#: src/mine/cmine.cc:119 src/ui.cc:1090
+#: src/mine/cmine.cc:119 src/ui.cc:1084
 msgid "Minesweeper"
 msgstr ""
 
@@ -2152,149 +2157,149 @@
 msgid "The number of mines must be a number"
 msgstr ""
 
-#: src/mine/cmine.cc:240
+#: src/mine/cmine.cc:238
 msgid "Setup custom game"
 msgstr ""
 
-#: src/mine/cmine.cc:243
+#: src/mine/cmine.cc:240
 msgid "Height of board: "
 msgstr ""
 
-#: src/mine/cmine.cc:247
+#: src/mine/cmine.cc:243
 msgid "Width of board: "
 msgstr ""
 
-#: src/mine/cmine.cc:251
+#: src/mine/cmine.cc:246
 msgid "Number of mines: "
 msgstr ""
 
-#: src/mine/cmine.cc:316
+#: src/mine/cmine.cc:305
 msgid "Choose difficulty level"
 msgstr ""
 
-#: src/mine/cmine.cc:318
+#: src/mine/cmine.cc:307
 msgid "Easy"
 msgstr ""
 
-#: src/mine/cmine.cc:319
+#: src/mine/cmine.cc:308
 msgid "Medium"
 msgstr ""
 
-#: src/mine/cmine.cc:320
+#: src/mine/cmine.cc:309
 msgid "Hard"
 msgstr ""
 
-#: src/mine/cmine.cc:321
+#: src/mine/cmine.cc:310
 msgid "Custom"
 msgstr ""
 
-#: src/mine/cmine.cc:411
+#: src/mine/cmine.cc:392
 msgid "You have won."
 msgstr ""
 
-#: src/mine/cmine.cc:414
+#: src/mine/cmine.cc:395
 msgid "You lose!"
 msgstr ""
 
-#: src/mine/cmine.cc:419
+#: src/mine/cmine.cc:400
 msgid "You die...  --More--"
 msgstr ""
 
-#: src/mine/cmine.cc:432
+#: src/mine/cmine.cc:413
 msgid "The spikes were poisoned!  The poison was deadly..  --More--"
 msgstr ""
 
-#: src/mine/cmine.cc:435
+#: src/mine/cmine.cc:416
 msgid "You land on a set of sharp iron spikes!  --More--"
 msgstr ""
 
-#: src/mine/cmine.cc:438
+#: src/mine/cmine.cc:419
 msgid "You fall into a pit!  --More--"
 msgstr ""
 
-#: src/mine/cmine.cc:441
+#: src/mine/cmine.cc:422
 msgid "KABOOM!  You step on a land mine.  --More--"
 msgstr ""
 
-#: src/mine/cmine.cc:446
+#: src/mine/cmine.cc:427
 msgid "The dart was poisoned!  The poison was deadly...  --More--"
 msgstr ""
 
-#: src/mine/cmine.cc:448
+#: src/mine/cmine.cc:429
 msgid ""
 "A little dart shoots out at you!  You are hit by a little dart!  --More--"
 msgstr ""
 
-#: src/mine/cmine.cc:452
+#: src/mine/cmine.cc:433
 msgid "You turn to stone... --More--"
 msgstr ""
 
-#: src/mine/cmine.cc:454
+#: src/mine/cmine.cc:435
 msgid "Touching the cockatrice corpse was a fatal mistake.  --More--"
 msgstr ""
 
-#: src/mine/cmine.cc:456
+#: src/mine/cmine.cc:437
 msgid "You feel here a cockatrice corpse.  --More--"
 msgstr ""
 
-#: src/mine/cmine.cc:460
+#: src/mine/cmine.cc:441
 msgid ""
 "Click!  You trigger a rolling boulder trap!  You are hit by a boulder! --"
 "More--"
 msgstr ""
 
-#: src/mine/cmine.cc:470
+#: src/mine/cmine.cc:451
 msgid "sleep"
 msgstr ""
 
-#: src/mine/cmine.cc:473
+#: src/mine/cmine.cc:454
 msgid "striking"
 msgstr ""
 
-#: src/mine/cmine.cc:476
+#: src/mine/cmine.cc:457
 msgid "death"
 msgstr ""
 
-#: src/mine/cmine.cc:479
+#: src/mine/cmine.cc:460
 msgid "polymorph"
 msgstr ""
 
-#: src/mine/cmine.cc:482
+#: src/mine/cmine.cc:463
 msgid "magic missile"
 msgstr ""
 
-#: src/mine/cmine.cc:485
+#: src/mine/cmine.cc:466
 msgid "secret door detection"
 msgstr ""
 
-#: src/mine/cmine.cc:488
+#: src/mine/cmine.cc:469
 msgid "invisibility"
 msgstr ""
 
-#: src/mine/cmine.cc:491
+#: src/mine/cmine.cc:472
 #, fuzzy
 msgid "cold"
 msgstr "reter"
 
-#: src/mine/cmine.cc:497
+#: src/mine/cmine.cc:478
 #, c-format
 msgid "Your wand of %s breaks apart and explodes!  --More--"
 msgstr ""
 
-#: src/mine/cmine.cc:503
+#: src/mine/cmine.cc:484
 msgid "You are jolted by a surge of electricity!  --More--"
 msgstr ""
 
-#: src/mine/cmine.cc:607
+#: src/mine/cmine.cc:588
 #, fuzzy
 msgid "Enter the filename to load: "
 msgstr "Introduza o novo formato de visualización do estado: "
 
-#: src/mine/cmine.cc:614
+#: src/mine/cmine.cc:595
 msgid "Enter the filename to save: "
 msgstr ""
 
-#: src/mine/cmine.cc:624
+#: src/mine/cmine.cc:605
 #, fuzzy
 msgid "mine-help.txt"
 msgstr "/help-gl.txt"
@@ -2303,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 ""
 
-#: src/pkg_columnizer.cc:84 src/ui.cc:1670
+#: src/pkg_columnizer.cc:84 src/ui.cc:1662
 msgid "Package"
 msgstr "Paquete"
 
@@ -3109,68 +3114,68 @@
 "s' if you are."
 msgstr ""
 
-#: src/pkg_item.cc:222 src/pkg_ver_item.cc:625
+#: src/pkg_item.cc:220 src/pkg_ver_item.cc:626
 #, fuzzy, c-format
 msgid "Information about %s"
 msgstr "Información de %s"
 
-#: src/pkg_item.cc:224 src/pkg_ver_item.cc:627
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:628
 #, c-format
 msgid "%s info"
 msgstr ""
 
-#: src/pkg_item.cc:310
+#: src/pkg_item.cc:308
 #, fuzzy, c-format
 msgid "Available versions of %s"
 msgstr "Versións dispoñibles de "
 
-#: src/pkg_item.cc:313
+#: src/pkg_item.cc:311
 #, fuzzy, c-format
 msgid "%s versions"
 msgstr "Versións"
 
-#: src/pkg_item.cc:325 src/pkg_ver_item.cc:655
+#: src/pkg_item.cc:323 src/pkg_ver_item.cc:656
 #, fuzzy, c-format
 msgid "Dependencies of %s"
 msgstr "Dependencias de %s"
 
-#: src/pkg_item.cc:327 src/pkg_ver_item.cc:657
+#: src/pkg_item.cc:325 src/pkg_ver_item.cc:658
 #, c-format
 msgid "%s deps"
 msgstr ""
 
-#: src/pkg_item.cc:338 src/pkg_ver_item.cc:667
+#: src/pkg_item.cc:336 src/pkg_ver_item.cc:668
 #, fuzzy, c-format
 msgid "Packages depending on %s"
 msgstr "Paquetes que dependen de %s"
 
-#: src/pkg_item.cc:340 src/pkg_ver_item.cc:669
+#: src/pkg_item.cc:338 src/pkg_ver_item.cc:670
 #, c-format
 msgid "%s reverse deps"
 msgstr ""
 
-#: src/pkg_item.cc:392 src/pkg_ver_item.cc:707
+#: src/pkg_item.cc:390 src/pkg_ver_item.cc:708
 #, c-format
 msgid "Reporting a bug in %s:\n"
 msgstr ""
 
-#: src/pkg_item.cc:414
+#: src/pkg_item.cc:412
 msgid ""
 "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:422
+#: src/pkg_item.cc:420
 #, c-format
 msgid "Reconfiguring %s\n"
 msgstr ""
 
-#: src/pkg_item.cc:447
+#: src/pkg_item.cc:445
 msgid "Hierarchy editor"
 msgstr ""
 
-#: src/pkg_item.cc:447
+#: src/pkg_item.cc:445
 msgid "Hierarchy Editor"
 msgstr ""
 
@@ -3206,20 +3211,20 @@
 msgid "Enter the new package sorting mechanism for this display: "
 msgstr "Introduza o novo formato de visualización de paquetes: "
 
-#: src/pkg_view.cc:344
+#: src/pkg_view.cc:359
 msgid "make_package_view: error in arguments -- two main widgets??"
 msgstr ""
 
-#: src/pkg_view.cc:350
+#: src/pkg_view.cc:365
 msgid ""
 "make_package_view: error in arguments -- bad column list for static item"
 msgstr ""
 
-#: src/pkg_view.cc:443
+#: src/pkg_view.cc:458
 msgid "make_package_view: bad argument!"
 msgstr ""
 
-#: src/pkg_view.cc:495
+#: src/pkg_view.cc:510
 msgid "make_package_view: no main widget found"
 msgstr ""
 
@@ -3256,164 +3261,164 @@
 msgid " (provided by %F)"
 msgstr ""
 
-#: src/reason_fragment.cc:278
+#: src/reason_fragment.cc:275
 #, c-format
 msgid "%F%s %F %F"
 msgstr ""
 
-#: src/reason_fragment.cc:327
+#: src/reason_fragment.cc:324
 msgid ""
 "If you select a package, an explanation of its current state will appear in "
 "this space."
 msgstr ""
 
-#: src/reason_fragment.cc:361
+#: src/reason_fragment.cc:358
 msgid ""
 "%B%s%b was installed automatically;  it is being removed because all of the "
 "packages which depend upon it are being removed:"
 msgstr ""
 
-#: src/reason_fragment.cc:365
+#: src/reason_fragment.cc:362
 #, fuzzy
 msgid "%B%s%b will be automatically removed because of dependency errors:"
 msgstr "Paquetes instalados para satisface-las dependencias"
 
-#: src/reason_fragment.cc:369
+#: src/reason_fragment.cc:366
 #, fuzzy
 msgid ""
 "%B%s%b will be automatically installed to satisfy the following dependencies:"
 msgstr "Paquetes instalados para satisface-las dependencias"
 
-#: src/reason_fragment.cc:375 src/reason_fragment.cc:387
+#: src/reason_fragment.cc:372 src/reason_fragment.cc:384
 msgid ""
 "%B%s%b cannot be upgraded now, but if it could be, it would still be held at "
 "version %B%s%b."
 msgstr ""
 
-#: src/reason_fragment.cc:378
+#: src/reason_fragment.cc:375
 #, fuzzy
 msgid ""
 "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the "
 "following dependencies:"
 msgstr "Paquetes instalados para satisface-las dependencias"
 
-#: src/reason_fragment.cc:390
+#: src/reason_fragment.cc:387
 msgid "%B%s%b is currently installed."
 msgstr ""
 
-#: src/reason_fragment.cc:396
+#: src/reason_fragment.cc:393
 #, fuzzy
 msgid "%B%s%b is not currently installed."
 msgstr "Paquetes para instalar"
 
-#: src/reason_fragment.cc:404
+#: src/reason_fragment.cc:401
 msgid "Some dependencies of %B%s%b are not satisfied:"
 msgstr ""
 
-#: src/reason_fragment.cc:408
+#: src/reason_fragment.cc:405
 msgid "%B%s%b will be downgraded."
 msgstr ""
 
-#: src/reason_fragment.cc:415
+#: src/reason_fragment.cc:412
 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b."
 msgstr ""
 
-#: src/reason_fragment.cc:419
+#: src/reason_fragment.cc:416
 msgid ""
 "%B%s%b could be upgraded to version %B%s%b, but it is being held at version %"
 "B%s%b."
 msgstr ""
 
-#: src/reason_fragment.cc:426
+#: src/reason_fragment.cc:423
 #, fuzzy
 msgid "%B%s%b will be re-installed."
 msgstr "Paquetes para reinstalar"
 
-#: src/reason_fragment.cc:430
+#: src/reason_fragment.cc:427
 #, fuzzy
 msgid "%B%s%b will be installed."
 msgstr "Paquetes para instalar"
 
-#: src/reason_fragment.cc:434
+#: src/reason_fragment.cc:431
 msgid "%B%s%b will be removed."
 msgstr ""
 
-#: src/reason_fragment.cc:439
+#: src/reason_fragment.cc:436
 msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b."
 msgstr ""
 
-#: src/reason_fragment.cc:475
+#: src/reason_fragment.cc:472
 #, fuzzy
 msgid ""
 "The following packages depend on %B%s%b and will be broken by its removal:"
 msgstr "Paquetes para instalar"
 
-#: src/reason_fragment.cc:478
+#: src/reason_fragment.cc:475
 #, fuzzy
 msgid "The following packages depend on %B%s%b and are broken:"
 msgstr "Paquetes para actualizar"
 
-#: src/reason_fragment.cc:485
+#: src/reason_fragment.cc:482
 #, fuzzy
 msgid ""
 "The following packages conflict with %B%s%b and will be broken by its "
 "installation:"
 msgstr "Paquetes para instalar"
 
-#: src/reason_fragment.cc:518
+#: src/reason_fragment.cc:515
 msgid ""
 "The following packages depend on a version of %B%s%b other than the "
 "currently installed version of %B%s%b, or conflict with the currently "
 "installed version:"
 msgstr ""
 
-#: src/reason_fragment.cc:522
+#: src/reason_fragment.cc:519
 msgid ""
 "The following packages conflict with %B%s%b, or depend on a version of it "
 "which is not going to be installed."
 msgstr ""
 
-#: src/reason_fragment.cc:526
+#: src/reason_fragment.cc:523
 #, fuzzy
 msgid "The following packages conflict with %B%s%b:"
 msgstr "Paquetes para actualizar"
 
-#: src/reason_fragment.cc:531
+#: src/reason_fragment.cc:528
 msgid ""
 "The following packages depend on a version of %B%s%b other than the "
 "currently installed version of %B%s%b:"
 msgstr ""
 
-#: src/reason_fragment.cc:535
+#: src/reason_fragment.cc:532
 msgid ""
 "The following packages depend on a version of %B%s%b which is not going to "
 "be installed."
 msgstr ""
 
-#: src/reason_fragment.cc:541
+#: src/reason_fragment.cc:538
 #, fuzzy
 msgid "upgraded"
 msgstr "actualizar"
 
-#: src/reason_fragment.cc:541
+#: src/reason_fragment.cc:538
 #, fuzzy
 msgid "downgraded"
 msgstr "[Descargado]"
 
-#: src/reason_fragment.cc:547
+#: src/reason_fragment.cc:544
 msgid ""
 "The following packages depend on the currently installed version of %B%s%b (%"
 "B%s%b), or conflict with the version it will be %s to (%B%s%b), and will be "
 "broken if it is %s."
 msgstr ""
 
-#: src/reason_fragment.cc:554
+#: src/reason_fragment.cc:551
 msgid ""
 "The following packages conflict with version %B%s%b of %B%s%b, and will be "
 "broken if it is %s."
 msgstr ""
 
-#: src/reason_fragment.cc:559
+#: src/reason_fragment.cc:556
 msgid ""
 "The following packages depend on version %B%s%b of %B%s%b, and will be "
 "broken if it is %s."
@@ -3455,28 +3460,33 @@
 msgid "Close"
 msgstr ""
 
-#: src/solution_fragment.cc:125
+#: src/solution_fragment.cc:134
 msgid "%BRemove%b the following packages:%n"
 msgstr ""
 
-#: src/solution_fragment.cc:135
+#: src/solution_fragment.cc:144
 msgid "%BInstall%b the following packages:%n"
 msgstr ""
 
-#: src/solution_fragment.cc:148
+#: src/solution_fragment.cc:157
 msgid "%BKeep%b the following packages at their current version:%n"
 msgstr ""
 
-#: src/solution_fragment.cc:161
+#: src/solution_fragment.cc:164
+#, fuzzy
+msgid "Not Installed"
+msgstr "instalado"
+
+#: src/solution_fragment.cc:177
 msgid "%BUpgrade%b the following packages:%n"
 msgstr ""
 
-#: src/solution_fragment.cc:176
+#: src/solution_fragment.cc:192
 #, fuzzy
 msgid "%BDowngrade%b the following packages:%n"
 msgstr "Descargando "
 
-#: src/solution_fragment.cc:190
+#: src/solution_fragment.cc:206
 #, c-format
 msgid "Score is %d"
 msgstr ""
@@ -3504,589 +3514,594 @@
 msgid "W:"
 msgstr ""
 
-#: src/ui.cc:194
+#: src/ui.cc:193
 msgid "Search for:"
 msgstr ""
 
-#: src/ui.cc:262
+#: src/ui.cc:258
 msgid "You already are root!"
 msgstr ""
 
-#: src/ui.cc:360
+#: src/ui.cc:356
 msgid ""
 "Subprocess exited with an error -- did you type your password correctly?"
 msgstr ""
 
-#: src/ui.cc:388
+#: src/ui.cc:384
 msgid "Loading cache"
 msgstr ""
 
-#: src/ui.cc:410
+#: src/ui.cc:406
 #, fuzzy
 msgid "Really quit Aptitude?"
 msgstr "¿Realmente quere saír?"
 
-#: src/ui.cc:489
+#: src/ui.cc:485
 msgid "Really discard your personal settings and reload the defaults?"
 msgstr ""
 
-#: src/ui.cc:589 src/ui.cc:591 src/ui.cc:619 src/ui.cc:621
+#: src/ui.cc:585 src/ui.cc:587 src/ui.cc:615 src/ui.cc:617
 #, fuzzy
 msgid "Packages"
 msgstr "Paquete"
 
-#: src/ui.cc:590 src/ui.cc:620
+#: src/ui.cc:586 src/ui.cc:616
 msgid "View available packages and choose actions to perform"
 msgstr ""
 
-#: src/ui.cc:667
+#: src/ui.cc:663
 msgid ""
-"%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
+"Aptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
 "BABSOLUTELY NO WARRANTY%b; for details see 'license' in the Help menu.  This "
 "is free software, and you are welcome to redistribute it under certain "
 "conditions; see 'license' for details."
 msgstr ""
 
-#: src/ui.cc:688
+#: src/ui.cc:684
 #, fuzzy
 msgid "help.txt"
 msgstr "/help-gl.txt"
 
-#: src/ui.cc:704
+#: src/ui.cc:700
 #, fuzzy
 msgid "README"
 msgstr "BORRAR"
 
-#: src/ui.cc:786
+#: src/ui.cc:782
 msgid ""
-"%C%BWARNING%b: untrusted versions of the following packages will be "
-"installed!%n%nUntrusted packages could %Bcompromise your system's security%"
-"b.  You should only proceed with the installation if you are certain that "
-"this is what you want to do.%n%n"
+"%BWARNING%b: untrusted versions of the following packages will be installed!%"
+"n%nUntrusted packages could %Bcompromise your system's security%b.  You "
+"should only proceed with the installation if you are certain that this is "
+"what you want to do.%n%n"
 msgstr ""
 
-#: src/ui.cc:800
+#: src/ui.cc:788
+#, fuzzy
+msgid "  %S*%N %s [version %s]%n"
+msgstr "Versións"
+
+#: src/ui.cc:795
 #, fuzzy
 msgid "Really Continue"
 msgstr "¿Realmente quere saír?"
 
-#: src/ui.cc:802
+#: src/ui.cc:797
 msgid "Abort Installation"
 msgstr ""
 
-#: src/ui.cc:863
+#: src/ui.cc:858
 msgid "Preview of package installation"
 msgstr ""
 
-#: src/ui.cc:864
+#: src/ui.cc:859
 msgid "View and/or adjust the actions that will be performed"
 msgstr ""
 
-#: src/ui.cc:865
+#: src/ui.cc:860
 msgid "Preview"
 msgstr ""
 
-#: src/ui.cc:901
+#: src/ui.cc:896
 #, fuzzy
 msgid "Some packages were broken and have been fixed:"
 msgstr "Algúns paquetes están corrompidos. ¿Arranxalos? "
 
-#: src/ui.cc:907
+#: src/ui.cc:902
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:913
+#: src/ui.cc:908
 #, c-format
 msgid ""
-"Ran out of time while trying to resolver dependencies (press \"%s\" to try "
+"Ran out of time while trying to resolve dependencies (press \"%s\" to try "
 "harder)"
 msgstr ""
 
-#: src/ui.cc:959
+#: src/ui.cc:954
 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:962 src/ui.cc:1078
+#: src/ui.cc:957 src/ui.cc:1072
 msgid "Become root"
 msgstr ""
 
-#: src/ui.cc:964 src/ui.cc:1080
+#: src/ui.cc:959 src/ui.cc:1074
 msgid "Don't become root"
 msgstr ""
 
-#: src/ui.cc:969 src/ui.cc:1085
+#: src/ui.cc:964 src/ui.cc:1079
 msgid "A package-list update or install run is already taking place."
 msgstr ""
 
-#: src/ui.cc:996
+#: src/ui.cc:991
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr ""
 
-#: src/ui.cc:1002
+#: src/ui.cc:997
 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:1074
+#: src/ui.cc:1069
 msgid ""
 "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:1090 src/ui.cc:1377
+#: src/ui.cc:1084 src/ui.cc:1371
 msgid "Waste time trying to find mines"
 msgstr ""
 
-#: src/ui.cc:1097 src/ui.cc:1150
+#: src/ui.cc:1091 src/ui.cc:1144
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr ""
 
-#: src/ui.cc:1100
+#: src/ui.cc:1094
 msgid "Deleting downloaded files"
 msgstr ""
 
-#: src/ui.cc:1114
+#: src/ui.cc:1108
 msgid "Downloaded package files have been deleted"
 msgstr ""
 
-#: src/ui.cc:1175
+#: src/ui.cc:1169
 #, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr ""
 
-#: src/ui.cc:1247
+#: src/ui.cc:1241
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1252 src/ui.cc:1283
+#: src/ui.cc:1246 src/ui.cc:1277
 msgid "Ran out of time while trying to find a solution."
 msgstr ""
 
-#: src/ui.cc:1277
+#: src/ui.cc:1271
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1307
+#: src/ui.cc:1301
 #, fuzzy, c-format
 msgid "Unable to open %s"
 msgstr "Non se puido abrir %s para rexistra-las accións"
 
-#: src/ui.cc:1313
+#: src/ui.cc:1307
 msgid "Error while dumping resolver state"
 msgstr ""
 
-#: src/ui.cc:1323
+#: src/ui.cc:1317
 msgid "File to which the resolver state should be dumped:"
 msgstr ""
 
-#: src/ui.cc:1353
+#: src/ui.cc:1347
 #, fuzzy
 msgid "^Install/remove packages"
 msgstr "Paquetes Instalados"
 
-#: src/ui.cc:1354
+#: src/ui.cc:1348
 msgid "Perform all pending installs and removals"
 msgstr ""
 
-#: src/ui.cc:1356
+#: src/ui.cc:1350
 #, fuzzy
 msgid "^Update package list"
 msgstr "Actualizando as listas de paquetes"
 
-#: src/ui.cc:1357
+#: src/ui.cc:1351
 msgid "Check for new versions of packages"
 msgstr ""
 
-#: src/ui.cc:1360
+#: src/ui.cc:1354
 #, fuzzy
 msgid "^Forget new packages"
 msgstr "Paquetes Novos"
 
-#: src/ui.cc:1361
+#: src/ui.cc:1355
 msgid "Forget which packages are \"new\""
 msgstr ""
 
-#: src/ui.cc:1364
+#: src/ui.cc:1358
 msgid "^Clean package cache"
 msgstr ""
 
-#: src/ui.cc:1365
+#: src/ui.cc:1359
 msgid "Delete package files which were previously downloaded"
 msgstr ""
 
-#: src/ui.cc:1368
+#: src/ui.cc:1362
 msgid "Clean ^obsolete files"
 msgstr ""
 
-#: src/ui.cc:1369
+#: src/ui.cc:1363
 msgid "Delete package files which can no longer be downloaded"
 msgstr ""
 
-#: src/ui.cc:1372
+#: src/ui.cc:1366
 msgid "Mark ^Upgradable"
 msgstr ""
 
-#: src/ui.cc:1373
+#: src/ui.cc:1367
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr ""
 
-#: src/ui.cc:1376
+#: src/ui.cc:1370
 msgid "^Play Minesweeper"
 msgstr ""
 
-#: src/ui.cc:1379
+#: src/ui.cc:1373
 msgid "^Become root"
 msgstr ""
 
-#: src/ui.cc:1380
+#: src/ui.cc:1374
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
 "will be preserved"
 msgstr ""
 
-#: src/ui.cc:1383
+#: src/ui.cc:1377
 msgid "^Reload package cache"
 msgstr ""
 
-#: src/ui.cc:1384
+#: src/ui.cc:1378
 msgid "Reload the package cache"
 msgstr ""
 
-#: src/ui.cc:1390
+#: src/ui.cc:1384
 msgid "^Quit"
 msgstr ""
 
-#: src/ui.cc:1391
+#: src/ui.cc:1385
 msgid "Exit the program"
 msgstr ""
 
-#: src/ui.cc:1397 src/ui.cc:1669
+#: src/ui.cc:1391 src/ui.cc:1661
 msgid "Undo"
 msgstr ""
 
-#: src/ui.cc:1398
+#: src/ui.cc:1392
 msgid "Undo the last package operation or group of operations"
 msgstr ""
 
-#: src/ui.cc:1405
+#: src/ui.cc:1399
 #, fuzzy
 msgid "^Install"
 msgstr "instalar"
 
-#: src/ui.cc:1406
+#: src/ui.cc:1400
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr ""
 
-#: src/ui.cc:1409
+#: src/ui.cc:1403
 msgid "^Remove"
 msgstr ""
 
-#: src/ui.cc:1410
+#: src/ui.cc:1404
 msgid "Flag the currently selected package for removal"
 msgstr ""
 
-#: src/ui.cc:1413
+#: src/ui.cc:1407
 #, fuzzy
 msgid "^Purge"
 msgstr "purgar"
 
-#: src/ui.cc:1414
+#: src/ui.cc:1408
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr ""
 
-#: src/ui.cc:1417
+#: src/ui.cc:1411
 msgid "^Keep"
 msgstr ""
 
-#: src/ui.cc:1418
+#: src/ui.cc:1412
 msgid "Cancel any action on the selected package"
 msgstr ""
 
-#: src/ui.cc:1421
+#: src/ui.cc:1415
 #, fuzzy
 msgid "^Hold"
 msgstr "reter"
 
-#: src/ui.cc:1422
+#: src/ui.cc:1416
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
 msgstr ""
 
-#: src/ui.cc:1425
+#: src/ui.cc:1419
 msgid "Mark ^Auto"
 msgstr ""
 
-#: src/ui.cc:1426
+#: src/ui.cc:1420
 msgid ""
 "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:1429
+#: src/ui.cc:1423
 msgid "Mark ^Manual"
 msgstr ""
 
-#: src/ui.cc:1430
+#: src/ui.cc:1424
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
 "removed unless you manually remove it"
 msgstr ""
 
-#: src/ui.cc:1433
+#: src/ui.cc:1427
 #, fuzzy
 msgid "^Forbid Version"
 msgstr "Versións"
 
-#: src/ui.cc:1434
+#: src/ui.cc:1428
 msgid ""
 "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:1438
+#: src/ui.cc:1432
 #, fuzzy
 msgid "I^nformation"
 msgstr "Información de %s"
 
-#: src/ui.cc:1439
+#: src/ui.cc:1433
 #, fuzzy
 msgid "Display more information about the selected package"
 msgstr "Información de %s"
 
-#: src/ui.cc:1442
+#: src/ui.cc:1436
 #, fuzzy
 msgid "^Changelog"
 msgstr "Rexistro de modificacións de "
 
-#: src/ui.cc:1443
+#: src/ui.cc:1437
 msgid "Display the Debian changelog of the selected package"
 msgstr ""
 
-#: src/ui.cc:1450
+#: src/ui.cc:1444
 msgid "^Find"
 msgstr ""
 
-#: src/ui.cc:1451
+#: src/ui.cc:1445
 msgid "Search for a package"
 msgstr ""
 
-#: src/ui.cc:1454
+#: src/ui.cc:1448
 msgid "Find ^Again"
 msgstr ""
 
-#: src/ui.cc:1455
+#: src/ui.cc:1449
 msgid "Repeat the last search"
 msgstr ""
 
-#: src/ui.cc:1459
+#: src/ui.cc:1453
 msgid "^Limit Display"
 msgstr ""
 
-#: src/ui.cc:1460
+#: src/ui.cc:1454
 #, fuzzy
 msgid "Apply a filter to the package list"
 msgstr "Actualizando as listas de paquetes"
 
-#: src/ui.cc:1463
+#: src/ui.cc:1457
 msgid "^Un-Limit Display"
 msgstr ""
 
-#: src/ui.cc:1464
+#: src/ui.cc:1458
 msgid "Remove the filter from the package list"
 msgstr ""
 
-#: src/ui.cc:1468
+#: src/ui.cc:1462
 #, fuzzy
 msgid "Find ^Broken"
 msgstr "corrupto"
 
-#: src/ui.cc:1469
+#: src/ui.cc:1463
 msgid "Find the next package with unsatisfied dependencies"
 msgstr ""
 
-#: src/ui.cc:1476
+#: src/ui.cc:1470
 msgid "^UI options"
 msgstr ""
 
-#: src/ui.cc:1477
+#: src/ui.cc:1471
 msgid "Change the settings which affect the user interface"
 msgstr ""
 
-#: src/ui.cc:1480
+#: src/ui.cc:1474
 msgid "^Dependency handling"
 msgstr ""
 
-#: src/ui.cc:1481
+#: src/ui.cc:1475
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr ""
 
-#: src/ui.cc:1484
+#: src/ui.cc:1478
 msgid "^Miscellaneous"
 msgstr ""
 
-#: src/ui.cc:1485
+#: src/ui.cc:1479
 msgid "Change miscellaneous program settings"
 msgstr ""
 
-#: src/ui.cc:1490
+#: src/ui.cc:1484
 msgid "^Revert options"
 msgstr ""
 
-#: src/ui.cc:1491
+#: src/ui.cc:1485
 msgid "Reset all settings to the system defaults"
 msgstr ""
 
-#: src/ui.cc:1502
+#: src/ui.cc:1496
 msgid "^Next"
 msgstr ""
 
-#: src/ui.cc:1503
+#: src/ui.cc:1497
 msgid "View next display"
 msgstr ""
 
-#: src/ui.cc:1506
+#: src/ui.cc:1500
 msgid "^Prev"
 msgstr ""
 
-#: src/ui.cc:1507
+#: src/ui.cc:1501
 msgid "View previous display"
 msgstr ""
 
-#: src/ui.cc:1510
+#: src/ui.cc:1504
 msgid "^Close"
 msgstr ""
 
-#: src/ui.cc:1511
+#: src/ui.cc:1505
 msgid "Close this display"
 msgstr ""
 
-#: src/ui.cc:1516
+#: src/ui.cc:1510
 #, fuzzy
 msgid "New Package ^View"
 msgstr "Paquetes Novos"
 
-#: src/ui.cc:1517
+#: src/ui.cc:1511
 msgid "Create a new default package view"
 msgstr ""
 
-#: src/ui.cc:1520
+#: src/ui.cc:1514
 msgid "New Categorical ^Browser"
 msgstr ""
 
-#: src/ui.cc:1522
+#: src/ui.cc:1516
 msgid "Browse packages by category"
 msgstr ""
 
-#: src/ui.cc:1530
+#: src/ui.cc:1524
 msgid "^About"
 msgstr ""
 
-#: src/ui.cc:1531
+#: src/ui.cc:1525
 #, fuzzy
 msgid "View information about this program"
 msgstr "Información de %s"
 
-#: src/ui.cc:1534
+#: src/ui.cc:1528
 msgid "^Help"
 msgstr ""
 
-#: src/ui.cc:1535
+#: src/ui.cc:1529
 #, fuzzy
 msgid "View the on-line help"
 msgstr "Axuda en liña de Aptitude"
 
-#: src/ui.cc:1537
+#: src/ui.cc:1531
 msgid "User's ^Manual"
 msgstr ""
 
-#: src/ui.cc:1538
+#: src/ui.cc:1532
 msgid "View the detailed program manual"
 msgstr ""
 
-#: src/ui.cc:1541
+#: src/ui.cc:1535
 msgid "^FAQ"
 msgstr ""
 
-#: src/ui.cc:1542
+#: src/ui.cc:1536
 msgid "View a list of frequently asked questions"
 msgstr ""
 
-#: src/ui.cc:1545
+#: src/ui.cc:1539
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1546
+#: src/ui.cc:1540
 msgid "View the important changes made in each version of "
 msgstr ""
 
-#: src/ui.cc:1549
+#: src/ui.cc:1543
 msgid "^License"
 msgstr ""
 
-#: src/ui.cc:1550
+#: src/ui.cc:1544
 msgid "View the terms under which you may copy the program"
 msgstr ""
 
-#: src/ui.cc:1668
+#: src/ui.cc:1660
 #, fuzzy
 msgid "Actions"
 msgstr "Acción"
 
-#: src/ui.cc:1671
+#: src/ui.cc:1663
 msgid "Search"
 msgstr ""
 
-#: src/ui.cc:1672
+#: src/ui.cc:1664
 #, fuzzy
 msgid "Options"
 msgstr "Acción"
 
-#: src/ui.cc:1673
+#: src/ui.cc:1665
 msgid "Views"
 msgstr ""
 
-#: src/ui.cc:1674
+#: src/ui.cc:1666
 msgid "Help"
 msgstr ""
 
-#: src/ui.cc:1734
+#: src/ui.cc:1726
 #, c-format
 msgid ""
 "%s: Menu  %s: Help  %s: Quit  %s: Update  %s: Download/Install/Remove Pkgs"
 msgstr ""
 
-#: src/ui.cc:2003 src/vscreen/vscreen.cc:281
+#: src/ui.cc:1996 src/vscreen/vscreen.cc:281
 msgid "yes_key"
 msgstr ""
 
-#: src/ui.cc:2004 src/vscreen/vscreen.cc:282
+#: src/ui.cc:1997 src/vscreen/vscreen.cc:282
 #, fuzzy
 msgid "no_key"
 msgstr "nada"
 
-#: src/view_changelog.cc:46
+#: src/view_changelog.cc:61
 msgid "You can only view changelogs of official Debian packages."
 msgstr ""
 
-#: src/view_changelog.cc:52
+#: src/view_changelog.cc:67
 #, fuzzy
 msgid "Downloading Changelog"
 msgstr "Descargando "
 
-#: src/view_changelog.cc:54
+#: src/view_changelog.cc:69
 #, fuzzy
 msgid "Download Changelog"
 msgstr "Descargando "
 
-#: src/view_changelog.cc:63
+#: src/view_changelog.cc:78
 #, c-format
 msgid "%s changes"
 msgstr ""
@@ -4117,11 +4132,33 @@
 #~ "%s"
 #~ msgstr "Introduza o disco etiquetado \""
 
+#~ msgid "Need exactly two colors in color definition \"%s\""
+#~ msgstr "Precísanse exactamente dúas cores na definición de cores \"%s\""
+
+#, fuzzy
+#~ msgid "Can't parse foreground \"%s\"of color \"%s\""
+#~ msgstr "Non se puido analiza-la cor de primeiro plano da cor \"%s\""
+
+#, fuzzy
+#~ msgid "Can't parse background \"%s\" of color \"%s\""
+#~ msgstr "Non se puido analiza-la cor de fondo da cor \"%s\""
+
+#~ msgid "Available versions of "
+#~ msgstr "Versións dispoñibles de "
+
 #, fuzzy
 #~ msgid "Information about "
 #~ msgstr "Información de %s"
 
 #, fuzzy
+#~ msgid "Some packages were broken and have been fixed"
+#~ msgstr "Algúns paquetes están corrompidos. ¿Arranxalos? "
+
+#, fuzzy
+#~ msgid "Some packages are broken.  Try to fix them?"
+#~ msgstr "Algúns paquetes están corrompidos. ¿Arranxalos? "
+
+#, fuzzy
 #~ msgid "^ChangeLog"
 #~ msgstr "Rexistro de modificacións de "
 
@@ -4189,6 +4226,9 @@
 #~ msgid "Upgradable Packages"
 #~ msgstr "Paquetes Actualizables"
 
+#~ msgid "Not Installed Packages"
+#~ msgstr "Paquetes Non Instalados"
+
 #~ msgid "Virtual Packages"
 #~ msgstr "Paquetes Virtuais"
 

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	Sun Jun 12 21:04:47 2005
@@ -1,38 +1,38 @@
 # Italian translations for aptitude package.
 # Copyright © 2004 Daniel Burrows
 # This file is distributed under the same license as the aptitude package.
-# Danilo Piazzalunga <danilopiazza at libero.it>, 2004.
+# Danilo Piazzalunga <danilopiazza at libero.it>, 2004-2005.
 #
 # Convenzioni usate, per rendere più semplice la loro individuazione ed
 # eventuale sostituzione (cfr. traduzioni di dpkg e apt):
 #
-# 'broken'............: «difettoso» (dpkg)
+# “broken”............: «difettoso» (dpkg)
 #       Peggiore di «errato», ma migliore di «rotto» (apt).
-# 'cache file'........: «file cache»
-# 'candidate version'.: «versione candidata»
-# 'Debian changelog'..: «changelog Debian»
-# 'Conflicts:'........: «È/va in conflitto» (dpkg, apt)
-# 'downgrade'.........: «retrocedere (downgrade)» (apt)
+# “cache file”........: «file cache»
+# “candidate version”.: «versione candidata»
+# “Debian changelog”..: «changelog Debian»
+# “Conflicts:”........: «È/va in conflitto» (dpkg, apt)
+# “downgrade”.........: «retrocedere (downgrade)» (apt)
 #       Unica soluzione sensata per rendere il concetto.
-# 'extended state'....: «stato esteso»
-# 'fix'...............: «correggere»
-# 'forbidden version'.: «versione proibita»
-# 'new'...............: «nuovo (new)» (apt)
+# “extended state”....: «stato esteso»
+# “fix”...............: «correggere»
+# “forbidden version”.: «versione proibita»
+# “new”...............: «nuovo (new)» (apt)
 #       Riferito a pacchetti che prima non erano installati.
-# 'obsolete'..........: «vecchio»
+# “obsolete”..........: «vecchio»
 #       Riferito a (file di) pacchetti sostituiti da versioni più recenti.
-# 'obsolete'..........: «obsoleto»
+# “obsolete”..........: «obsoleto»
 #       Riferito a librerie che esistono solo per compatibilità o a pacchetti
 #       che non esistono più.
-# 'Obsoletes:'........: «Rende obsoleto:» (apt)
-# 'package lists'.....: «elenco dei pacchetti»
-# 'Provides:'.........: «Fornisce:» (dpkg, apt)
-# 'Replaces:'.........: «Sostituisce:» (apt)
-# 'source list'.......: «elenco delle sorgenti»
-# 'Suggests:'.........: «Consiglia:» (apt)
+# “Obsoletes:”........: «Rende obsoleto:» (apt)
+# “package lists”.....: «elenco dei pacchetti»
+# “Provides:”.........: «Fornisce:» (dpkg, apt)
+# “Replaces:”.........: «Sostituisce:» (apt)
+# “source list”.......: «elenco delle sorgenti»
+# “Suggests:”.........: «Consiglia:» (apt)
 #       Migliore di «suggerisce» (dpkg).
-# 'task':.............: «task» (tasksel)
-# 'unpack/unpacked'...: «estrarre/estratto»
+# “task”:.............: «task» (tasksel)
+# “unpack/unpacked”...: «estrarre/estratto» (apt)
 #       Migliore di «spacchettato» (dpkg).
 #
 # Molti messaggi sono stati tradotti in modo da essere visualizzati
@@ -40,10 +40,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: aptitude 0.2.15.7\n"
+"Project-Id-Version: aptitude 0.2.15.9\n"
 "Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-05-01 14:08-0400\n"
-"PO-Revision-Date: 2004-09-17 22:37+0200\n"
+"POT-Creation-Date: 2005-06-12 22:42+0200\n"
+"PO-Revision-Date: 2005-04-12 22:24+0200\n"
 "Last-Translator: Danilo Piazzalunga <danilopiazza at libero.it>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
 "MIME-Version: 1.0\n"
@@ -185,14 +185,14 @@
 msgid "Automatically remove unused packages matching this filter"
 msgstr "Filtro per i pacchetti inutilizzati"
 
-#: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:219 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
-#: src/vscreen/vs_util.cc:328
+#: src/apt_options.cc:240 src/mine/cmine.cc:249 src/mine/cmine.cc:312
+#: src/ui.cc:215 src/vscreen/vs_util.cc:77 src/vscreen/vs_util.cc:90
+#: src/vscreen/vs_util.cc:264 src/vscreen/vs_util.cc:298
 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:328
+#: src/apt_options.cc:241 src/download_list.cc:69 src/mine/cmine.cc:250
+#: src/mine/cmine.cc:313 src/vscreen/vs_util.cc:298
 msgid "Cancel"
 msgstr "Annulla"
 
@@ -273,15 +273,15 @@
 msgid "%s: Previous"
 msgstr ""
 
-#: src/broken_indicator.cc:233
+#: src/broken_indicator.cc:232
 #, c-format
-msgid "%CSolution search failed.  %s: try harder"
+msgid "Solution search failed.  %s: try harder"
 msgstr ""
 
-#: src/broken_indicator.cc:239
-#, c-format
-msgid "%CUnable to resolve dependencies."
-msgstr ""
+#: src/broken_indicator.cc:237
+#, fuzzy
+msgid "Unable to resolve dependencies."
+msgstr "Impossibile aprire %s in scrittura"
 
 #: src/cmdline/cmdline_action.cc:36
 #, c-format
@@ -655,31 +655,37 @@
 "this is what you want to do.\n"
 "\n"
 msgstr ""
+"ATTENZIONE: verranno installate versioni non sicure dei seguenti pacchetti.\n"
+"\n"
+"Pacchetti non sicuri potrebbero compromettere la sicurezza del sistema.\n"
+"Si dovrebbe procedere con l'installazione solo se si è sicuri di quello che\n"
+"si sta facendo.\n"
+"\n"
 
-#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
-#: src/vscreen/vs_util.cc:212
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:165
+#: src/vscreen/vs_util.cc:202
 msgid "Yes"
 msgstr "Sì"
 
-#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
-#: src/vscreen/vs_util.cc:212
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:165
+#: src/vscreen/vs_util.cc:202
 msgid "No"
 msgstr "No"
 
 #: src/cmdline/cmdline_prompt.cc:388
 #, c-format
 msgid "Do you want to ignore this warning and proceed anyway?\n"
-msgstr ""
+msgstr "Ignorare questo avviso e procedere comunque?\n"
 
 #: src/cmdline/cmdline_prompt.cc:389
-#, fuzzy, c-format
+#, c-format
 msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
-msgstr "Per continuare, inserire la frase «%s»:\n"
+msgstr "Per continuare, inserire «%s»; per annullare, inserire «%s»: "
 
 #: src/cmdline/cmdline_prompt.cc:400
 #, c-format
 msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
-msgstr ""
+msgstr "Input non riconosciuto. Inserire «%s» oppure «%s».\n"
 
 #: src/cmdline/cmdline_prompt.cc:499
 #, c-format
@@ -973,7 +979,7 @@
 msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:212
+#: src/cmdline/cmdline_resolver.cc:212 src/cmdline/cmdline_resolver.cc:285
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
@@ -1028,196 +1034,201 @@
 msgid "The following packages have unmet dependencies:\n"
 msgstr "I seguenti pacchetti hanno dipendenze non soddisfatte:\n"
 
-#: src/cmdline/cmdline_show.cc:133
+#: src/cmdline/cmdline_show.cc:119 src/cmdline/cmdline_show.cc:305
+#: src/solution_fragment.cc:65
+msgid "<NULL>"
+msgstr ""
+
+#: src/cmdline/cmdline_show.cc:138
 msgid "not installed"
 msgstr "non installato"
 
-#: src/cmdline/cmdline_show.cc:135 src/pkg_columnizer.cc:231
+#: src/cmdline/cmdline_show.cc:140 src/pkg_columnizer.cc:231
 #: src/pkg_ver_item.cc:225
 msgid "unpacked"
 msgstr "estratto"
 
-#: src/cmdline/cmdline_show.cc:137
+#: src/cmdline/cmdline_show.cc:142
 msgid "partially configured"
 msgstr "parzialmente configurato"
 
-#: src/cmdline/cmdline_show.cc:139
+#: src/cmdline/cmdline_show.cc:144
 msgid "partially installed"
 msgstr "parzialmente installato"
 
-#: src/cmdline/cmdline_show.cc:141
+#: src/cmdline/cmdline_show.cc:146
 msgid "not installed (configuration files remain)"
 msgstr "non installato (file di configurazione presenti)"
 
-#: src/cmdline/cmdline_show.cc:143 src/pkg_columnizer.cc:239
+#: src/cmdline/cmdline_show.cc:148 src/pkg_columnizer.cc:239
 #: src/pkg_ver_item.cc:233
 msgid "installed"
 msgstr "installato"
 
-#: src/cmdline/cmdline_show.cc:152
+#: src/cmdline/cmdline_show.cc:157
 msgid "not a real package"
 msgstr "non è un vero pacchetto"
 
-#: src/cmdline/cmdline_show.cc:165
+#: src/cmdline/cmdline_show.cc:170
 msgid " [held]"
 msgstr " [bloccato]"
 
-#: src/cmdline/cmdline_show.cc:174
+#: src/cmdline/cmdline_show.cc:179
 #, c-format
 msgid "%s; version %s will be installed"
 msgstr "%s; verrà installata la versione %s"
 
-#: src/cmdline/cmdline_show.cc:178
+#: src/cmdline/cmdline_show.cc:183
 #, c-format
 msgid "%s; version %s will be installed automatically"
 msgstr "%s; verrà installata automaticamente la versione %s"
 
-#: src/cmdline/cmdline_show.cc:184 src/cmdline/cmdline_show.cc:199
+#: src/cmdline/cmdline_show.cc:189 src/cmdline/cmdline_show.cc:204
 #, c-format
 msgid "%s; will be purged"
 msgstr "%s; verrà eliminato"
 
-#: src/cmdline/cmdline_show.cc:197
+#: src/cmdline/cmdline_show.cc:202
 #, c-format
 msgid "%s; will be purged because nothing depends on it"
 msgstr "%s; verrà eliminato perché nessun pacchetto dipende da esso"
 
-#: src/cmdline/cmdline_show.cc:204
+#: src/cmdline/cmdline_show.cc:209
 #, c-format
 msgid "%s; will be removed because nothing depends on it"
 msgstr "%s; verrà rimosso perché nessun pacchetto dipende da esso"
 
-#: src/cmdline/cmdline_show.cc:206
+#: src/cmdline/cmdline_show.cc:211
 #, c-format
 msgid "%s; will be removed"
 msgstr "%s; verrà rimosso"
 
-#: src/cmdline/cmdline_show.cc:220
+#: src/cmdline/cmdline_show.cc:225
 #, c-format
 msgid "%s%s; will be downgraded [%s -> %s]"
 msgstr "%s%s; verrà retrocesso (downgraded) [%s -> %s]"
 
-#: src/cmdline/cmdline_show.cc:223
+#: src/cmdline/cmdline_show.cc:228
 #, c-format
 msgid "%s%s; will be upgraded [%s -> %s]"
 msgstr "%s%s; verrà aggiornato [%s -> %s]"
 
-#: src/cmdline/cmdline_show.cc:235 src/cmdline/cmdline_show.cc:256
+#: src/cmdline/cmdline_show.cc:240 src/cmdline/cmdline_show.cc:261
 msgid "Package: "
 msgstr "Pacchetto: "
 
-#: src/cmdline/cmdline_show.cc:236 src/cmdline/cmdline_show.cc:264
+#: src/cmdline/cmdline_show.cc:241 src/cmdline/cmdline_show.cc:269
 #: src/pkg_columnizer.cc:87
 msgid "State"
 msgstr "Stato"
 
-#: src/cmdline/cmdline_show.cc:237 src/cmdline/cmdline_show.cc:318
+#: src/cmdline/cmdline_show.cc:242 src/cmdline/cmdline_show.cc:325
 msgid "Provided by"
 msgstr "Fornito da"
 
-#: src/cmdline/cmdline_show.cc:258 src/pkg_info_screen.cc:105
+#: src/cmdline/cmdline_show.cc:263 src/pkg_info_screen.cc:105
 msgid "Essential: "
 msgstr "Essenziale: "
 
-#: src/cmdline/cmdline_show.cc:258 src/cmdline/cmdline_show.cc:262
-#: src/cmdline/cmdline_show.cc:273 src/pkg_info_screen.cc:105
+#: src/cmdline/cmdline_show.cc:263 src/cmdline/cmdline_show.cc:267
+#: src/cmdline/cmdline_show.cc:278 src/pkg_info_screen.cc:105
 msgid "yes"
 msgstr "sì"
 
-#: src/cmdline/cmdline_show.cc:262
+#: src/cmdline/cmdline_show.cc:267
 msgid "New"
 msgstr "Nuovo"
 
-#: src/cmdline/cmdline_show.cc:267
+#: src/cmdline/cmdline_show.cc:272
 msgid "Forbidden version"
 msgstr "Versione proibita"
 
-#: src/cmdline/cmdline_show.cc:271
+#: src/cmdline/cmdline_show.cc:276
 msgid "Automatically installed"
 msgstr "Installato automaticamente"
 
-#: src/cmdline/cmdline_show.cc:273
+#: src/cmdline/cmdline_show.cc:278
 msgid "no"
 msgstr "no"
 
-#: src/cmdline/cmdline_show.cc:275
+#: src/cmdline/cmdline_show.cc:280
 msgid "Version: "
 msgstr "Versione: "
 
-#: src/cmdline/cmdline_show.cc:276 src/pkg_info_screen.cc:113
+#: src/cmdline/cmdline_show.cc:281 src/pkg_info_screen.cc:113
 msgid "Priority: "
 msgstr "Priorità: "
 
-#: src/cmdline/cmdline_show.cc:277 src/cmdline/cmdline_show.cc:279
-#: src/cmdline/cmdline_show.cc:288
+#: src/cmdline/cmdline_show.cc:282 src/cmdline/cmdline_show.cc:284
+#: src/cmdline/cmdline_show.cc:293
 msgid "N/A"
 msgstr "N/D"
 
-#: src/cmdline/cmdline_show.cc:278 src/pkg_info_screen.cc:114
+#: src/cmdline/cmdline_show.cc:283 src/pkg_info_screen.cc:114
 msgid "Section: "
 msgstr "Sezione: "
 
-#: src/cmdline/cmdline_show.cc:280 src/pkg_info_screen.cc:115
+#: src/cmdline/cmdline_show.cc:285 src/pkg_info_screen.cc:115
 msgid "Maintainer: "
 msgstr "Responsabile: "
 
-#: src/cmdline/cmdline_show.cc:283
+#: src/cmdline/cmdline_show.cc:288
 msgid "Uncompressed Size: "
 msgstr "Dimensione pacchetto installato: "
 
-#: src/cmdline/cmdline_show.cc:287
+#: src/cmdline/cmdline_show.cc:292
 msgid "Architecture: "
 msgstr "Architettura: "
 
-#: src/cmdline/cmdline_show.cc:289
+#: src/cmdline/cmdline_show.cc:294
 msgid "Compressed Size: "
 msgstr "Dimensione pacchetto compresso: "
 
-#: src/cmdline/cmdline_show.cc:291
+#: src/cmdline/cmdline_show.cc:296
 msgid "Filename: "
 msgstr "Nome del file: "
 
-#: src/cmdline/cmdline_show.cc:293
+#: src/cmdline/cmdline_show.cc:298
 msgid "MD5sum: "
 msgstr "MD5sum: "
 
-#: src/cmdline/cmdline_show.cc:297 src/cmdline/cmdline_show.cc:299
+#: src/cmdline/cmdline_show.cc:302 src/cmdline/cmdline_show.cc:305
 msgid "Archive"
 msgstr "Archivio"
 
-#: src/cmdline/cmdline_show.cc:303
+#: src/cmdline/cmdline_show.cc:310
 msgid "Depends"
 msgstr "Dipende"
 
-#: src/cmdline/cmdline_show.cc:305
+#: src/cmdline/cmdline_show.cc:312
 msgid "PreDepends"
 msgstr "Pre-dipende"
 
-#: src/cmdline/cmdline_show.cc:307
+#: src/cmdline/cmdline_show.cc:314
 msgid "Recommends"
 msgstr "Raccomanda"
 
-#: src/cmdline/cmdline_show.cc:309
+#: src/cmdline/cmdline_show.cc:316
 msgid "Suggests"
 msgstr "Consiglia"
 
-#: src/cmdline/cmdline_show.cc:311
+#: src/cmdline/cmdline_show.cc:318
 msgid "Conflicts"
 msgstr "Va in conflitto"
 
-#: src/cmdline/cmdline_show.cc:313
+#: src/cmdline/cmdline_show.cc:320
 msgid "Replaces"
 msgstr "Sostituisce"
 
-#: src/cmdline/cmdline_show.cc:315
+#: src/cmdline/cmdline_show.cc:322
 msgid "Obsoletes"
 msgstr "Rende obsoleto"
 
-#: src/cmdline/cmdline_show.cc:317
+#: src/cmdline/cmdline_show.cc:324
 msgid "Provides"
 msgstr "Fornisce"
 
-#: src/cmdline/cmdline_show.cc:321 src/pkg_info_screen.cc:97
+#: src/cmdline/cmdline_show.cc:328 src/pkg_info_screen.cc:97
 msgid "Description: "
 msgstr "Descrizione: "
 
@@ -1263,32 +1274,34 @@
 msgstr ""
 "Non è possibile specificare sia l'archivio che la versione di un pacchetto\n"
 
-#: src/dep_item.cc:137
+#: src/dep_item.cc:139
 msgid "UNSATISFIED"
 msgstr "NON SODDISFATTA"
 
-#: src/dep_item.cc:137 src/reason_fragment.cc:247
+#: src/dep_item.cc:139 src/reason_fragment.cc:244
 msgid "UNAVAILABLE"
 msgstr "NON DISPONIBILE"
 
-#: src/download_bar.cc:56 src/download_list.cc:263 src/download_screen.cc:57
+#: src/download_bar.cc:56 src/download_list.cc:266 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_bar.cc:77 src/generic/acqprogress.cc:63
+# NdT: Si può tradurre?
+#: src/download_bar.cc:75 src/generic/acqprogress.cc:63
 msgid "Hit "
 msgstr "Hit "
 
-#: src/download_bar.cc:90
+#: src/download_bar.cc:88
 msgid "Downloading "
 msgstr "Scaricamento "
 
-#: src/download_bar.cc:103
+# NdT: Si può tradurre?
+#: src/download_bar.cc:101
 msgid "Got "
 msgstr "Got "
 
-#: src/download_bar.cc:157
+#: src/download_bar.cc:155
 msgid "Downloading..."
 msgstr "Scaricamento..."
 
@@ -1318,7 +1331,7 @@
 msgid "Couldn't clean out list directories"
 msgstr "Impossibile ripulire le directory dell'elenco"
 
-#: src/download.cc:177 src/ui.cc:1153
+#: src/download.cc:177 src/ui.cc:1147
 msgid "Deleting obsolete downloaded files"
 msgstr "Cancellazione dei vecchi file scaricati"
 
@@ -1456,7 +1469,7 @@
 msgstr ""
 "Ahi! C'è stato un errore durante l'installazione. Tentativo di ripristino:"
 
-#: src/download.cc:477 src/pkg_item.cc:432
+#: src/download.cc:477 src/pkg_item.cc:430
 msgid "Press return to continue.\n"
 msgstr "Premere Invio per continuare.\n"
 
@@ -1467,7 +1480,7 @@
 "Impossibile recuperare il lock di sistema! Forse un altro apt o dpkg è in "
 "esecuzione."
 
-#: src/download_item.cc:66 src/download_item.cc:70 src/download_item.cc:100
+#: src/download_item.cc:70 src/download_item.cc:74 src/download_item.cc:104
 #: src/generic/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
@@ -1476,11 +1489,12 @@
 # NdT: Indica che il file (Packages, Release, Sources) è già stato scaricato
 # e se ne possiede la copia aggiornata. Lo lascerei non tradotto perché è una
 # sorta di «cache hit».
-#: src/download_item.cc:104 src/download_list.cc:283
+# NdT: Si può tradurre?
+#: src/download_item.cc:108 src/download_list.cc:284
 msgid "[Hit]"
 msgstr "[Hit]"
 
-#: src/download_item.cc:104 src/download_list.cc:303
+#: src/download_item.cc:108 src/download_list.cc:304
 msgid "[Downloaded]"
 msgstr "[Scaricato]"
 
@@ -1494,34 +1508,34 @@
 msgid "%n%nSome files were not downloaded successfully."
 msgstr ""
 
-#: src/download_list.cc:68
+#: src/download_list.cc:66
 msgid "Continue"
 msgstr "Continua"
 
-#: src/download_list.cc:175 src/download_screen.cc:203
+#: src/download_list.cc:178 src/download_screen.cc:203
 msgid "Total Progress: "
 msgstr "Avanzamento totale: "
 
-#: src/download_list.cc:194 src/download_screen.cc:218
+#: src/download_list.cc:197 src/download_screen.cc:218
 #, c-format
 msgid " [ %i%% ] (%sB/s, %s remaining)"
 msgstr " [ %i%% ] (%sB/s, %s alla fine)"
 
-#: src/download_list.cc:196
+#: src/download_list.cc:199
 #, c-format
 msgid " [ %i%% ] (stalled)"
 msgstr " [ %i%% ] (fermo)"
 
-#: src/download_list.cc:198
+#: src/download_list.cc:201
 #, c-format
 msgid " [ %i%% ]"
 msgstr " [ %i%% ]"
 
-#: src/download_list.cc:323
+#: src/download_list.cc:324
 msgid "[IGNORED]"
 msgstr "[IGNORATO]"
 
-#: src/download_list.cc:329
+#: src/download_list.cc:330
 msgid "[ERROR]"
 msgstr "[ERRORE]"
 
@@ -1530,11 +1544,11 @@
 msgid "Downloaded %sB in %ss (%sB/s)."
 msgstr "Scaricato %sB in %ss (%sB/s)."
 
-#: src/edit_pkg_hier.cc:158
+#: src/edit_pkg_hier.cc:176
 msgid "No hierarchy information to edit"
 msgstr "Non ci sono informazioni sulla gerarchia da modificare"
 
-#: src/edit_pkg_hier.cc:258
+#: src/edit_pkg_hier.cc:276
 msgid "Couldn't open for writing"
 msgstr "Impossibile aprire il file in scrittura"
 
@@ -1634,41 +1648,41 @@
 msgstr ""
 "Impossibile creare un lock sul file di cache: apertura in sola lettura."
 
-#: src/generic/matchers.cc:797
+#: src/generic/matchers.cc:798
 msgid "Unmatched '('"
-msgstr "«(» non accoppiata"
+msgstr "\"(\" solitaria"
 
-#: src/generic/matchers.cc:887 src/generic/matchers.cc:968
+#: src/generic/matchers.cc:888 src/generic/matchers.cc:969
 #, c-format
 msgid "Unknown dependency type: %s"
 msgstr "Dipendenza «%s» sconosciuta"
 
-#: src/generic/matchers.cc:950
+#: src/generic/matchers.cc:951
 #, c-format
 msgid "Unknown action type: %s"
 msgstr "Azione «%s» sconosciuta"
 
-#: src/generic/matchers.cc:1017
+#: src/generic/matchers.cc:1018
 #, c-format
 msgid "Unknown priority %s"
 msgstr "Priorità «%s» sconosciuta"
 
-#: src/generic/matchers.cc:1039
+#: src/generic/matchers.cc:1040
 #, c-format
 msgid "Unknown pattern type: %c"
 msgstr "Modello «%c» sconosciuto"
 
-#: src/generic/matchers.cc:1084
+#: src/generic/matchers.cc:1105
 msgid "Unexpected empty expression"
 msgstr "Espressione vuota non prevista"
 
-#: src/generic/matchers.cc:1119
+#: src/generic/matchers.cc:1143
 msgid "Badly formed expression"
 msgstr "Espressione non corretta"
 
-#: src/generic/matchers.cc:1148
+#: src/generic/matchers.cc:1175
 msgid "Unexpected ')'"
-msgstr "«)» non prevista"
+msgstr "\")\" non prevista"
 
 #: src/generic/pkg_acqfile.cc:86
 #, c-format
@@ -1692,7 +1706,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:61
+#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:76
 #, c-format
 msgid "ChangeLog of %s"
 msgstr "ChangeLog di %s"
@@ -1735,37 +1749,37 @@
 msgid "Reading task descriptions"
 msgstr "Lettura delle descrizioni dei task"
 
-#: src/load_config.cc:30
-#, c-format
-msgid "Invalid entry in color definition group: \"%s\""
-msgstr "Voce non ammessa nel gruppo di definizione dei colori: «%s»"
+#: src/load_config.cc:42
+#, fuzzy, c-format
+msgid "Unrecognized color name \"%s\""
+msgstr "Task non riconosciuti"
 
-#: src/load_config.cc:32
-#, c-format
-msgid "Invalid tagless entry in color definition group: \"%s\""
-msgstr "Voce senza tag non ammessa nel gruppo di definizione dei colori: «%s»"
+#: src/load_config.cc:69
+#, fuzzy, c-format
+msgid "Unrecognized attribute name \"%s\""
+msgstr "Task non riconosciuti"
 
-#: src/load_config.cc:34
-#, c-format
-msgid "Need exactly two colors in color definition \"%s\""
-msgstr "Servono esattamente due colori nella definizione dei colori «%s»"
+#: src/load_config.cc:106
+#, fuzzy, c-format
+msgid "Invalid entry in style definition group: \"%s\""
+msgstr "Voce non ammessa nel gruppo di definizione dei colori: «%s»"
 
-#: src/load_config.cc:50
-#, c-format
-msgid "Can't parse foreground \"%s\"of color \"%s\""
-msgstr "Impossibile analizzare il primo piano «%s» del colore «%s»"
+#: src/load_config.cc:108
+#, fuzzy, c-format
+msgid "Invalid tagless entry in style definition group: \"%s\""
+msgstr "Voce senza tag non ammessa nel gruppo di definizione dei colori: «%s»"
 
-#: src/load_config.cc:53
-#, c-format
-msgid "Can't parse background \"%s\" of color \"%s\""
-msgstr "Impossibile analizzare lo sfondo «%s» del colore «%s»"
+#: src/load_config.cc:130
+#, fuzzy, c-format
+msgid "Unknown style attribute %s"
+msgstr "Azione «%s» sconosciuta"
 
-#: src/load_config.cc:72 src/load_config.cc:74
+#: src/load_config.cc:153 src/load_config.cc:155
 #, c-format
 msgid "Invalid entry in keybinding group: \"%s\""
 msgstr "Voce non ammessa nel gruppo di assegnazione tasti: «%s»"
 
-#: src/load_config.cc:89
+#: src/load_config.cc:170
 #, c-format
 msgid "Ignoring invalid keybinding \"%s\" -> \"%s\""
 msgstr "È stata ignorata l'assegnazione di tasti non ammessa «%s» -> «%s»"
@@ -1849,7 +1863,7 @@
 
 #: src/load_grouppolicy.cc:302
 msgid "Unmatched '(' in grouping policy description"
-msgstr "«(» non accoppiata nella descrizione del criterio di raggruppamento"
+msgstr "\"(\" solitaria nella descrizione del criterio di raggruppamento"
 
 #: src/load_grouppolicy.cc:329
 #, c-format
@@ -1903,7 +1917,7 @@
 
 #: src/load_sortpolicy.cc:137
 msgid "Unmatched '(' in sorting policy description"
-msgstr "«(» non accoppiata nella descrizione del criterio di ordinamento"
+msgstr "\"(\" solitaria nella descrizione del criterio di ordinamento"
 
 #: src/load_sortpolicy.cc:164
 #, c-format
@@ -2194,43 +2208,43 @@
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                  Questo Aptitude non ha i Poteri della Super Mucca.\n"
 
-#: src/main.cc:255
+#: src/main.cc:252
 #, 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:301 src/main.cc:310
+#: src/main.cc:291 src/main.cc:300
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr "STRANEZZA: ricevuto un codice di opzione sconosciuto\n"
 
-#: src/main.cc:319
+#: src/main.cc:309
 msgid "Only one of -u and -i may be specified\n"
 msgstr "-u e -i non possono essere specificate contemporaneamente\n"
 
-#: src/main.cc:327
+#: src/main.cc:317
 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:348
+#: src/main.cc:338
 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:405
+#: src/main.cc:395
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr "Comando sconosciuto: «%s»\n"
 
-#: src/main.cc:412 src/main.cc:469
+#: src/main.cc:402 src/main.cc:450
 msgid "Internal error: uncaught 'out of solutions' exception.\n"
 msgstr ""
 
-#: src/main.cc:417 src/main.cc:474
+#: src/main.cc:407 src/main.cc:455
 msgid "Internal error: uncaught 'out of time' exception.\n"
 msgstr ""
 
-#: src/main.cc:424
+#: src/main.cc:414
 #, c-format
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
@@ -2261,7 +2275,7 @@
 msgid "Lost"
 msgstr "Perso"
 
-#: src/mine/cmine.cc:119 src/ui.cc:1090
+#: src/mine/cmine.cc:119 src/ui.cc:1084
 msgid "Minesweeper"
 msgstr "Campo minato"
 
@@ -2287,160 +2301,159 @@
 msgid "The number of mines must be a number"
 msgstr "Il numero di mine deve essere un numero"
 
-#: src/mine/cmine.cc:240
+#: src/mine/cmine.cc:238
 msgid "Setup custom game"
 msgstr "Imposta un gioco personalizzato"
 
-#: src/mine/cmine.cc:243
+#: src/mine/cmine.cc:240
 msgid "Height of board: "
 msgstr "Altezza dell'area di gioco: "
 
-#: src/mine/cmine.cc:247
+#: src/mine/cmine.cc:243
 msgid "Width of board: "
 msgstr "Larghezza dell'area di gioco: "
 
-#: src/mine/cmine.cc:251
+#: src/mine/cmine.cc:246
 msgid "Number of mines: "
 msgstr "Numero di mine: "
 
-#: src/mine/cmine.cc:316
+#: src/mine/cmine.cc:305
 msgid "Choose difficulty level"
 msgstr "Scegliere il livello di difficoltà"
 
-#: src/mine/cmine.cc:318
+#: src/mine/cmine.cc:307
 msgid "Easy"
 msgstr "Facile"
 
-#: src/mine/cmine.cc:319
+#: src/mine/cmine.cc:308
 msgid "Medium"
 msgstr "Intermedio"
 
-#: src/mine/cmine.cc:320
+#: src/mine/cmine.cc:309
 msgid "Hard"
 msgstr "Difficile"
 
-#: src/mine/cmine.cc:321
+#: src/mine/cmine.cc:310
 msgid "Custom"
 msgstr "Personalizzato"
 
-#: src/mine/cmine.cc:411
+#: src/mine/cmine.cc:392
 msgid "You have won."
 msgstr "Hai vinto."
 
-#: src/mine/cmine.cc:414
+#: src/mine/cmine.cc:395
 msgid "You lose!"
 msgstr "Hai perso!"
 
-#: src/mine/cmine.cc:419
+#: src/mine/cmine.cc:400
 msgid "You die...  --More--"
 msgstr "Sei morto...  --Ancora--"
 
-#: src/mine/cmine.cc:432
+#: src/mine/cmine.cc:413
 msgid "The spikes were poisoned!  The poison was deadly..  --More--"
 msgstr "Gli spuntoni erano avvelenati! Il veleno era letale...  --Ancora--"
 
-#: src/mine/cmine.cc:435
+#: src/mine/cmine.cc:416
 msgid "You land on a set of sharp iron spikes!  --More--"
 msgstr "Atterri su un mucchio di spuntoni taglienti!  --Ancora"
 
-#: src/mine/cmine.cc:438
+#: src/mine/cmine.cc:419
 msgid "You fall into a pit!  --More--"
 msgstr "Cadi in una buca!  --Ancora--"
 
-#: src/mine/cmine.cc:441
+#: src/mine/cmine.cc:422
 msgid "KABOOM!  You step on a land mine.  --More--"
 msgstr "BOOM! Calpesti una mina di terra.  --Ancora--"
 
-#: src/mine/cmine.cc:446
+#: src/mine/cmine.cc:427
 msgid "The dart was poisoned!  The poison was deadly...  --More--"
 msgstr "Il dardo era avvelenato! Il veleno era letale...  --Ancora--"
 
-#: src/mine/cmine.cc:448
+#: src/mine/cmine.cc:429
 msgid ""
 "A little dart shoots out at you!  You are hit by a little dart!  --More--"
 msgstr ""
 "Un piccolo dardo ti viene sparato addosso! Sei colpito da un piccolo dardo!  "
 "--Ancora--"
 
-#: src/mine/cmine.cc:452
+#: src/mine/cmine.cc:433
 msgid "You turn to stone... --More--"
 msgstr "Ti trasformi in pietra...  --Ancora--"
 
-#: src/mine/cmine.cc:454
+#: src/mine/cmine.cc:435
 msgid "Touching the cockatrice corpse was a fatal mistake.  --More--"
 msgstr ""
 "Toccare il cadavere del basilisco è stato un errore fatale.  --Ancora--"
 
-#: src/mine/cmine.cc:456
+#: src/mine/cmine.cc:437
 msgid "You feel here a cockatrice corpse.  --More--"
 msgstr "Senti il cadavere di un basilisco.  --Ancora--"
 
-#: src/mine/cmine.cc:460
+#: src/mine/cmine.cc:441
 msgid ""
 "Click!  You trigger a rolling boulder trap!  You are hit by a boulder! --"
 "More--"
 msgstr ""
 "Click! Fai partire un masso rotante! Sei colpito da un masso!  --Ancora--"
 
-#: src/mine/cmine.cc:470
+#: src/mine/cmine.cc:451
 msgid "sleep"
 msgstr "addormenta"
 
-#: src/mine/cmine.cc:473
+#: src/mine/cmine.cc:454
 msgid "striking"
 msgstr "colpisci"
 
-#: src/mine/cmine.cc:476
+#: src/mine/cmine.cc:457
 msgid "death"
 msgstr "raggio mortale"
 
-#: src/mine/cmine.cc:479
+#: src/mine/cmine.cc:460
 msgid "polymorph"
 msgstr "trasforma"
 
-#: src/mine/cmine.cc:482
+#: src/mine/cmine.cc:463
 msgid "magic missile"
 msgstr "missile magico"
 
-#: src/mine/cmine.cc:485
+#: src/mine/cmine.cc:466
 msgid "secret door detection"
 msgstr "rileva porte segrete"
 
-#: src/mine/cmine.cc:488
+#: src/mine/cmine.cc:469
 msgid "invisibility"
 msgstr "invisibilità"
 
-#: src/mine/cmine.cc:491
+#: src/mine/cmine.cc:472
 msgid "cold"
 msgstr "raggio gelato"
 
-#: src/mine/cmine.cc:497
+#: src/mine/cmine.cc:478
 #, c-format
 msgid "Your wand of %s breaks apart and explodes!  --More--"
 msgstr "La tua bacchetta di «%s» si rompe ed esplode!  --Ancora--"
 
-#: src/mine/cmine.cc:503
+#: src/mine/cmine.cc:484
 msgid "You are jolted by a surge of electricity!  --More--"
 msgstr "Sei colpito da una scarica di elettricità!  --Ancora--"
 
-#: src/mine/cmine.cc:607
+#: src/mine/cmine.cc:588
 msgid "Enter the filename to load: "
 msgstr "Inserire il nome del file da aprire: "
 
-#: src/mine/cmine.cc:614
+#: src/mine/cmine.cc:595
 msgid "Enter the filename to save: "
 msgstr "Inserire il nome del file da salvare: "
 
-#: src/mine/cmine.cc:624
+#: src/mine/cmine.cc:605
 msgid "mine-help.txt"
 msgstr "mine-help-it.txt"
 
-# NdT: Queste vanno rimesse a posto in base alla lunghezza dei campi.
 #: src/pkg_columnizer.cc:81
 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:1670
+#: src/pkg_columnizer.cc:84 src/ui.cc:1662
 msgid "Package"
 msgstr "Pacchetto"
 
@@ -2639,8 +2652,8 @@
 msgid "DL Size: %sB"
 msgstr "Scarica: %sB"
 
-# NdT: HN = hostname. L'autore avrà le sue ragioni per accorciare i messaggi
-# così
+# NdT: HN = hostname.
+# L'autore avrà le sue ragioni per accorciare a tal punto i messaggi.
 #: src/pkg_columnizer.cc:480
 msgid "HN too long"
 msgstr "HN troppo lungo"
@@ -3521,52 +3534,52 @@
 "Se si è certi di volerlo rimuovere, inserire\n"
 "«%s»."
 
-#: src/pkg_item.cc:222 src/pkg_ver_item.cc:625
+#: src/pkg_item.cc:220 src/pkg_ver_item.cc:626
 #, c-format
 msgid "Information about %s"
 msgstr "Informazioni su %s"
 
-#: src/pkg_item.cc:224 src/pkg_ver_item.cc:627
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:628
 #, c-format
 msgid "%s info"
 msgstr ""
 
-#: src/pkg_item.cc:310
+#: src/pkg_item.cc:308
 #, fuzzy, c-format
 msgid "Available versions of %s"
 msgstr "Versioni disponibili di "
 
-#: src/pkg_item.cc:313
+#: src/pkg_item.cc:311
 #, fuzzy, c-format
 msgid "%s versions"
 msgstr "Versioni"
 
-#: src/pkg_item.cc:325 src/pkg_ver_item.cc:655
+#: src/pkg_item.cc:323 src/pkg_ver_item.cc:656
 #, c-format
 msgid "Dependencies of %s"
 msgstr "Dipendenze di %s"
 
-#: src/pkg_item.cc:327 src/pkg_ver_item.cc:657
+#: src/pkg_item.cc:325 src/pkg_ver_item.cc:658
 #, c-format
 msgid "%s deps"
 msgstr ""
 
-#: src/pkg_item.cc:338 src/pkg_ver_item.cc:667
+#: src/pkg_item.cc:336 src/pkg_ver_item.cc:668
 #, c-format
 msgid "Packages depending on %s"
 msgstr "Pacchetti che dipendono da %s"
 
-#: src/pkg_item.cc:340 src/pkg_ver_item.cc:669
+#: src/pkg_item.cc:338 src/pkg_ver_item.cc:670
 #, c-format
 msgid "%s reverse deps"
 msgstr ""
 
-#: src/pkg_item.cc:392 src/pkg_ver_item.cc:707
+#: src/pkg_item.cc:390 src/pkg_ver_item.cc:708
 #, c-format
 msgid "Reporting a bug in %s:\n"
 msgstr "Segnalazione di un bug in %s:\n"
 
-#: src/pkg_item.cc:414
+#: src/pkg_item.cc:412
 #, fuzzy
 msgid ""
 "You are not root and I cannot find any way to become root.  To reconfigure "
@@ -3578,16 +3591,16 @@
 "Per riconfigurare questo pacchetto, installare il pacchetto\n"
 "«menu», il pacchetto «login», oppure eseguire Aptitude come root."
 
-#: src/pkg_item.cc:422
+#: src/pkg_item.cc:420
 #, c-format
 msgid "Reconfiguring %s\n"
 msgstr "Riconfigurazione di %s\n"
 
-#: src/pkg_item.cc:447
+#: src/pkg_item.cc:445
 msgid "Hierarchy editor"
 msgstr "Editor della gerarchia"
 
-#: src/pkg_item.cc:447
+#: src/pkg_item.cc:445
 #, fuzzy
 msgid "Hierarchy Editor"
 msgstr "Editor della gerarchia"
@@ -3621,22 +3634,22 @@
 msgid "Enter the new package sorting mechanism for this display: "
 msgstr "Nuovo meccanismo di ordinamento dei pacchetti per questa vista: "
 
-#: src/pkg_view.cc:344
+#: src/pkg_view.cc:359
 msgid "make_package_view: error in arguments -- two main widgets??"
 msgstr "make_package_view: errore negli argomenti (due widget principali)"
 
-#: src/pkg_view.cc:350
+#: src/pkg_view.cc:365
 msgid ""
 "make_package_view: error in arguments -- bad column list for static item"
 msgstr ""
 "make_package_view: errore negli argomenti (elenco delle colonne non ammesso "
 "per un elemento statico)"
 
-#: src/pkg_view.cc:443
+#: src/pkg_view.cc:458
 msgid "make_package_view: bad argument!"
 msgstr "make_package_view: argomento non ammesso"
 
-#: src/pkg_view.cc:495
+#: src/pkg_view.cc:510
 msgid "make_package_view: no main widget found"
 msgstr "make_package_view: manca il widget principale"
 
@@ -3673,12 +3686,12 @@
 msgid " (provided by %F)"
 msgstr " (fornito da %F)"
 
-#: src/reason_fragment.cc:278
+#: src/reason_fragment.cc:275
 #, c-format
 msgid "%F%s %F %F"
 msgstr "%F%s %F %F"
 
-#: src/reason_fragment.cc:327
+#: src/reason_fragment.cc:324
 msgid ""
 "If you select a package, an explanation of its current state will appear in "
 "this space."
@@ -3686,7 +3699,7 @@
 "Selezionando un pacchetto, una spiegazione del suo stato attuale appare in "
 "questo spazio."
 
-#: src/reason_fragment.cc:361
+#: src/reason_fragment.cc:358
 msgid ""
 "%B%s%b was installed automatically;  it is being removed because all of the "
 "packages which depend upon it are being removed:"
@@ -3694,19 +3707,19 @@
 "%B%s%b è stato installato automaticamente; viene rimosso perché tutti i "
 "pacchetti che dipendono da esso stanno per essere rimossi:"
 
-#: src/reason_fragment.cc:365
+#: src/reason_fragment.cc:362
 msgid "%B%s%b will be automatically removed because of dependency errors:"
 msgstr ""
 "%B%s%b verrà rimosso automaticamente a causa di problemi con le dipendenze:"
 
-#: src/reason_fragment.cc:369
+#: src/reason_fragment.cc:366
 msgid ""
 "%B%s%b will be automatically installed to satisfy the following dependencies:"
 msgstr ""
 "%B%s%b verrà installato automaticamente per soddisfare le seguenti "
 "dipendenze:"
 
-#: src/reason_fragment.cc:375 src/reason_fragment.cc:387
+#: src/reason_fragment.cc:372 src/reason_fragment.cc:384
 msgid ""
 "%B%s%b cannot be upgraded now, but if it could be, it would still be held at "
 "version %B%s%b."
@@ -3714,7 +3727,7 @@
 "%B%s%b non può essere aggiornato ora ma, anche se fosse, sarebbe comunque "
 "mantenuto alla versione %B%s%b."
 
-#: src/reason_fragment.cc:378
+#: src/reason_fragment.cc:375
 msgid ""
 "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the "
 "following dependencies:"
@@ -3722,27 +3735,27 @@
 "%B%s%b non verrà aggiornato alla versione %B%s%b, per evitare di rompere le "
 "seguenti dipendenze:"
 
-#: src/reason_fragment.cc:390
+#: src/reason_fragment.cc:387
 msgid "%B%s%b is currently installed."
 msgstr "%B%s%b è attualmente installato."
 
-#: src/reason_fragment.cc:396
+#: src/reason_fragment.cc:393
 msgid "%B%s%b is not currently installed."
 msgstr "%B%s%b non è attualmente installato."
 
-#: src/reason_fragment.cc:404
+#: src/reason_fragment.cc:401
 msgid "Some dependencies of %B%s%b are not satisfied:"
 msgstr "Alcune dipendenze di %B%s%b non sono soddisfatte:"
 
-#: src/reason_fragment.cc:408
+#: src/reason_fragment.cc:405
 msgid "%B%s%b will be downgraded."
 msgstr "%B%s%b saranno retrocessi (downgraded)."
 
-#: src/reason_fragment.cc:415
+#: src/reason_fragment.cc:412
 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b."
 msgstr "%B%s%b non verrà aggiornato alla versione proibita %B%s%b."
 
-#: src/reason_fragment.cc:419
+#: src/reason_fragment.cc:416
 msgid ""
 "%B%s%b could be upgraded to version %B%s%b, but it is being held at version %"
 "B%s%b."
@@ -3750,34 +3763,34 @@
 "%B%s%b potrebbe essere aggiornato alla versione %B%s%b ma viene mantenuto "
 "alla versione %B%s%b."
 
-#: src/reason_fragment.cc:426
+#: src/reason_fragment.cc:423
 msgid "%B%s%b will be re-installed."
 msgstr "%B%s%b sarà reinstallato."
 
-#: src/reason_fragment.cc:430
+#: src/reason_fragment.cc:427
 msgid "%B%s%b will be installed."
 msgstr "%B%s%b verrà installato."
 
-#: src/reason_fragment.cc:434
+#: src/reason_fragment.cc:431
 msgid "%B%s%b will be removed."
 msgstr "%B%s%b verrà rimosso."
 
-#: src/reason_fragment.cc:439
+#: src/reason_fragment.cc:436
 msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b."
 msgstr "%B%s%b verrà aggiornato dalla versione %B%s%b alla versione %B%s%b."
 
-#: src/reason_fragment.cc:475
+#: src/reason_fragment.cc:472
 msgid ""
 "The following packages depend on %B%s%b and will be broken by its removal:"
 msgstr ""
 "I seguenti pacchetti dipendono da %B%s%b e saranno difettosi dopo la sua "
 "rimozione:"
 
-#: src/reason_fragment.cc:478
+#: src/reason_fragment.cc:475
 msgid "The following packages depend on %B%s%b and are broken:"
 msgstr "I seguenti pacchetti dipendono da %B%s%b e sono difettosi:"
 
-#: src/reason_fragment.cc:485
+#: src/reason_fragment.cc:482
 msgid ""
 "The following packages conflict with %B%s%b and will be broken by its "
 "installation:"
@@ -3785,7 +3798,7 @@
 "I seguenti pacchetti sono in conflitto con %B%s%b e saranno difettosi dopo "
 "la sua installazione:"
 
-#: src/reason_fragment.cc:518
+#: src/reason_fragment.cc:515
 msgid ""
 "The following packages depend on a version of %B%s%b other than the "
 "currently installed version of %B%s%b, or conflict with the currently "
@@ -3795,7 +3808,7 @@
 "attualmente installata (%B%s%b), oppure sono in conflitto con la versione "
 "attualmente installata:"
 
-#: src/reason_fragment.cc:522
+#: src/reason_fragment.cc:519
 msgid ""
 "The following packages conflict with %B%s%b, or depend on a version of it "
 "which is not going to be installed."
@@ -3803,12 +3816,12 @@
 "I seguenti pacchetti sono in conflitto con %B%s%b, oppure dipendono da una "
 "versione che non sta per essere installata."
 
-#: src/reason_fragment.cc:526
+#: src/reason_fragment.cc:523
 msgid "The following packages conflict with %B%s%b:"
 msgstr "I seguenti pacchetti sono in conflitto con %B%s%b:"
 
 # NdT: Le %s significano: nome del pacchetto, versione attualmente installata.
-#: src/reason_fragment.cc:531
+#: src/reason_fragment.cc:528
 msgid ""
 "The following packages depend on a version of %B%s%b other than the "
 "currently installed version of %B%s%b:"
@@ -3817,7 +3830,7 @@
 "attualmente installata (%B%s%b):"
 
 # NdT: Le %s significano: nome del pacchetto, versione attualmente installata.
-#: src/reason_fragment.cc:535
+#: src/reason_fragment.cc:532
 msgid ""
 "The following packages depend on a version of %B%s%b which is not going to "
 "be installed."
@@ -3825,17 +3838,17 @@
 "I seguenti pacchetti dipendono da una versione di %B%s%b che non sta per "
 "essere installata."
 
-#: src/reason_fragment.cc:541
+#: src/reason_fragment.cc:538
 msgid "upgraded"
 msgstr "aggiornato"
 
-#: src/reason_fragment.cc:541
+#: src/reason_fragment.cc:538
 msgid "downgraded"
 msgstr "retrocesso (downgraded)"
 
 # NdT: Le %s significano: nome del pacchetto, versione attualmente installata,
 # "aggiornato", versione candidata, "aggiornato".
-#: src/reason_fragment.cc:547
+#: src/reason_fragment.cc:544
 msgid ""
 "The following packages depend on the currently installed version of %B%s%b (%"
 "B%s%b), or conflict with the version it will be %s to (%B%s%b), and will be "
@@ -3845,7 +3858,7 @@
 "b (%B%s%b), oppure sono in conflitto con la versione alla quale verrà %s (%B%"
 "s%b); saranno quindi difettosi se verrà %s."
 
-#: src/reason_fragment.cc:554
+#: src/reason_fragment.cc:551
 msgid ""
 "The following packages conflict with version %B%s%b of %B%s%b, and will be "
 "broken if it is %s."
@@ -3853,7 +3866,7 @@
 "I seguenti pacchetti sono in conflitto con la versione %B%s%b di %B%s%b e, "
 "se verrà %s, saranno difettosi."
 
-#: src/reason_fragment.cc:559
+#: src/reason_fragment.cc:556
 msgid ""
 "The following packages depend on version %B%s%b of %B%s%b, and will be "
 "broken if it is %s."
@@ -3900,38 +3913,43 @@
 msgid "Close"
 msgstr "^Chiudi"
 
-#: src/solution_fragment.cc:125
+#: src/solution_fragment.cc:134
 #, fuzzy
 msgid "%BRemove%b the following packages:%n"
 msgstr "I seguenti pacchetti sono DIFETTOSI:"
 
-#: src/solution_fragment.cc:135
+#: src/solution_fragment.cc:144
 #, fuzzy
 msgid "%BInstall%b the following packages:%n"
 msgstr "I seguenti pacchetti sono DIFETTOSI:"
 
-#: src/solution_fragment.cc:148
+#: src/solution_fragment.cc:157
 msgid "%BKeep%b the following packages at their current version:%n"
 msgstr ""
 
-#: src/solution_fragment.cc:161
+#: src/solution_fragment.cc:164
+#, fuzzy
+msgid "Not Installed"
+msgstr "non installato"
+
+#: src/solution_fragment.cc:177
 #, fuzzy
 msgid "%BUpgrade%b the following packages:%n"
 msgstr "I seguenti pacchetti sono DIFETTOSI:"
 
-#: src/solution_fragment.cc:176
+#: src/solution_fragment.cc:192
 #, fuzzy
 msgid "%BDowngrade%b the following packages:%n"
 msgstr "Scaricamento dei pacchetti"
 
-#: src/solution_fragment.cc:190
+#: src/solution_fragment.cc:206
 #, c-format
 msgid "Score is %d"
 msgstr ""
 
 #: src/trust.cc:17 src/trust.cc:19
 msgid "WARNING"
-msgstr ""
+msgstr "ATTENZIONE"
 
 #: src/trust.cc:18
 msgid ""
@@ -3939,6 +3957,9 @@
 "package could allow a malicious individual to damage or take control of your "
 "system."
 msgstr ""
+"%F: Questa versione di %s proviene da una %Bfonte non sicura%b. Installare "
+"questo pacchetto potrebbe consentire a un individuo malintenzionato di "
+"causare danno o assumere il controllo del sistema."
 
 #: src/ui.cc:165
 msgid "Er, there aren't any errors, this shouldn't have happened.."
@@ -3952,44 +3973,44 @@
 msgid "W:"
 msgstr ""
 
-#: src/ui.cc:194
+#: src/ui.cc:193
 msgid "Search for:"
 msgstr "Cerca:"
 
-#: src/ui.cc:262
+#: src/ui.cc:258
 msgid "You already are root!"
 msgstr "Si è già root."
 
-#: src/ui.cc:360
+#: src/ui.cc:356
 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:388
+#: src/ui.cc:384
 msgid "Loading cache"
 msgstr "Caricamento della cache"
 
-#: src/ui.cc:410
+#: src/ui.cc:406
 msgid "Really quit Aptitude?"
 msgstr "Uscire da Aptitude?"
 
-#: src/ui.cc:489
+#: src/ui.cc:485
 msgid "Really discard your personal settings and reload the defaults?"
 msgstr "Abbandonare le impostazioni personali e tornare a quelle predefinite?"
 
-#: src/ui.cc:589 src/ui.cc:591 src/ui.cc:619 src/ui.cc:621
+#: src/ui.cc:585 src/ui.cc:587 src/ui.cc:615 src/ui.cc:617
 msgid "Packages"
 msgstr "Pacchetti"
 
-#: src/ui.cc:590 src/ui.cc:620
+#: src/ui.cc:586 src/ui.cc:616
 msgid "View available packages and choose actions to perform"
 msgstr "Mostra i pacchetti disponibili e sceglie le azioni da eseguire"
 
-#: src/ui.cc:667
+#: src/ui.cc:663
 #, fuzzy
 msgid ""
-"%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
+"Aptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
 "BABSOLUTELY NO WARRANTY%b; for details see 'license' in the Help menu.  This "
 "is free software, and you are welcome to redistribute it under certain "
 "conditions; see 'license' for details."
@@ -4003,61 +4024,69 @@
 "ridistribuzione sotto determinate condizioni; fare riferimento a «licenza»\n"
 "per maggiori dettagli."
 
-#: src/ui.cc:688
+#: src/ui.cc:684
 msgid "help.txt"
 msgstr "help-it.txt"
 
-#: src/ui.cc:704
+#: src/ui.cc:700
 msgid "README"
 msgstr "README"
 
-#: src/ui.cc:786
+#: src/ui.cc:782
 msgid ""
-"%C%BWARNING%b: untrusted versions of the following packages will be "
-"installed!%n%nUntrusted packages could %Bcompromise your system's security%"
-"b.  You should only proceed with the installation if you are certain that "
-"this is what you want to do.%n%n"
+"%BWARNING%b: untrusted versions of the following packages will be installed!%"
+"n%nUntrusted packages could %Bcompromise your system's security%b.  You "
+"should only proceed with the installation if you are certain that this is "
+"what you want to do.%n%n"
 msgstr ""
+"%BATTENZIONE%b: verranno installate versioni non sicure dei seguenti "
+"pacchetti.%n%nPacchetti non sicuri potrebbero %Bcompromettere la sicurezza "
+"del sistema%b. Si dovrebbe procedere con l'installazione solo se si è sicuri "
+"di quello che si sta facendo.%n%n"
 
-#: src/ui.cc:800
+#: src/ui.cc:788
 #, fuzzy
+msgid "  %S*%N %s [version %s]%n"
+msgstr "Versioni"
+
+#: src/ui.cc:795
 msgid "Really Continue"
-msgstr "Continua"
+msgstr "Continua comunque"
 
-#: src/ui.cc:802
+#: src/ui.cc:797
 msgid "Abort Installation"
-msgstr ""
+msgstr "Annulla l'installazione"
 
-#: src/ui.cc:863
+#: src/ui.cc:858
 msgid "Preview of package installation"
 msgstr "Anteprima dell'installazione dei pacchetti"
 
-#: src/ui.cc:864
+#: src/ui.cc:859
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Mostra e modifica le azioni da compiere"
 
-#: src/ui.cc:865
+#: src/ui.cc:860
 #, fuzzy
 msgid "Preview"
 msgstr "^Precedente"
 
-#: src/ui.cc:901
+#: src/ui.cc:896
 #, fuzzy
 msgid "Some packages were broken and have been fixed:"
 msgstr "Alcuni pacchetti erano difettosi e sono stati corretti"
 
-#: src/ui.cc:907
+#: src/ui.cc:902
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:913
-#, c-format
+#: src/ui.cc:908
+#, fuzzy, c-format
 msgid ""
-"Ran out of time while trying to resolver dependencies (press \"%s\" to try "
+"Ran out of time while trying to resolve dependencies (press \"%s\" to try "
 "harder)"
-msgstr ""
+msgstr "Perdi tempo cercando di scovare le mine"
 
-#: src/ui.cc:959
+#: src/ui.cc:954
 #, fuzzy
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
@@ -4066,24 +4095,24 @@
 "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:962 src/ui.cc:1078
+#: src/ui.cc:957 src/ui.cc:1072
 msgid "Become root"
 msgstr "Diventa root"
 
-#: src/ui.cc:964 src/ui.cc:1080
+#: src/ui.cc:959 src/ui.cc:1074
 msgid "Don't become root"
 msgstr "Non diventare root"
 
-#: src/ui.cc:969 src/ui.cc:1085
+#: src/ui.cc:964 src/ui.cc:1079
 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:996
+#: src/ui.cc:991
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "Non ci sono pacchetti da installare, rimuovere o aggiornare."
 
-#: src/ui.cc:1002
+#: src/ui.cc:997
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -4095,7 +4124,7 @@
 "Alcuni pacchetti potrebbero venire aggiornati ma si è scelto di non farlo.\n"
 "Premere «U» per preparare un aggiornamento."
 
-#: src/ui.cc:1074
+#: src/ui.cc:1069
 #, fuzzy
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
@@ -4105,116 +4134,116 @@
 "amministratore,\n"
 "dei quali attualmente si è privi. Passare all'account di root?\n"
 
-#: src/ui.cc:1090 src/ui.cc:1377
+#: src/ui.cc:1084 src/ui.cc:1371
 msgid "Waste time trying to find mines"
 msgstr "Perdi tempo cercando di scovare le mine"
 
-#: src/ui.cc:1097 src/ui.cc:1150
+#: src/ui.cc:1091 src/ui.cc:1144
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "Pulire mentre è in corso uno scaricamento non è permesso"
 
-#: src/ui.cc:1100
+#: src/ui.cc:1094
 msgid "Deleting downloaded files"
 msgstr "Cancellazione dei file scaricati"
 
-#: src/ui.cc:1114
+#: src/ui.cc:1108
 msgid "Downloaded package files have been deleted"
 msgstr "I file dei pacchetti scaricati sono stati cancellati"
 
-#: src/ui.cc:1175
+#: src/ui.cc:1169
 #, 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:1247
+#: src/ui.cc:1241
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1252 src/ui.cc:1283
+#: src/ui.cc:1246 src/ui.cc:1277
 #, fuzzy
 msgid "Ran out of time while trying to find a solution."
 msgstr "Perdi tempo cercando di scovare le mine"
 
-#: src/ui.cc:1277
+#: src/ui.cc:1271
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1307
+#: src/ui.cc:1301
 #, fuzzy, c-format
 msgid "Unable to open %s"
 msgstr "Impossibile aprire %s in scrittura"
 
-#: src/ui.cc:1313
+#: src/ui.cc:1307
 msgid "Error while dumping resolver state"
 msgstr ""
 
-#: src/ui.cc:1323
+#: src/ui.cc:1317
 msgid "File to which the resolver state should be dumped:"
 msgstr ""
 
-#: src/ui.cc:1353
+#: src/ui.cc:1347
 msgid "^Install/remove packages"
 msgstr "^Installa/rimuovi pacchetti"
 
-#: src/ui.cc:1354
+#: src/ui.cc:1348
 msgid "Perform all pending installs and removals"
 msgstr "Procede ad installare e rimuovere i pacchetti"
 
-#: src/ui.cc:1356
+#: src/ui.cc:1350
 msgid "^Update package list"
 msgstr "^Aggiorna l'elenco dei pacchetti"
 
-#: src/ui.cc:1357
+#: src/ui.cc:1351
 msgid "Check for new versions of packages"
 msgstr "Cerca nuove versioni dei pacchetti"
 
-#: src/ui.cc:1360
+#: src/ui.cc:1354
 msgid "^Forget new packages"
 msgstr "^Dimentica i nuovi pacchetti"
 
-#: src/ui.cc:1361
+#: src/ui.cc:1355
 msgid "Forget which packages are \"new\""
 msgstr "Dimentica quali pacchetti sono «nuovi»"
 
-#: src/ui.cc:1364
+#: src/ui.cc:1358
 msgid "^Clean package cache"
 msgstr "^Pulisci la cache dei pacchetti"
 
-#: src/ui.cc:1365
+#: src/ui.cc:1359
 msgid "Delete package files which were previously downloaded"
 msgstr "Cancella i file dei pacchetti scaricati precedentemente"
 
-#: src/ui.cc:1368
+#: src/ui.cc:1362
 msgid "Clean ^obsolete files"
 msgstr "^Cancella i file vecchi"
 
-#: src/ui.cc:1369
+#: src/ui.cc:1363
 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:1372
+#: src/ui.cc:1366
 msgid "Mark ^Upgradable"
 msgstr "Aggiorna ^tutti i pacchetti"
 
-#: src/ui.cc:1373
+#: src/ui.cc:1367
 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:1376
+#: src/ui.cc:1370
 msgid "^Play Minesweeper"
 msgstr "^Gioca a campo minato"
 
-#: src/ui.cc:1379
+#: src/ui.cc:1373
 msgid "^Become root"
 msgstr "Diventa ^root"
 
-#: src/ui.cc:1380
+#: src/ui.cc:1374
 #, fuzzy
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
@@ -4223,80 +4252,80 @@
 "Esegue «su» per diventare root; questo farà ripartire il programma,\n"
 "mantenendo però le impostazioni attuali"
 
-#: src/ui.cc:1383
+#: src/ui.cc:1377
 msgid "^Reload package cache"
 msgstr "Ricarica ^la cache dei pacchetti"
 
-#: src/ui.cc:1384
+#: src/ui.cc:1378
 msgid "Reload the package cache"
 msgstr "Ricarica la cache dei pacchetti"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1384
 msgid "^Quit"
 msgstr "^Esci"
 
-#: src/ui.cc:1391
+#: src/ui.cc:1385
 msgid "Exit the program"
 msgstr "Esce dal programma"
 
-#: src/ui.cc:1397 src/ui.cc:1669
+#: src/ui.cc:1391 src/ui.cc:1661
 msgid "Undo"
 msgstr "Annulla"
 
-#: src/ui.cc:1398
+#: src/ui.cc:1392
 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:1405
+#: src/ui.cc:1399
 msgid "^Install"
 msgstr "^Installa"
 
-#: src/ui.cc:1406
+#: src/ui.cc:1400
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "Richiede l'installazione e l'aggiornamento del pacchetto selezionato"
 
-#: src/ui.cc:1409
+#: src/ui.cc:1403
 msgid "^Remove"
 msgstr "^Rimuovi"
 
-#: src/ui.cc:1410
+#: src/ui.cc:1404
 msgid "Flag the currently selected package for removal"
 msgstr "Richiede la rimozione del pacchetto selezionato"
 
-#: src/ui.cc:1413
+#: src/ui.cc:1407
 msgid "^Purge"
 msgstr "^Elimina"
 
-#: src/ui.cc:1414
+#: src/ui.cc:1408
 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:1417
+#: src/ui.cc:1411
 msgid "^Keep"
-msgstr "^Tieni"
+msgstr "Man^tieni"
 
-#: src/ui.cc:1418
+#: src/ui.cc:1412
 msgid "Cancel any action on the selected package"
 msgstr "Annulla ogni azione sul pacchetto selezionato"
 
-#: src/ui.cc:1421
+#: src/ui.cc:1415
 msgid "^Hold"
 msgstr "^Blocca"
 
-#: src/ui.cc:1422
+#: src/ui.cc:1416
 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:1425
+#: src/ui.cc:1419
 msgid "Mark ^Auto"
 msgstr "Installato ^automaticamente"
 
-#: src/ui.cc:1426
+#: src/ui.cc:1420
 #, fuzzy
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
@@ -4305,11 +4334,11 @@
 "Segna il pacchetto selezionato come installato automaticamente;\n"
 "verrà rimosso automaticamente se nessun altro pacchetto dipende da esso"
 
-#: src/ui.cc:1429
+#: src/ui.cc:1423
 msgid "Mark ^Manual"
 msgstr "Installato ^manualmente"
 
-#: src/ui.cc:1430
+#: src/ui.cc:1424
 #, fuzzy
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
@@ -4318,11 +4347,11 @@
 "Segna il pacchetto selezionato come installato manualmente;\n"
 "non verrà rimosso, a meno che non si intervenga manualmente"
 
-#: src/ui.cc:1433
+#: src/ui.cc:1427
 msgid "^Forbid Version"
 msgstr "^Proibisci versione"
 
-#: src/ui.cc:1434
+#: src/ui.cc:1428
 #, fuzzy
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
@@ -4332,208 +4361,208 @@
 "selezionato;\n"
 "le versioni successive verranno installate normalmente"
 
-#: src/ui.cc:1438
+#: src/ui.cc:1432
 msgid "I^nformation"
 msgstr "I^nformazioni"
 
-#: src/ui.cc:1439
+#: src/ui.cc:1433
 msgid "Display more information about the selected package"
 msgstr "Mostra informazioni dettagliate sul pacchetto selezionato"
 
-#: src/ui.cc:1442
+#: src/ui.cc:1436
 msgid "^Changelog"
 msgstr "^Changelog"
 
-#: src/ui.cc:1443
+#: src/ui.cc:1437
 msgid "Display the Debian changelog of the selected package"
 msgstr "Mostra il changelog Debian del pacchetto selezionato"
 
-#: src/ui.cc:1450
+#: src/ui.cc:1444
 msgid "^Find"
 msgstr "^Trova"
 
-#: src/ui.cc:1451
+#: src/ui.cc:1445
 msgid "Search for a package"
 msgstr "Cerca un pacchetto"
 
-#: src/ui.cc:1454
+#: src/ui.cc:1448
 msgid "Find ^Again"
 msgstr "Trova ^successivo"
 
-#: src/ui.cc:1455
+#: src/ui.cc:1449
 msgid "Repeat the last search"
 msgstr "Ripete l'ultima ricerca"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1453
 msgid "^Limit Display"
 msgstr "^Applica filtro"
 
-#: src/ui.cc:1460
+#: src/ui.cc:1454
 msgid "Apply a filter to the package list"
 msgstr "Applica un filtro all'elenco dei pacchetti"
 
-#: src/ui.cc:1463
+#: src/ui.cc:1457
 msgid "^Un-Limit Display"
 msgstr "^Rimuovi filtro"
 
-#: src/ui.cc:1464
+#: src/ui.cc:1458
 msgid "Remove the filter from the package list"
 msgstr "Rimuove il filtro dall'elenco dei pacchetti"
 
-#: src/ui.cc:1468
+#: src/ui.cc:1462
 msgid "Find ^Broken"
 msgstr "Trova ^difettosi"
 
-#: src/ui.cc:1469
+#: src/ui.cc:1463
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Trova il prossimo pacchetto con dipendenze non soddisfatte"
 
-#: src/ui.cc:1476
+#: src/ui.cc:1470
 msgid "^UI options"
 msgstr "Opzioni dell'interfaccia ^utente"
 
-#: src/ui.cc:1477
+#: src/ui.cc:1471
 msgid "Change the settings which affect the user interface"
 msgstr "Cambia le impostazioni che riguardano l'interfaccia utente"
 
-#: src/ui.cc:1480
+#: src/ui.cc:1474
 msgid "^Dependency handling"
 msgstr "Gestione delle ^dipendenze"
 
-#: src/ui.cc:1481
+#: src/ui.cc:1475
 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:1484
+#: src/ui.cc:1478
 msgid "^Miscellaneous"
 msgstr "^Varie"
 
-#: src/ui.cc:1485
+#: src/ui.cc:1479
 msgid "Change miscellaneous program settings"
 msgstr "Cambia altre impostazioni del programma"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1484
 msgid "^Revert options"
 msgstr "^Reimposta le opzioni"
 
-#: src/ui.cc:1491
+#: src/ui.cc:1485
 msgid "Reset all settings to the system defaults"
 msgstr "Riporta tutte le impostazioni ai valori predefiniti"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1496
 msgid "^Next"
 msgstr "^Successivo"
 
-#: src/ui.cc:1503
+#: src/ui.cc:1497
 msgid "View next display"
 msgstr "Mostra la vista successiva"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1500
 msgid "^Prev"
 msgstr "^Precedente"
 
-#: src/ui.cc:1507
+#: src/ui.cc:1501
 msgid "View previous display"
 msgstr "Mostra la vista precedente"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1504
 msgid "^Close"
 msgstr "^Chiudi"
 
-#: src/ui.cc:1511
+#: src/ui.cc:1505
 msgid "Close this display"
 msgstr "Chiude questa vista"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1510
 msgid "New Package ^View"
 msgstr "Nuova ^vista dei pacchetti"
 
-#: src/ui.cc:1517
+#: src/ui.cc:1511
 msgid "Create a new default package view"
 msgstr "Crea una nuova vista dei pacchetti"
 
-#: src/ui.cc:1520
+#: src/ui.cc:1514
 msgid "New Categorical ^Browser"
 msgstr "Nuova vista per ^categorie"
 
-#: src/ui.cc:1522
+#: src/ui.cc:1516
 msgid "Browse packages by category"
 msgstr "Sfoglia i pacchetti per categoria"
 
-#: src/ui.cc:1530
+#: src/ui.cc:1524
 msgid "^About"
 msgstr "^Informazioni su"
 
-#: src/ui.cc:1531
+#: src/ui.cc:1525
 msgid "View information about this program"
 msgstr "Mostra le informazioni su questo programma"
 
-#: src/ui.cc:1534
+#: src/ui.cc:1528
 msgid "^Help"
 msgstr "^Aiuto"
 
-#: src/ui.cc:1535
+#: src/ui.cc:1529
 msgid "View the on-line help"
 msgstr "Mostra una breve guida online"
 
-#: src/ui.cc:1537
+#: src/ui.cc:1531
 msgid "User's ^Manual"
 msgstr "^Manuale dell'utente"
 
-#: src/ui.cc:1538
+#: src/ui.cc:1532
 msgid "View the detailed program manual"
 msgstr "Mostra il manuale dettagliato del programma"
 
-#: src/ui.cc:1541
+#: src/ui.cc:1535
 msgid "^FAQ"
 msgstr "^FAQ"
 
-#: src/ui.cc:1542
+#: src/ui.cc:1536
 msgid "View a list of frequently asked questions"
 msgstr "Visualizza un elenco delle domande più frequenti"
 
-#: src/ui.cc:1545
+#: src/ui.cc:1539
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1546
+#: src/ui.cc:1540
 #, 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:1549
+#: src/ui.cc:1543
 msgid "^License"
 msgstr "^Licenza"
 
-#: src/ui.cc:1550
+#: src/ui.cc:1544
 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:1668
+#: src/ui.cc:1660
 msgid "Actions"
 msgstr "Azioni"
 
-#: src/ui.cc:1671
+#: src/ui.cc:1663
 msgid "Search"
 msgstr "Cerca"
 
-#: src/ui.cc:1672
+#: src/ui.cc:1664
 msgid "Options"
 msgstr "Opzioni"
 
-#: src/ui.cc:1673
+#: src/ui.cc:1665
 msgid "Views"
 msgstr "Viste"
 
-#: src/ui.cc:1674
+#: src/ui.cc:1666
 msgid "Help"
 msgstr "Aiuto"
 
-#: src/ui.cc:1734
+#: src/ui.cc:1726
 #, c-format
 msgid ""
 "%s: Menu  %s: Help  %s: Quit  %s: Update  %s: Download/Install/Remove Pkgs"
@@ -4541,29 +4570,29 @@
 "%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:2003 src/vscreen/vscreen.cc:281
+#: src/ui.cc:1996 src/vscreen/vscreen.cc:281
 msgid "yes_key"
 msgstr "s"
 
 # Put the appropriate key for Y/N choices here (lower case)
-#: src/ui.cc:2004 src/vscreen/vscreen.cc:282
+#: src/ui.cc:1997 src/vscreen/vscreen.cc:282
 msgid "no_key"
 msgstr "n"
 
-#: src/view_changelog.cc:46
+#: src/view_changelog.cc:61
 msgid "You can only view changelogs of official Debian packages."
 msgstr "È possibile vedere i changelog solo dei pacchetti Debian ufficiali."
 
-#: src/view_changelog.cc:52
+#: src/view_changelog.cc:67
 msgid "Downloading Changelog"
 msgstr "Scaricamento del Changelog"
 
-#: src/view_changelog.cc:54
+#: src/view_changelog.cc:69
 #, fuzzy
 msgid "Download Changelog"
 msgstr "Scaricamento del Changelog"
 
-#: src/view_changelog.cc:63
+#: src/view_changelog.cc:78
 #, c-format
 msgid "%s changes"
 msgstr ""
@@ -4660,18 +4689,201 @@
 #~ "Inserire il seguente disco nell'unità «%s»:\n"
 #~ "%s"
 
+#~ msgid "Need exactly two colors in color definition \"%s\""
+#~ msgstr "Servono esattamente due colori nella definizione dei colori «%s»"
+
+#~ msgid "Can't parse foreground \"%s\"of color \"%s\""
+#~ msgstr "Impossibile analizzare il primo piano «%s» del colore «%s»"
+
+#~ msgid "Can't parse background \"%s\" of color \"%s\""
+#~ msgstr "Impossibile analizzare lo sfondo «%s» del colore «%s»"
+
 #~ msgid "Invalid option for interactive mode: -s\n"
 #~ msgstr "Opzione non ammessa nella modalità interattiva: -s\n"
 
+#~ 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."
+#~ msgstr ""
+#~ "Programmi per faxmodem e altri dispositivi di comunicazione\n"
+#~ " I pacchetti nella sezione «comm» servono a controllare modem e altri "
+#~ "dispositivi hardware di comunicazione. È incluso software per controllare "
+#~ "i faxmodem come, ad esempio, PPP per connessioni internet dialup e "
+#~ "programmi originariamente scritti a tale scopo (zmodem/kermit), così come "
+#~ "software per controllare telefoni cellulari, interfacciarsi con FidoNet e "
+#~ "gestire una BBS."
+
+#~ 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"
+#~ " .\n"
+#~ " For more information about what Debian considers to be Free Software, "
+#~ "see http://www.debian.org/social_contract#guidelines"
+#~ msgstr ""
+#~ "Programmi che non sono Software Libero\n"
+#~ " I pacchetti nella sezione «non-free» non fanno parte di Debian.\n"
+#~ " .\n"
+#~ " Questi pacchetti non soddisfano uno o più requisiti delle Linee Guida "
+#~ "Debian per il Software Libero (vedere sotto). Si dovrebbero leggere le "
+#~ "licenze dei programmi in questa sezione per accertarsi di avere il "
+#~ "permesso di usarli nel modo desiderato.\n"
+#~ " .\n"
+#~ " Per maggiori informazioni riguardo a cosa Debian considera Software "
+#~ "Libero, vedere anche http://www.debian.org/social_contract#guidelines"
+
+#~ 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)"
+#~ msgstr ""
+#~ "Pacchetti nuovi\n"
+#~ " Questi pacchetti sono stati aggiunti a Debian dopo l'ultima "
+#~ "cancellazione dell'elenco dei pacchetti «nuovi»; scegliere «Dimentica i "
+#~ "nuovi pacchetti» dal menu Azioni per svuotare questo elenco."
+
+#~ msgid ""
+#~ "%s is an essential package!\n"
+#~ "\n"
+#~ "Are you sure you want to remove it?\n"
+#~ "Type '%s' if you are."
+#~ msgstr ""
+#~ "%s è un pacchetto essenziale!\n"
+#~ "\n"
+#~ "Se si è certi di volerlo rimuovere, inserire\n"
+#~ "«%s»."
+
+#~ msgid "Available versions of "
+#~ msgstr "Versioni disponibili di "
+
+#~ 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."
+#~ 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."
+
 #~ msgid "Information about "
 #~ msgstr "Informazioni su "
 
+#~ msgid ""
+#~ "Aptitude %s\n"
+#~ "\n"
+#~ "Copyright 2000 Daniel Burrows.\n"
+#~ "\n"
+#~ "aptitude comes with ABSOLUTELY NO WARRANTY; for details see 'license' in "
+#~ "the\n"
+#~ "Help menu.  This is free software, and you are welcome to redistribute "
+#~ "it\n"
+#~ "under certain conditions; see 'license' for details."
+#~ msgstr ""
+#~ "Aptitude %s\n"
+#~ "\n"
+#~ "Copyright © 2000 Daniel Burrows.\n"
+#~ "\n"
+#~ "Aptitude è fornito SENZA ALCUNA GARANZIA; per maggiori dettagli vedere "
+#~ "la\n"
+#~ "voce «licenza» nel menu Aiuto. Questo è Software Libero ed è possibile "
+#~ "la\n"
+#~ "ridistribuzione sotto determinate condizioni; fare riferimento a "
+#~ "«licenza»\n"
+#~ "per maggiori dettagli."
+
+#~ msgid "Some packages were broken and have been fixed"
+#~ msgstr "Alcuni pacchetti erano difettosi e sono stati corretti"
+
 #~ msgid "Some broken packages could not be fixed!"
 #~ msgstr "Non è stato possibile correggere alcuni pacchetti difettosi."
 
+#~ msgid "Some packages are broken.  Try to fix them?"
+#~ msgstr "Alcuni pacchetti sono difettosi. Provare a correggerli?"
+
+#~ msgid ""
+#~ "Installing/removing packages requires administrative privileges, which\n"
+#~ "you currently do not have.  Would you like to change to the root "
+#~ "account?\n"
+#~ msgstr ""
+#~ "Per installare e rimuovere pacchetti servono i privilegi di "
+#~ "amministratore,\n"
+#~ "dei quali al momento si è privi. Passare all'account di root?\n"
+
+#~ msgid ""
+#~ "No packages will be installed, removed or upgraded.\n"
+#~ "\n"
+#~ "Some packages could be upgraded, but you have not chosen to upgrade "
+#~ "them.\n"
+#~ "Type \"U\" to prepare an upgrade."
+#~ msgstr ""
+#~ "Nessun pacchetto verrà installato, rimosso o aggiornato.\n"
+#~ "\n"
+#~ "Alcuni pacchetti potrebbero venire aggiornati ma si è scelto di non "
+#~ "farlo.\n"
+#~ "Premere «U» per preparare un aggiornamento."
+
+#~ 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"
+#~ msgstr ""
+#~ "Per aggiornare l'elenco dei pacchetti servono i privilegi di "
+#~ "amministratore,\n"
+#~ "dei quali attualmente si è privi. Passare all'account di root?\n"
+
+#~ msgid "Obsolete downloaded package files have been deleted"
+#~ msgstr "I file dei vecchi pacchetti scaricati sono stati cancellati"
+
+#~ msgid ""
+#~ "Run 'su' to become root; this will restart the program, but your\n"
+#~ "settings will be preserved"
+#~ msgstr ""
+#~ "Esegue «su» per diventare root; questo farà ripartire il programma,\n"
+#~ "mantenendo però le impostazioni attuali"
+
+#~ msgid ""
+#~ "Mark the selected package as having been automatically installed;\n"
+#~ "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"
+
+#~ msgid ""
+#~ "Mark the selected package as having been manually installed;\n"
+#~ "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"
+
+#~ msgid ""
+#~ "Forbid the candidate version of the selected package from being "
+#~ "installed;\n"
+#~ "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"
+
 #~ msgid "^ChangeLog"
 #~ msgstr "^ChangeLog"
 
+#~ msgid "View the important changes made in each version of the program"
+#~ msgstr ""
+#~ "Mostra i cambiamenti più importanti effettuati in ogni versione del "
+#~ "programma"
+
 #~ 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	Sun Jun 12 21:04:47 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-05-01 14:08-0400\n"
+"POT-Creation-Date: 2005-06-12 22:42+0200\n"
 "PO-Revision-Date: 2004-09-20 11:01+0900\n"
 "Last-Translator: YasuoEto <yasuo at etou.org>\n"
 "Language-Team: \n"
@@ -147,14 +147,14 @@
 msgid "Automatically remove unused packages matching this filter"
 msgstr "このフィルターに当てはまる使われていないパッケージを自動的に削除する"
 
-#: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:219 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
-#: src/vscreen/vs_util.cc:328
+#: src/apt_options.cc:240 src/mine/cmine.cc:249 src/mine/cmine.cc:312
+#: src/ui.cc:215 src/vscreen/vs_util.cc:77 src/vscreen/vs_util.cc:90
+#: src/vscreen/vs_util.cc:264 src/vscreen/vs_util.cc:298
 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:328
+#: src/apt_options.cc:241 src/download_list.cc:69 src/mine/cmine.cc:250
+#: src/mine/cmine.cc:313 src/vscreen/vs_util.cc:298
 msgid "Cancel"
 msgstr "キャンセル"
 
@@ -235,15 +235,15 @@
 msgid "%s: Previous"
 msgstr ""
 
-#: src/broken_indicator.cc:233
+#: src/broken_indicator.cc:232
 #, c-format
-msgid "%CSolution search failed.  %s: try harder"
+msgid "Solution search failed.  %s: try harder"
 msgstr ""
 
-#: src/broken_indicator.cc:239
-#, c-format
-msgid "%CUnable to resolve dependencies."
-msgstr ""
+#: src/broken_indicator.cc:237
+#, fuzzy
+msgid "Unable to resolve dependencies."
+msgstr "%s を書き込み可能な状態で開けません"
 
 #: src/cmdline/cmdline_action.cc:36
 #, c-format
@@ -617,13 +617,13 @@
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
-#: src/vscreen/vs_util.cc:212
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:165
+#: src/vscreen/vs_util.cc:202
 msgid "Yes"
 msgstr "Yes"
 
-#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
-#: src/vscreen/vs_util.cc:212
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:165
+#: src/vscreen/vs_util.cc:202
 msgid "No"
 msgstr "No"
 
@@ -937,7 +937,7 @@
 msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:212
+#: src/cmdline/cmdline_resolver.cc:212 src/cmdline/cmdline_resolver.cc:285
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
@@ -994,196 +994,201 @@
 msgid "The following packages have unmet dependencies:\n"
 msgstr "以下のパッケージには解決できない依存関係があります:\n"
 
-#: src/cmdline/cmdline_show.cc:133
+#: src/cmdline/cmdline_show.cc:119 src/cmdline/cmdline_show.cc:305
+#: src/solution_fragment.cc:65
+msgid "<NULL>"
+msgstr ""
+
+#: src/cmdline/cmdline_show.cc:138
 msgid "not installed"
 msgstr "インストールされていません"
 
-#: src/cmdline/cmdline_show.cc:135 src/pkg_columnizer.cc:231
+#: src/cmdline/cmdline_show.cc:140 src/pkg_columnizer.cc:231
 #: src/pkg_ver_item.cc:225
 msgid "unpacked"
 msgstr "展開済み"
 
-#: src/cmdline/cmdline_show.cc:137
+#: src/cmdline/cmdline_show.cc:142
 msgid "partially configured"
 msgstr "設定未完了"
 
-#: src/cmdline/cmdline_show.cc:139
+#: src/cmdline/cmdline_show.cc:144
 msgid "partially installed"
 msgstr "インストール未完了"
 
-#: src/cmdline/cmdline_show.cc:141
+#: src/cmdline/cmdline_show.cc:146
 msgid "not installed (configuration files remain)"
 msgstr "インストールされていない(設定ファイルは残っている)"
 
-#: src/cmdline/cmdline_show.cc:143 src/pkg_columnizer.cc:239
+#: src/cmdline/cmdline_show.cc:148 src/pkg_columnizer.cc:239
 #: src/pkg_ver_item.cc:233
 msgid "installed"
 msgstr "インストール済み"
 
-#: src/cmdline/cmdline_show.cc:152
+#: src/cmdline/cmdline_show.cc:157
 msgid "not a real package"
 msgstr "本当のパッケージではない"
 
-#: src/cmdline/cmdline_show.cc:165
+#: src/cmdline/cmdline_show.cc:170
 msgid " [held]"
 msgstr "[ヘルプ]"
 
-#: src/cmdline/cmdline_show.cc:174
+#: src/cmdline/cmdline_show.cc:179
 #, c-format
 msgid "%s; version %s will be installed"
 msgstr "%s の、バージョン %s がインストールされます。"
 
-#: src/cmdline/cmdline_show.cc:178
+#: src/cmdline/cmdline_show.cc:183
 #, c-format
 msgid "%s; version %s will be installed automatically"
 msgstr "%s のバージョン %s が自動的にインストールされます。"
 
-#: src/cmdline/cmdline_show.cc:184 src/cmdline/cmdline_show.cc:199
+#: src/cmdline/cmdline_show.cc:189 src/cmdline/cmdline_show.cc:204
 #, c-format
 msgid "%s; will be purged"
 msgstr "%s は完全削除されます。"
 
-#: src/cmdline/cmdline_show.cc:197
+#: src/cmdline/cmdline_show.cc:202
 #, c-format
 msgid "%s; will be purged because nothing depends on it"
 msgstr "なにからも依存されていない %s は完全削除されます。"
 
-#: src/cmdline/cmdline_show.cc:204
+#: src/cmdline/cmdline_show.cc:209
 #, c-format
 msgid "%s; will be removed because nothing depends on it"
 msgstr "なにからも依存されていない %s は削除されます:"
 
-#: src/cmdline/cmdline_show.cc:206
+#: src/cmdline/cmdline_show.cc:211
 #, c-format
 msgid "%s; will be removed"
 msgstr "%s は削除されます。"
 
-#: src/cmdline/cmdline_show.cc:220
+#: src/cmdline/cmdline_show.cc:225
 #, c-format
 msgid "%s%s; will be downgraded [%s -> %s]"
 msgstr "%s%s ダウングレードされます。[%s -> %s]"
 
-#: src/cmdline/cmdline_show.cc:223
+#: src/cmdline/cmdline_show.cc:228
 #, c-format
 msgid "%s%s; will be upgraded [%s -> %s]"
 msgstr "%s%s アップグレードされます。[%s -> %s]"
 
-#: src/cmdline/cmdline_show.cc:235 src/cmdline/cmdline_show.cc:256
+#: src/cmdline/cmdline_show.cc:240 src/cmdline/cmdline_show.cc:261
 msgid "Package: "
 msgstr "パッケージ: "
 
-#: src/cmdline/cmdline_show.cc:236 src/cmdline/cmdline_show.cc:264
+#: src/cmdline/cmdline_show.cc:241 src/cmdline/cmdline_show.cc:269
 #: src/pkg_columnizer.cc:87
 msgid "State"
 msgstr "ステータス"
 
-#: src/cmdline/cmdline_show.cc:237 src/cmdline/cmdline_show.cc:318
+#: src/cmdline/cmdline_show.cc:242 src/cmdline/cmdline_show.cc:325
 msgid "Provided by"
 msgstr "提供"
 
-#: src/cmdline/cmdline_show.cc:258 src/pkg_info_screen.cc:105
+#: src/cmdline/cmdline_show.cc:263 src/pkg_info_screen.cc:105
 msgid "Essential: "
 msgstr "å¿…é ˆ: "
 
-#: src/cmdline/cmdline_show.cc:258 src/cmdline/cmdline_show.cc:262
-#: src/cmdline/cmdline_show.cc:273 src/pkg_info_screen.cc:105
+#: src/cmdline/cmdline_show.cc:263 src/cmdline/cmdline_show.cc:267
+#: src/cmdline/cmdline_show.cc:278 src/pkg_info_screen.cc:105
 msgid "yes"
 msgstr "yes"
 
-#: src/cmdline/cmdline_show.cc:262
+#: src/cmdline/cmdline_show.cc:267
 msgid "New"
 msgstr "新規"
 
-#: src/cmdline/cmdline_show.cc:267
+#: src/cmdline/cmdline_show.cc:272
 msgid "Forbidden version"
 msgstr "禁止バージョン"
 
-#: src/cmdline/cmdline_show.cc:271
+#: src/cmdline/cmdline_show.cc:276
 msgid "Automatically installed"
 msgstr "自動的にインストールされる"
 
-#: src/cmdline/cmdline_show.cc:273
+#: src/cmdline/cmdline_show.cc:278
 msgid "no"
 msgstr "no"
 
-#: src/cmdline/cmdline_show.cc:275
+#: src/cmdline/cmdline_show.cc:280
 msgid "Version: "
 msgstr "バージョン: "
 
-#: src/cmdline/cmdline_show.cc:276 src/pkg_info_screen.cc:113
+#: src/cmdline/cmdline_show.cc:281 src/pkg_info_screen.cc:113
 msgid "Priority: "
 msgstr "優先度: "
 
-#: src/cmdline/cmdline_show.cc:277 src/cmdline/cmdline_show.cc:279
-#: src/cmdline/cmdline_show.cc:288
+#: src/cmdline/cmdline_show.cc:282 src/cmdline/cmdline_show.cc:284
+#: src/cmdline/cmdline_show.cc:293
 msgid "N/A"
 msgstr "N/A"
 
-#: src/cmdline/cmdline_show.cc:278 src/pkg_info_screen.cc:114
+#: src/cmdline/cmdline_show.cc:283 src/pkg_info_screen.cc:114
 msgid "Section: "
 msgstr "分類: "
 
-#: src/cmdline/cmdline_show.cc:280 src/pkg_info_screen.cc:115
+#: src/cmdline/cmdline_show.cc:285 src/pkg_info_screen.cc:115
 msgid "Maintainer: "
 msgstr "保守担当者: "
 
-#: src/cmdline/cmdline_show.cc:283
+#: src/cmdline/cmdline_show.cc:288
 msgid "Uncompressed Size: "
 msgstr "展開サイズ: "
 
-#: src/cmdline/cmdline_show.cc:287
+#: src/cmdline/cmdline_show.cc:292
 msgid "Architecture: "
 msgstr "アーキテクチャ: "
 
-#: src/cmdline/cmdline_show.cc:289
+#: src/cmdline/cmdline_show.cc:294
 msgid "Compressed Size: "
 msgstr "圧縮サイズ: "
 
-#: src/cmdline/cmdline_show.cc:291
+#: src/cmdline/cmdline_show.cc:296
 msgid "Filename: "
 msgstr "ファイル名: "
 
-#: src/cmdline/cmdline_show.cc:293
+#: src/cmdline/cmdline_show.cc:298
 msgid "MD5sum: "
 msgstr "MD5sum"
 
-#: src/cmdline/cmdline_show.cc:297 src/cmdline/cmdline_show.cc:299
+#: src/cmdline/cmdline_show.cc:302 src/cmdline/cmdline_show.cc:305
 msgid "Archive"
 msgstr "アーカイブ"
 
-#: src/cmdline/cmdline_show.cc:303
+#: src/cmdline/cmdline_show.cc:310
 msgid "Depends"
 msgstr "依存"
 
-#: src/cmdline/cmdline_show.cc:305
+#: src/cmdline/cmdline_show.cc:312
 msgid "PreDepends"
 msgstr "先行依存"
 
-#: src/cmdline/cmdline_show.cc:307
+#: src/cmdline/cmdline_show.cc:314
 msgid "Recommends"
 msgstr "提案"
 
-#: src/cmdline/cmdline_show.cc:309
+#: src/cmdline/cmdline_show.cc:316
 msgid "Suggests"
 msgstr "推奨"
 
-#: src/cmdline/cmdline_show.cc:311
+#: src/cmdline/cmdline_show.cc:318
 msgid "Conflicts"
 msgstr "競合"
 
-#: src/cmdline/cmdline_show.cc:313
+#: src/cmdline/cmdline_show.cc:320
 msgid "Replaces"
 msgstr "置換"
 
-#: src/cmdline/cmdline_show.cc:315
+#: src/cmdline/cmdline_show.cc:322
 msgid "Obsoletes"
 msgstr "廃止"
 
-#: src/cmdline/cmdline_show.cc:317
+#: src/cmdline/cmdline_show.cc:324
 msgid "Provides"
 msgstr "提供"
 
-#: src/cmdline/cmdline_show.cc:321 src/pkg_info_screen.cc:97
+#: src/cmdline/cmdline_show.cc:328 src/pkg_info_screen.cc:97
 msgid "Description: "
 msgstr "詳細: "
 
@@ -1226,32 +1231,32 @@
 msgid "You cannot specify both an archive and a version for a package\n"
 msgstr "パッケージのバージョンとアーカイブを同時には指定できません\n"
 
-#: src/dep_item.cc:137
+#: src/dep_item.cc:139
 msgid "UNSATISFIED"
 msgstr "依存関係未解決"
 
-#: src/dep_item.cc:137 src/reason_fragment.cc:247
+#: src/dep_item.cc:139 src/reason_fragment.cc:244
 msgid "UNAVAILABLE"
 msgstr "入手不可"
 
-#: src/download_bar.cc:56 src/download_list.cc:263 src/download_screen.cc:57
+#: src/download_bar.cc:56 src/download_list.cc:266 src/download_screen.cc:57
 #, c-format
 msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
 msgstr "\"%s\"  と書かれたディスクを \"%s\" ドライブに入れてください"
 
-#: src/download_bar.cc:77 src/generic/acqprogress.cc:63
+#: src/download_bar.cc:75 src/generic/acqprogress.cc:63
 msgid "Hit "
 msgstr "発見 "
 
-#: src/download_bar.cc:90
+#: src/download_bar.cc:88
 msgid "Downloading "
 msgstr "ダウンロード中 "
 
-#: src/download_bar.cc:103
+#: src/download_bar.cc:101
 msgid "Got "
 msgstr "取得 "
 
-#: src/download_bar.cc:157
+#: src/download_bar.cc:155
 msgid "Downloading..."
 msgstr "ダウンロード中..."
 
@@ -1279,7 +1284,7 @@
 msgid "Couldn't clean out list directories"
 msgstr "入手先一覧のディレクトリを綺麗にできませんでした"
 
-#: src/download.cc:177 src/ui.cc:1153
+#: src/download.cc:177 src/ui.cc:1147
 msgid "Deleting obsolete downloaded files"
 msgstr "ダウンロードされた古いファイルを削除しています"
 
@@ -1415,7 +1420,7 @@
 "Ack!  Something bad happened while installing packages.  Trying to recover:"
 msgstr " パッケージのインストール中に問題が起こりました。修復を試みます: "
 
-#: src/download.cc:477 src/pkg_item.cc:432
+#: src/download.cc:477 src/pkg_item.cc:430
 msgid "Press return to continue.\n"
 msgstr "続けるには RETURN を押してください。\n"
 
@@ -1424,17 +1429,17 @@
 "Could not regain the system lock!  (Perhaps another apt or dpkg is running?)"
 msgstr "システムロックを復帰できません(他にaptかdpkgが動いていませんか?)"
 
-#: src/download_item.cc:66 src/download_item.cc:70 src/download_item.cc:100
+#: src/download_item.cc:70 src/download_item.cc:74 src/download_item.cc:104
 #: src/generic/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr " [作業中]"
 
-#: src/download_item.cc:104 src/download_list.cc:283
+#: src/download_item.cc:108 src/download_list.cc:284
 msgid "[Hit]"
 msgstr "[発見]"
 
-#: src/download_item.cc:104 src/download_list.cc:303
+#: src/download_item.cc:108 src/download_list.cc:304
 msgid "[Downloaded]"
 msgstr "[ダウンロード済み]"
 
@@ -1449,34 +1454,34 @@
 msgid "%n%nSome files were not downloaded successfully."
 msgstr ""
 
-#: src/download_list.cc:68
+#: src/download_list.cc:66
 msgid "Continue"
 msgstr "続行"
 
-#: src/download_list.cc:175 src/download_screen.cc:203
+#: src/download_list.cc:178 src/download_screen.cc:203
 msgid "Total Progress: "
 msgstr "進行状況: "
 
-#: src/download_list.cc:194 src/download_screen.cc:218
+#: src/download_list.cc:197 src/download_screen.cc:218
 #, c-format
 msgid " [ %i%% ] (%sB/s, %s remaining)"
 msgstr " [ %i%% ] (%sB/秒, 残り %s秒)"
 
-#: src/download_list.cc:196
+#: src/download_list.cc:199
 #, c-format
 msgid " [ %i%% ] (stalled)"
 msgstr " [ %i%% ] (待機中)"
 
-#: src/download_list.cc:198
+#: src/download_list.cc:201
 #, c-format
 msgid " [ %i%% ]"
 msgstr " [ %i%% ]"
 
-#: src/download_list.cc:323
+#: src/download_list.cc:324
 msgid "[IGNORED]"
 msgstr "[無視]"
 
-#: src/download_list.cc:329
+#: src/download_list.cc:330
 msgid "[ERROR]"
 msgstr "[エラー]"
 
@@ -1485,11 +1490,11 @@
 msgid "Downloaded %sB in %ss (%sB/s)."
 msgstr "%sB を %s 秒で取得しました。(%sB/s). 続けるにはキーを押してください..."
 
-#: src/edit_pkg_hier.cc:158
+#: src/edit_pkg_hier.cc:176
 msgid "No hierarchy information to edit"
 msgstr "階層情報を書き込めません"
 
-#: src/edit_pkg_hier.cc:258
+#: src/edit_pkg_hier.cc:276
 msgid "Couldn't open for writing"
 msgstr "書き込み可能な状態で開けません"
 
@@ -1586,39 +1591,39 @@
 msgid "Warning: could not lock the cache file.  Opening in read-only mode"
 msgstr "警告: キャッシュファイルをロックできません。表示のみモードで開きます"
 
-#: src/generic/matchers.cc:797
+#: src/generic/matchers.cc:798
 msgid "Unmatched '('"
 msgstr "'('のかっこ対応がとれません"
 
-#: src/generic/matchers.cc:887 src/generic/matchers.cc:968
+#: src/generic/matchers.cc:888 src/generic/matchers.cc:969
 #, c-format
 msgid "Unknown dependency type: %s"
 msgstr "不明な依存形式: %s"
 
-#: src/generic/matchers.cc:950
+#: src/generic/matchers.cc:951
 #, c-format
 msgid "Unknown action type: %s"
 msgstr "不明な動作: %s"
 
-#: src/generic/matchers.cc:1017
+#: src/generic/matchers.cc:1018
 #, c-format
 msgid "Unknown priority %s"
 msgstr "不明な優先度: %s"
 
-#: src/generic/matchers.cc:1039
+#: src/generic/matchers.cc:1040
 #, c-format
 msgid "Unknown pattern type: %c"
 msgstr "不明なパターン: %c"
 
-#: src/generic/matchers.cc:1084
+#: src/generic/matchers.cc:1105
 msgid "Unexpected empty expression"
 msgstr "想定外の空の式です"
 
-#: src/generic/matchers.cc:1119
+#: src/generic/matchers.cc:1143
 msgid "Badly formed expression"
 msgstr "書式が正しくありません"
 
-#: src/generic/matchers.cc:1148
+#: src/generic/matchers.cc:1175
 msgid "Unexpected ')'"
 msgstr "想定外の')'です"
 
@@ -1643,7 +1648,7 @@
 msgid "Can't get value of $HOME, using TMPDIR (insecure)"
 msgstr "$HOME が取得できません、 TMPディレクトリを使用します。"
 
-#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:61
+#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:76
 #, c-format
 msgid "ChangeLog of %s"
 msgstr "%s の更新履歴"
@@ -1689,37 +1694,37 @@
 msgid "Reading task descriptions"
 msgstr "タスクの説明を読み込み中"
 
-#: src/load_config.cc:30
-#, c-format
-msgid "Invalid entry in color definition group: \"%s\""
-msgstr "無効な色定義グループエントリ: \"%s\""
+#: src/load_config.cc:42
+#, fuzzy, c-format
+msgid "Unrecognized color name \"%s\""
+msgstr "未承認タスク"
 
-#: src/load_config.cc:32
-#, c-format
-msgid "Invalid tagless entry in color definition group: \"%s\""
-msgstr "無効な色定義グループのタグのないエントリ: \"%s\""
+#: src/load_config.cc:69
+#, fuzzy, c-format
+msgid "Unrecognized attribute name \"%s\""
+msgstr "未承認タスク"
 
-#: src/load_config.cc:34
-#, c-format
-msgid "Need exactly two colors in color definition \"%s\""
-msgstr "色の定義 \"%s\"には2色必要です"
+#: src/load_config.cc:106
+#, fuzzy, c-format
+msgid "Invalid entry in style definition group: \"%s\""
+msgstr "無効な色定義グループエントリ: \"%s\""
 
-#: src/load_config.cc:50
-#, c-format
-msgid "Can't parse foreground \"%s\"of color \"%s\""
-msgstr "\"%2$s\" 色は前景色  \"%1$s\" を解析できません"
+#: src/load_config.cc:108
+#, fuzzy, c-format
+msgid "Invalid tagless entry in style definition group: \"%s\""
+msgstr "無効な色定義グループのタグのないエントリ: \"%s\""
 
-#: src/load_config.cc:53
-#, c-format
-msgid "Can't parse background \"%s\" of color \"%s\""
-msgstr "\"%2$s\" 色は背景色 \"%1$s\" を解析できません"
+#: src/load_config.cc:130
+#, fuzzy, c-format
+msgid "Unknown style attribute %s"
+msgstr "不明な動作: %s"
 
-#: src/load_config.cc:72 src/load_config.cc:74
+#: src/load_config.cc:153 src/load_config.cc:155
 #, c-format
 msgid "Invalid entry in keybinding group: \"%s\""
 msgstr "キー設定グループ \"%s\"で無効なエントリです"
 
-#: src/load_config.cc:89
+#: src/load_config.cc:170
 #, c-format
 msgid "Ignoring invalid keybinding \"%s\" -> \"%s\""
 msgstr " \"%s\" -> \"%s\" は無効なキー設定です"
@@ -2122,44 +2127,44 @@
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                  aptitudeはスーパー牛さんパワーなど持っていません\n"
 
-#: src/main.cc:255
+#: src/main.cc:252
 #, c-format
 msgid "-o requires an argument of the form key=value, got %s"
 msgstr "-o は %s の key=value の引き数が必要です"
 
-#: src/main.cc:301 src/main.cc:310
+#: src/main.cc:291 src/main.cc:300
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr "不可思議: 未知のオプションのコードを受けました\n"
 
-#: src/main.cc:319
+#: src/main.cc:309
 msgid "Only one of -u and -i may be specified\n"
 msgstr "-u と -i は片方しか指定できません\n"
 
-#: src/main.cc:327
+#: src/main.cc:317
 msgid ""
 "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgstr ""
 "-u と -i はコマンドラインモードのオプションではありません(例、'install'と使"
 "う)"
 
-#: src/main.cc:348
+#: src/main.cc:338
 msgid "-u and -i may not be specified with a command"
 msgstr "-u と -i はコマンドの指定ではありません"
 
-#: src/main.cc:405
+#: src/main.cc:395
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr "不明なコマンド \"%s\"\n"
 
-#: src/main.cc:412 src/main.cc:469
+#: src/main.cc:402 src/main.cc:450
 msgid "Internal error: uncaught 'out of solutions' exception.\n"
 msgstr ""
 
-#: src/main.cc:417 src/main.cc:474
+#: src/main.cc:407 src/main.cc:455
 msgid "Internal error: uncaught 'out of time' exception.\n"
 msgstr ""
 
-#: src/main.cc:424
+#: src/main.cc:414
 #, c-format
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
@@ -2190,7 +2195,7 @@
 msgid "Lost"
 msgstr "敗北"
 
-#: src/mine/cmine.cc:119 src/ui.cc:1090
+#: src/mine/cmine.cc:119 src/ui.cc:1084
 msgid "Minesweeper"
 msgstr "マインスイーパ"
 
@@ -2216,148 +2221,148 @@
 msgid "The number of mines must be a number"
 msgstr "地雷の数を数字で入力してください"
 
-#: src/mine/cmine.cc:240
+#: src/mine/cmine.cc:238
 msgid "Setup custom game"
 msgstr "カスタムゲームの設定"
 
-#: src/mine/cmine.cc:243
+#: src/mine/cmine.cc:240
 msgid "Height of board: "
 msgstr "ボードの高さ: "
 
-#: src/mine/cmine.cc:247
+#: src/mine/cmine.cc:243
 msgid "Width of board: "
 msgstr "ボードの幅: "
 
-#: src/mine/cmine.cc:251
+#: src/mine/cmine.cc:246
 msgid "Number of mines: "
 msgstr "地雷の数: "
 
-#: src/mine/cmine.cc:316
+#: src/mine/cmine.cc:305
 msgid "Choose difficulty level"
 msgstr "レベルを選択"
 
-#: src/mine/cmine.cc:318
+#: src/mine/cmine.cc:307
 msgid "Easy"
 msgstr "簡単"
 
-#: src/mine/cmine.cc:319
+#: src/mine/cmine.cc:308
 msgid "Medium"
 msgstr "普通"
 
-#: src/mine/cmine.cc:320
+#: src/mine/cmine.cc:309
 msgid "Hard"
 msgstr "難しい"
 
-#: src/mine/cmine.cc:321
+#: src/mine/cmine.cc:310
 msgid "Custom"
 msgstr "独自"
 
-#: src/mine/cmine.cc:411
+#: src/mine/cmine.cc:392
 msgid "You have won."
 msgstr "あなたの勝ちです。"
 
-#: src/mine/cmine.cc:414
+#: src/mine/cmine.cc:395
 msgid "You lose!"
 msgstr "あなたの負けです"
 
-#: src/mine/cmine.cc:419
+#: src/mine/cmine.cc:400
 msgid "You die...  --More--"
 msgstr "あなたは死にました... --More--"
 
-#: src/mine/cmine.cc:432
+#: src/mine/cmine.cc:413
 msgid "The spikes were poisoned!  The poison was deadly..  --More--"
 msgstr "刺には毒が塗られていました! 致死量でした。。。 --More--"
 
-#: src/mine/cmine.cc:435
+#: src/mine/cmine.cc:416
 msgid "You land on a set of sharp iron spikes!  --More--"
 msgstr "設置してあった鉄の刺に着陸しました! --More--"
 
-#: src/mine/cmine.cc:438
+#: src/mine/cmine.cc:419
 msgid "You fall into a pit!  --More--"
 msgstr "落し穴に落ちました! --More--"
 
-#: src/mine/cmine.cc:441
+#: src/mine/cmine.cc:422
 msgid "KABOOM!  You step on a land mine.  --More--"
 msgstr "ドカーン! 地雷を踏みました。 --More--"
 
-#: src/mine/cmine.cc:446
+#: src/mine/cmine.cc:427
 msgid "The dart was poisoned!  The poison was deadly...  --More--"
 msgstr "投げ矢には毒が塗られていました! 致死量にでした。。。 --More--"
 
-#: src/mine/cmine.cc:448
+#: src/mine/cmine.cc:429
 msgid ""
 "A little dart shoots out at you!  You are hit by a little dart!  --More--"
 msgstr ""
 "小さな投げ矢が飛んできました! 小さな投げ矢はあなたに命中しました! --More--"
 
-#: src/mine/cmine.cc:452
+#: src/mine/cmine.cc:433
 msgid "You turn to stone... --More--"
 msgstr "あなたは石になりました。。。 --More--"
 
-#: src/mine/cmine.cc:454
+#: src/mine/cmine.cc:435
 msgid "Touching the cockatrice corpse was a fatal mistake.  --More--"
 msgstr "コカトリスの死体に触るのは致命的ミスだ。 --More--"
 
-#: src/mine/cmine.cc:456
+#: src/mine/cmine.cc:437
 msgid "You feel here a cockatrice corpse.  --More--"
 msgstr "あなたはコカトリスの死体に触った。--More--"
 
-#: src/mine/cmine.cc:460
+#: src/mine/cmine.cc:441
 msgid ""
 "Click!  You trigger a rolling boulder trap!  You are hit by a boulder! --"
 "More--"
 msgstr "カチッ! 転がる岩のスイッチだ! 岩はあなたに当った! --More--"
 
-#: src/mine/cmine.cc:470
+#: src/mine/cmine.cc:451
 msgid "sleep"
 msgstr "眠り"
 
-#: src/mine/cmine.cc:473
+#: src/mine/cmine.cc:454
 msgid "striking"
 msgstr "打撃"
 
-#: src/mine/cmine.cc:476
+#: src/mine/cmine.cc:457
 msgid "death"
 msgstr "死亡"
 
-#: src/mine/cmine.cc:479
+#: src/mine/cmine.cc:460
 msgid "polymorph"
 msgstr "変身"
 
-#: src/mine/cmine.cc:482
+#: src/mine/cmine.cc:463
 msgid "magic missile"
 msgstr "魔法の矢"
 
-#: src/mine/cmine.cc:485
+#: src/mine/cmine.cc:466
 msgid "secret door detection"
 msgstr "秘密の扉看破"
 
-#: src/mine/cmine.cc:488
+#: src/mine/cmine.cc:469
 msgid "invisibility"
 msgstr "盲目"
 
-#: src/mine/cmine.cc:491
+#: src/mine/cmine.cc:472
 msgid "cold"
 msgstr "冷気"
 
-#: src/mine/cmine.cc:497
+#: src/mine/cmine.cc:478
 #, c-format
 msgid "Your wand of %s breaks apart and explodes!  --More--"
 msgstr "あなたの %s の杖はバラバラに砕け散った! --More--"
 
-#: src/mine/cmine.cc:503
+#: src/mine/cmine.cc:484
 msgid "You are jolted by a surge of electricity!  --More--"
 msgstr "電流があなたの体に衝撃を与えた! --More--"
 
-#: src/mine/cmine.cc:607
+#: src/mine/cmine.cc:588
 msgid "Enter the filename to load: "
 msgstr "読み込むファイル名を入力してください: "
 
-#: src/mine/cmine.cc:614
+#: src/mine/cmine.cc:595
 msgid "Enter the filename to save: "
 msgstr "保存するファイル名を入力してくだし: "
 
-#: src/mine/cmine.cc:624
+#: src/mine/cmine.cc:605
 msgid "mine-help.txt"
 msgstr "mine-help.txt"
 
@@ -2365,7 +2370,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:1670
+#: src/pkg_columnizer.cc:84 src/ui.cc:1662
 msgid "Package"
 msgstr "パッケージ"
 
@@ -3416,52 +3421,52 @@
 "本当に削除したいですか?\n"
 "削除する場合ば'%s'と入力してください。"
 
-#: src/pkg_item.cc:222 src/pkg_ver_item.cc:625
+#: src/pkg_item.cc:220 src/pkg_ver_item.cc:626
 #, c-format
 msgid "Information about %s"
 msgstr "%s の情報"
 
-#: src/pkg_item.cc:224 src/pkg_ver_item.cc:627
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:628
 #, c-format
 msgid "%s info"
 msgstr ""
 
-#: src/pkg_item.cc:310
+#: src/pkg_item.cc:308
 #, fuzzy, c-format
 msgid "Available versions of %s"
 msgstr "利用可能バージョン"
 
-#: src/pkg_item.cc:313
+#: src/pkg_item.cc:311
 #, fuzzy, c-format
 msgid "%s versions"
 msgstr "バージョン"
 
-#: src/pkg_item.cc:325 src/pkg_ver_item.cc:655
+#: src/pkg_item.cc:323 src/pkg_ver_item.cc:656
 #, c-format
 msgid "Dependencies of %s"
 msgstr "%s の依存関係"
 
-#: src/pkg_item.cc:327 src/pkg_ver_item.cc:657
+#: src/pkg_item.cc:325 src/pkg_ver_item.cc:658
 #, c-format
 msgid "%s deps"
 msgstr ""
 
-#: src/pkg_item.cc:338 src/pkg_ver_item.cc:667
+#: src/pkg_item.cc:336 src/pkg_ver_item.cc:668
 #, c-format
 msgid "Packages depending on %s"
 msgstr "%s に依存しているパッケージ"
 
-#: src/pkg_item.cc:340 src/pkg_ver_item.cc:669
+#: src/pkg_item.cc:338 src/pkg_ver_item.cc:670
 #, c-format
 msgid "%s reverse deps"
 msgstr ""
 
-#: src/pkg_item.cc:392 src/pkg_ver_item.cc:707
+#: src/pkg_item.cc:390 src/pkg_ver_item.cc:708
 #, c-format
 msgid "Reporting a bug in %s:\n"
 msgstr "%s のバグを報告します。 \n"
 
-#: src/pkg_item.cc:414
+#: src/pkg_item.cc:412
 #, fuzzy
 msgid ""
 "You are not root and I cannot find any way to become root.  To reconfigure "
@@ -3473,16 +3478,16 @@
 "menu や login パッケージをインストールするか、\n"
 "aptitude を root で起動してください。"
 
-#: src/pkg_item.cc:422
+#: src/pkg_item.cc:420
 #, c-format
 msgid "Reconfiguring %s\n"
 msgstr "%s を再設定 \n"
 
-#: src/pkg_item.cc:447
+#: src/pkg_item.cc:445
 msgid "Hierarchy editor"
 msgstr "階層エディタ"
 
-#: src/pkg_item.cc:447
+#: src/pkg_item.cc:445
 #, fuzzy
 msgid "Hierarchy Editor"
 msgstr "階層エディタ"
@@ -3516,20 +3521,20 @@
 msgid "Enter the new package sorting mechanism for this display: "
 msgstr "新規パッケージの並び替えルールを入力してください: "
 
-#: src/pkg_view.cc:344
+#: src/pkg_view.cc:359
 msgid "make_package_view: error in arguments -- two main widgets??"
 msgstr "make_package_view: 引数エラー -- 二つのメインウィジェット??"
 
-#: src/pkg_view.cc:350
+#: src/pkg_view.cc:365
 msgid ""
 "make_package_view: error in arguments -- bad column list for static item"
 msgstr "make_packafe_view: 引数エラー -- 静的なアイテムで不正なカラムリスト"
 
-#: src/pkg_view.cc:443
+#: src/pkg_view.cc:458
 msgid "make_package_view: bad argument!"
 msgstr "make_package_view: 不正な引数!"
 
-#: src/pkg_view.cc:495
+#: src/pkg_view.cc:510
 msgid "make_package_view: no main widget found"
 msgstr "make_package_view: メインウィジェットが見つかりません"
 
@@ -3566,18 +3571,18 @@
 msgid " (provided by %F)"
 msgstr "(提供 %F)"
 
-#: src/reason_fragment.cc:278
+#: src/reason_fragment.cc:275
 #, c-format
 msgid "%F%s %F %F"
 msgstr "%F%s %F %F"
 
-#: src/reason_fragment.cc:327
+#: src/reason_fragment.cc:324
 msgid ""
 "If you select a package, an explanation of its current state will appear in "
 "this space."
 msgstr "パッケージ選択時に、現在の状態と説明がここに表示されます。"
 
-#: src/reason_fragment.cc:361
+#: src/reason_fragment.cc:358
 msgid ""
 "%B%s%b was installed automatically;  it is being removed because all of the "
 "packages which depend upon it are being removed:"
@@ -3585,22 +3590,22 @@
 "%B%s%b は自動的にインストールされました; このパッケージを削除すると依存して "
 "いる以下のパッケージも削除されます:"
 
-#: src/reason_fragment.cc:365
+#: src/reason_fragment.cc:362
 msgid "%B%s%b will be automatically removed because of dependency errors:"
 msgstr "%B%s%b は依存関係エラーにより自動的に削除されます:"
 
-#: src/reason_fragment.cc:369
+#: src/reason_fragment.cc:366
 msgid ""
 "%B%s%b will be automatically installed to satisfy the following dependencies:"
 msgstr "%B%s%b は依存関係を解決するために自動的にインストールされます:"
 
-#: src/reason_fragment.cc:375 src/reason_fragment.cc:387
+#: src/reason_fragment.cc:372 src/reason_fragment.cc:384
 msgid ""
 "%B%s%b cannot be upgraded now, but if it could be, it would still be held at "
 "version %B%s%b."
 msgstr "%B%s%b は更新できません。バージョン %B%s%bで変更禁止されています。"
 
-#: src/reason_fragment.cc:378
+#: src/reason_fragment.cc:375
 msgid ""
 "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the "
 "following dependencies:"
@@ -3608,27 +3613,27 @@
 "%B%s%b はバージョン %B%s%b から更新できません、以下の依存 関係を維持するため"
 "です:"
 
-#: src/reason_fragment.cc:390
+#: src/reason_fragment.cc:387
 msgid "%B%s%b is currently installed."
 msgstr "%B%s%b は既にインストールされています"
 
-#: src/reason_fragment.cc:396
+#: src/reason_fragment.cc:393
 msgid "%B%s%b is not currently installed."
 msgstr "%B%s%b はインストールされていません"
 
-#: src/reason_fragment.cc:404
+#: src/reason_fragment.cc:401
 msgid "Some dependencies of %B%s%b are not satisfied:"
 msgstr "%B%s%b の依存関係が解決されていません:"
 
-#: src/reason_fragment.cc:408
+#: src/reason_fragment.cc:405
 msgid "%B%s%b will be downgraded."
 msgstr "%B%s%b はダウングレードされます。"
 
-#: src/reason_fragment.cc:415
+#: src/reason_fragment.cc:412
 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b."
 msgstr "%B%s%b からバージョン %B%s%b への更新を禁止されています。"
 
-#: src/reason_fragment.cc:419
+#: src/reason_fragment.cc:416
 msgid ""
 "%B%s%b could be upgraded to version %B%s%b, but it is being held at version %"
 "B%s%b."
@@ -3636,40 +3641,40 @@
 "%B%s%b はバージョン %B%s%b に更新可能です、しかしバージョン %B%s%bで更新禁止"
 "になっています。"
 
-#: src/reason_fragment.cc:426
+#: src/reason_fragment.cc:423
 msgid "%B%s%b will be re-installed."
 msgstr "%B%s%b は再インストールされます。"
 
-#: src/reason_fragment.cc:430
+#: src/reason_fragment.cc:427
 msgid "%B%s%b will be installed."
 msgstr "%B%s%b はインストールされます。"
 
-#: src/reason_fragment.cc:434
+#: src/reason_fragment.cc:431
 msgid "%B%s%b will be removed."
 msgstr "%B%s%b は削除されます。"
 
-#: src/reason_fragment.cc:439
+#: src/reason_fragment.cc:436
 msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b."
 msgstr "%B%s%b はバージョン %B%s%b からバージョン %B%s%b に更新されます。"
 
-#: src/reason_fragment.cc:475
+#: src/reason_fragment.cc:472
 msgid ""
 "The following packages depend on %B%s%b and will be broken by its removal:"
 msgstr ""
 "以下のパッケージは %B%s%b に依存しています。削除すると依存関係が解決されなく"
 "なります:"
 
-#: src/reason_fragment.cc:478
+#: src/reason_fragment.cc:475
 msgid "The following packages depend on %B%s%b and are broken:"
 msgstr "以下のパッケージは 依存関係が解決できない %B%s%b に依存しています:"
 
-#: src/reason_fragment.cc:485
+#: src/reason_fragment.cc:482
 msgid ""
 "The following packages conflict with %B%s%b and will be broken by its "
 "installation:"
 msgstr "以下のパッケージは %B%s%b と競合し依存関係が解決できなくなります :"
 
-#: src/reason_fragment.cc:518
+#: src/reason_fragment.cc:515
 msgid ""
 "The following packages depend on a version of %B%s%b other than the "
 "currently installed version of %B%s%b, or conflict with the currently "
@@ -3679,7 +3684,7 @@
 "ているバージョンは %B%s%b です、もしくは現在インストールされているバージョン"
 "と競合します:"
 
-#: src/reason_fragment.cc:522
+#: src/reason_fragment.cc:519
 msgid ""
 "The following packages conflict with %B%s%b, or depend on a version of it "
 "which is not going to be installed."
@@ -3687,11 +3692,11 @@
 "以下のパッケージは%B%s%bと競合するかインストールされていないバージョンに依存"
 "しています"
 
-#: src/reason_fragment.cc:526
+#: src/reason_fragment.cc:523
 msgid "The following packages conflict with %B%s%b:"
 msgstr "以下のパッケージは %B%s%b と競合しています:"
 
-#: src/reason_fragment.cc:531
+#: src/reason_fragment.cc:528
 msgid ""
 "The following packages depend on a version of %B%s%b other than the "
 "currently installed version of %B%s%b:"
@@ -3699,18 +3704,18 @@
 "以下のパッケージはバージョン %B%s%b に依存していますが、現在インストールされ"
 "ているバージョンは %B%s%b です:"
 
-#: src/reason_fragment.cc:535
+#: src/reason_fragment.cc:532
 msgid ""
 "The following packages depend on a version of %B%s%b which is not going to "
 "be installed."
 msgstr ""
 "以下のパッケージはバージョン %B%s%b に依存していますがインストールできません"
 
-#: src/reason_fragment.cc:541
+#: src/reason_fragment.cc:538
 msgid "upgraded"
 msgstr "アップグレード"
 
-#: src/reason_fragment.cc:541
+#: src/reason_fragment.cc:538
 msgid "downgraded"
 msgstr "ダウングレード"
 
@@ -3729,7 +3734,7 @@
 #  I hope this is ok for the translators :-/ --
 #  factoring out upgraded/downgraded in its two senses
 #  would be a royal pain even if gettext supported it.
-#: src/reason_fragment.cc:547
+#: src/reason_fragment.cc:544
 msgid ""
 "The following packages depend on the currently installed version of %B%s%b (%"
 "B%s%b), or conflict with the version it will be %s to (%B%s%b), and will be "
@@ -3738,7 +3743,7 @@
 "以下のパッケージは現在のバージョン %B%s%b (%B%s%b) に依存しているか、%s (%B%s"
 "%b) と衝突してしまい、依存関係を解決できません。"
 
-#: src/reason_fragment.cc:554
+#: src/reason_fragment.cc:551
 msgid ""
 "The following packages conflict with version %B%s%b of %B%s%b, and will be "
 "broken if it is %s."
@@ -3746,7 +3751,7 @@
 "以下のパッケージは %B%2$s%b のバージョン %B%1$s%b と衝突してしまうので、 %s "
 "の依存関係が解決できなくなります。"
 
-#: src/reason_fragment.cc:559
+#: src/reason_fragment.cc:556
 msgid ""
 "The following packages depend on version %B%s%b of %B%s%b, and will be "
 "broken if it is %s."
@@ -3793,31 +3798,36 @@
 msgid "Close"
 msgstr "閉じる"
 
-#: src/solution_fragment.cc:125
+#: src/solution_fragment.cc:134
 #, fuzzy
 msgid "%BRemove%b the following packages:%n"
 msgstr "以下のパッケージが壊れています:"
 
-#: src/solution_fragment.cc:135
+#: src/solution_fragment.cc:144
 #, fuzzy
 msgid "%BInstall%b the following packages:%n"
 msgstr "以下のパッケージが壊れています:"
 
-#: src/solution_fragment.cc:148
+#: src/solution_fragment.cc:157
 msgid "%BKeep%b the following packages at their current version:%n"
 msgstr ""
 
-#: src/solution_fragment.cc:161
+#: src/solution_fragment.cc:164
+#, fuzzy
+msgid "Not Installed"
+msgstr "インストールされていません"
+
+#: src/solution_fragment.cc:177
 #, fuzzy
 msgid "%BUpgrade%b the following packages:%n"
 msgstr "以下のパッケージが壊れています:"
 
-#: src/solution_fragment.cc:176
+#: src/solution_fragment.cc:192
 #, fuzzy
 msgid "%BDowngrade%b the following packages:%n"
 msgstr "ダウンロード中 "
 
-#: src/solution_fragment.cc:190
+#: src/solution_fragment.cc:206
 #, c-format
 msgid "Score is %d"
 msgstr ""
@@ -3846,43 +3856,43 @@
 msgid "W:"
 msgstr ""
 
-#: src/ui.cc:194
+#: src/ui.cc:193
 msgid "Search for:"
 msgstr "検索: "
 
-#: src/ui.cc:262
+#: src/ui.cc:258
 msgid "You already are root!"
 msgstr "既に root です!"
 
-#: src/ui.cc:360
+#: src/ui.cc:356
 msgid ""
 "Subprocess exited with an error -- did you type your password correctly?"
 msgstr "サブプロセスはエラーで終了しました。入力したパスワードは正しいですか?"
 
-#: src/ui.cc:388
+#: src/ui.cc:384
 msgid "Loading cache"
 msgstr "キャッシュを読み込んでいます"
 
-#: src/ui.cc:410
+#: src/ui.cc:406
 msgid "Really quit Aptitude?"
 msgstr "本当に aptitude を終了しますか?"
 
-#: src/ui.cc:489
+#: src/ui.cc:485
 msgid "Really discard your personal settings and reload the defaults?"
 msgstr "変更された設定を破棄してデフォルトの設定に戻しますか?"
 
-#: src/ui.cc:589 src/ui.cc:591 src/ui.cc:619 src/ui.cc:621
+#: src/ui.cc:585 src/ui.cc:587 src/ui.cc:615 src/ui.cc:617
 msgid "Packages"
 msgstr "パッケージ"
 
-#: src/ui.cc:590 src/ui.cc:620
+#: src/ui.cc:586 src/ui.cc:616
 msgid "View available packages and choose actions to perform"
 msgstr "利用可能なパッケージを閲覧し、実行するアクションを選択したりする"
 
-#: src/ui.cc:667
+#: src/ui.cc:663
 #, fuzzy
 msgid ""
-"%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
+"Aptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
 "BABSOLUTELY NO WARRANTY%b; for details see 'license' in the Help menu.  This "
 "is free software, and you are welcome to redistribute it under certain "
 "conditions; see 'license' for details."
@@ -3896,61 +3906,66 @@
 "このソフトはフリーソフトウェアです、ライセンスに従って再配布が認められていま"
 "す。詳しくは'license' を見てください"
 
-#: src/ui.cc:688
+#: src/ui.cc:684
 msgid "help.txt"
 msgstr "help-ja.txt"
 
-#: src/ui.cc:704
+#: src/ui.cc:700
 msgid "README"
 msgstr "README"
 
-#: src/ui.cc:786
+#: src/ui.cc:782
 msgid ""
-"%C%BWARNING%b: untrusted versions of the following packages will be "
-"installed!%n%nUntrusted packages could %Bcompromise your system's security%"
-"b.  You should only proceed with the installation if you are certain that "
-"this is what you want to do.%n%n"
+"%BWARNING%b: untrusted versions of the following packages will be installed!%"
+"n%nUntrusted packages could %Bcompromise your system's security%b.  You "
+"should only proceed with the installation if you are certain that this is "
+"what you want to do.%n%n"
 msgstr ""
 
-#: src/ui.cc:800
+#: src/ui.cc:788
+#, fuzzy
+msgid "  %S*%N %s [version %s]%n"
+msgstr "バージョン"
+
+#: src/ui.cc:795
 #, fuzzy
 msgid "Really Continue"
 msgstr "続行"
 
-#: src/ui.cc:802
+#: src/ui.cc:797
 msgid "Abort Installation"
 msgstr ""
 
-#: src/ui.cc:863
+#: src/ui.cc:858
 msgid "Preview of package installation"
 msgstr "導入するパッケージのプレビュー"
 
-#: src/ui.cc:864
+#: src/ui.cc:859
 msgid "View and/or adjust the actions that will be performed"
 msgstr "実行されるアクションの表示や設定を行なう"
 
-#: src/ui.cc:865
+#: src/ui.cc:860
 #, fuzzy
 msgid "Preview"
 msgstr "前"
 
-#: src/ui.cc:901
+#: src/ui.cc:896
 #, fuzzy
 msgid "Some packages were broken and have been fixed:"
 msgstr "一部のパッケージが壊れています。修復しました"
 
-#: src/ui.cc:907
+#: src/ui.cc:902
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:913
-#, c-format
+#: src/ui.cc:908
+#, fuzzy, c-format
 msgid ""
-"Ran out of time while trying to resolver dependencies (press \"%s\" to try "
+"Ran out of time while trying to resolve dependencies (press \"%s\" to try "
 "harder)"
-msgstr ""
+msgstr "地雷探しに挑戦して時間つぶし"
 
-#: src/ui.cc:959
+#: src/ui.cc:954
 #, fuzzy
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
@@ -3959,23 +3974,23 @@
 "パッケージのインストールもしくは削除を行うには管理者権限が必要です。 \n"
 "現在権限がありません。rootになりますか? \n"
 
-#: src/ui.cc:962 src/ui.cc:1078
+#: src/ui.cc:957 src/ui.cc:1072
 msgid "Become root"
 msgstr "root になる"
 
-#: src/ui.cc:964 src/ui.cc:1080
+#: src/ui.cc:959 src/ui.cc:1074
 msgid "Don't become root"
 msgstr "root にならない"
 
-#: src/ui.cc:969 src/ui.cc:1085
+#: src/ui.cc:964 src/ui.cc:1079
 msgid "A package-list update or install run is already taking place."
 msgstr "現在パッケージリストのアップデート、またはインストールを実行中です。"
 
-#: src/ui.cc:996
+#: src/ui.cc:991
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "導入、削除、更新をする予定のパッケージがありません。"
 
-#: src/ui.cc:1002
+#: src/ui.cc:997
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -3987,7 +4002,7 @@
 "幾つかのパッケージは更新可能かもしれませんが、更新を選択されていません。\n"
 "\"U\"と打って更新の準備をしてください。"
 
-#: src/ui.cc:1074
+#: src/ui.cc:1069
 #, fuzzy
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
@@ -3996,112 +4011,112 @@
 "パッケージリストの更新には管理者権限が必要です。 \n"
 "現在権限がありません。root になりますか? \n"
 
-#: src/ui.cc:1090 src/ui.cc:1377
+#: src/ui.cc:1084 src/ui.cc:1371
 msgid "Waste time trying to find mines"
 msgstr "地雷探しに挑戦して時間つぶし"
 
-#: src/ui.cc:1097 src/ui.cc:1150
+#: src/ui.cc:1091 src/ui.cc:1144
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "ダウンロード中の削除は許可されていません"
 
-#: src/ui.cc:1100
+#: src/ui.cc:1094
 msgid "Deleting downloaded files"
 msgstr "ダウンロードされたファイルを削除しています"
 
-#: src/ui.cc:1114
+#: src/ui.cc:1108
 msgid "Downloaded package files have been deleted"
 msgstr "ダウンロードされたパッケージファイルは既に削除されています"
 
-#: src/ui.cc:1175
+#: src/ui.cc:1169
 #, fuzzy, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr "ダウンロードされた古いパッケージのファイルは削除されました"
 
-#: src/ui.cc:1247
+#: src/ui.cc:1241
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1252 src/ui.cc:1283
+#: src/ui.cc:1246 src/ui.cc:1277
 #, fuzzy
 msgid "Ran out of time while trying to find a solution."
 msgstr "地雷探しに挑戦して時間つぶし"
 
-#: src/ui.cc:1277
+#: src/ui.cc:1271
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1307
+#: src/ui.cc:1301
 #, fuzzy, c-format
 msgid "Unable to open %s"
 msgstr "%s を書き込み可能な状態で開けません"
 
-#: src/ui.cc:1313
+#: src/ui.cc:1307
 msgid "Error while dumping resolver state"
 msgstr ""
 
-#: src/ui.cc:1323
+#: src/ui.cc:1317
 msgid "File to which the resolver state should be dumped:"
 msgstr ""
 
-#: src/ui.cc:1353
+#: src/ui.cc:1347
 msgid "^Install/remove packages"
 msgstr "パッケージのインストールまたは削除"
 
-#: src/ui.cc:1354
+#: src/ui.cc:1348
 msgid "Perform all pending installs and removals"
 msgstr "選択されているパッケージの導入や削除"
 
-#: src/ui.cc:1356
+#: src/ui.cc:1350
 msgid "^Update package list"
 msgstr "パッケージのリストを更新する"
 
-#: src/ui.cc:1357
+#: src/ui.cc:1351
 msgid "Check for new versions of packages"
 msgstr "パッケージの新しいバージョンを確認する"
 
-#: src/ui.cc:1360
+#: src/ui.cc:1354
 msgid "^Forget new packages"
 msgstr "新規パッケージ一覧を消去"
 
-#: src/ui.cc:1361
+#: src/ui.cc:1355
 msgid "Forget which packages are \"new\""
 msgstr "どのパッケージが \"新規\"かを消去"
 
-#: src/ui.cc:1364
+#: src/ui.cc:1358
 msgid "^Clean package cache"
 msgstr "パッケージのキャッシュを消去"
 
-#: src/ui.cc:1365
+#: src/ui.cc:1359
 msgid "Delete package files which were previously downloaded"
 msgstr "ダウンロードされたパッケージのファイルを削除する"
 
-#: src/ui.cc:1368
+#: src/ui.cc:1362
 msgid "Clean ^obsolete files"
 msgstr "使われていないファイルを消す"
 
-#: src/ui.cc:1369
+#: src/ui.cc:1363
 msgid "Delete package files which can no longer be downloaded"
 msgstr "もうダウンロードできないパッケージのファイルを削除する"
 
-#: src/ui.cc:1372
+#: src/ui.cc:1366
 msgid "Mark ^Upgradable"
 msgstr "更新可能なものをマークする"
 
-#: src/ui.cc:1373
+#: src/ui.cc:1367
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr "更新用にマークされていない更新可能なパッケージをすべてマークする"
 
-#: src/ui.cc:1376
+#: src/ui.cc:1370
 msgid "^Play Minesweeper"
 msgstr "マインスイーパで遊ぶ"
 
-#: src/ui.cc:1379
+#: src/ui.cc:1373
 msgid "^Become root"
 msgstr "root になる"
 
-#: src/ui.cc:1380
+#: src/ui.cc:1374
 #, fuzzy
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
@@ -4110,79 +4125,79 @@
 "su を実行して root になり、プログラムを再起動します。\n"
 "その際、現在の設定は保持されます。"
 
-#: src/ui.cc:1383
+#: src/ui.cc:1377
 msgid "^Reload package cache"
 msgstr "パッケージキャッシュの再読み込み"
 
-#: src/ui.cc:1384
+#: src/ui.cc:1378
 msgid "Reload the package cache"
 msgstr "パッケージのキャッシュを再度読み込む"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1384
 msgid "^Quit"
 msgstr "終了"
 
-#: src/ui.cc:1391
+#: src/ui.cc:1385
 msgid "Exit the program"
 msgstr "プログラムの終了"
 
-#: src/ui.cc:1397 src/ui.cc:1669
+#: src/ui.cc:1391 src/ui.cc:1661
 msgid "Undo"
 msgstr "戻る"
 
-#: src/ui.cc:1398
+#: src/ui.cc:1392
 msgid "Undo the last package operation or group of operations"
 msgstr "最後に行なったパッケージ管理操作を戻す"
 
-#: src/ui.cc:1405
+#: src/ui.cc:1399
 msgid "^Install"
 msgstr "インストール"
 
-#: src/ui.cc:1406
+#: src/ui.cc:1400
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "インストールかアップグレードするよう選択されたパッケージ"
 
-#: src/ui.cc:1409
+#: src/ui.cc:1403
 msgid "^Remove"
 msgstr "削除"
 
-#: src/ui.cc:1410
+#: src/ui.cc:1404
 msgid "Flag the currently selected package for removal"
 msgstr "削除されるよう選択されたパッケージ"
 
-#: src/ui.cc:1413
+#: src/ui.cc:1407
 msgid "^Purge"
 msgstr "完全削除"
 
-#: src/ui.cc:1414
+#: src/ui.cc:1408
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr "パッケージ及び設定ファイルを削除するよう選択されたパッケージ"
 
-#: src/ui.cc:1417
+#: src/ui.cc:1411
 msgid "^Keep"
 msgstr "保持"
 
-#: src/ui.cc:1418
+#: src/ui.cc:1412
 msgid "Cancel any action on the selected package"
 msgstr "選択されたパッケージはアクションが取り消される"
 
-#: src/ui.cc:1421
+#: src/ui.cc:1415
 msgid "^Hold"
 msgstr "維持"
 
-#: src/ui.cc:1422
+#: src/ui.cc:1416
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
 msgstr ""
 "選択されたパッケージはアクションが取り消され、今後もアップグレードも 防がれる"
 
-#: src/ui.cc:1425
+#: src/ui.cc:1419
 msgid "Mark ^Auto"
 msgstr "自動マーク"
 
-#: src/ui.cc:1426
+#: src/ui.cc:1420
 #, fuzzy
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
@@ -4191,11 +4206,11 @@
 "選択されたパッケージに自動でインストールされた印を付ける;\n"
 "依存していたパッケージがなくなるとと自動的削除されるだろう"
 
-#: src/ui.cc:1429
+#: src/ui.cc:1423
 msgid "Mark ^Manual"
 msgstr "手動マーク"
 
-#: src/ui.cc:1430
+#: src/ui.cc:1424
 #, fuzzy
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
@@ -4204,11 +4219,11 @@
 "選択されたパッケージに手動でインストールされた印を付ける;\n"
 "手動で削除されない限り削除されないだろう"
 
-#: src/ui.cc:1433
+#: src/ui.cc:1427
 msgid "^Forbid Version"
 msgstr "禁止バージョン"
 
-#: src/ui.cc:1434
+#: src/ui.cc:1428
 #, fuzzy
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
@@ -4217,232 +4232,232 @@
 "選択されたパッケージの候補バージョンがインストールされるのを禁止する;\n"
 "通常インストールされているものより新しいバージョンのパッケージです"
 
-#: src/ui.cc:1438
+#: src/ui.cc:1432
 msgid "I^nformation"
 msgstr "情報"
 
-#: src/ui.cc:1439
+#: src/ui.cc:1433
 msgid "Display more information about the selected package"
 msgstr "選択されたパッケージのより詳しい情報が表示される"
 
-#: src/ui.cc:1442
+#: src/ui.cc:1436
 msgid "^Changelog"
 msgstr "変更履歴"
 
-#: src/ui.cc:1443
+#: src/ui.cc:1437
 msgid "Display the Debian changelog of the selected package"
 msgstr "選択されたパッケージの更新履歴が表示される"
 
-#: src/ui.cc:1450
+#: src/ui.cc:1444
 msgid "^Find"
 msgstr "検索"
 
-#: src/ui.cc:1451
+#: src/ui.cc:1445
 msgid "Search for a package"
 msgstr "パッケージを検索する"
 
-#: src/ui.cc:1454
+#: src/ui.cc:1448
 msgid "Find ^Again"
 msgstr "再検索"
 
-#: src/ui.cc:1455
+#: src/ui.cc:1449
 msgid "Repeat the last search"
 msgstr "最後に行なった検索を繰り換えす"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1453
 msgid "^Limit Display"
 msgstr "表示制限"
 
-#: src/ui.cc:1460
+#: src/ui.cc:1454
 msgid "Apply a filter to the package list"
 msgstr "パッケージリストをフィルタリングする"
 
-#: src/ui.cc:1463
+#: src/ui.cc:1457
 msgid "^Un-Limit Display"
 msgstr "表示制限解除"
 
-#: src/ui.cc:1464
+#: src/ui.cc:1458
 msgid "Remove the filter from the package list"
 msgstr "パッケージリストのフィルターを削除する"
 
-#: src/ui.cc:1468
+#: src/ui.cc:1462
 msgid "Find ^Broken"
 msgstr "壊れているものを探す"
 
-#: src/ui.cc:1469
+#: src/ui.cc:1463
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "解決できない依存関係があるパッケージを探す"
 
-#: src/ui.cc:1476
+#: src/ui.cc:1470
 msgid "^UI options"
 msgstr "UIオプション"
 
-#: src/ui.cc:1477
+#: src/ui.cc:1471
 msgid "Change the settings which affect the user interface"
 msgstr "ユーザインターフェースに影響する設定を変更する。"
 
-#: src/ui.cc:1480
+#: src/ui.cc:1474
 msgid "^Dependency handling"
 msgstr "依存関係の処理"
 
-#: src/ui.cc:1481
+#: src/ui.cc:1475
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr "パッケージ依存関係の処理に関する設定を変更"
 
-#: src/ui.cc:1484
+#: src/ui.cc:1478
 msgid "^Miscellaneous"
 msgstr "その他"
 
-#: src/ui.cc:1485
+#: src/ui.cc:1479
 msgid "Change miscellaneous program settings"
 msgstr "その他の設定の変更"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1484
 msgid "^Revert options"
 msgstr "オプションを元に戻す"
 
-#: src/ui.cc:1491
+#: src/ui.cc:1485
 msgid "Reset all settings to the system defaults"
 msgstr "すべての設定をデフォルトの設定に戻す"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1496
 msgid "^Next"
 msgstr "次"
 
-#: src/ui.cc:1503
+#: src/ui.cc:1497
 msgid "View next display"
 msgstr "次の画面を表示"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1500
 msgid "^Prev"
 msgstr "前"
 
-#: src/ui.cc:1507
+#: src/ui.cc:1501
 msgid "View previous display"
 msgstr "前の画面を表示"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1504
 msgid "^Close"
 msgstr "閉じる"
 
-#: src/ui.cc:1511
+#: src/ui.cc:1505
 msgid "Close this display"
 msgstr "この画面を閉じる"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1510
 msgid "New Package ^View"
 msgstr "新しいパッケージ画面"
 
-#: src/ui.cc:1517
+#: src/ui.cc:1511
 msgid "Create a new default package view"
 msgstr "新規に標準のパッケージ画面を作成"
 
-#: src/ui.cc:1520
+#: src/ui.cc:1514
 msgid "New Categorical ^Browser"
 msgstr "新しいカテゴリーで表示"
 
-#: src/ui.cc:1522
+#: src/ui.cc:1516
 msgid "Browse packages by category"
 msgstr "パッケージを詳しく分類して表示します。"
 
-#: src/ui.cc:1530
+#: src/ui.cc:1524
 msgid "^About"
 msgstr "このプログラムについて"
 
-#: src/ui.cc:1531
+#: src/ui.cc:1525
 msgid "View information about this program"
 msgstr "このプログラムについての説明"
 
-#: src/ui.cc:1534
+#: src/ui.cc:1528
 msgid "^Help"
 msgstr "ヘルプ"
 
-#: src/ui.cc:1535
+#: src/ui.cc:1529
 msgid "View the on-line help"
 msgstr "オンラインヘルプを表示します"
 
-#: src/ui.cc:1537
+#: src/ui.cc:1531
 msgid "User's ^Manual"
 msgstr "ユーザマニュアル"
 
-#: src/ui.cc:1538
+#: src/ui.cc:1532
 msgid "View the detailed program manual"
 msgstr "詳細なマニュアルを表示します"
 
-#: src/ui.cc:1541
+#: src/ui.cc:1535
 msgid "^FAQ"
 msgstr "FAQ"
 
-#: src/ui.cc:1542
+#: src/ui.cc:1536
 msgid "View a list of frequently asked questions"
 msgstr "頻繁に質問される事を表示します"
 
-#: src/ui.cc:1545
+#: src/ui.cc:1539
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1546
+#: src/ui.cc:1540
 #, fuzzy
 msgid "View the important changes made in each version of "
 msgstr "プログラムの重要なバージョンごとの変更点を表示します"
 
-#: src/ui.cc:1549
+#: src/ui.cc:1543
 msgid "^License"
 msgstr "ライセンス"
 
-#: src/ui.cc:1550
+#: src/ui.cc:1544
 msgid "View the terms under which you may copy the program"
 msgstr "プログラムを再配布する際などの条件を表示"
 
-#: src/ui.cc:1668
+#: src/ui.cc:1660
 msgid "Actions"
 msgstr "アクション"
 
-#: src/ui.cc:1671
+#: src/ui.cc:1663
 msgid "Search"
 msgstr "検索"
 
-#: src/ui.cc:1672
+#: src/ui.cc:1664
 msgid "Options"
 msgstr "オプション"
 
-#: src/ui.cc:1673
+#: src/ui.cc:1665
 msgid "Views"
 msgstr "表示"
 
-#: src/ui.cc:1674
+#: src/ui.cc:1666
 msgid "Help"
 msgstr "ヘルプ"
 
-#: src/ui.cc:1734
+#: src/ui.cc:1726
 #, 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:2003 src/vscreen/vscreen.cc:281
+#: src/ui.cc:1996 src/vscreen/vscreen.cc:281
 msgid "yes_key"
 msgstr "yes keu"
 
-#: src/ui.cc:2004 src/vscreen/vscreen.cc:282
+#: src/ui.cc:1997 src/vscreen/vscreen.cc:282
 msgid "no_key"
 msgstr "no key"
 
-#: src/view_changelog.cc:46
+#: src/view_changelog.cc:61
 msgid "You can only view changelogs of official Debian packages."
 msgstr "公式 Debian パッケージの更新履歴のみ閲覧することができます。"
 
-#: src/view_changelog.cc:52
+#: src/view_changelog.cc:67
 msgid "Downloading Changelog"
 msgstr "更新履歴をダウンロード中"
 
-#: src/view_changelog.cc:54
+#: src/view_changelog.cc:69
 #, fuzzy
 msgid "Download Changelog"
 msgstr "更新履歴をダウンロード中"
 
-#: src/view_changelog.cc:63
+#: src/view_changelog.cc:78
 #, c-format
 msgid "%s changes"
 msgstr ""
@@ -4536,18 +4551,189 @@
 #~ "%s"
 #~ msgstr "ドライブ \"%s\": に、ディスク %s を入れてください"
 
+#~ msgid "Need exactly two colors in color definition \"%s\""
+#~ msgstr "色の定義 \"%s\"には2色必要です"
+
+#~ msgid "Can't parse foreground \"%s\"of color \"%s\""
+#~ msgstr "\"%2$s\" 色は前景色  \"%1$s\" を解析できません"
+
+#~ msgid "Can't parse background \"%s\" of color \"%s\""
+#~ msgstr "\"%2$s\" 色は背景色 \"%1$s\" を解析できません"
+
 #~ msgid "Invalid option for interactive mode: -s\n"
 #~ msgstr "インタラクティブモードで不正なオプション: -s\n"
 
+#~ 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."
+#~ msgstr ""
+#~ " FAXモデムやその他の通信デバイス関連のプログラム \n"
+#~ " 'comm' に分類されたパッケージはモデムやその他通信機器のコントロールのため"
+#~ "に使用される。これは; FAXモデムコントロールするソフトウェア(例えば、ダイ"
+#~ "アルアップ接続のための PPP、(zmodem/kermit) の機能を持つオリジナルのプログ"
+#~ "ラム、携帯電話、 FidoNet インターフェースを制御するプログラム、BBS)を含み"
+#~ "ます。"
+
+#~ 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"
+#~ " .\n"
+#~ " For more information about what Debian considers to be Free Software, "
+#~ "see http://www.debian.org/social_contract#guidelines"
+#~ msgstr ""
+#~ "フリーでないソフトウェアのパッケージ\n"
+#~ " 'non-free' に分類されたパッケージは Debian の一部とみなされていません。\n"
+#~ " .\n"
+#~ " これらのパッケージは Debian Free Software Guidelines (下記参照)の条件を満"
+#~ "していません。あなたはこの分類のプログラムのライセンスを読み、あなたの使用"
+#~ "用途が許可されているかどうか確認しなければなりません。\n"
+#~ " .\n"
+#~ " Debian のフリーソフトウェアに対する考えの詳細は、以下の URL を参照してく"
+#~ "ださい。http://www.debian.org/social_contract#guidelines"
+
+#~ 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)"
+#~ msgstr ""
+#~ "新規パッケージ\n"
+#~ " \"新規\" パッケージ最後にリストを消してから Debian に追加されたパッケージ"
+#~ "群(\"新規パッケージ一覧を消去 \" をメニューから選ぶとリストを空にできる)"
+
+#~ msgid ""
+#~ "%s is an essential package!\n"
+#~ "\n"
+#~ "Are you sure you want to remove it?\n"
+#~ "Type '%s' if you are."
+#~ msgstr ""
+#~ "%sは不可欠のパッケージです!\n"
+#~ "\n"
+#~ "本当に削除したいですか?\n"
+#~ "削除する場合ば'%s'と入力してください。"
+
+#~ msgid "Available versions of "
+#~ msgstr "利用可能バージョン"
+
+#~ 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."
+#~ msgstr ""
+#~ "現在 root 権限を持っていません。また root になる他の方法も\n"
+#~ "見つかりませんでした。 このパッケージを設定し直すには、\n"
+#~ "menu や login パッケージをインストールするか、\n"
+#~ "aptitude を root で起動してください。"
+
 #~ msgid "Information about "
 #~ msgstr "情報"
 
+#~ msgid ""
+#~ "Aptitude %s\n"
+#~ "\n"
+#~ "Copyright 2000 Daniel Burrows.\n"
+#~ "\n"
+#~ "aptitude comes with ABSOLUTELY NO WARRANTY; for details see 'license' in "
+#~ "the\n"
+#~ "Help menu.  This is free software, and you are welcome to redistribute "
+#~ "it\n"
+#~ "under certain conditions; see 'license' for details."
+#~ msgstr ""
+#~ "Aptitude %s\n"
+#~ "\n"
+#~ "Copyright 2000 Daniel Burrows.\n"
+#~ "\n"
+#~ "aptitudeは無保証です。詳細はメニューのヘルプにあるライセンスを見てくださ"
+#~ "い。 \n"
+#~ "このソフトはフリーソフトウェアです、ライセンスに従って再配布が認められてい"
+#~ "ます。詳しくは'license' を見てください"
+
+#~ msgid "Some packages were broken and have been fixed"
+#~ msgstr "一部のパッケージが壊れています。修復しました"
+
 #~ msgid "Some broken packages could not be fixed!"
 #~ msgstr "壊れたパッケージを修復できません!"
 
+#~ msgid "Some packages are broken.  Try to fix them?"
+#~ msgstr "パッケージが壊れています。修復を試みますか?"
+
+#~ msgid ""
+#~ "Installing/removing packages requires administrative privileges, which\n"
+#~ "you currently do not have.  Would you like to change to the root "
+#~ "account?\n"
+#~ msgstr ""
+#~ "パッケージのインストールもしくは削除を行うには管理者権限が必要です。 \n"
+#~ "現在権限がありません。rootになりますか? \n"
+
+#~ msgid ""
+#~ "No packages will be installed, removed or upgraded.\n"
+#~ "\n"
+#~ "Some packages could be upgraded, but you have not chosen to upgrade "
+#~ "them.\n"
+#~ "Type \"U\" to prepare an upgrade."
+#~ msgstr ""
+#~ "導入や削除、更新するパッケージがありません。\n"
+#~ "\n"
+#~ "幾つかのパッケージは更新可能かもしれませんが、更新を選択されていません。\n"
+#~ "\"U\"と打って更新の準備をしてください。"
+
+#~ 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"
+#~ msgstr ""
+#~ "パッケージリストの更新には管理者権限が必要です。 \n"
+#~ "現在権限がありません。root になりますか? \n"
+
+#~ msgid "Obsolete downloaded package files have been deleted"
+#~ msgstr "ダウンロードされた古いパッケージのファイルは削除されました"
+
+#~ msgid ""
+#~ "Run 'su' to become root; this will restart the program, but your\n"
+#~ "settings will be preserved"
+#~ msgstr ""
+#~ "su を実行して root になり、プログラムを再起動します。\n"
+#~ "その際、現在の設定は保持されます。"
+
+#~ msgid ""
+#~ "Mark the selected package as having been automatically installed;\n"
+#~ "it will automatically be removed if no other packages depend on it"
+#~ msgstr ""
+#~ "選択されたパッケージに自動でインストールされた印を付ける;\n"
+#~ "依存していたパッケージがなくなるとと自動的削除されるだろう"
+
+#~ msgid ""
+#~ "Mark the selected package as having been manually installed;\n"
+#~ "it will not be removed unless you manually remove it"
+#~ msgstr ""
+#~ "選択されたパッケージに手動でインストールされた印を付ける;\n"
+#~ "手動で削除されない限り削除されないだろう"
+
+#~ msgid ""
+#~ "Forbid the candidate version of the selected package from being "
+#~ "installed;\n"
+#~ "newer versions of the package will be installed as usual"
+#~ msgstr ""
+#~ "選択されたパッケージの候補バージョンがインストールされるのを禁止する;\n"
+#~ "通常インストールされているものより新しいバージョンのパッケージです"
+
 #~ msgid "^ChangeLog"
 #~ msgstr "変更履歴"
 
+#~ msgid "View the important changes made in each version of the program"
+#~ 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	Sun Jun 12 21:04:47 2005
@@ -1,25 +1,18 @@
-# translation of aptitude_0.2.15.8-1_lt.po to Lithuankian
-# translation of lt.po to Lithuanian
 # translation of aptitude_lt.po to Lithuanian
-# translation of aptitude_naujas.po to Lithuanian
-# translation of aptitude_0.2.14-3_lt.po to Lithuanian
-# This file is distributed under the same license as the PACKAGE package.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER, 2004.
-# Darius Zitkevicius <skystis at splius.lt>, 2004.
-# Darius Žitkevicius <skystis at splius.lt>, 2004.
+# Darius Žitkevičius <skystis at splius.lt>, 2005.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: aptitude_0.2.15.8-1_lt\n"
+"Project-Id-Version: aptitude_lt\n"
 "Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-05-01 14:08-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"
+"POT-Creation-Date: 2005-06-12 22:42+0200\n"
+"PO-Revision-Date: 2005-03-26 23:49+0200\n"
+"Last-Translator: Darius Žitkevičius <skystis at splius.lt>\n"
+"Language-Team:  <komp_lt at konferencijos.lt>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.3.1\n"
+"X-Generator: KBabel 1.9.1\n"
 "Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%"
 "100<10 || n%100>=20) ? 1 : 2);\n"
 "100<10 || n%100>=20) ? 1 : 2);\n"
@@ -34,7 +27,7 @@
 
 #: src/apt_options.cc:113
 msgid "Use a minibuffer-style prompt when possible"
-msgstr "Jei įmanoma naudoti mini buferio-stiliaus kvietinius"
+msgstr "Jei įmanoma naudoti mini buferio stiliaus kvietinius"
 
 #: src/apt_options.cc:115
 msgid "Show partial search results (incremental search)"
@@ -107,7 +100,7 @@
 
 #: src/apt_options.cc:156
 msgid "Remove obsolete package files after downloading new package lists"
-msgstr "Gavus naują paketų sąrašą, pašalinti įrašus apie pasenusius paketus"
+msgstr "Gavus naują paketų sąrašą, pašalinti pasenusių paketų bylas"
 
 #: src/apt_options.cc:158
 msgid "URL to use to download changelogs"
@@ -155,14 +148,14 @@
 msgid "Automatically remove unused packages matching this filter"
 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:219 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
-#: src/vscreen/vs_util.cc:328
+#: src/apt_options.cc:240 src/mine/cmine.cc:249 src/mine/cmine.cc:312
+#: src/ui.cc:215 src/vscreen/vs_util.cc:77 src/vscreen/vs_util.cc:90
+#: src/vscreen/vs_util.cc:264 src/vscreen/vs_util.cc:298
 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:328
+#: src/apt_options.cc:241 src/download_list.cc:69 src/mine/cmine.cc:250
+#: src/mine/cmine.cc:313 src/vscreen/vs_util.cc:298
 msgid "Cancel"
 msgstr "Atšaukti"
 
@@ -243,15 +236,15 @@
 msgid "%s: Previous"
 msgstr ""
 
-#: src/broken_indicator.cc:233
+#: src/broken_indicator.cc:232
 #, c-format
-msgid "%CSolution search failed.  %s: try harder"
+msgid "Solution search failed.  %s: try harder"
 msgstr ""
 
-#: src/broken_indicator.cc:239
-#, c-format
-msgid "%CUnable to resolve dependencies."
-msgstr ""
+#: src/broken_indicator.cc:237
+#, fuzzy
+msgid "Unable to resolve dependencies."
+msgstr "Negaliu atidaryti %s rašymui"
 
 #: src/cmdline/cmdline_action.cc:36
 #, c-format
@@ -259,7 +252,7 @@
 "Note: \"%s\", providing the virtual package\n"
 "      \"%s\", is already installed.\n"
 msgstr ""
-"Dėmesio paketas „%s“ iš virtualaus paketo\n"
+"Dėmesio: paketas „%s“ pateikia virtualų paketą\n"
 "      „%s“ jau įdiegtas.\n"
 
 #: src/cmdline/cmdline_action.cc:43
@@ -268,7 +261,7 @@
 "Note: \"%s\", providing the virtual package\n"
 "      \"%s\", is already going to be installed.\n"
 msgstr ""
-"Dėmesio paketas „%s“ iš virtualaus paketo\n"
+"Dėmesio: paketas „%s“ pateikia virtualų paketą\n"
 "      „%s“ jau numatytas įdiegti.\n"
 
 #: src/cmdline/cmdline_action.cc:61
@@ -278,7 +271,7 @@
 "real package and no package provides it.\n"
 msgstr ""
 "Paketas „%s“ paketų duomenų bazėje yra, tačiau\n"
-"jis nÄ—ra realus ir jis neteikia jokio kito paketo.\n"
+"jis nÄ—ra realus ir joks paketas jo nepateikia.\n"
 
 #: src/cmdline/cmdline_action.cc:67
 #, c-format
@@ -620,13 +613,13 @@
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
-#: src/vscreen/vs_util.cc:212
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:165
+#: src/vscreen/vs_util.cc:202
 msgid "Yes"
 msgstr "Taip"
 
-#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
-#: src/vscreen/vs_util.cc:212
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:165
+#: src/vscreen/vs_util.cc:202
 msgid "No"
 msgstr "Ne"
 
@@ -648,7 +641,7 @@
 #: src/cmdline/cmdline_prompt.cc:499
 #, 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"
+msgstr "Šie paketai yra REKOMENDUOJAMI, tačiau jie nebus įdiegti:\n"
 
 #: src/cmdline/cmdline_prompt.cc:505
 #, c-format
@@ -693,12 +686,12 @@
 #: src/cmdline/cmdline_prompt.cc:537
 #, c-format
 msgid "After unpacking %sB will be used.\n"
-msgstr "Po archyvų išpakavimo bus panaudota %sB.\n"
+msgstr "Po išpakavimo bus panaudota %sB.\n"
 
 #: src/cmdline/cmdline_prompt.cc:540
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
-msgstr "Po archyvų išpakavimo bus atlaisvinta %sB.\n"
+msgstr "Po išpakavimo atsilaisvins %sB.\n"
 
 #: src/cmdline/cmdline_prompt.cc:578
 #, c-format
@@ -707,7 +700,7 @@
 
 #: src/cmdline/cmdline_prompt.cc:580
 msgid "Press Return to continue."
-msgstr "Kad tęsti spauskite ENTER."
+msgstr "Norėdami tęsti spauskite ENTER."
 
 #: src/cmdline/cmdline_prompt.cc:606
 #, c-format
@@ -940,7 +933,7 @@
 msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:212
+#: src/cmdline/cmdline_resolver.cc:212 src/cmdline/cmdline_resolver.cc:285
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
@@ -995,203 +988,208 @@
 msgid "The following packages have unmet dependencies:\n"
 msgstr "Šių paketų priklausomybės netenkinamos:\n"
 
-#: src/cmdline/cmdline_show.cc:133
+#: src/cmdline/cmdline_show.cc:119 src/cmdline/cmdline_show.cc:305
+#: src/solution_fragment.cc:65
+msgid "<NULL>"
+msgstr ""
+
+#: src/cmdline/cmdline_show.cc:138
 msgid "not installed"
 msgstr "neįdiegtas"
 
-#: src/cmdline/cmdline_show.cc:135 src/pkg_columnizer.cc:231
+#: src/cmdline/cmdline_show.cc:140 src/pkg_columnizer.cc:231
 #: src/pkg_ver_item.cc:225
 msgid "unpacked"
 msgstr "išspaustas"
 
-#: src/cmdline/cmdline_show.cc:137
+#: src/cmdline/cmdline_show.cc:142
 msgid "partially configured"
-msgstr "dalinai suderintas"
+msgstr "dalinai sukonfigūruotas"
 
-#: src/cmdline/cmdline_show.cc:139
+#: src/cmdline/cmdline_show.cc:144
 msgid "partially installed"
 msgstr "dalinai įdiegtas"
 
-#: src/cmdline/cmdline_show.cc:141
+#: src/cmdline/cmdline_show.cc:146
 msgid "not installed (configuration files remain)"
-msgstr "neįdiegtas (lieka nustatymų bylos)"
+msgstr "neįdiegtas (lieka konfigūracijos bylos)"
 
-#: src/cmdline/cmdline_show.cc:143 src/pkg_columnizer.cc:239
+#: src/cmdline/cmdline_show.cc:148 src/pkg_columnizer.cc:239
 #: src/pkg_ver_item.cc:233
 msgid "installed"
 msgstr "įdiegtas"
 
-#: src/cmdline/cmdline_show.cc:152
+#: src/cmdline/cmdline_show.cc:157
 msgid "not a real package"
 msgstr "nÄ—ra realus paketas"
 
-#: src/cmdline/cmdline_show.cc:165
+#: src/cmdline/cmdline_show.cc:170
 msgid " [held]"
 msgstr " [užlaikytas]"
 
-#: src/cmdline/cmdline_show.cc:174
+#: src/cmdline/cmdline_show.cc:179
 #, c-format
 msgid "%s; version %s will be installed"
 msgstr "%s; versija %s bus įdiegtas"
 
-#: src/cmdline/cmdline_show.cc:178
+#: src/cmdline/cmdline_show.cc:183
 #, c-format
 msgid "%s; version %s will be installed automatically"
 msgstr "%s; versija %s bus įdiegtas automatiškai"
 
-#: src/cmdline/cmdline_show.cc:184 src/cmdline/cmdline_show.cc:199
+#: src/cmdline/cmdline_show.cc:189 src/cmdline/cmdline_show.cc:204
 #, c-format
 msgid "%s; will be purged"
 msgstr "%s; bus išvalytas"
 
-#: src/cmdline/cmdline_show.cc:197
+#: src/cmdline/cmdline_show.cc:202
 #, c-format
 msgid "%s; will be purged because nothing depends on it"
 msgstr "%s; bus išvalytas, nes jokiam paketui jo nereikia"
 
-#: src/cmdline/cmdline_show.cc:204
+#: src/cmdline/cmdline_show.cc:209
 #, c-format
 msgid "%s; will be removed because nothing depends on it"
-msgstr "%s; bus išvalytas, nes niekam jo nereikia."
+msgstr "%s; bus pašalintas, nes jokiam paketui jo nereikia."
 
-#: src/cmdline/cmdline_show.cc:206
+#: src/cmdline/cmdline_show.cc:211
 #, c-format
 msgid "%s; will be removed"
 msgstr "%s; bus pašalintas"
 
-#: src/cmdline/cmdline_show.cc:220
+#: src/cmdline/cmdline_show.cc:225
 #, c-format
 msgid "%s%s; will be downgraded [%s -> %s]"
 msgstr "%s%s; bus pasendintas [%s -> %s]"
 
-#: src/cmdline/cmdline_show.cc:223
+#: src/cmdline/cmdline_show.cc:228
 #, c-format
 msgid "%s%s; will be upgraded [%s -> %s]"
-msgstr "%s%s; pasendintas (įdiegta senesnė versija) [%s -> %s]"
+msgstr "%s%s; bus atnaujintas [%s -> %s]"
 
-#: src/cmdline/cmdline_show.cc:235 src/cmdline/cmdline_show.cc:256
+#: src/cmdline/cmdline_show.cc:240 src/cmdline/cmdline_show.cc:261
 msgid "Package: "
 msgstr "Paketas: "
 
-#: src/cmdline/cmdline_show.cc:236 src/cmdline/cmdline_show.cc:264
+#: src/cmdline/cmdline_show.cc:241 src/cmdline/cmdline_show.cc:269
 #: src/pkg_columnizer.cc:87
 msgid "State"
 msgstr "BÅ«sena"
 
-#: src/cmdline/cmdline_show.cc:237 src/cmdline/cmdline_show.cc:318
+#: src/cmdline/cmdline_show.cc:242 src/cmdline/cmdline_show.cc:325
 msgid "Provided by"
 msgstr "PateikÄ—"
 
-#: src/cmdline/cmdline_show.cc:258 src/pkg_info_screen.cc:105
+#: src/cmdline/cmdline_show.cc:263 src/pkg_info_screen.cc:105
 msgid "Essential: "
 msgstr "Esminiai: "
 
-#: src/cmdline/cmdline_show.cc:258 src/cmdline/cmdline_show.cc:262
-#: src/cmdline/cmdline_show.cc:273 src/pkg_info_screen.cc:105
+#: src/cmdline/cmdline_show.cc:263 src/cmdline/cmdline_show.cc:267
+#: src/cmdline/cmdline_show.cc:278 src/pkg_info_screen.cc:105
 msgid "yes"
 msgstr "taip"
 
-#: src/cmdline/cmdline_show.cc:262
+#: src/cmdline/cmdline_show.cc:267
 msgid "New"
 msgstr "Naujas"
 
-#: src/cmdline/cmdline_show.cc:267
+#: src/cmdline/cmdline_show.cc:272
 msgid "Forbidden version"
 msgstr "Uždrausta versija"
 
-#: src/cmdline/cmdline_show.cc:271
+#: src/cmdline/cmdline_show.cc:276
 msgid "Automatically installed"
-msgstr "Automatiškai įdiegti"
+msgstr "Automatiškai įdiegtas"
 
-#: src/cmdline/cmdline_show.cc:273
+#: src/cmdline/cmdline_show.cc:278
 msgid "no"
 msgstr "ne"
 
-#: src/cmdline/cmdline_show.cc:275
+#: src/cmdline/cmdline_show.cc:280
 msgid "Version: "
 msgstr "Versija: "
 
-#: src/cmdline/cmdline_show.cc:276 src/pkg_info_screen.cc:113
+#: src/cmdline/cmdline_show.cc:281 src/pkg_info_screen.cc:113
 msgid "Priority: "
 msgstr "Prioritetas: "
 
-#: src/cmdline/cmdline_show.cc:277 src/cmdline/cmdline_show.cc:279
-#: src/cmdline/cmdline_show.cc:288
+#: src/cmdline/cmdline_show.cc:282 src/cmdline/cmdline_show.cc:284
+#: src/cmdline/cmdline_show.cc:293
 msgid "N/A"
 msgstr "NÄ—ra"
 
-#: src/cmdline/cmdline_show.cc:278 src/pkg_info_screen.cc:114
+#: src/cmdline/cmdline_show.cc:283 src/pkg_info_screen.cc:114
 msgid "Section: "
 msgstr "Sekcija: "
 
-#: src/cmdline/cmdline_show.cc:280 src/pkg_info_screen.cc:115
+#: src/cmdline/cmdline_show.cc:285 src/pkg_info_screen.cc:115
 msgid "Maintainer: "
-msgstr "Tvarkytojas: "
+msgstr "Koordinatorius: "
 
-#: src/cmdline/cmdline_show.cc:283
+#: src/cmdline/cmdline_show.cc:288
 msgid "Uncompressed Size: "
 msgstr "Nesuspausto dydis: "
 
-#: src/cmdline/cmdline_show.cc:287
+#: src/cmdline/cmdline_show.cc:292
 msgid "Architecture: "
 msgstr "Architektūra: "
 
-#: src/cmdline/cmdline_show.cc:289
+#: src/cmdline/cmdline_show.cc:294
 msgid "Compressed Size: "
 msgstr "Suspausto dydis: "
 
-#: src/cmdline/cmdline_show.cc:291
+#: src/cmdline/cmdline_show.cc:296
 msgid "Filename: "
 msgstr "Bylos pavadinimas: "
 
-#: src/cmdline/cmdline_show.cc:293
+#: src/cmdline/cmdline_show.cc:298
 msgid "MD5sum: "
 msgstr "MD5 suma: "
 
-#: src/cmdline/cmdline_show.cc:297 src/cmdline/cmdline_show.cc:299
+#: src/cmdline/cmdline_show.cc:302 src/cmdline/cmdline_show.cc:305
 msgid "Archive"
 msgstr "Archyvas"
 
-#: src/cmdline/cmdline_show.cc:303
+#: src/cmdline/cmdline_show.cc:310
 msgid "Depends"
 msgstr "Reikia"
 
-#: src/cmdline/cmdline_show.cc:305
+#: src/cmdline/cmdline_show.cc:312
 msgid "PreDepends"
-msgstr "reikia prieš"
+msgstr "Reikia prieš"
 
-#: src/cmdline/cmdline_show.cc:307
+#: src/cmdline/cmdline_show.cc:314
 msgid "Recommends"
 msgstr "Rekomenduoja"
 
-#: src/cmdline/cmdline_show.cc:309
+#: src/cmdline/cmdline_show.cc:316
 msgid "Suggests"
 msgstr "Siūlo"
 
-#: src/cmdline/cmdline_show.cc:311
+#: src/cmdline/cmdline_show.cc:318
 msgid "Conflicts"
 msgstr "Konfliktuoja"
 
-#: src/cmdline/cmdline_show.cc:313
+#: src/cmdline/cmdline_show.cc:320
 msgid "Replaces"
 msgstr "Pakeičia"
 
-#: src/cmdline/cmdline_show.cc:315
+#: src/cmdline/cmdline_show.cc:322
 msgid "Obsoletes"
-msgstr "Pasenęs"
+msgstr "Nurašo"
 
-#: src/cmdline/cmdline_show.cc:317
+#: src/cmdline/cmdline_show.cc:324
 msgid "Provides"
 msgstr "Pateikia"
 
-#: src/cmdline/cmdline_show.cc:321 src/pkg_info_screen.cc:97
+#: src/cmdline/cmdline_show.cc:328 src/pkg_info_screen.cc:97
 msgid "Description: "
 msgstr "Aprašas: "
 
 #: src/cmdline/cmdline_simulate.cc:37
 #, c-format
 msgid "Would download/install/remove packages.\n"
-msgstr "Siųstu/diegtu/šalintu paketus.\n"
+msgstr "Gaučiau/diegčiau/šalinčiau paketus.\n"
 
 #: src/cmdline/cmdline_simulate.cc:48
 msgid "Internal Error, Ordering didn't finish"
@@ -1215,7 +1213,7 @@
 #: src/cmdline/cmdline_util.cc:93
 #, c-format
 msgid "Unable to find a version \"%s\" for the package \"%s\"\n"
-msgstr "Negaliu rasti versijos „%s“ paketo „%s“\n"
+msgstr "Negaliu rasti paketo „%1s“ versijos „%2s“\n"
 
 #: src/cmdline/cmdline_util.cc:99
 #, c-format
@@ -1231,32 +1229,32 @@
 #  If we can quickly prove that this is not satisfiable, tell
 #  the user that.  (specifically, if there are no available packages
 #  fulfilling the dependency)
-#: src/dep_item.cc:137
+#: src/dep_item.cc:139
 msgid "UNSATISFIED"
 msgstr "NETINKAMAS"
 
-#: src/dep_item.cc:137 src/reason_fragment.cc:247
+#: src/dep_item.cc:139 src/reason_fragment.cc:244
 msgid "UNAVAILABLE"
 msgstr "NEEGZISTUOJA"
 
-#: src/download_bar.cc:56 src/download_list.cc:263 src/download_screen.cc:57
+#: src/download_bar.cc:56 src/download_list.cc:266 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_bar.cc:77 src/generic/acqprogress.cc:63
+#: src/download_bar.cc:75 src/generic/acqprogress.cc:63
 msgid "Hit "
 msgstr "Spauskite "
 
-#: src/download_bar.cc:90
+#: src/download_bar.cc:88
 msgid "Downloading "
 msgstr "Gaunu "
 
-#: src/download_bar.cc:103
+#: src/download_bar.cc:101
 msgid "Got "
 msgstr "Gavau "
 
-#: src/download_bar.cc:157
+#: src/download_bar.cc:155
 msgid "Downloading..."
 msgstr "Gaunu..."
 
@@ -1266,7 +1264,7 @@
 
 #: 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?"
+msgstr "Negaliu užrakinti sąrašo aplanko. Ar Jūs root?"
 
 #: src/download.cc:111
 msgid "Updating package lists"
@@ -1274,7 +1272,7 @@
 
 #: src/download.cc:112
 msgid "View the progress of the package list update"
-msgstr "Žiūrėti paketų sąrašo atnaujinimo progresą"
+msgstr "Stebėti paketų sąrašo atnaujinimo progresą"
 
 #: src/download.cc:113
 msgid "List Update"
@@ -1282,9 +1280,9 @@
 
 #: src/download.cc:160
 msgid "Couldn't clean out list directories"
-msgstr "Negaliu išvalyti katalogų sąrašo"
+msgstr "Negaliu išvalyti aplankų sąrašo"
 
-#: src/download.cc:177 src/ui.cc:1153
+#: src/download.cc:177 src/ui.cc:1147
 msgid "Deleting obsolete downloaded files"
 msgstr "Trinamos pasenusios gautos bylos"
 
@@ -1296,7 +1294,7 @@
 #: src/download.cc:224
 #, c-format
 msgid "Unable to open %s to log actions"
-msgstr "Negaliu atidaryti žurnalo %s"
+msgstr "Negaliu atidaryti %s žurnalui"
 
 #: src/download.cc:230
 msgid "log report"
@@ -1309,8 +1307,9 @@
 "dpkg problems may not be completed.\n"
 "\n"
 msgstr ""
-"SVARBU: šiame žurnale surašyti tik numatyti veiksmai, kurie nebuvo įvykdyti\n"
-"dėl dpkg klaidos. Šie veiksmai negali būti užbaigt.\n"
+"SVARBU: šiame žurnale surašyti tik numatyti veiksmai, kurių nepavyko "
+"įvykdyti\n"
+"dėl dpkg klaidos. Šie veiksmai negali būti užbaigti.\n"
 "\n"
 
 #: src/download.cc:232
@@ -1413,14 +1412,14 @@
 
 #: src/download.cc:415
 msgid "Unable to correct for unavailable packages"
-msgstr "Negaliu ištaisyti neegzistuojančių paketų"
+msgstr "Negaliu sutvarkyti neegzistuojančių paketų"
 
 #: 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:477 src/pkg_item.cc:432
+#: src/download.cc:477 src/pkg_item.cc:430
 msgid "Press return to continue.\n"
 msgstr "Norėdami tęsti spauskite ENTER.\n"
 
@@ -1431,17 +1430,17 @@
 "Negaliu užrakinti sistemos!  (Tikriausiai kažkur jau yra paleistas apt arba "
 "dpkg)"
 
-#: src/download_item.cc:66 src/download_item.cc:70 src/download_item.cc:100
+#: src/download_item.cc:70 src/download_item.cc:74 src/download_item.cc:104
 #: src/generic/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr " [Dirbu]"
 
-#: src/download_item.cc:104 src/download_list.cc:283
+#: src/download_item.cc:108 src/download_list.cc:284
 msgid "[Hit]"
 msgstr "[Tiko]"
 
-#: src/download_item.cc:104 src/download_list.cc:303
+#: src/download_item.cc:108 src/download_list.cc:304
 msgid "[Downloaded]"
 msgstr "[Gautas]"
 
@@ -1455,34 +1454,34 @@
 msgid "%n%nSome files were not downloaded successfully."
 msgstr ""
 
-#: src/download_list.cc:68
+#: src/download_list.cc:66
 msgid "Continue"
 msgstr "Tęsti"
 
-#: src/download_list.cc:175 src/download_screen.cc:203
+#: src/download_list.cc:178 src/download_screen.cc:203
 msgid "Total Progress: "
 msgstr "Visas progresas: "
 
-#: src/download_list.cc:194 src/download_screen.cc:218
+#: src/download_list.cc:197 src/download_screen.cc:218
 #, c-format
 msgid " [ %i%% ] (%sB/s, %s remaining)"
 msgstr " [ %i%% ] (%sB/s, liko %s)"
 
-#: src/download_list.cc:196
+#: src/download_list.cc:199
 #, c-format
 msgid " [ %i%% ] (stalled)"
 msgstr " [ %i%% ] (užstrigo)"
 
-#: src/download_list.cc:198
+#: src/download_list.cc:201
 #, c-format
 msgid " [ %i%% ]"
 msgstr " [ %i%% ]"
 
-#: src/download_list.cc:323
+#: src/download_list.cc:324
 msgid "[IGNORED]"
 msgstr "[IGNORUOTAS]"
 
-#: src/download_list.cc:329
+#: src/download_list.cc:330
 msgid "[ERROR]"
 msgstr "[KLAIDA]"
 
@@ -1491,11 +1490,11 @@
 msgid "Downloaded %sB in %ss (%sB/s)."
 msgstr "Gauta %sB iš %ss (%sB/s)."
 
-#: src/edit_pkg_hier.cc:158
+#: src/edit_pkg_hier.cc:176
 msgid "No hierarchy information to edit"
 msgstr "Nėra hierarchijos informacijos, kurią būtų galima redaguoti"
 
-#: src/edit_pkg_hier.cc:258
+#: src/edit_pkg_hier.cc:276
 msgid "Couldn't open for writing"
 msgstr "Negaliu atidaryti rašymui"
 
@@ -1551,7 +1550,7 @@
 #: 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ė"
+msgstr "Vidinis buferis persipildė, bandant įrašyti paketo „%s“ būsenos bylą "
 
 #: src/generic/aptcache.cc:559
 msgid "Couldn't write state file"
@@ -1568,17 +1567,16 @@
 #: 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"
+"Neįmanoma sutvarkyti priklausomybių, kai kurie paketai negali būti įdiegti"
 
 #: src/generic/aptcache.cc:1572
 msgid "The list of sources could not be read."
-msgstr "Nepavyko perskaityti šaltinių sąrašo."
+msgstr "Šaltinių sąrašas negali būti perskaitytas."
 
 #: src/generic/aptcache.cc:1579
 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."
+"Paketų sąrašas arba būsenos byla negali būti interpretuota arba atidaryta."
 
 #: src/generic/aptcache.cc:1582
 msgid "You may want to update the package lists to correct these missing files"
@@ -1587,46 +1585,46 @@
 #: 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"
+msgstr "Negaliu pakeisti bylos %s nauja konfigūracijos byla"
 
 #: 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"
+"Dėmesio: negaliu užrakinti krepšio (cache) bylos.  Atidarau tik skaitymui"
 
-#: src/generic/matchers.cc:797
+#: src/generic/matchers.cc:798
 msgid "Unmatched '('"
 msgstr "Neatitikęs „(“"
 
-#: src/generic/matchers.cc:887 src/generic/matchers.cc:968
+#: src/generic/matchers.cc:888 src/generic/matchers.cc:969
 #, c-format
 msgid "Unknown dependency type: %s"
 msgstr "Nežinomas priklausomybės tipas: %s"
 
-#: src/generic/matchers.cc:950
+#: src/generic/matchers.cc:951
 #, c-format
 msgid "Unknown action type: %s"
 msgstr "Nežinomas veiksmo tipas: %s"
 
-#: src/generic/matchers.cc:1017
+#: src/generic/matchers.cc:1018
 #, c-format
 msgid "Unknown priority %s"
 msgstr "Nežinomas prioritetas: %s"
 
-#: src/generic/matchers.cc:1039
+#: src/generic/matchers.cc:1040
 #, c-format
 msgid "Unknown pattern type: %c"
 msgstr "Nežinomas šablono tipas: %c"
 
-#: src/generic/matchers.cc:1084
+#: src/generic/matchers.cc:1105
 msgid "Unexpected empty expression"
 msgstr "Netikėtas tuščias reiškinys"
 
-#: src/generic/matchers.cc:1119
+#: src/generic/matchers.cc:1143
 msgid "Badly formed expression"
 msgstr "Blogai suformuotas reiškinys"
 
-#: src/generic/matchers.cc:1148
+#: src/generic/matchers.cc:1175
 msgid "Unexpected ')'"
 msgstr "Netikėtas „)“"
 
@@ -1649,7 +1647,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:61
+#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:76
 #, c-format
 msgid "ChangeLog of %s"
 msgstr "Pasikeitimų sąrašas paketui %s"
@@ -1670,7 +1668,7 @@
 
 #: src/generic/pkg_hier.cc:178
 msgid "Bad record encountered (no Package or Group entry), skipping"
-msgstr "Rastas blogas įrašas (nėra įrašo „Paketas“ arba „Grupė“), praleidžiu"
+msgstr "Rastas blogas įrašas (nėra Paketo arba Grupės įrašo), praleidžiu"
 
 #: src/generic/pkg_hier.cc:180
 #, c-format
@@ -1690,37 +1688,37 @@
 msgid "Reading task descriptions"
 msgstr "Skaitau užduočių aprašus"
 
-#: src/load_config.cc:30
-#, c-format
-msgid "Invalid entry in color definition group: \"%s\""
-msgstr "Klaidingas įrašas spalvų aprašymo grupėje: „%s“"
+#: src/load_config.cc:42
+#, fuzzy, c-format
+msgid "Unrecognized color name \"%s\""
+msgstr "Neatpažinti darbai"
 
-#: src/load_config.cc:32
-#, c-format
-msgid "Invalid tagless entry in color definition group: \"%s\""
-msgstr "Netinkamas įrašas spalvos aprašymo grupėje „%s“"
+#: src/load_config.cc:69
+#, fuzzy, c-format
+msgid "Unrecognized attribute name \"%s\""
+msgstr "Neatpažinti darbai"
 
-#: src/load_config.cc:34
-#, c-format
-msgid "Need exactly two colors in color definition \"%s\""
-msgstr "Spalvų apraše „%s“ reikalingos būtent dvi spalvos"
+#: src/load_config.cc:106
+#, fuzzy, c-format
+msgid "Invalid entry in style definition group: \"%s\""
+msgstr "Spalvų aprašymo grupėje: „%s“ yra klaidingas įrašas"
 
-#: src/load_config.cc:50
-#, c-format
-msgid "Can't parse foreground \"%s\"of color \"%s\""
-msgstr "Negaliu interpretuoti priekinio plano „%s“ spalvos „%s“"
+#: src/load_config.cc:108
+#, fuzzy, c-format
+msgid "Invalid tagless entry in style definition group: \"%s\""
+msgstr "Spalvų aprašymo grupėje: „%s“ yra klaidingas įrašas be žymės"
 
-#: src/load_config.cc:53
-#, c-format
-msgid "Can't parse background \"%s\" of color \"%s\""
-msgstr "Negaliu interpretuoti fono „%s“ spalvos „%s“"
+#: src/load_config.cc:130
+#, fuzzy, c-format
+msgid "Unknown style attribute %s"
+msgstr "Nežinomas veiksmo tipas: %s"
 
-#: src/load_config.cc:72 src/load_config.cc:74
+#: src/load_config.cc:153 src/load_config.cc:155
 #, c-format
 msgid "Invalid entry in keybinding group: \"%s\""
 msgstr "Neteisingas įrašas klavišų kombinacijų grupėje: „%s“"
 
-#: src/load_config.cc:89
+#: src/load_config.cc:170
 #, c-format
 msgid "Ignoring invalid keybinding \"%s\" -> \"%s\""
 msgstr "Ignoruoju neteisingą klavišų kombinaciją: „%s“ -> „%s“"
@@ -1797,7 +1795,7 @@
 
 #: src/load_grouppolicy.cc:302
 msgid "Unmatched '(' in grouping policy description"
-msgstr "Grupavimo taisyklių aprašuose yra neuždaryti „(“"
+msgstr "Grupavimo taisyklių aprašuose yra neatitikę „(“"
 
 #: src/load_grouppolicy.cc:329
 #, c-format
@@ -1899,7 +1897,7 @@
 #: src/main.cc:87
 #, c-format
 msgid "       aptitude [options] <action> ..."
-msgstr "       aptitude [parametrai] <veiksmas> ..."
+msgstr "       aptitude [parinktys] <veiksmas> ..."
 
 #: src/main.cc:89
 #, c-format
@@ -1923,7 +1921,8 @@
 #: src/main.cc:92
 #, c-format
 msgid " purge        - Remove packages and their configuration files\n"
-msgstr " purge        - Pašalinti paketus ir jų nustatymų bylas\n"
+msgstr ""
+" purge        - Pašalinti paketus ir jų konfigūracijos bylas (išvalyti)\n"
 
 #: src/main.cc:93
 #, c-format
@@ -1972,8 +1971,8 @@
 " dist-upgrade - Perform an upgrade, possibly installing and removing "
 "packages\n"
 msgstr ""
-" dist-upgrade - Atnaujinti ir leisti pašalinti nereikalingus ir įdiegti "
-"naujus paketus\n"
+" dist-upgrade - Atnaujinti, leisti pašalinti nereikalingus ir įdiegti naujus "
+"paketus\n"
 
 #: src/main.cc:105
 #, c-format
@@ -1988,7 +1987,7 @@
 #: src/main.cc:107
 #, c-format
 msgid " show         - Display detailed information about a package\n"
-msgstr " show         - Rodyti smulkiÄ… paketo informacijÄ…\n"
+msgstr " show         - Rodyti detaliÄ… paketo informacijÄ…\n"
 
 #: src/main.cc:108
 #, c-format
@@ -1998,7 +1997,7 @@
 #: src/main.cc:109
 #, c-format
 msgid " autoclean    - Erase old downloaded package files\n"
-msgstr " autoclean    - Pašalinti senus atsisiųstus paketus\n"
+msgstr " autoclean    - Pašalinti senas gautas paketų bylas\n"
 
 #: src/main.cc:110
 #, c-format
@@ -2008,12 +2007,12 @@
 #: src/main.cc:111
 #, c-format
 msgid " download     - Download the .deb file for a package\n"
-msgstr " download     - Gauti paketÄ…\n"
+msgstr " download     - Gauti paketo .deb bylÄ…\n"
 
 #: src/main.cc:113
 #, c-format
 msgid "  Options:\n"
-msgstr "  Parametrai:\n"
+msgstr "  Parinktys:\n"
 
 #: src/main.cc:114
 #, c-format
@@ -2050,7 +2049,7 @@
 " -F format      Specify a format for displaying search results; see the "
 "manual\n"
 msgstr ""
-" -F formatas      Nurodyti kokių formatu rodyti paieškos rezultatus žr. "
+" -F formatas    Nurodyti kokių formatu rodyti paieškos rezultatus žr. "
 "instrukcijÄ…\n"
 
 #: src/main.cc:120
@@ -2058,14 +2057,14 @@
 msgid ""
 " -O order       Specify how search results should be sorted; see the manual\n"
 msgstr ""
-" -O tvarka       Nurodyti kaip rūšiuoti paieškos rezultatus; žr. "
+" -O tvarka      Nurodyti kaip rūšiuoti paieškos rezultatus; žr. "
 "instrukcijoje\n"
 
 #: src/main.cc:121
 #, 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"
+msgstr " -w plotis      Nuodyti ekrano plotį, paieškos rezultatų formavimui\n"
 
 #: src/main.cc:122
 #, c-format
@@ -2086,7 +2085,7 @@
 #: src/main.cc:125
 #, 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"
+msgstr " -Z             Rodyti įdiegtų paketų dydžio pasikeitimus.\n"
 
 #: src/main.cc:126
 #, c-format
@@ -2100,12 +2099,12 @@
 #, 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"
+msgstr " -t [release]   Nustatyti iš kurių paketų diegti.\n"
 
 #: src/main.cc:128
 #, 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"
+msgstr " -o raktas=reikšmė      Tiesiogiai siųsti parametrą „raktas“\n"
 
 #: src/main.cc:129
 #, c-format
@@ -2127,7 +2126,7 @@
 #: src/main.cc:131
 #, c-format
 msgid " -u      : Download new package lists on startup.\n"
-msgstr " -u      : Siųstis naują paketų sąrašą tik paleidus programą.\n"
+msgstr " -u      : Tik paleidus programą gauti naują paketų sąrašą.\n"
 
 #: src/main.cc:132
 #, c-format
@@ -2137,44 +2136,44 @@
 #: src/main.cc:134
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
-msgstr "                  aptitude neturi Superkarvės galių.\n"
+msgstr "                  Šis aptitude neturi Superkarvės galių.\n"
 
-#: src/main.cc:255
+#: src/main.cc:252
 #, c-format
 msgid "-o requires an argument of the form key=value, got %s"
-msgstr "  o reikalauja argumentų formate „raktas=reikšmė“, gavau %s"
+msgstr "-o reikalauja argumentų formate raktas=reikšmė, gavau %s"
 
-#: src/main.cc:301 src/main.cc:310
+#: src/main.cc:291 src/main.cc:300
 msgid "WEIRDNESS: unknown option code received\n"
-msgstr "KEISTA: gautas nežinomas kodas\n"
+msgstr "KEISTA: gautas nežinomas parinkčių kodas\n"
 
-#: src/main.cc:319
+#: src/main.cc:309
 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:327
+#: src/main.cc:317
 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“)"
+msgstr "-u ir -i nenaudojami komandinės eilutės režime (pvz., su „install“)"
 
-#: src/main.cc:348
+#: src/main.cc:338
 msgid "-u and -i may not be specified with a command"
 msgstr "-u ir -i negali būti nurodyti su komanda"
 
-#: src/main.cc:405
+#: src/main.cc:395
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr "Nežinoma komanda „%s“\n"
 
-#: src/main.cc:412 src/main.cc:469
+#: src/main.cc:402 src/main.cc:450
 msgid "Internal error: uncaught 'out of solutions' exception.\n"
 msgstr ""
 
-#: src/main.cc:417 src/main.cc:474
+#: src/main.cc:407 src/main.cc:455
 msgid "Internal error: uncaught 'out of time' exception.\n"
 msgstr ""
 
-#: src/main.cc:424
+#: src/main.cc:414
 #, c-format
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
@@ -2205,7 +2204,7 @@
 msgid "Lost"
 msgstr "Pralošėt"
 
-#: src/mine/cmine.cc:119 src/ui.cc:1090
+#: src/mine/cmine.cc:119 src/ui.cc:1084
 msgid "Minesweeper"
 msgstr "Minų laukas"
 
@@ -2231,92 +2230,92 @@
 msgid "The number of mines must be a number"
 msgstr "Minų skaičius turi būti nurodytas skaičiais"
 
-#: src/mine/cmine.cc:240
+#: src/mine/cmine.cc:238
 msgid "Setup custom game"
 msgstr "Sukurti kitokį žaidimą"
 
-#: src/mine/cmine.cc:243
+#: src/mine/cmine.cc:240
 msgid "Height of board: "
 msgstr "Lauko aukštis: "
 
-#: src/mine/cmine.cc:247
+#: src/mine/cmine.cc:243
 msgid "Width of board: "
 msgstr "Lauko plotis: "
 
-#: src/mine/cmine.cc:251
+#: src/mine/cmine.cc:246
 msgid "Number of mines: "
 msgstr "Minų skaičius: "
 
-#: src/mine/cmine.cc:316
+#: src/mine/cmine.cc:305
 msgid "Choose difficulty level"
 msgstr "Pasirinkite sudėtingumo lygį"
 
-#: src/mine/cmine.cc:318
+#: src/mine/cmine.cc:307
 msgid "Easy"
 msgstr "Lengvas"
 
-#: src/mine/cmine.cc:319
+#: src/mine/cmine.cc:308
 msgid "Medium"
 msgstr "Vidutinis"
 
-#: src/mine/cmine.cc:320
+#: src/mine/cmine.cc:309
 msgid "Hard"
 msgstr "Sunkus"
 
-#: src/mine/cmine.cc:321
+#: src/mine/cmine.cc:310
 msgid "Custom"
 msgstr "Kitoks"
 
-#: src/mine/cmine.cc:411
+#: src/mine/cmine.cc:392
 msgid "You have won."
 msgstr "JÅ«s laimÄ—jot."
 
-#: src/mine/cmine.cc:414
+#: src/mine/cmine.cc:395
 msgid "You lose!"
 msgstr "Jūs pralošėte!"
 
-#: src/mine/cmine.cc:419
+#: src/mine/cmine.cc:400
 msgid "You die...  --More--"
 msgstr "Tu miręs...   --Dar---"
 
-#: src/mine/cmine.cc:432
+#: src/mine/cmine.cc:413
 msgid "The spikes were poisoned!  The poison was deadly..  --More--"
 msgstr "Vinys nuodingos!  Nuodai buvo mirtini..  --Dar--"
 
-#: src/mine/cmine.cc:435
+#: src/mine/cmine.cc:416
 msgid "You land on a set of sharp iron spikes!  --More--"
 msgstr "Tu nusileidai ant aštrių plieno vinių!  --Dar--"
 
-#: src/mine/cmine.cc:438
+#: src/mine/cmine.cc:419
 msgid "You fall into a pit!  --More--"
 msgstr "Tu įkritai į duobę!  --Dar--"
 
-#: src/mine/cmine.cc:441
+#: src/mine/cmine.cc:422
 msgid "KABOOM!  You step on a land mine.  --More--"
 msgstr "BUM!  Tu užlipai ant minos.  --Dar--"
 
-#: src/mine/cmine.cc:446
+#: src/mine/cmine.cc:427
 msgid "The dart was poisoned!  The poison was deadly...  --More--"
 msgstr "StrÄ—lÄ— nuodinga!  Nuodai buvo mirtini...  -Dar--"
 
-#: src/mine/cmine.cc:448
+#: src/mine/cmine.cc:429
 msgid ""
 "A little dart shoots out at you!  You are hit by a little dart!  --More--"
 msgstr "Į tave pataikė maža strėlė!  --Dar--"
 
-#: src/mine/cmine.cc:452
+#: src/mine/cmine.cc:433
 msgid "You turn to stone... --More--"
 msgstr "Tu pavirtai akmeniu... --Dar--"
 
-#: src/mine/cmine.cc:454
+#: src/mine/cmine.cc:435
 msgid "Touching the cockatrice corpse was a fatal mistake.  --More--"
 msgstr "PalietÄ™ bazilikÄ…, padarÄ—te lemiamÄ… klaidÄ….  --Dar--"
 
-#: src/mine/cmine.cc:456
+#: src/mine/cmine.cc:437
 msgid "You feel here a cockatrice corpse.  --More--"
 msgstr "Čia Jūs matote baziliko kūną.  --Dar--"
 
-#: src/mine/cmine.cc:460
+#: src/mine/cmine.cc:441
 msgid ""
 "Click!  You trigger a rolling boulder trap!  You are hit by a boulder! --"
 "More--"
@@ -2324,64 +2323,64 @@
 "Trakšt!  Tu pakliuvai į riedančios uolos spąstus!  Tave sutraiškė uola! -- "
 "Dar--"
 
-#: src/mine/cmine.cc:470
+#: src/mine/cmine.cc:451
 msgid "sleep"
 msgstr "miegas"
 
-#: src/mine/cmine.cc:473
+#: src/mine/cmine.cc:454
 msgid "striking"
 msgstr "puikus"
 
-#: src/mine/cmine.cc:476
+#: src/mine/cmine.cc:457
 msgid "death"
 msgstr "mirtis"
 
-#: src/mine/cmine.cc:479
+#: src/mine/cmine.cc:460
 msgid "polymorph"
 msgstr "polimorfas"
 
-#: src/mine/cmine.cc:482
+#: src/mine/cmine.cc:463
 msgid "magic missile"
 msgstr "stebuklinga raketa"
 
-#: src/mine/cmine.cc:485
+#: src/mine/cmine.cc:466
 msgid "secret door detection"
 msgstr "Slaptų durų paieška"
 
-#: src/mine/cmine.cc:488
+#: src/mine/cmine.cc:469
 msgid "invisibility"
 msgstr "nematomumas"
 
-#: src/mine/cmine.cc:491
+#: src/mine/cmine.cc:472
 msgid "cold"
 msgstr "Å¡altis"
 
-#: src/mine/cmine.cc:497
+#: src/mine/cmine.cc:478
 #, c-format
 msgid "Your wand of %s breaks apart and explodes!  --More--"
 msgstr "Tavo lazdelė %s lūžo ir sprogo!  --Dar--"
 
-#: src/mine/cmine.cc:503
+#: src/mine/cmine.cc:484
 msgid "You are jolted by a surge of electricity!  --More--"
 msgstr "Jus nutrenkė elektros iškrova!  --Dar--"
 
-#: src/mine/cmine.cc:607
+#: src/mine/cmine.cc:588
 msgid "Enter the filename to load: "
 msgstr "Nurodykite kurią bylą įkelti: "
 
-#: src/mine/cmine.cc:614
+#: src/mine/cmine.cc:595
 msgid "Enter the filename to save: "
 msgstr "Nurodykite į kokią bylą išsaugoti: "
 
-#: src/mine/cmine.cc:624
+#: src/mine/cmine.cc:605
 msgid "mine-help.txt"
-msgstr "minų help.txt"
+msgstr "mine-help.txt"
 
 #: src/pkg_columnizer.cc:81
 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:1670
+#: src/pkg_columnizer.cc:84 src/ui.cc:1662
 msgid "Package"
 msgstr "Paketas"
 
@@ -2443,7 +2442,7 @@
 
 #: src/pkg_columnizer.cc:102
 msgid "ProgName"
-msgstr "ProgVardas"
+msgstr "ProgPav"
 
 #: src/pkg_columnizer.cc:103
 msgid "ProgVer"
@@ -2480,7 +2479,7 @@
 
 #: src/pkg_columnizer.cc:233 src/pkg_ver_item.cc:227
 msgid "half-config"
-msgstr "dalinai nustatyti"
+msgstr "dalinai sudderinti"
 
 #: src/pkg_columnizer.cc:235 src/pkg_ver_item.cc:229
 msgid "half-install"
@@ -2818,7 +2817,7 @@
 " Paketai sekcijoje „perl“ pateikia Perl programavimo kalbą ir papildomas jos "
 "bibliotekas. Jei neplanuojate programuoti su Perl, tuomet Jums neprireiks "
 "nei vieno iš šių paketų. Jei Jūsų naudojamoms programoms bus reikalingi šie "
-"kai kurie iš šių paketų, jie bus įdiegti automatiškai."
+"paketai, jie bus įdiegti automatiškai."
 
 #: src/pkg_grouppolicy.cc:173
 msgid ""
@@ -2832,7 +2831,7 @@
 " Paketai sekcijoje „python“ pateikia Python programavimo kalbą ir papildomas "
 "jos bibliotekas. Jei neplanuojate programuoti su Python, tuomet Jums "
 "neprireiks nei vieno iš šių paketų. Jei Jūsų naudojamoms programoms bus "
-"reikalingi šie kai kurie iš šių paketų, jie bus įdiegti automatiškai."
+"reikalingi šie paketai, jie bus įdiegti automatiškai."
 
 #: src/pkg_grouppolicy.cc:174
 msgid ""
@@ -3043,8 +3042,8 @@
 " Paketai „contrib“ sekcijoje nėra Debian dalis.\n"
 " .\n"
 " Šie paketai, tai laisvos programos, tačiau joms reikia kitų programų, "
-"kurios nepriklauso Debian sistemai. Tai gali būti ne laisvos programos non-"
-"free sekcijoje. Taip pat tai gali būti programos kurių Debian negali "
+"kurios nepriklauso Debian sistemai. Tai gali būti ne laisvos programos „non-"
+"free“ sekcijoje. Taip pat tai gali būti programos kurių Debian negali "
 "platinti, arba (retas atvejas) programa, kurios paketo dar niekas "
 "neparuošė.\n"
 " .\n"
@@ -3079,7 +3078,7 @@
 "changes in export policies. Most packages which were formerly found in this "
 "section, therefore, are now in 'main'."
 msgstr ""
-"Programos, laikomos už Amerikos ribų dėl eksportavimo apribojimų\n"
+"Programos, laikomos už JAV ribų dėl eksportavimo apribojimų\n"
 " Paketai „non-US“ sekcijoje, tai daugiausiai kriptografiniai algoritmai, kai "
 "kurie iš jų patentuoti. Dėl šių priežasčių jie negali būti eksportuojami iš "
 "Jungtinių Amerikos Valstijų. ir laikomi serveryje, kuris yra „laisvame "
@@ -3198,8 +3197,8 @@
 msgstr ""
 "Nebenaudojami ir lokaliai sukurti paketai\n"
 " Šie paketai yra įdiegti į Jūsų kompiuterį, tačiau jų nėra paketų sąrašuose "
-"(apt šaltiniuose).  Jie gali būti nebenaudojami, arba jūs patys sukūrėte šių "
-"paketų asmeninę versiją."
+"(apt šaltiniuose).  Jie gali būti nebenaudojami ir pašalinti iš Debian "
+"archyvo, arba jūs patys sukūrėte šių paketų asmeninę versiją."
 
 #: src/pkg_grouppolicy.cc:324
 msgid ""
@@ -3218,9 +3217,9 @@
 "provide full functionality in some other programs that you are installing or "
 "upgrading."
 msgstr ""
-"Paketai, kuriuos siūlo kiti paketai\n"
+"Paketai, kuriuos rekomenduoja kiti paketai\n"
 " Šie paketai nėra būtini, tam kad Jūsų sistema sėkmingai funkcionuotu, "
-"tačiau jie gali būti reikalingi, pilnam tam tikrų programų funkcionavimui."
+"tačiau jie gali būti reikalingi, pilnam įdiegiamų programų funkcionavimui."
 
 #: src/pkg_grouppolicy.cc:491
 msgid ""
@@ -3264,7 +3263,7 @@
 " These packages could be upgraded, but they have been kept in their current "
 "state to avoid breaking dependencies."
 msgstr ""
-"Paketų būsena sulaikyta dabartinėje būsenoje\n"
+"Paketų būsena automatiškai sulaikyta dabartinėje būsenoje\n"
 " Šie paketai gali būti atnaujinti, tačiau paliekami esamoje būklėje tam, kad "
 "nesugadinti priklausomybių."
 
@@ -3313,7 +3312,7 @@
 " These packages will be reinstalled."
 msgstr ""
 "Paketai, kurie bus įdiegti iš naujo\n"
-" Å ie paketai bus perinstaliuoti."
+" Šie paketai bus įdiegti iš naujo."
 
 #: src/pkg_grouppolicy.cc:526
 msgid ""
@@ -3393,11 +3392,11 @@
 
 #: src/pkg_info_screen.cc:117
 msgid "Uncompressed size: "
-msgstr "IÅ¡pakuoto dydis: "
+msgstr "IÅ¡spausto dydis: "
 
 #: src/pkg_info_screen.cc:118
 msgid "Source Package: "
-msgstr "Išeities tekstų paketas: "
+msgstr "Kilęs iš paketo: "
 
 #: src/pkg_info_screen.cc:128
 #, c-format
@@ -3428,52 +3427,52 @@
 "Ar Jūs tikrai norite jį pašalinti?\n"
 "Jei Jūs tikras įveskite: „%s“."
 
-#: src/pkg_item.cc:222 src/pkg_ver_item.cc:625
+#: src/pkg_item.cc:220 src/pkg_ver_item.cc:626
 #, c-format
 msgid "Information about %s"
 msgstr "Informacija apie %s"
 
-#: src/pkg_item.cc:224 src/pkg_ver_item.cc:627
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:628
 #, c-format
 msgid "%s info"
 msgstr ""
 
-#: src/pkg_item.cc:310
+#: src/pkg_item.cc:308
 #, fuzzy, c-format
 msgid "Available versions of %s"
 msgstr "Egzistuojančios versijos paketo "
 
-#: src/pkg_item.cc:313
+#: src/pkg_item.cc:311
 #, fuzzy, c-format
 msgid "%s versions"
 msgstr "Versijos"
 
-#: src/pkg_item.cc:325 src/pkg_ver_item.cc:655
+#: src/pkg_item.cc:323 src/pkg_ver_item.cc:656
 #, c-format
 msgid "Dependencies of %s"
 msgstr "Paketo %s priklausomybÄ—s."
 
-#: src/pkg_item.cc:327 src/pkg_ver_item.cc:657
+#: src/pkg_item.cc:325 src/pkg_ver_item.cc:658
 #, c-format
 msgid "%s deps"
 msgstr ""
 
-#: src/pkg_item.cc:338 src/pkg_ver_item.cc:667
+#: src/pkg_item.cc:336 src/pkg_ver_item.cc:668
 #, c-format
 msgid "Packages depending on %s"
 msgstr "Paketai, kuriems reikia %s"
 
-#: src/pkg_item.cc:340 src/pkg_ver_item.cc:669
+#: src/pkg_item.cc:338 src/pkg_ver_item.cc:670
 #, c-format
 msgid "%s reverse deps"
 msgstr ""
 
-#: src/pkg_item.cc:392 src/pkg_ver_item.cc:707
+#: src/pkg_item.cc:390 src/pkg_ver_item.cc:708
 #, c-format
 msgid "Reporting a bug in %s:\n"
-msgstr "Pranešam apie klaidas %s:\n"
+msgstr "Pranešame apie klaidas pakete %s:\n"
 
-#: src/pkg_item.cc:414
+#: src/pkg_item.cc:412
 #, fuzzy
 msgid ""
 "You are not root and I cannot find any way to become root.  To reconfigure "
@@ -3486,16 +3485,16 @@
 "„menu“ ir „login“ arba paleiskite aptitude\n"
 "turÄ—dami root teises."
 
-#: src/pkg_item.cc:422
+#: src/pkg_item.cc:420
 #, c-format
 msgid "Reconfiguring %s\n"
 msgstr "Perkonfigūruojamas paketas %s\n"
 
-#: src/pkg_item.cc:447
+#: src/pkg_item.cc:445
 msgid "Hierarchy editor"
 msgstr "Hierarchijos redaktorius"
 
-#: src/pkg_item.cc:447
+#: src/pkg_item.cc:445
 #, fuzzy
 msgid "Hierarchy Editor"
 msgstr "Hierarchijos redaktorius"
@@ -3515,7 +3514,7 @@
 #: src/pkg_tree.cc:632
 #, c-format
 msgid "No packages matched the pattern \"%s\"."
-msgstr "Joks paketas neatitiko šabloną „%s“."
+msgstr "Joks paketas neatitiko šablono „%s“."
 
 #: src/pkg_tree.cc:654
 msgid "Enter the new package tree limit: "
@@ -3523,28 +3522,28 @@
 
 #: src/pkg_tree.cc:688
 msgid "Enter the new package grouping mechanism for this display: "
-msgstr "Įveskite naują grupavimo mechanizmą šiam ekranui: "
+msgstr "Įveskite naują šio ekrano paketų grupavimo mechanizmą: "
 
 #: src/pkg_tree.cc:696
 msgid "Enter the new package sorting mechanism for this display: "
-msgstr "Įveskite naują rūšiavimo mechanizmą šiam ekranui: "
+msgstr "Įveskite naują šio ekrano paketų rūšiavimo mechanizmą: "
 
-#: src/pkg_view.cc:344
+#: src/pkg_view.cc:359
 msgid "make_package_view: error in arguments -- two main widgets??"
 msgstr "make_package_view: klaida argumentuose -- du pagrindiniai elementai??"
 
-#: src/pkg_view.cc:350
+#: src/pkg_view.cc:365
 msgid ""
 "make_package_view: error in arguments -- bad column list for static item"
 msgstr ""
 "make_package_view: klaida argumentuose -- blogas statinio elemento stulpelių "
 "sąrašas"
 
-#: src/pkg_view.cc:443
+#: src/pkg_view.cc:458
 msgid "make_package_view: bad argument!"
 msgstr "make_package_view: blogas argumentas!"
 
-#: src/pkg_view.cc:495
+#: src/pkg_view.cc:510
 msgid "make_package_view: no main widget found"
 msgstr "make_package_view: nėra pagrindinio raktažodžio"
 
@@ -3581,18 +3580,18 @@
 msgid " (provided by %F)"
 msgstr " (pateiktas paketo %F)"
 
-#: src/reason_fragment.cc:278
+#: src/reason_fragment.cc:275
 #, c-format
 msgid "%F%s %F %F"
 msgstr "%F%s %F %F"
 
-#: src/reason_fragment.cc:327
+#: src/reason_fragment.cc:324
 msgid ""
 "If you select a package, an explanation of its current state will appear in "
 "this space."
 msgstr "Pažymėjus paketą, šioje vietoje atsiras jo būsenos aprašymas."
 
-#: src/reason_fragment.cc:361
+#: src/reason_fragment.cc:358
 msgid ""
 "%B%s%b was installed automatically;  it is being removed because all of the "
 "packages which depend upon it are being removed:"
@@ -3600,17 +3599,17 @@
 "%B%s%b buvo įdiegtas automatiškai; dabar jis pašalintas, nes paketai, "
 "kuriems jo reikia pašalinami: "
 
-#: src/reason_fragment.cc:365
+#: src/reason_fragment.cc:362
 msgid "%B%s%b will be automatically removed because of dependency errors:"
 msgstr ""
 "%B%s%b bus automatiškai pašalintas, nes trūksta jam reikalingų paketų: "
 
-#: src/reason_fragment.cc:369
+#: src/reason_fragment.cc:366
 msgid ""
 "%B%s%b will be automatically installed to satisfy the following dependencies:"
 msgstr "%B%s%b bus automatiškai įdiegtas, nes jis reikalingas paketams: "
 
-#: src/reason_fragment.cc:375 src/reason_fragment.cc:387
+#: src/reason_fragment.cc:372 src/reason_fragment.cc:384
 msgid ""
 "%B%s%b cannot be upgraded now, but if it could be, it would still be held at "
 "version %B%s%b."
@@ -3618,35 +3617,35 @@
 "%B%s%b negali būti atnaujintas dabar, bet jei galėtu, jis vis vien liktu "
 "versijos %B%s%b."
 
-#: src/reason_fragment.cc:378
+#: src/reason_fragment.cc:375
 msgid ""
 "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the "
 "following dependencies:"
 msgstr ""
-"%B%s%b nebus atnaujintas iki versijos %B%s%b, kad nesugadinti šių "
+"%B%s%b nebus atnaujintas iki versijos %B%s%b, kad nesugriautų šių "
 "priklausomybių: "
 
-#: src/reason_fragment.cc:390
+#: src/reason_fragment.cc:387
 msgid "%B%s%b is currently installed."
 msgstr "%B%s%b šiuo metu įdiegtas."
 
-#: src/reason_fragment.cc:396
+#: src/reason_fragment.cc:393
 msgid "%B%s%b is not currently installed."
 msgstr "%B%s%b šiuo metu nėra įdiegtas."
 
-#: src/reason_fragment.cc:404
+#: src/reason_fragment.cc:401
 msgid "Some dependencies of %B%s%b are not satisfied:"
 msgstr "Kai kurios %B%s%b priklausomybÄ—s netenkinamos:"
 
-#: src/reason_fragment.cc:408
+#: src/reason_fragment.cc:405
 msgid "%B%s%b will be downgraded."
 msgstr "%B%s%b bus pasendintas."
 
-#: src/reason_fragment.cc:415
+#: src/reason_fragment.cc:412
 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b."
 msgstr "%B%s%b nebus atnaujintas iki uždraustos versijos %B%s%b."
 
-#: src/reason_fragment.cc:419
+#: src/reason_fragment.cc:416
 msgid ""
 "%B%s%b could be upgraded to version %B%s%b, but it is being held at version %"
 "B%s%b."
@@ -3654,38 +3653,38 @@
 "%B%s%b negali būti atnaujintas iki versijos %B%s%b, jis paliekamas %B%s%b "
 "versijos."
 
-#: src/reason_fragment.cc:426
+#: src/reason_fragment.cc:423
 msgid "%B%s%b will be re-installed."
 msgstr "%B%s%b bus įdiegtas iš naujo."
 
-#: src/reason_fragment.cc:430
+#: src/reason_fragment.cc:427
 msgid "%B%s%b will be installed."
 msgstr "%B%s%b bus įdiegtas."
 
-#: src/reason_fragment.cc:434
+#: src/reason_fragment.cc:431
 msgid "%B%s%b will be removed."
 msgstr "%B%s%b bus pašalintas."
 
-#: src/reason_fragment.cc:439
+#: src/reason_fragment.cc:436
 msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b."
 msgstr "%B%s%b bus atnaujintas nuo versijos %B%s%b iki versijos %B%s%b."
 
-#: src/reason_fragment.cc:475
+#: src/reason_fragment.cc:472
 msgid ""
 "The following packages depend on %B%s%b and will be broken by its removal:"
-msgstr "Šiam paketui reikia %B%s%b, jį pašalinus paketas bus sugadintas: "
+msgstr "Šiems paketams reikia %B%s%b, jį pašalinus paketasi bus sugadinti: "
 
-#: src/reason_fragment.cc:478
+#: src/reason_fragment.cc:475
 msgid "The following packages depend on %B%s%b and are broken:"
 msgstr "Å iems paketams reikia %B%s%b ir jie yra sugadinti: "
 
-#: src/reason_fragment.cc:485
+#: src/reason_fragment.cc:482
 msgid ""
 "The following packages conflict with %B%s%b and will be broken by its "
 "installation:"
 msgstr "Šie paketai konfliktuoja su %B%s%b, todėl po įdiegimo būtų sugadinti:"
 
-#: src/reason_fragment.cc:518
+#: src/reason_fragment.cc:515
 msgid ""
 "The following packages depend on a version of %B%s%b other than the "
 "currently installed version of %B%s%b, or conflict with the currently "
@@ -3694,41 +3693,41 @@
 "Šiems paketams reikia %B%s%b versijos, tačiau įdiegta versija yra %B%s%b. "
 "Arba paketas konfliktuoja su įdiegta versija:"
 
-#: src/reason_fragment.cc:522
+#: src/reason_fragment.cc:519
 msgid ""
 "The following packages conflict with %B%s%b, or depend on a version of it "
 "which is not going to be installed."
 msgstr ""
-"Å ie paketai konfliktuoja su %B%s%b, arba jiems reikia versijos, kuri negali "
-"būti įdiegta."
+"Å ie paketai konfliktuoja su %B%s%b, arba jiems reikia versijos, kurios "
+"neplanuojama įdiegti."
 
-#: src/reason_fragment.cc:526
+#: src/reason_fragment.cc:523
 msgid "The following packages conflict with %B%s%b:"
 msgstr "Å ie paketai konfliktuoja su %B%s%b: "
 
-#: src/reason_fragment.cc:531
+#: src/reason_fragment.cc:528
 msgid ""
 "The following packages depend on a version of %B%s%b other than the "
 "currently installed version of %B%s%b:"
 msgstr ""
 "Šiems paketams reikia paketo %B%s%b kitos versijos nei yra įdiegta %B%s%b:"
 
-#: src/reason_fragment.cc:535
+#: src/reason_fragment.cc:532
 msgid ""
 "The following packages depend on a version of %B%s%b which is not going to "
 "be installed."
 msgstr ""
-"Šiems paketams reikia paketo versijos %B%s%b, kuri negali būti įdiegta."
+"Šiems paketams reikia paketo versijos %B%s%b, kurios neplanuojama įdiegti."
 
-#: src/reason_fragment.cc:541
+#: src/reason_fragment.cc:538
 msgid "upgraded"
 msgstr "atnaujinta"
 
-#: src/reason_fragment.cc:541
+#: src/reason_fragment.cc:538
 msgid "downgraded"
 msgstr "pasendinta"
 
-#: src/reason_fragment.cc:547
+#: src/reason_fragment.cc:544
 msgid ""
 "The following packages depend on the currently installed version of %B%s%b (%"
 "B%s%b), or conflict with the version it will be %s to (%B%s%b), and will be "
@@ -3737,7 +3736,7 @@
 "Šiems paketams reikia šiuo metu įdiegtos versijos %B%s%b (%B%s%b), arba jis "
 "konfliktuoja su versija %s (%B%s%b), jei tai bus %s paketas bus sugadintas."
 
-#: src/reason_fragment.cc:554
+#: src/reason_fragment.cc:551
 msgid ""
 "The following packages conflict with version %B%s%b of %B%s%b, and will be "
 "broken if it is %s."
@@ -3745,7 +3744,7 @@
 "Å ie paketai konfliktuoja su versija %B%s%b paketo %B%s%b, jei tai bus %s "
 "paketas bus sugadintas."
 
-#: src/reason_fragment.cc:559
+#: src/reason_fragment.cc:556
 msgid ""
 "The following packages depend on version %B%s%b of %B%s%b, and will be "
 "broken if it is %s."
@@ -3792,31 +3791,36 @@
 msgid "Close"
 msgstr "^Uždaryti"
 
-#: src/solution_fragment.cc:125
+#: src/solution_fragment.cc:134
 #, fuzzy
 msgid "%BRemove%b the following packages:%n"
 msgstr "Å ie paketai yra SUGADINTI:"
 
-#: src/solution_fragment.cc:135
+#: src/solution_fragment.cc:144
 #, fuzzy
 msgid "%BInstall%b the following packages:%n"
 msgstr "Å ie paketai yra SUGADINTI:"
 
-#: src/solution_fragment.cc:148
+#: src/solution_fragment.cc:157
 msgid "%BKeep%b the following packages at their current version:%n"
 msgstr ""
 
-#: src/solution_fragment.cc:161
+#: src/solution_fragment.cc:164
+#, fuzzy
+msgid "Not Installed"
+msgstr "neįdiegtas"
+
+#: src/solution_fragment.cc:177
 #, fuzzy
 msgid "%BUpgrade%b the following packages:%n"
 msgstr "Å ie paketai yra SUGADINTI:"
 
-#: src/solution_fragment.cc:176
+#: src/solution_fragment.cc:192
 #, fuzzy
 msgid "%BDowngrade%b the following packages:%n"
 msgstr "Gaunu paketus"
 
-#: src/solution_fragment.cc:190
+#: src/solution_fragment.cc:206
 #, c-format
 msgid "Score is %d"
 msgstr ""
@@ -3844,45 +3848,45 @@
 msgid "W:"
 msgstr ""
 
-#: src/ui.cc:194
+#: src/ui.cc:193
 msgid "Search for:"
 msgstr "Ieškoti: "
 
-#: src/ui.cc:262
+#: src/ui.cc:258
 msgid "You already are root!"
-msgstr "JÅ«s jau turite root teises!"
+msgstr "JÅ«s jau turite administratoriaus teises!"
 
-#: src/ui.cc:360
+#: src/ui.cc:356
 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:388
+#: src/ui.cc:384
 msgid "Loading cache"
-msgstr "Paimu duomenis"
+msgstr "Įkeliamas krepšys"
 
-#: src/ui.cc:410
+#: src/ui.cc:406
 msgid "Really quit Aptitude?"
 msgstr "Tikrai išeinate iš Aptitude?"
 
-#: src/ui.cc:489
+#: src/ui.cc:485
 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:589 src/ui.cc:591 src/ui.cc:619 src/ui.cc:621
+#: src/ui.cc:585 src/ui.cc:587 src/ui.cc:615 src/ui.cc:617
 msgid "Packages"
 msgstr "Paketai"
 
-#: src/ui.cc:590 src/ui.cc:620
+#: src/ui.cc:586 src/ui.cc:616
 msgid "View available packages and choose actions to perform"
 msgstr "Peržiūrėti turimus paketus ir atlikti veiksmus"
 
-#: src/ui.cc:667
+#: src/ui.cc:663
 #, fuzzy
 msgid ""
-"%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
+"Aptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
 "BABSOLUTELY NO WARRANTY%b; for details see 'license' in the Help menu.  This "
 "is free software, and you are welcome to redistribute it under certain "
 "conditions; see 'license' for details."
@@ -3896,61 +3900,66 @@
 "jūs galite ją platinti pagal tam tikras sąlygas;\n"
 "norėdami sužinoti daugiau žiūrėkite „licencija“."
 
-#: src/ui.cc:688
+#: src/ui.cc:684
 msgid "help.txt"
 msgstr "help.txt"
 
-#: src/ui.cc:704
+#: src/ui.cc:700
 msgid "README"
 msgstr "README"
 
-#: src/ui.cc:786
+#: src/ui.cc:782
 msgid ""
-"%C%BWARNING%b: untrusted versions of the following packages will be "
-"installed!%n%nUntrusted packages could %Bcompromise your system's security%"
-"b.  You should only proceed with the installation if you are certain that "
-"this is what you want to do.%n%n"
+"%BWARNING%b: untrusted versions of the following packages will be installed!%"
+"n%nUntrusted packages could %Bcompromise your system's security%b.  You "
+"should only proceed with the installation if you are certain that this is "
+"what you want to do.%n%n"
 msgstr ""
 
-#: src/ui.cc:800
+#: src/ui.cc:788
+#, fuzzy
+msgid "  %S*%N %s [version %s]%n"
+msgstr "Versijos"
+
+#: src/ui.cc:795
 #, fuzzy
 msgid "Really Continue"
 msgstr "Tęsti"
 
-#: src/ui.cc:802
+#: src/ui.cc:797
 msgid "Abort Installation"
 msgstr ""
 
-#: src/ui.cc:863
+#: src/ui.cc:858
 msgid "Preview of package installation"
 msgstr "Peržiūrėti paketo diegimą"
 
-#: src/ui.cc:864
+#: src/ui.cc:859
 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:865
+#: src/ui.cc:860
 #, fuzzy
 msgid "Preview"
 msgstr "^Atgal"
 
-#: src/ui.cc:901
+#: src/ui.cc:896
 #, fuzzy
 msgid "Some packages were broken and have been fixed:"
 msgstr "Kai kurie paketai buvo sugadinti ir aš juos sutvarkiau"
 
-#: src/ui.cc:907
+#: src/ui.cc:902
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:913
-#, c-format
+#: src/ui.cc:908
+#, fuzzy, c-format
 msgid ""
-"Ran out of time while trying to resolver dependencies (press \"%s\" to try "
+"Ran out of time while trying to resolve dependencies (press \"%s\" to try "
 "harder)"
-msgstr ""
+msgstr "Gaištate laiką bandydami rasti minas"
 
-#: src/ui.cc:959
+#: src/ui.cc:954
 #, fuzzy
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
@@ -3959,23 +3968,23 @@
 "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:962 src/ui.cc:1078
+#: src/ui.cc:957 src/ui.cc:1072
 msgid "Become root"
 msgstr "Tapti „root“"
 
-#: src/ui.cc:964 src/ui.cc:1080
+#: src/ui.cc:959 src/ui.cc:1074
 msgid "Don't become root"
 msgstr "Netapti „root“"
 
-#: src/ui.cc:969 src/ui.cc:1085
+#: src/ui.cc:964 src/ui.cc:1079
 msgid "A package-list update or install run is already taking place."
 msgstr "Paketų atnaujinimas arba diegimas jau vyksta."
 
-#: src/ui.cc:996
+#: src/ui.cc:991
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "Jokio paketo įdiegimas, pašalinimas ar atnaujinimas neplanuojamas."
 
-#: src/ui.cc:1002
+#: src/ui.cc:997
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -3988,7 +3997,7 @@
 "atnaujinti.\n"
 "Spauskite „U“ kad paruošti atnaujinimą."
 
-#: src/ui.cc:1074
+#: src/ui.cc:1069
 #, fuzzy
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
@@ -3997,113 +4006,113 @@
 "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:1090 src/ui.cc:1377
+#: src/ui.cc:1084 src/ui.cc:1371
 msgid "Waste time trying to find mines"
 msgstr "Gaištate laiką bandydami rasti minas"
 
-#: src/ui.cc:1097 src/ui.cc:1150
+#: src/ui.cc:1091 src/ui.cc:1144
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "Valymas tuo metu, kai gaunami paketai, draudžiamas"
 
-#: src/ui.cc:1100
+#: src/ui.cc:1094
 msgid "Deleting downloaded files"
-msgstr "Trinu gautus paketus"
+msgstr "Trinu gautas bylas"
 
-#: src/ui.cc:1114
+#: src/ui.cc:1108
 msgid "Downloaded package files have been deleted"
-msgstr "Gauti paketai ištrinti"
+msgstr "Gautos paketų bylos ištrintos"
 
-#: src/ui.cc:1175
+#: src/ui.cc:1169
 #, 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:1247
+#: src/ui.cc:1241
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1252 src/ui.cc:1283
+#: src/ui.cc:1246 src/ui.cc:1277
 #, fuzzy
 msgid "Ran out of time while trying to find a solution."
 msgstr "Gaištate laiką bandydami rasti minas"
 
-#: src/ui.cc:1277
+#: src/ui.cc:1271
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1307
+#: src/ui.cc:1301
 #, fuzzy, c-format
 msgid "Unable to open %s"
 msgstr "Negaliu atidaryti %s rašymui"
 
-#: src/ui.cc:1313
+#: src/ui.cc:1307
 msgid "Error while dumping resolver state"
 msgstr ""
 
-#: src/ui.cc:1323
+#: src/ui.cc:1317
 msgid "File to which the resolver state should be dumped:"
 msgstr ""
 
-#: src/ui.cc:1353
+#: src/ui.cc:1347
 msgid "^Install/remove packages"
 msgstr "^Diegti/Å¡alinti paketus"
 
-#: src/ui.cc:1354
+#: src/ui.cc:1348
 msgid "Perform all pending installs and removals"
 msgstr "Vykdyti numatytus veiksmus"
 
-#: src/ui.cc:1356
+#: src/ui.cc:1350
 msgid "^Update package list"
 msgstr "^Atnaujinti paketų sąrašą"
 
-#: src/ui.cc:1357
+#: src/ui.cc:1351
 msgid "Check for new versions of packages"
 msgstr "Ieškoti naujų paketų versijų"
 
-#: src/ui.cc:1360
+#: src/ui.cc:1354
 msgid "^Forget new packages"
 msgstr "^Pamiršti naujus paketus"
 
-#: src/ui.cc:1361
+#: src/ui.cc:1355
 msgid "Forget which packages are \"new\""
 msgstr "Pamiršti kurie paketai yra „nauji“"
 
-#: src/ui.cc:1364
+#: src/ui.cc:1358
 msgid "^Clean package cache"
-msgstr "^Valyti paketų talpyklą"
+msgstr "^Valyti paketų krepšį"
 
-#: src/ui.cc:1365
+#: src/ui.cc:1359
 msgid "Delete package files which were previously downloaded"
 msgstr "Ištrinti paketus, kurie buvo atsiųsti anksčiau"
 
-#: src/ui.cc:1368
+#: src/ui.cc:1362
 msgid "Clean ^obsolete files"
 msgstr "^IÅ¡valyti pasenusius paketus"
 
-#: src/ui.cc:1369
+#: src/ui.cc:1363
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Pašalinti paketus, kurių nebeįmanoma gauti"
 
-#: src/ui.cc:1372
+#: src/ui.cc:1366
 msgid "Mark ^Upgradable"
 msgstr "Pažymėti ^kaip atnaujinamą"
 
-#: src/ui.cc:1373
+#: src/ui.cc:1367
 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:1376
+#: src/ui.cc:1370
 msgid "^Play Minesweeper"
 msgstr "Žaisti ^Minų lauką"
 
-#: src/ui.cc:1379
+#: src/ui.cc:1373
 msgid "^Become root"
 msgstr "^Tapti „root“"
 
-#: src/ui.cc:1380
+#: src/ui.cc:1374
 #, fuzzy
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
@@ -4112,68 +4121,68 @@
 "Paleiskite komandą „su“, kad taptumėte root.  Programa startuos\n"
 "iš naujo, bet visi jūsų nustatymai išliks."
 
-#: src/ui.cc:1383
+#: src/ui.cc:1377
 msgid "^Reload package cache"
-msgstr "^Perdaryti paketų bylas"
+msgstr "^Perdaryti paketų krepšį"
 
-#: src/ui.cc:1384
+#: src/ui.cc:1378
 msgid "Reload the package cache"
-msgstr "Perkrauti paketų talpyklą"
+msgstr "Perkrauti paketų krepšį"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1384
 msgid "^Quit"
 msgstr "^Baigti"
 
-#: src/ui.cc:1391
+#: src/ui.cc:1385
 msgid "Exit the program"
 msgstr "Išeiti iš programos"
 
-#: src/ui.cc:1397 src/ui.cc:1669
+#: src/ui.cc:1391 src/ui.cc:1661
 msgid "Undo"
 msgstr "Atšaukti"
 
-#: src/ui.cc:1398
+#: src/ui.cc:1392
 msgid "Undo the last package operation or group of operations"
 msgstr "Atšaukti paskutinį veiksmą, arba operacijų grupę."
 
-#: src/ui.cc:1405
+#: src/ui.cc:1399
 msgid "^Install"
 msgstr "Įd^iegti"
 
-#: src/ui.cc:1406
+#: src/ui.cc:1400
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "Pažymėti dabartinį paketą diegti arba atnaujinti"
 
-#: src/ui.cc:1409
+#: src/ui.cc:1403
 msgid "^Remove"
 msgstr "^Pašalinti"
 
-#: src/ui.cc:1410
+#: src/ui.cc:1404
 msgid "Flag the currently selected package for removal"
 msgstr "Pažymėti šį paketą, kaip šalinamą"
 
-#: src/ui.cc:1413
+#: src/ui.cc:1407
 msgid "^Purge"
 msgstr "iš^naikinti"
 
-#: src/ui.cc:1414
+#: src/ui.cc:1408
 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:1417
+#: src/ui.cc:1411
 msgid "^Keep"
 msgstr "^Palikti"
 
-#: src/ui.cc:1418
+#: src/ui.cc:1412
 msgid "Cancel any action on the selected package"
 msgstr "Atšaukti šiam paketui visus veiksmus"
 
-#: src/ui.cc:1421
+#: src/ui.cc:1415
 msgid "^Hold"
 msgstr "^Sulaikyti"
 
-#: src/ui.cc:1422
+#: src/ui.cc:1416
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -4181,11 +4190,11 @@
 "Atšaukti šiam paketui visus veiksmus, ir apsaugoti jį nuo ateities "
 "atnaujinimų"
 
-#: src/ui.cc:1425
+#: src/ui.cc:1419
 msgid "Mark ^Auto"
 msgstr "Pažymėti ^Auto"
 
-#: src/ui.cc:1426
+#: src/ui.cc:1420
 #, fuzzy
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
@@ -4194,11 +4203,11 @@
 "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:1429
+#: src/ui.cc:1423
 msgid "Mark ^Manual"
 msgstr "Žymėti ^Ne automatinis"
 
-#: src/ui.cc:1430
+#: src/ui.cc:1424
 #, fuzzy
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
@@ -4207,11 +4216,11 @@
 "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:1433
+#: src/ui.cc:1427
 msgid "^Forbid Version"
-msgstr "^Uždraustos Versijos"
+msgstr "^Uždrausti Versiją"
 
-#: src/ui.cc:1434
+#: src/ui.cc:1428
 #, fuzzy
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
@@ -4220,234 +4229,234 @@
 "Uždrausti pažymėto paketo šią versiją;\n"
 "naujesnės paketo versijos bus įdiegtos kaip įprasta"
 
-#: src/ui.cc:1438
+#: src/ui.cc:1432
 msgid "I^nformation"
-msgstr "I^informacija"
+msgstr "I^nformacija"
 
-#: src/ui.cc:1439
+#: src/ui.cc:1433
 msgid "Display more information about the selected package"
 msgstr "Parodyti daugiau informacijos apie pažymėtą paketą"
 
-#: src/ui.cc:1442
+#: src/ui.cc:1436
 msgid "^Changelog"
 msgstr "Pakeitimų ^sąrašas"
 
-#: src/ui.cc:1443
+#: src/ui.cc:1437
 msgid "Display the Debian changelog of the selected package"
-msgstr "Rodyti šio paketo Debian pakeitimų sąrašą (Changelog)"
+msgstr "Rodyti šio paketo Debian pakeitimų sąrašą (changelog)"
 
-#: src/ui.cc:1450
+#: src/ui.cc:1444
 msgid "^Find"
 msgstr "^Rasti"
 
-#: src/ui.cc:1451
+#: src/ui.cc:1445
 msgid "Search for a package"
-msgstr "Ieškoti paketo: "
+msgstr "Ieškoti paketo"
 
-#: src/ui.cc:1454
+#: src/ui.cc:1448
 msgid "Find ^Again"
 msgstr "Rasti ^VÄ—l"
 
-#: src/ui.cc:1455
+#: src/ui.cc:1449
 msgid "Repeat the last search"
-msgstr "Pakartoti paiešką"
+msgstr "Pakartoti paskutinę paiešką"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1453
 msgid "^Limit Display"
 msgstr "^Apriboti ekranÄ…"
 
-#: src/ui.cc:1460
+#: src/ui.cc:1454
 msgid "Apply a filter to the package list"
 msgstr "Pritaikyti filtrą paketų sąrašui"
 
-#: src/ui.cc:1463
+#: src/ui.cc:1457
 msgid "^Un-Limit Display"
-msgstr "^Neberiboti ekrano"
+msgstr "^Neriboti ekrano"
 
-#: src/ui.cc:1464
+#: src/ui.cc:1458
 msgid "Remove the filter from the package list"
-msgstr "Nebenaudoti"
+msgstr "Nebenaudoti paketų sąrašo filtro"
 
-#: src/ui.cc:1468
+#: src/ui.cc:1462
 msgid "Find ^Broken"
 msgstr "Rasti ^BlogÄ…"
 
-#: src/ui.cc:1469
+#: src/ui.cc:1463
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Rasti sekantį blogą paketą"
 
-#: src/ui.cc:1476
+#: src/ui.cc:1470
 msgid "^UI options"
-msgstr "^Aplinkos nustatymai"
+msgstr "^Aplinkos parinktys"
 
-#: src/ui.cc:1477
+#: src/ui.cc:1471
 msgid "Change the settings which affect the user interface"
 msgstr "Pakeisti nustatymus, susijusius su naudotojo aplinka"
 
-#: src/ui.cc:1480
+#: src/ui.cc:1474
 msgid "^Dependency handling"
 msgstr "^Priklausomybių tvarkymas"
 
-#: src/ui.cc:1481
+#: src/ui.cc:1475
 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:1484
+#: src/ui.cc:1478
 msgid "^Miscellaneous"
 msgstr "^Kitkas"
 
-#: src/ui.cc:1485
+#: src/ui.cc:1479
 msgid "Change miscellaneous program settings"
-msgstr "Keisti kitas Aptitude nustatymus"
+msgstr "Keisti kitus programos nustatymus"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1484
 msgid "^Revert options"
-msgstr "Atstatyti ^nustatymus"
+msgstr "Atstatyti ^parinktis"
 
-#: src/ui.cc:1491
+#: src/ui.cc:1485
 msgid "Reset all settings to the system defaults"
 msgstr "Atstatyti sistemos pradinius nustatymus"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1496
 msgid "^Next"
 msgstr "^Sekantis"
 
-#: src/ui.cc:1503
+#: src/ui.cc:1497
 msgid "View next display"
 msgstr "Pereiti į sekantį ekraną"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1500
 msgid "^Prev"
 msgstr "^Atgal"
 
-#: src/ui.cc:1507
+#: src/ui.cc:1501
 msgid "View previous display"
 msgstr "Pereiti į ankstesnį ekraną"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1504
 msgid "^Close"
 msgstr "^Uždaryti"
 
-#: src/ui.cc:1511
+#: src/ui.cc:1505
 msgid "Close this display"
 msgstr "Uždaryti šį ekraną"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1510
 msgid "New Package ^View"
 msgstr "Sekantis paketų ^vaizdas"
 
-#: src/ui.cc:1517
+#: src/ui.cc:1511
 msgid "Create a new default package view"
 msgstr "Sukurti naują standartinį paketų rodymą"
 
-#: src/ui.cc:1520
+#: src/ui.cc:1514
 msgid "New Categorical ^Browser"
 msgstr "^Nauja kategorijų naršyklė"
 
-#: src/ui.cc:1522
+#: src/ui.cc:1516
 msgid "Browse packages by category"
 msgstr "Naršyti paketus pagal kategorijas"
 
-#: src/ui.cc:1530
+#: src/ui.cc:1524
 msgid "^About"
 msgstr "^Apie"
 
-#: src/ui.cc:1531
+#: src/ui.cc:1525
 msgid "View information about this program"
 msgstr "Rodyti informacijÄ… apie Å¡iÄ… programÄ…"
 
-#: src/ui.cc:1534
+#: src/ui.cc:1528
 msgid "^Help"
 msgstr "^Pagalba"
 
-#: src/ui.cc:1535
+#: src/ui.cc:1529
 msgid "View the on-line help"
 msgstr "Rodyti pagalbÄ…"
 
-#: src/ui.cc:1537
+#: src/ui.cc:1531
 msgid "User's ^Manual"
 msgstr "Naudotojo ^instrukcijos"
 
-#: src/ui.cc:1538
+#: src/ui.cc:1532
 msgid "View the detailed program manual"
 msgstr "Rodyti detalizuotas naudotojo instrukcijas"
 
-#: src/ui.cc:1541
+#: src/ui.cc:1535
 msgid "^FAQ"
 msgstr "^DUK"
 
-#: src/ui.cc:1542
+#: src/ui.cc:1536
 msgid "View a list of frequently asked questions"
-msgstr "Rodyti dažniausiai užduodamus klausimus"
+msgstr "Rodyti dažniausiai užduodamų klausimų sąrašą"
 
-#: src/ui.cc:1545
+#: src/ui.cc:1539
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1546
+#: src/ui.cc:1540
 #, fuzzy
 msgid "View the important changes made in each version of "
 msgstr ""
 "Rodyti svarbiausius pakeitimus, kurie atsirado kiekvienoje programos "
 "versijoje"
 
-#: src/ui.cc:1549
+#: src/ui.cc:1543
 msgid "^License"
 msgstr "^Licencija"
 
-#: src/ui.cc:1550
+#: src/ui.cc:1544
 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:1668
+#: src/ui.cc:1660
 msgid "Actions"
 msgstr "Veiksmai"
 
-#: src/ui.cc:1671
+#: src/ui.cc:1663
 msgid "Search"
 msgstr "Paieška"
 
-#: src/ui.cc:1672
+#: src/ui.cc:1664
 msgid "Options"
-msgstr "Nuostatos"
+msgstr "Parinktys"
 
-#: src/ui.cc:1673
+#: src/ui.cc:1665
 msgid "Views"
 msgstr "Rodymas"
 
-#: src/ui.cc:1674
+#: src/ui.cc:1666
 msgid "Help"
 msgstr "Pagalba"
 
-#: src/ui.cc:1734
+#: src/ui.cc:1726
 #, 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:2003 src/vscreen/vscreen.cc:281
+#: src/ui.cc:1996 src/vscreen/vscreen.cc:281
 msgid "yes_key"
 msgstr "t"
 
-#: src/ui.cc:2004 src/vscreen/vscreen.cc:282
+#: src/ui.cc:1997 src/vscreen/vscreen.cc:282
 msgid "no_key"
 msgstr "n"
 
-#: src/view_changelog.cc:46
+#: src/view_changelog.cc:61
 msgid "You can only view changelogs of official Debian packages."
 msgstr "Oficialių Debian paketų pakeitimų sąrašą galima tik skaityti."
 
-#: src/view_changelog.cc:52
+#: src/view_changelog.cc:67
 msgid "Downloading Changelog"
 msgstr "Gaunu pakeitimų sąrašą"
 
-#: src/view_changelog.cc:54
+#: src/view_changelog.cc:69
 #, fuzzy
 msgid "Download Changelog"
 msgstr "Gaunu pakeitimų sąrašą"
 
-#: src/view_changelog.cc:63
+#: src/view_changelog.cc:78
 #, c-format
 msgid "%s changes"
 msgstr ""
@@ -4532,10 +4541,10 @@
 #~ 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 "
+#~ "kad Jūs atliekate neįmanomus veiksmus arba naudojate nestabilų\n"
+#~ "distributyvą, kuriame kai kurie būtini paketai dar nesukurti arba "
 #~ "iškelti \n"
-#~ "iš incoming katalogo.\n"
+#~ "iš Incoming.\n"
 #~ "\n"
 
 #~ msgid ""
@@ -4545,14 +4554,189 @@
 #~ "Prašome įdėti diską į įrenginį „%s“:\n"
 #~ "%s"
 
+#~ msgid "Need exactly two colors in color definition \"%s\""
+#~ msgstr "Spalvų apraše „%s“ reikalingos būtent dvi spalvos"
+
+#~ msgid "Can't parse foreground \"%s\"of color \"%s\""
+#~ msgstr "Negaliu interpretuoti priekinio plano „%s“ spalvos „%s“"
+
+#~ msgid "Can't parse background \"%s\" of color \"%s\""
+#~ msgstr "Negaliu interpretuoti fono „%s“ spalvos „%s“"
+
 #~ msgid "Invalid option for interactive mode: -s\n"
 #~ msgstr "Neteisingas interaktyvaus režimo nustatymas -s\n"
 
+#~ 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."
+#~ msgstr ""
+#~ "Programos darbui su faks/modemais ir kitais komunikaciniais prietaisais\n"
+#~ " Paketai „comm“ sekcijoje skirti valdyti modemus ir kitus komunikacinius "
+#~ "prietaisus. "
+
+#~ 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"
+#~ " .\n"
+#~ " For more information about what Debian considers to be Free Software, "
+#~ "see http://www.debian.org/social_contract#guidelines"
+#~ msgstr ""
+#~ "Ne laisvos programos\n"
+#~ " Paketai „non-free“ sekcijoje nėra Debian dalis.\n"
+#~ " .\n"
+#~ " Šie paketai netenkina Debian laisvos programinės įrangos rekomendacijų. "
+#~ "Prieš diegdami šiuos paketus perskaitykite jos licenciją, kad "
+#~ "įsitikintumėt, jog turite teisę juos naudoti taip kaip planuojate.\n"
+#~ " .\n"
+#~ " NorÄ—dami rasti daugiau informacijos apie Debian, kaip laisvÄ… programinÄ™ "
+#~ "įrangą žiūrėkite: http://www.debian.org/social_contract#guidelines"
+
+#~ 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)"
+#~ msgstr ""
+#~ "Nauji paketai\n"
+#~ " Šie paketai atsirado po paskutinio naujų paketų sąrašo išvalymo. "
+#~ "Pasirinkite „Užmiršti naujus paketus“ meniu punkte „Veiksmai“, norėdami "
+#~ "išvalyti šį sąrašą."
+
+#~ msgid ""
+#~ "%s is an essential package!\n"
+#~ "\n"
+#~ "Are you sure you want to remove it?\n"
+#~ "Type '%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“."
+
+#~ msgid "Available versions of "
+#~ msgstr "Egzistuojančios versijos paketo "
+
+#~ 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."
+#~ msgstr ""
+#~ "Jūs neturite administratoriaus teisių ir aš \n"
+#~ "nematau būdo šias teises gauti.  Norėdami šį\n"
+#~ "paketą perkonfigūruoti įdiekite paketus\n"
+#~ "„menu“ ir „login“ arba paleiskite aptitude\n"
+#~ "turÄ—dami root teises."
+
 #~ msgid "Information about "
 #~ msgstr "Informacija apie "
 
+#~ msgid ""
+#~ "Aptitude %s\n"
+#~ "\n"
+#~ "Copyright 2000 Daniel Burrows.\n"
+#~ "\n"
+#~ "aptitude comes with ABSOLUTELY NO WARRANTY; for details see 'license' in "
+#~ "the\n"
+#~ "Help menu.  This is free software, and you are welcome to redistribute "
+#~ "it\n"
+#~ "under certain conditions; see 'license' for details."
+#~ msgstr ""
+#~ "Aptitude %s\n"
+#~ "\n"
+#~ "AutorinÄ—s teisÄ—s 2000 Daniel Burrows.\n"
+#~ "\n"
+#~ "aptitude platinamas BE JOKIŲ GARANTIJŲ, norėdami sužinoti daugiau\n"
+#~ "žiūrėkite „licencija“ iš meniu „pagalba“. Tai laisva programinė įranga, \n"
+#~ "jūs galite ją platinti pagal tam tikras sąlygas;\n"
+#~ "norėdami sužinoti daugiau žiūrėkite „licencija“."
+
+#~ msgid "Some packages were broken and have been fixed"
+#~ msgstr "Kai kurie paketai buvo sugadinti ir aš juos sutvarkiau"
+
 #~ msgid "Some broken packages could not be fixed!"
 #~ msgstr "Keli sugadinti paketai negali būti sutvarkyti!"
 
+#~ msgid "Some packages are broken.  Try to fix them?"
+#~ msgstr "Keli paketai sugadint.  Ar man bandyti juos sutvarkyti?"
+
+#~ msgid ""
+#~ "Installing/removing packages requires administrative privileges, which\n"
+#~ "you currently do not have.  Would you like to change to the root "
+#~ "account?\n"
+#~ msgstr ""
+#~ "Norėdami įdiegti/pašalinti paketus turite turėti administratoriaus "
+#~ "(root)\n"
+#~ "privilegijas, kurių jūs neturite.  Ar norite pereiti į „root“ paskyrą?\n"
+
+#~ msgid ""
+#~ "No packages will be installed, removed or upgraded.\n"
+#~ "\n"
+#~ "Some packages could be upgraded, but you have not chosen to upgrade "
+#~ "them.\n"
+#~ "Type \"U\" to prepare an upgrade."
+#~ msgstr ""
+#~ "Joks paketas nebus įdiegtas, pašalintas ar atnaujintas.\n"
+#~ "\n"
+#~ "Yra paketų, kuriuos būtų galima atnaujinti, tačiau jūs nenurodėte juos "
+#~ "atnaujinti.\n"
+#~ "Spauskite „U“ kad paruoštumėte atnaujinimą."
+
+#~ 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"
+#~ msgstr ""
+#~ "Norint atnaujinti paketų sąrašą Jūs turite turėti administratoriaus "
+#~ "teises, kurių\n"
+#~ "jūs šiuo momentu neturite. Ar norite jas įgyti?\n"
+
+#~ msgid "Obsolete downloaded package files have been deleted"
+#~ msgstr "Pasenusių gautų paketų bylos ištrintos"
+
+#~ msgid ""
+#~ "Run 'su' to become root; this will restart the program, but your\n"
+#~ "settings will be preserved"
+#~ msgstr ""
+#~ "Paleiskite komandą „su“, kad taptumėte root.  Programa startuos\n"
+#~ "iš naujo, bet visi jūsų nustatymai išliks."
+
+#~ msgid ""
+#~ "Mark the selected package as having been automatically installed;\n"
+#~ "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"
+
+#~ msgid ""
+#~ "Mark the selected package as having been manually installed;\n"
+#~ "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"
+
+#~ msgid ""
+#~ "Forbid the candidate version of the selected package from being "
+#~ "installed;\n"
+#~ "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"
+
 #~ msgid "^ChangeLog"
 #~ msgstr "Pakeitimų ^sąrašas"
+
+#~ msgid "View the important changes made in each version of the program"
+#~ msgstr ""
+#~ "Rodyti svarbiausius pakeitimus, kurie atsirado kiekvienoje programos "
+#~ "versijoje"

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	Sun Jun 12 21:04:47 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-05-01 14:08-0400\n"
+"POT-Creation-Date: 2005-06-12 22:42+0200\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"
@@ -161,14 +161,14 @@
 msgid "Automatically remove unused packages matching this filter"
 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:219 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
-#: src/vscreen/vs_util.cc:328
+#: src/apt_options.cc:240 src/mine/cmine.cc:249 src/mine/cmine.cc:312
+#: src/ui.cc:215 src/vscreen/vs_util.cc:77 src/vscreen/vs_util.cc:90
+#: src/vscreen/vs_util.cc:264 src/vscreen/vs_util.cc:298
 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:328
+#: src/apt_options.cc:241 src/download_list.cc:69 src/mine/cmine.cc:250
+#: src/mine/cmine.cc:313 src/vscreen/vs_util.cc:298
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -249,15 +249,15 @@
 msgid "%s: Previous"
 msgstr ""
 
-#: src/broken_indicator.cc:233
+#: src/broken_indicator.cc:232
 #, c-format
-msgid "%CSolution search failed.  %s: try harder"
+msgid "Solution search failed.  %s: try harder"
 msgstr ""
 
-#: src/broken_indicator.cc:239
-#, c-format
-msgid "%CUnable to resolve dependencies."
-msgstr ""
+#: src/broken_indicator.cc:237
+#, fuzzy
+msgid "Unable to resolve dependencies."
+msgstr "Klarer ikke å åpne %s for å skrive til den"
 
 #: src/cmdline/cmdline_action.cc:36
 #, c-format
@@ -627,13 +627,13 @@
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
-#: src/vscreen/vs_util.cc:212
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:165
+#: src/vscreen/vs_util.cc:202
 msgid "Yes"
 msgstr "Ja"
 
-#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
-#: src/vscreen/vs_util.cc:212
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:165
+#: src/vscreen/vs_util.cc:202
 msgid "No"
 msgstr "Nei"
 
@@ -942,7 +942,7 @@
 msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:212
+#: src/cmdline/cmdline_resolver.cc:212 src/cmdline/cmdline_resolver.cc:285
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
@@ -997,196 +997,201 @@
 msgid "The following packages have unmet dependencies:\n"
 msgstr "Disse pakkene hadde utilfredsstilte avhengigheter:\n"
 
-#: src/cmdline/cmdline_show.cc:133
+#: src/cmdline/cmdline_show.cc:119 src/cmdline/cmdline_show.cc:305
+#: src/solution_fragment.cc:65
+msgid "<NULL>"
+msgstr ""
+
+#: src/cmdline/cmdline_show.cc:138
 msgid "not installed"
 msgstr "ikke installert"
 
-#: src/cmdline/cmdline_show.cc:135 src/pkg_columnizer.cc:231
+#: src/cmdline/cmdline_show.cc:140 src/pkg_columnizer.cc:231
 #: src/pkg_ver_item.cc:225
 msgid "unpacked"
 msgstr "utpakket"
 
-#: src/cmdline/cmdline_show.cc:137
+#: src/cmdline/cmdline_show.cc:142
 msgid "partially configured"
 msgstr "delvis oppsatt"
 
-#: src/cmdline/cmdline_show.cc:139
+#: src/cmdline/cmdline_show.cc:144
 msgid "partially installed"
 msgstr "delvis installert"
 
-#: src/cmdline/cmdline_show.cc:141
+#: src/cmdline/cmdline_show.cc:146
 msgid "not installed (configuration files remain)"
 msgstr "ikke installert (oppsettsfiler gjenstår)"
 
-#: src/cmdline/cmdline_show.cc:143 src/pkg_columnizer.cc:239
+#: src/cmdline/cmdline_show.cc:148 src/pkg_columnizer.cc:239
 #: src/pkg_ver_item.cc:233
 msgid "installed"
 msgstr "installert"
 
-#: src/cmdline/cmdline_show.cc:152
+#: src/cmdline/cmdline_show.cc:157
 msgid "not a real package"
 msgstr "ikke en virkelig pakke"
 
-#: src/cmdline/cmdline_show.cc:165
+#: src/cmdline/cmdline_show.cc:170
 msgid " [held]"
 msgstr " [holdt igjen]"
 
-#: src/cmdline/cmdline_show.cc:174
+#: src/cmdline/cmdline_show.cc:179
 #, c-format
 msgid "%s; version %s will be installed"
 msgstr "%s, versjon %s vil bli installert"
 
-#: src/cmdline/cmdline_show.cc:178
+#: src/cmdline/cmdline_show.cc:183
 #, c-format
 msgid "%s; version %s will be installed automatically"
 msgstr "%s, versjon %s vil bli installert automatisk"
 
-#: src/cmdline/cmdline_show.cc:184 src/cmdline/cmdline_show.cc:199
+#: src/cmdline/cmdline_show.cc:189 src/cmdline/cmdline_show.cc:204
 #, c-format
 msgid "%s; will be purged"
 msgstr "%s vil bli slettet"
 
-#: src/cmdline/cmdline_show.cc:197
+#: src/cmdline/cmdline_show.cc:202
 #, c-format
 msgid "%s; will be purged because nothing depends on it"
 msgstr "%s vil bli slettet fordi ingenting er avhengig av det"
 
-#: src/cmdline/cmdline_show.cc:204
+#: src/cmdline/cmdline_show.cc:209
 #, c-format
 msgid "%s; will be removed because nothing depends on it"
 msgstr "%s vil bli fjernet fordi ingenting avhenger av det"
 
-#: src/cmdline/cmdline_show.cc:206
+#: src/cmdline/cmdline_show.cc:211
 #, c-format
 msgid "%s; will be removed"
 msgstr "%s vil bli fjernet"
 
-#: src/cmdline/cmdline_show.cc:220
+#: src/cmdline/cmdline_show.cc:225
 #, c-format
 msgid "%s%s; will be downgraded [%s -> %s]"
 msgstr "%s%s vil bli nedgradert [%s -> %s]"
 
-#: src/cmdline/cmdline_show.cc:223
+#: src/cmdline/cmdline_show.cc:228
 #, c-format
 msgid "%s%s; will be upgraded [%s -> %s]"
 msgstr "%s%s vil bli oppgradert [%s -> %s]"
 
-#: src/cmdline/cmdline_show.cc:235 src/cmdline/cmdline_show.cc:256
+#: src/cmdline/cmdline_show.cc:240 src/cmdline/cmdline_show.cc:261
 msgid "Package: "
 msgstr "Pakke: "
 
-#: src/cmdline/cmdline_show.cc:236 src/cmdline/cmdline_show.cc:264
+#: src/cmdline/cmdline_show.cc:241 src/cmdline/cmdline_show.cc:269
 #: src/pkg_columnizer.cc:87
 msgid "State"
 msgstr "Tilstand"
 
-#: src/cmdline/cmdline_show.cc:237 src/cmdline/cmdline_show.cc:318
+#: src/cmdline/cmdline_show.cc:242 src/cmdline/cmdline_show.cc:325
 msgid "Provided by"
 msgstr "Skaffes av"
 
-#: src/cmdline/cmdline_show.cc:258 src/pkg_info_screen.cc:105
+#: src/cmdline/cmdline_show.cc:263 src/pkg_info_screen.cc:105
 msgid "Essential: "
 msgstr "Grunnleggende: "
 
-#: src/cmdline/cmdline_show.cc:258 src/cmdline/cmdline_show.cc:262
-#: src/cmdline/cmdline_show.cc:273 src/pkg_info_screen.cc:105
+#: src/cmdline/cmdline_show.cc:263 src/cmdline/cmdline_show.cc:267
+#: src/cmdline/cmdline_show.cc:278 src/pkg_info_screen.cc:105
 msgid "yes"
 msgstr "ja"
 
-#: src/cmdline/cmdline_show.cc:262
+#: src/cmdline/cmdline_show.cc:267
 msgid "New"
 msgstr "Ny"
 
-#: src/cmdline/cmdline_show.cc:267
+#: src/cmdline/cmdline_show.cc:272
 msgid "Forbidden version"
 msgstr "Forbudt versjon"
 
-#: src/cmdline/cmdline_show.cc:271
+#: src/cmdline/cmdline_show.cc:276
 msgid "Automatically installed"
 msgstr "Automatisk installert"
 
-#: src/cmdline/cmdline_show.cc:273
+#: src/cmdline/cmdline_show.cc:278
 msgid "no"
 msgstr "ingen"
 
-#: src/cmdline/cmdline_show.cc:275
+#: src/cmdline/cmdline_show.cc:280
 msgid "Version: "
 msgstr "Versjon: "
 
-#: src/cmdline/cmdline_show.cc:276 src/pkg_info_screen.cc:113
+#: src/cmdline/cmdline_show.cc:281 src/pkg_info_screen.cc:113
 msgid "Priority: "
 msgstr "Prioritet: "
 
-#: src/cmdline/cmdline_show.cc:277 src/cmdline/cmdline_show.cc:279
-#: src/cmdline/cmdline_show.cc:288
+#: src/cmdline/cmdline_show.cc:282 src/cmdline/cmdline_show.cc:284
+#: src/cmdline/cmdline_show.cc:293
 msgid "N/A"
 msgstr "I/T"
 
-#: src/cmdline/cmdline_show.cc:278 src/pkg_info_screen.cc:114
+#: src/cmdline/cmdline_show.cc:283 src/pkg_info_screen.cc:114
 msgid "Section: "
 msgstr "Bolk: "
 
-#: src/cmdline/cmdline_show.cc:280 src/pkg_info_screen.cc:115
+#: src/cmdline/cmdline_show.cc:285 src/pkg_info_screen.cc:115
 msgid "Maintainer: "
 msgstr "Vedlikeholder: "
 
-#: src/cmdline/cmdline_show.cc:283
+#: src/cmdline/cmdline_show.cc:288
 msgid "Uncompressed Size: "
 msgstr "Ukomprimert størrelse: "
 
-#: src/cmdline/cmdline_show.cc:287
+#: src/cmdline/cmdline_show.cc:292
 msgid "Architecture: "
 msgstr "Arkitektur: "
 
-#: src/cmdline/cmdline_show.cc:289
+#: src/cmdline/cmdline_show.cc:294
 msgid "Compressed Size: "
 msgstr "Komprimert størrelse: "
 
-#: src/cmdline/cmdline_show.cc:291
+#: src/cmdline/cmdline_show.cc:296
 msgid "Filename: "
 msgstr "Filnavn: "
 
-#: src/cmdline/cmdline_show.cc:293
+#: src/cmdline/cmdline_show.cc:298
 msgid "MD5sum: "
 msgstr "MD5sum: "
 
-#: src/cmdline/cmdline_show.cc:297 src/cmdline/cmdline_show.cc:299
+#: src/cmdline/cmdline_show.cc:302 src/cmdline/cmdline_show.cc:305
 msgid "Archive"
 msgstr "Arkiv"
 
-#: src/cmdline/cmdline_show.cc:303
+#: src/cmdline/cmdline_show.cc:310
 msgid "Depends"
 msgstr "Krav"
 
-#: src/cmdline/cmdline_show.cc:305
+#: src/cmdline/cmdline_show.cc:312
 msgid "PreDepends"
 msgstr "Forkrav"
 
-#: src/cmdline/cmdline_show.cc:307
+#: src/cmdline/cmdline_show.cc:314
 msgid "Recommends"
 msgstr "Anbefalinger"
 
-#: src/cmdline/cmdline_show.cc:309
+#: src/cmdline/cmdline_show.cc:316
 msgid "Suggests"
 msgstr "Forslag"
 
-#: src/cmdline/cmdline_show.cc:311
+#: src/cmdline/cmdline_show.cc:318
 msgid "Conflicts"
 msgstr "Konflikter"
 
-#: src/cmdline/cmdline_show.cc:313
+#: src/cmdline/cmdline_show.cc:320
 msgid "Replaces"
 msgstr "Erstatter"
 
-#: src/cmdline/cmdline_show.cc:315
+#: src/cmdline/cmdline_show.cc:322
 msgid "Obsoletes"
 msgstr "Foreldet"
 
-#: src/cmdline/cmdline_show.cc:317
+#: src/cmdline/cmdline_show.cc:324
 msgid "Provides"
 msgstr "Skaffer"
 
-#: src/cmdline/cmdline_show.cc:321 src/pkg_info_screen.cc:97
+#: src/cmdline/cmdline_show.cc:328 src/pkg_info_screen.cc:97
 msgid "Description: "
 msgstr "Beskrivelse: "
 
@@ -1229,32 +1234,32 @@
 msgid "You cannot specify both an archive and a version for a package\n"
 msgstr "Du kan ikke oppgi både et arkiv og en versjon for en pakke\n"
 
-#: src/dep_item.cc:137
+#: src/dep_item.cc:139
 msgid "UNSATISFIED"
 msgstr "IKKE OPPFYLT"
 
-#: src/dep_item.cc:137 src/reason_fragment.cc:247
+#: src/dep_item.cc:139 src/reason_fragment.cc:244
 msgid "UNAVAILABLE"
 msgstr "UTILGJENGELIG"
 
-#: src/download_bar.cc:56 src/download_list.cc:263 src/download_screen.cc:57
+#: src/download_bar.cc:56 src/download_list.cc:266 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_bar.cc:77 src/generic/acqprogress.cc:63
+#: src/download_bar.cc:75 src/generic/acqprogress.cc:63
 msgid "Hit "
 msgstr "Treff "
 
-#: src/download_bar.cc:90
+#: src/download_bar.cc:88
 msgid "Downloading "
 msgstr "Laster ned "
 
-#: src/download_bar.cc:103
+#: src/download_bar.cc:101
 msgid "Got "
 msgstr "Fikk "
 
-#: src/download_bar.cc:157
+#: src/download_bar.cc:155
 msgid "Downloading..."
 msgstr "Laster ned ..."
 
@@ -1282,7 +1287,7 @@
 msgid "Couldn't clean out list directories"
 msgstr "Klarte ikke å slette listemappene"
 
-#: src/download.cc:177 src/ui.cc:1153
+#: src/download.cc:177 src/ui.cc:1147
 msgid "Deleting obsolete downloaded files"
 msgstr "Sletter nedlastede filer som er foreldet"
 
@@ -1421,7 +1426,7 @@
 msgstr ""
 "Uff! Noe gikk galt under installasjonen av pakker. Prøver å gjenopprette:"
 
-#: src/download.cc:477 src/pkg_item.cc:432
+#: src/download.cc:477 src/pkg_item.cc:430
 msgid "Press return to continue.\n"
 msgstr "Trykk Enter for å fortsette.\n"
 
@@ -1431,17 +1436,17 @@
 msgstr ""
 "Klarte ikke å skru av symbollåsen! (Kanskje en annet apt eller dpkg kjører?)"
 
-#: src/download_item.cc:66 src/download_item.cc:70 src/download_item.cc:100
+#: src/download_item.cc:70 src/download_item.cc:74 src/download_item.cc:104
 #: src/generic/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr " [Arbeider]"
 
-#: src/download_item.cc:104 src/download_list.cc:283
+#: src/download_item.cc:108 src/download_list.cc:284
 msgid "[Hit]"
 msgstr "[Treff]"
 
-#: src/download_item.cc:104 src/download_list.cc:303
+#: src/download_item.cc:108 src/download_list.cc:304
 msgid "[Downloaded]"
 msgstr "[Nedlastet]"
 
@@ -1455,34 +1460,34 @@
 msgid "%n%nSome files were not downloaded successfully."
 msgstr ""
 
-#: src/download_list.cc:68
+#: src/download_list.cc:66
 msgid "Continue"
 msgstr "Fortsett"
 
-#: src/download_list.cc:175 src/download_screen.cc:203
+#: src/download_list.cc:178 src/download_screen.cc:203
 msgid "Total Progress: "
 msgstr "Totalt utført: "
 
-#: src/download_list.cc:194 src/download_screen.cc:218
+#: src/download_list.cc:197 src/download_screen.cc:218
 #, c-format
 msgid " [ %i%% ] (%sB/s, %s remaining)"
 msgstr " [ %i%% ] (%sB/s, %s igjen)"
 
-#: src/download_list.cc:196
+#: src/download_list.cc:199
 #, c-format
 msgid " [ %i%% ] (stalled)"
 msgstr " [ %i%% ] (stoppa)"
 
-#: src/download_list.cc:198
+#: src/download_list.cc:201
 #, c-format
 msgid " [ %i%% ]"
 msgstr " [ %i%% ]"
 
-#: src/download_list.cc:323
+#: src/download_list.cc:324
 msgid "[IGNORED]"
 msgstr "[IGNORERT]"
 
-#: src/download_list.cc:329
+#: src/download_list.cc:330
 msgid "[ERROR]"
 msgstr "[FEIL]"
 
@@ -1491,11 +1496,11 @@
 msgid "Downloaded %sB in %ss (%sB/s)."
 msgstr "Lasta ned %sB på %ss (%sB/s)."
 
-#: src/edit_pkg_hier.cc:158
+#: src/edit_pkg_hier.cc:176
 msgid "No hierarchy information to edit"
 msgstr "Ingen hierarkiinformasjon å redigere"
 
-#: src/edit_pkg_hier.cc:258
+#: src/edit_pkg_hier.cc:276
 msgid "Couldn't open for writing"
 msgstr "Klarte ikke å åpne for skriving"
 
@@ -1591,39 +1596,39 @@
 msgstr ""
 "Advarsel: klarer ikke å låse mellomlagerfila. åpner i skrivebeskyttet modus"
 
-#: src/generic/matchers.cc:797
+#: src/generic/matchers.cc:798
 msgid "Unmatched '('"
 msgstr "Mangler motsvar til «(»"
 
-#: src/generic/matchers.cc:887 src/generic/matchers.cc:968
+#: src/generic/matchers.cc:888 src/generic/matchers.cc:969
 #, c-format
 msgid "Unknown dependency type: %s"
 msgstr "Ukjent kravtype: %s"
 
-#: src/generic/matchers.cc:950
+#: src/generic/matchers.cc:951
 #, c-format
 msgid "Unknown action type: %s"
 msgstr "Ukjent handlingstype: %s"
 
-#: src/generic/matchers.cc:1017
+#: src/generic/matchers.cc:1018
 #, c-format
 msgid "Unknown priority %s"
 msgstr "Ukjent prioritet %s"
 
-#: src/generic/matchers.cc:1039
+#: src/generic/matchers.cc:1040
 #, c-format
 msgid "Unknown pattern type: %c"
 msgstr "Ukjent mønstertype: %c"
 
-#: src/generic/matchers.cc:1084
+#: src/generic/matchers.cc:1105
 msgid "Unexpected empty expression"
 msgstr "Uventet tomt uttrykk"
 
-#: src/generic/matchers.cc:1119
+#: src/generic/matchers.cc:1143
 msgid "Badly formed expression"
 msgstr "DÃ¥rlig utformet uttrykk"
 
-#: src/generic/matchers.cc:1148
+#: src/generic/matchers.cc:1175
 msgid "Unexpected ')'"
 msgstr "Uventet «)»"
 
@@ -1647,7 +1652,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:61
+#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:76
 #, c-format
 msgid "ChangeLog of %s"
 msgstr "Endringslogg for %s"
@@ -1689,37 +1694,37 @@
 msgid "Reading task descriptions"
 msgstr "Leser oppgavebeskrivelser"
 
-#: src/load_config.cc:30
-#, c-format
-msgid "Invalid entry in color definition group: \"%s\""
-msgstr "Ugyldig oppføring i gruppa for fargeangivelser: «%s»"
+#: src/load_config.cc:42
+#, fuzzy, c-format
+msgid "Unrecognized color name \"%s\""
+msgstr "Ikke gjenkjente oppgaver"
 
-#: src/load_config.cc:32
-#, c-format
-msgid "Invalid tagless entry in color definition group: \"%s\""
-msgstr "Ugyldig oppføring uten tagg i gruppa for fargeangivelser «%s»"
+#: src/load_config.cc:69
+#, fuzzy, c-format
+msgid "Unrecognized attribute name \"%s\""
+msgstr "Ikke gjenkjente oppgaver"
 
-#: src/load_config.cc:34
-#, c-format
-msgid "Need exactly two colors in color definition \"%s\""
-msgstr "Trenger nøyaktig to farger i fargeangivelsen «%s»"
+#: src/load_config.cc:106
+#, fuzzy, c-format
+msgid "Invalid entry in style definition group: \"%s\""
+msgstr "Ugyldig oppføring i gruppa for fargeangivelser: «%s»"
 
-#: src/load_config.cc:50
-#, c-format
-msgid "Can't parse foreground \"%s\"of color \"%s\""
-msgstr "Klarer ikke å tolke forgrunn «%s» til fargen «%s»"
+#: src/load_config.cc:108
+#, fuzzy, c-format
+msgid "Invalid tagless entry in style definition group: \"%s\""
+msgstr "Ugyldig oppføring uten tagg i gruppa for fargeangivelser «%s»"
 
-#: src/load_config.cc:53
-#, c-format
-msgid "Can't parse background \"%s\" of color \"%s\""
-msgstr "Klarer ikke å tolke bakgrunn «%s» til fargen «%s»"
+#: src/load_config.cc:130
+#, fuzzy, c-format
+msgid "Unknown style attribute %s"
+msgstr "Ukjent handlingstype: %s"
 
-#: src/load_config.cc:72 src/load_config.cc:74
+#: src/load_config.cc:153 src/load_config.cc:155
 #, c-format
 msgid "Invalid entry in keybinding group: \"%s\""
 msgstr "Ugyldig oppføring i gruppa med tastebindinger: «%s»"
 
-#: src/load_config.cc:89
+#: src/load_config.cc:170
 #, c-format
 msgid "Ignoring invalid keybinding \"%s\" -> \"%s\""
 msgstr "Ignorerer de ugyldige tastebindingene «%s» -> «%s»"
@@ -2125,42 +2130,42 @@
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                  Denne aptituden har ikke superku-krefter.\n"
 
-#: src/main.cc:255
+#: src/main.cc:252
 #, 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:301 src/main.cc:310
+#: src/main.cc:291 src/main.cc:300
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr "MERKELIG: mottok en ukjent valgkode\n"
 
-#: src/main.cc:319
+#: src/main.cc:309
 msgid "Only one of -u and -i may be specified\n"
 msgstr "Du kan bare oppgi enten -u eller -i\n"
 
-#: src/main.cc:327
+#: src/main.cc:317
 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:348
+#: src/main.cc:338
 msgid "-u and -i may not be specified with a command"
 msgstr "-u og -i kan ikke oppgis med en kommando"
 
-#: src/main.cc:405
+#: src/main.cc:395
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr "Ukjent kommando «%s»\n"
 
-#: src/main.cc:412 src/main.cc:469
+#: src/main.cc:402 src/main.cc:450
 msgid "Internal error: uncaught 'out of solutions' exception.\n"
 msgstr ""
 
-#: src/main.cc:417 src/main.cc:474
+#: src/main.cc:407 src/main.cc:455
 msgid "Internal error: uncaught 'out of time' exception.\n"
 msgstr ""
 
-#: src/main.cc:424
+#: src/main.cc:414
 #, c-format
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
@@ -2191,7 +2196,7 @@
 msgid "Lost"
 msgstr "Tapt"
 
-#: src/mine/cmine.cc:119 src/ui.cc:1090
+#: src/mine/cmine.cc:119 src/ui.cc:1084
 msgid "Minesweeper"
 msgstr "Minesveiper"
 
@@ -2217,93 +2222,93 @@
 msgid "The number of mines must be a number"
 msgstr "Antall miner må være et tall"
 
-#: src/mine/cmine.cc:240
+#: src/mine/cmine.cc:238
 msgid "Setup custom game"
 msgstr "Sett opp et tilpasset spill"
 
-#: src/mine/cmine.cc:243
+#: src/mine/cmine.cc:240
 msgid "Height of board: "
 msgstr "Høyden på brettet: "
 
-#: src/mine/cmine.cc:247
+#: src/mine/cmine.cc:243
 msgid "Width of board: "
 msgstr "Bredden på brettet: "
 
-#: src/mine/cmine.cc:251
+#: src/mine/cmine.cc:246
 msgid "Number of mines: "
 msgstr "Antall miner: "
 
-#: src/mine/cmine.cc:316
+#: src/mine/cmine.cc:305
 msgid "Choose difficulty level"
 msgstr "Velg vanskelighetsgrad"
 
-#: src/mine/cmine.cc:318
+#: src/mine/cmine.cc:307
 msgid "Easy"
 msgstr "Lett"
 
-#: src/mine/cmine.cc:319
+#: src/mine/cmine.cc:308
 msgid "Medium"
 msgstr "Middels"
 
-#: src/mine/cmine.cc:320
+#: src/mine/cmine.cc:309
 msgid "Hard"
 msgstr "Vanskelig"
 
-#: src/mine/cmine.cc:321
+#: src/mine/cmine.cc:310
 msgid "Custom"
 msgstr "Tilpasset"
 
-#: src/mine/cmine.cc:411
+#: src/mine/cmine.cc:392
 msgid "You have won."
 msgstr "Du har vunnet."
 
-#: src/mine/cmine.cc:414
+#: src/mine/cmine.cc:395
 msgid "You lose!"
 msgstr "Du tapte."
 
-#: src/mine/cmine.cc:419
+#: src/mine/cmine.cc:400
 msgid "You die...  --More--"
 msgstr "Du dør ...  --Mer--"
 
-#: src/mine/cmine.cc:432
+#: src/mine/cmine.cc:413
 msgid "The spikes were poisoned!  The poison was deadly..  --More--"
 msgstr "Spydene var forgiftet!  Gifta var dødelig ...  --Mer--"
 
-#: src/mine/cmine.cc:435
+#: src/mine/cmine.cc:416
 msgid "You land on a set of sharp iron spikes!  --More--"
 msgstr "Du landet på noen skarpe jernspyd!  --Mer--"
 
-#: src/mine/cmine.cc:438
+#: src/mine/cmine.cc:419
 msgid "You fall into a pit!  --More--"
 msgstr "Du datt ned i et hull!  --Mer--"
 
-#: src/mine/cmine.cc:441
+#: src/mine/cmine.cc:422
 msgid "KABOOM!  You step on a land mine.  --More--"
 msgstr "KABOOM!  Du tråkka på en landmine.  --Mer--"
 
-#: src/mine/cmine.cc:446
+#: src/mine/cmine.cc:427
 msgid "The dart was poisoned!  The poison was deadly...  --More--"
 msgstr "Pila var forgifta!  Gifta var dødelig ...  --Mer--"
 
-#: src/mine/cmine.cc:448
+#: src/mine/cmine.cc:429
 msgid ""
 "A little dart shoots out at you!  You are hit by a little dart!  --More--"
 msgstr ""
 "En liten pil ble skutt mot deg!  Du ble truffet av den vesle pila.  --Mer--"
 
-#: src/mine/cmine.cc:452
+#: src/mine/cmine.cc:433
 msgid "You turn to stone... --More--"
 msgstr "Du blir til stein ...  --Mer--"
 
-#: src/mine/cmine.cc:454
+#: src/mine/cmine.cc:435
 msgid "Touching the cockatrice corpse was a fatal mistake.  --More--"
 msgstr "Det var en dødelig feil å ta på kadaveret til basilisken.  --Mer--"
 
-#: src/mine/cmine.cc:456
+#: src/mine/cmine.cc:437
 msgid "You feel here a cockatrice corpse.  --More--"
 msgstr "Her kan du kjenne kadaveret til en basilisk.  --Mer--"
 
-#: src/mine/cmine.cc:460
+#: src/mine/cmine.cc:441
 msgid ""
 "Click!  You trigger a rolling boulder trap!  You are hit by a boulder! --"
 "More--"
@@ -2311,56 +2316,56 @@
 "Klikk!  Du utløste en rullende kampestein! Du blir truffet av den store "
 "steinen! --Mer--"
 
-#: src/mine/cmine.cc:470
+#: src/mine/cmine.cc:451
 msgid "sleep"
 msgstr "sov"
 
-#: src/mine/cmine.cc:473
+#: src/mine/cmine.cc:454
 msgid "striking"
 msgstr "angrep"
 
-#: src/mine/cmine.cc:476
+#: src/mine/cmine.cc:457
 msgid "death"
 msgstr "død"
 
-#: src/mine/cmine.cc:479
+#: src/mine/cmine.cc:460
 msgid "polymorph"
 msgstr "mangeformet"
 
-#: src/mine/cmine.cc:482
+#: src/mine/cmine.cc:463
 msgid "magic missile"
 msgstr "magisk missil"
 
-#: src/mine/cmine.cc:485
+#: src/mine/cmine.cc:466
 msgid "secret door detection"
 msgstr "oppdaging av hemmelige dører"
 
-#: src/mine/cmine.cc:488
+#: src/mine/cmine.cc:469
 msgid "invisibility"
 msgstr "usynlig"
 
-#: src/mine/cmine.cc:491
+#: src/mine/cmine.cc:472
 msgid "cold"
 msgstr "kald"
 
-#: src/mine/cmine.cc:497
+#: src/mine/cmine.cc:478
 #, c-format
 msgid "Your wand of %s breaks apart and explodes!  --More--"
 msgstr "Tryllestaven din fra %s går i stykker og eksploderer!  --Mer--"
 
-#: src/mine/cmine.cc:503
+#: src/mine/cmine.cc:484
 msgid "You are jolted by a surge of electricity!  --More--"
 msgstr "Du får et elektrisk støt!  --Mer--"
 
-#: src/mine/cmine.cc:607
+#: src/mine/cmine.cc:588
 msgid "Enter the filename to load: "
 msgstr "Skriv inn navnet på fila som skal lastes: "
 
-#: src/mine/cmine.cc:614
+#: src/mine/cmine.cc:595
 msgid "Enter the filename to save: "
 msgstr "Skriv inn navnet på fila som skal lagres: "
 
-#: src/mine/cmine.cc:624
+#: src/mine/cmine.cc:605
 msgid "mine-help.txt"
 msgstr "mine-hjelp.txt"
 
@@ -2368,7 +2373,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:1670
+#: src/pkg_columnizer.cc:84 src/ui.cc:1662
 msgid "Package"
 msgstr "Pakke"
 
@@ -3431,52 +3436,52 @@
 "Er du sikker på at du vil fjerne den?\n"
 "Skriv %s hvis du er sikker."
 
-#: src/pkg_item.cc:222 src/pkg_ver_item.cc:625
+#: src/pkg_item.cc:220 src/pkg_ver_item.cc:626
 #, c-format
 msgid "Information about %s"
 msgstr "Informasjon om %s"
 
-#: src/pkg_item.cc:224 src/pkg_ver_item.cc:627
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:628
 #, c-format
 msgid "%s info"
 msgstr ""
 
-#: src/pkg_item.cc:310
+#: src/pkg_item.cc:308
 #, fuzzy, c-format
 msgid "Available versions of %s"
 msgstr "Tilgjengelige versjoner av "
 
-#: src/pkg_item.cc:313
+#: src/pkg_item.cc:311
 #, fuzzy, c-format
 msgid "%s versions"
 msgstr "Versjoner"
 
-#: src/pkg_item.cc:325 src/pkg_ver_item.cc:655
+#: src/pkg_item.cc:323 src/pkg_ver_item.cc:656
 #, c-format
 msgid "Dependencies of %s"
 msgstr "Avhengigheter av %s"
 
-#: src/pkg_item.cc:327 src/pkg_ver_item.cc:657
+#: src/pkg_item.cc:325 src/pkg_ver_item.cc:658
 #, c-format
 msgid "%s deps"
 msgstr ""
 
-#: src/pkg_item.cc:338 src/pkg_ver_item.cc:667
+#: src/pkg_item.cc:336 src/pkg_ver_item.cc:668
 #, c-format
 msgid "Packages depending on %s"
 msgstr "Pakker som er avhengige av %s"
 
-#: src/pkg_item.cc:340 src/pkg_ver_item.cc:669
+#: src/pkg_item.cc:338 src/pkg_ver_item.cc:670
 #, c-format
 msgid "%s reverse deps"
 msgstr ""
 
-#: src/pkg_item.cc:392 src/pkg_ver_item.cc:707
+#: src/pkg_item.cc:390 src/pkg_ver_item.cc:708
 #, c-format
 msgid "Reporting a bug in %s:\n"
 msgstr "Rapporterer en feil i %s:\n"
 
-#: src/pkg_item.cc:414
+#: src/pkg_item.cc:412
 #, fuzzy
 msgid ""
 "You are not root and I cannot find any way to become root.  To reconfigure "
@@ -3488,16 +3493,16 @@
 "pakken på nytt, installer menypakken, logg inn-\n"
 "pakken, eller kjør aptitude som root."
 
-#: src/pkg_item.cc:422
+#: src/pkg_item.cc:420
 #, c-format
 msgid "Reconfiguring %s\n"
 msgstr "Setter opp %s på nytt\n"
 
-#: src/pkg_item.cc:447
+#: src/pkg_item.cc:445
 msgid "Hierarchy editor"
 msgstr "Gjør om på hierarkiet"
 
-#: src/pkg_item.cc:447
+#: src/pkg_item.cc:445
 #, fuzzy
 msgid "Hierarchy Editor"
 msgstr "Gjør om på hierarkiet"
@@ -3533,22 +3538,22 @@
 msgstr ""
 "Skriv inn den nye mekanismen for å sortere pakker på dette skjermbildet: "
 
-#: src/pkg_view.cc:344
+#: src/pkg_view.cc:359
 msgid "make_package_view: error in arguments -- two main widgets??"
 msgstr "make_package_view: feil i argumentene -- er det to hovedelementer??"
 
-#: src/pkg_view.cc:350
+#: src/pkg_view.cc:365
 msgid ""
 "make_package_view: error in arguments -- bad column list for static item"
 msgstr ""
 "make_package_view: feil ved argumentet -- feil på kolonnelista for statiske "
 "elementer"
 
-#: src/pkg_view.cc:443
+#: src/pkg_view.cc:458
 msgid "make_package_view: bad argument!"
 msgstr "make_package_view: ugyldig argument."
 
-#: src/pkg_view.cc:495
+#: src/pkg_view.cc:510
 msgid "make_package_view: no main widget found"
 msgstr "make_package_view: fant intet hovedelement"
 
@@ -3585,12 +3590,12 @@
 msgid " (provided by %F)"
 msgstr " (kreves av %F)"
 
-#: src/reason_fragment.cc:278
+#: src/reason_fragment.cc:275
 #, c-format
 msgid "%F%s %F %F"
 msgstr "%F%s %F %F"
 
-#: src/reason_fragment.cc:327
+#: src/reason_fragment.cc:324
 msgid ""
 "If you select a package, an explanation of its current state will appear in "
 "this space."
@@ -3598,7 +3603,7 @@
 "Hvis du velger en pakke, så vil en beskrivelse av statusen dens vises i "
 "dette feltet."
 
-#: src/reason_fragment.cc:361
+#: src/reason_fragment.cc:358
 msgid ""
 "%B%s%b was installed automatically;  it is being removed because all of the "
 "packages which depend upon it are being removed:"
@@ -3606,18 +3611,18 @@
 "%B%s%b ble installert automatisk;  den blir slettet fordi alle pakkene som "
 "hadde avhengigheter til den også slettes:"
 
-#: src/reason_fragment.cc:365
+#: src/reason_fragment.cc:362
 msgid "%B%s%b will be automatically removed because of dependency errors:"
 msgstr "%B%s%b vil bli slettet automatisk på grunn av avhengighetsfeil:"
 
-#: src/reason_fragment.cc:369
+#: src/reason_fragment.cc:366
 msgid ""
 "%B%s%b will be automatically installed to satisfy the following dependencies:"
 msgstr ""
 "%B%s%b vil bli installert automatisk for å tilfredsstille følgende "
 "avhengigheter:"
 
-#: src/reason_fragment.cc:375 src/reason_fragment.cc:387
+#: src/reason_fragment.cc:372 src/reason_fragment.cc:384
 msgid ""
 "%B%s%b cannot be upgraded now, but if it could be, it would still be held at "
 "version %B%s%b."
@@ -3625,7 +3630,7 @@
 "%B%s%b kan ikke oppgraderes nå, men hadde den kunnet oppgraderes, så hadde "
 "den fortsatt blitt beholdt i versjon %B%s%b."
 
-#: src/reason_fragment.cc:378
+#: src/reason_fragment.cc:375
 msgid ""
 "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the "
 "following dependencies:"
@@ -3633,27 +3638,27 @@
 "%B%s%b vil ikke bli oppgradert til versjon %B%s%b for å hindre at følgende "
 "avhengigheter blir brutt:"
 
-#: src/reason_fragment.cc:390
+#: src/reason_fragment.cc:387
 msgid "%B%s%b is currently installed."
 msgstr "%B%s%b er allerede installert."
 
-#: src/reason_fragment.cc:396
+#: src/reason_fragment.cc:393
 msgid "%B%s%b is not currently installed."
 msgstr "%B%s%b er ikke installert."
 
-#: src/reason_fragment.cc:404
+#: src/reason_fragment.cc:401
 msgid "Some dependencies of %B%s%b are not satisfied:"
 msgstr "Noen av %B%s%bs avhengigheter er ikke tilfredsstilt:"
 
-#: src/reason_fragment.cc:408
+#: src/reason_fragment.cc:405
 msgid "%B%s%b will be downgraded."
 msgstr "%B%s%b vil bli nedgradert."
 
-#: src/reason_fragment.cc:415
+#: src/reason_fragment.cc:412
 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b."
 msgstr "%B%s%b vil ikke bli oppgradert til den forbudte versjonen %B%s%b."
 
-#: src/reason_fragment.cc:419
+#: src/reason_fragment.cc:416
 msgid ""
 "%B%s%b could be upgraded to version %B%s%b, but it is being held at version %"
 "B%s%b."
@@ -3661,33 +3666,33 @@
 "%B%s%b kunne blitt oppgradert til versjon %B%s%b, men blir beholdt som "
 "versjon %B%s%b."
 
-#: src/reason_fragment.cc:426
+#: src/reason_fragment.cc:423
 msgid "%B%s%b will be re-installed."
 msgstr "%B%s%b vil bli installert på nytt."
 
-#: src/reason_fragment.cc:430
+#: src/reason_fragment.cc:427
 msgid "%B%s%b will be installed."
 msgstr "%B%s%b vil bli installert."
 
-#: src/reason_fragment.cc:434
+#: src/reason_fragment.cc:431
 msgid "%B%s%b will be removed."
 msgstr "%B%s%b blir slettet."
 
-#: src/reason_fragment.cc:439
+#: src/reason_fragment.cc:436
 msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b."
 msgstr "%B%s%b vil bli oppgradert fra versjon %B%s%b til versjon %B%s%b."
 
-#: src/reason_fragment.cc:475
+#: src/reason_fragment.cc:472
 msgid ""
 "The following packages depend on %B%s%b and will be broken by its removal:"
 msgstr ""
 "Følgende pakker er avhengige av %B%s%b og vil bli skadet hvis du fjerner den:"
 
-#: src/reason_fragment.cc:478
+#: src/reason_fragment.cc:475
 msgid "The following packages depend on %B%s%b and are broken:"
 msgstr "Følgende pakker er avhengige av %B%s%b og er skadet:"
 
-#: src/reason_fragment.cc:485
+#: src/reason_fragment.cc:482
 msgid ""
 "The following packages conflict with %B%s%b and will be broken by its "
 "installation:"
@@ -3695,7 +3700,7 @@
 "Følgende pakker er i konflikt med %B%s%b og vil bli skadet hvis den "
 "installeres:"
 
-#: src/reason_fragment.cc:518
+#: src/reason_fragment.cc:515
 msgid ""
 "The following packages depend on a version of %B%s%b other than the "
 "currently installed version of %B%s%b, or conflict with the currently "
@@ -3704,7 +3709,7 @@
 "Følgende pakker er avhengige av en annen versjon av %B%s%b enn den versjonen "
 "av %B%s%b som nå er installert, eller er i konflikt med nåværende versjon:"
 
-#: src/reason_fragment.cc:522
+#: src/reason_fragment.cc:519
 msgid ""
 "The following packages conflict with %B%s%b, or depend on a version of it "
 "which is not going to be installed."
@@ -3712,11 +3717,11 @@
 "Følgende pakker er i konflikt med %B%s%b eller er avhengige av en versjon av "
 "den som ikke vil bli installert."
 
-#: src/reason_fragment.cc:526
+#: src/reason_fragment.cc:523
 msgid "The following packages conflict with %B%s%b:"
 msgstr "Følgende pakker er i konflikt med %B%s%b:"
 
-#: src/reason_fragment.cc:531
+#: src/reason_fragment.cc:528
 msgid ""
 "The following packages depend on a version of %B%s%b other than the "
 "currently installed version of %B%s%b:"
@@ -3724,7 +3729,7 @@
 "Følgende pakker er avhengige av en annen versjon av %B%s%b enn den versjonen "
 "av %B%s%b som nå er installert:"
 
-#: src/reason_fragment.cc:535
+#: src/reason_fragment.cc:532
 msgid ""
 "The following packages depend on a version of %B%s%b which is not going to "
 "be installed."
@@ -3732,15 +3737,15 @@
 "Følgende pakker er avhengige av en versjon av %B%s%b som ikke vil bli "
 "installert."
 
-#: src/reason_fragment.cc:541
+#: src/reason_fragment.cc:538
 msgid "upgraded"
 msgstr "oppgradert"
 
-#: src/reason_fragment.cc:541
+#: src/reason_fragment.cc:538
 msgid "downgraded"
 msgstr "nedgradert"
 
-#: src/reason_fragment.cc:547
+#: src/reason_fragment.cc:544
 msgid ""
 "The following packages depend on the currently installed version of %B%s%b (%"
 "B%s%b), or conflict with the version it will be %s to (%B%s%b), and will be "
@@ -3750,7 +3755,7 @@
 "b), eller er i konflikt med den versjonen den vil bli %s til (%B%s%b), og "
 "vil bli skadet hvis den blir %s."
 
-#: src/reason_fragment.cc:554
+#: src/reason_fragment.cc:551
 msgid ""
 "The following packages conflict with version %B%s%b of %B%s%b, and will be "
 "broken if it is %s."
@@ -3758,7 +3763,7 @@
 "Følgende pakker er konflikt med versjon %B%s%b av %B%s%b og vil bli skadet "
 "hvis den blir %s."
 
-#: src/reason_fragment.cc:559
+#: src/reason_fragment.cc:556
 msgid ""
 "The following packages depend on version %B%s%b of %B%s%b, and will be "
 "broken if it is %s."
@@ -3805,31 +3810,36 @@
 msgid "Close"
 msgstr "^Lukk"
 
-#: src/solution_fragment.cc:125
+#: src/solution_fragment.cc:134
 #, fuzzy
 msgid "%BRemove%b the following packages:%n"
 msgstr "Disse pakkene er ØDELAGTE:"
 
-#: src/solution_fragment.cc:135
+#: src/solution_fragment.cc:144
 #, fuzzy
 msgid "%BInstall%b the following packages:%n"
 msgstr "Disse pakkene er ØDELAGTE:"
 
-#: src/solution_fragment.cc:148
+#: src/solution_fragment.cc:157
 msgid "%BKeep%b the following packages at their current version:%n"
 msgstr ""
 
-#: src/solution_fragment.cc:161
+#: src/solution_fragment.cc:164
+#, fuzzy
+msgid "Not Installed"
+msgstr "ikke installert"
+
+#: src/solution_fragment.cc:177
 #, fuzzy
 msgid "%BUpgrade%b the following packages:%n"
 msgstr "Disse pakkene er ØDELAGTE:"
 
-#: src/solution_fragment.cc:176
+#: src/solution_fragment.cc:192
 #, fuzzy
 msgid "%BDowngrade%b the following packages:%n"
 msgstr "Laster ned pakker"
 
-#: src/solution_fragment.cc:190
+#: src/solution_fragment.cc:206
 #, c-format
 msgid "Score is %d"
 msgstr ""
@@ -3857,45 +3867,45 @@
 msgid "W:"
 msgstr ""
 
-#: src/ui.cc:194
+#: src/ui.cc:193
 msgid "Search for:"
 msgstr "Søk etter:"
 
-#: src/ui.cc:262
+#: src/ui.cc:258
 msgid "You already are root!"
 msgstr "Du er allerede root."
 
-#: src/ui.cc:360
+#: src/ui.cc:356
 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:388
+#: src/ui.cc:384
 msgid "Loading cache"
 msgstr "Laster mellomlageret"
 
-#: src/ui.cc:410
+#: src/ui.cc:406
 msgid "Really quit Aptitude?"
 msgstr "Vil du virkelig avslutte aptitude?"
 
-#: src/ui.cc:489
+#: src/ui.cc:485
 msgid "Really discard your personal settings and reload the defaults?"
 msgstr ""
 "Vil du virkelig slette dine selvvalgte innstillinger og bruke "
 "standardinnstillingene?"
 
-#: src/ui.cc:589 src/ui.cc:591 src/ui.cc:619 src/ui.cc:621
+#: src/ui.cc:585 src/ui.cc:587 src/ui.cc:615 src/ui.cc:617
 msgid "Packages"
 msgstr "Pakker"
 
-#: src/ui.cc:590 src/ui.cc:620
+#: src/ui.cc:586 src/ui.cc:616
 msgid "View available packages and choose actions to perform"
 msgstr "Vis tilgjengelige pakker og velg hvilken handlinger du vil utføre"
 
-#: src/ui.cc:667
+#: src/ui.cc:663
 #, fuzzy
 msgid ""
-"%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
+"Aptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
 "BABSOLUTELY NO WARRANTY%b; for details see 'license' in the Help menu.  This "
 "is free software, and you are welcome to redistribute it under certain "
 "conditions; see 'license' for details."
@@ -3909,61 +3919,66 @@
 "andre,\n"
 "men under bestemte betingelser, se «lisens» for mer informasjon."
 
-#: src/ui.cc:688
+#: src/ui.cc:684
 msgid "help.txt"
 msgstr "hjelp.txt"
 
-#: src/ui.cc:704
+#: src/ui.cc:700
 msgid "README"
 msgstr "LES_MEG"
 
-#: src/ui.cc:786
+#: src/ui.cc:782
 msgid ""
-"%C%BWARNING%b: untrusted versions of the following packages will be "
-"installed!%n%nUntrusted packages could %Bcompromise your system's security%"
-"b.  You should only proceed with the installation if you are certain that "
-"this is what you want to do.%n%n"
+"%BWARNING%b: untrusted versions of the following packages will be installed!%"
+"n%nUntrusted packages could %Bcompromise your system's security%b.  You "
+"should only proceed with the installation if you are certain that this is "
+"what you want to do.%n%n"
 msgstr ""
 
-#: src/ui.cc:800
+#: src/ui.cc:788
+#, fuzzy
+msgid "  %S*%N %s [version %s]%n"
+msgstr "Versjoner"
+
+#: src/ui.cc:795
 #, fuzzy
 msgid "Really Continue"
 msgstr "Fortsett"
 
-#: src/ui.cc:802
+#: src/ui.cc:797
 msgid "Abort Installation"
 msgstr ""
 
-#: src/ui.cc:863
+#: src/ui.cc:858
 msgid "Preview of package installation"
 msgstr "Forhåndsvisning av pakkeinstallasjonen"
 
-#: src/ui.cc:864
+#: src/ui.cc:859
 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:865
+#: src/ui.cc:860
 #, fuzzy
 msgid "Preview"
 msgstr "^Forh"
 
-#: src/ui.cc:901
+#: src/ui.cc:896
 #, fuzzy
 msgid "Some packages were broken and have been fixed:"
 msgstr "Noen pakker var skadet og har blitt reparert"
 
-#: src/ui.cc:907
+#: src/ui.cc:902
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:913
-#, c-format
+#: src/ui.cc:908
+#, fuzzy, c-format
 msgid ""
-"Ran out of time while trying to resolver dependencies (press \"%s\" to try "
+"Ran out of time while trying to resolve dependencies (press \"%s\" to try "
 "harder)"
-msgstr ""
+msgstr "Kast bort tid på å finne miner"
 
-#: src/ui.cc:959
+#: src/ui.cc:954
 #, fuzzy
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
@@ -3972,24 +3987,24 @@
 "Ã… 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:962 src/ui.cc:1078
+#: src/ui.cc:957 src/ui.cc:1072
 msgid "Become root"
 msgstr "Bli root"
 
-#: src/ui.cc:964 src/ui.cc:1080
+#: src/ui.cc:959 src/ui.cc:1074
 msgid "Don't become root"
 msgstr "Ikke bli root"
 
-#: src/ui.cc:969 src/ui.cc:1085
+#: src/ui.cc:964 src/ui.cc:1079
 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:996
+#: src/ui.cc:991
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "Ingen pakker vil bli installert, oppgradert eller fjernet."
 
-#: src/ui.cc:1002
+#: src/ui.cc:997
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -4002,7 +4017,7 @@
 "oppgraderes.\n"
 "Tast «U» for å forberede oppgradering."
 
-#: src/ui.cc:1074
+#: src/ui.cc:1069
 #, fuzzy
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
@@ -4011,112 +4026,112 @@
 "Ã… 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:1090 src/ui.cc:1377
+#: src/ui.cc:1084 src/ui.cc:1371
 msgid "Waste time trying to find mines"
 msgstr "Kast bort tid på å finne miner"
 
-#: src/ui.cc:1097 src/ui.cc:1150
+#: src/ui.cc:1091 src/ui.cc:1144
 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:1100
+#: src/ui.cc:1094
 msgid "Deleting downloaded files"
 msgstr "Sletter nedlastede filer"
 
-#: src/ui.cc:1114
+#: src/ui.cc:1108
 msgid "Downloaded package files have been deleted"
 msgstr "Nedlastede filer er slettet"
 
-#: src/ui.cc:1175
+#: src/ui.cc:1169
 #, 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:1247
+#: src/ui.cc:1241
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1252 src/ui.cc:1283
+#: src/ui.cc:1246 src/ui.cc:1277
 #, fuzzy
 msgid "Ran out of time while trying to find a solution."
 msgstr "Kast bort tid på å finne miner"
 
-#: src/ui.cc:1277
+#: src/ui.cc:1271
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1307
+#: src/ui.cc:1301
 #, fuzzy, c-format
 msgid "Unable to open %s"
 msgstr "Klarer ikke å åpne %s for å skrive til den"
 
-#: src/ui.cc:1313
+#: src/ui.cc:1307
 msgid "Error while dumping resolver state"
 msgstr ""
 
-#: src/ui.cc:1323
+#: src/ui.cc:1317
 msgid "File to which the resolver state should be dumped:"
 msgstr ""
 
-#: src/ui.cc:1353
+#: src/ui.cc:1347
 msgid "^Install/remove packages"
 msgstr "^installer/slett pakker"
 
-#: src/ui.cc:1354
+#: src/ui.cc:1348
 msgid "Perform all pending installs and removals"
 msgstr "Utfør alle ventende installeringer og slettinger"
 
-#: src/ui.cc:1356
+#: src/ui.cc:1350
 msgid "^Update package list"
 msgstr "^Oppdater pakkelista"
 
-#: src/ui.cc:1357
+#: src/ui.cc:1351
 msgid "Check for new versions of packages"
 msgstr "Se etter nye versjoner av pakkene"
 
-#: src/ui.cc:1360
+#: src/ui.cc:1354
 msgid "^Forget new packages"
 msgstr "^Glem nye pakker"
 
-#: src/ui.cc:1361
+#: src/ui.cc:1355
 msgid "Forget which packages are \"new\""
 msgstr "Glem hvilke pakker som er «nye»"
 
-#: src/ui.cc:1364
+#: src/ui.cc:1358
 msgid "^Clean package cache"
 msgstr "^Slett mellomlageret for pakker"
 
-#: src/ui.cc:1365
+#: src/ui.cc:1359
 msgid "Delete package files which were previously downloaded"
 msgstr "Slett alle pakkefiler som ble lastet ned tidligere"
 
-#: src/ui.cc:1368
+#: src/ui.cc:1362
 msgid "Clean ^obsolete files"
 msgstr "Fjern ^foreldede filer"
 
-#: src/ui.cc:1369
+#: src/ui.cc:1363
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Slett pakkefiler som ikke lenger kan lastes ned"
 
-#: src/ui.cc:1372
+#: src/ui.cc:1366
 msgid "Mark ^Upgradable"
 msgstr "Marker ^oppgraderbare"
 
-#: src/ui.cc:1373
+#: src/ui.cc:1367
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr "Marker alle oppgraderbare pakker som ikke holdes tilbake"
 
-#: src/ui.cc:1376
+#: src/ui.cc:1370
 msgid "^Play Minesweeper"
 msgstr "^Spill minesveiper"
 
-#: src/ui.cc:1379
+#: src/ui.cc:1373
 msgid "^Become root"
 msgstr "^Bli root"
 
-#: src/ui.cc:1380
+#: src/ui.cc:1374
 #, fuzzy
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
@@ -4125,68 +4140,68 @@
 "Kjør «su» for å bli root.  Dette vil starte programmet på nytt, men \n"
 "innstillingene blir bevart"
 
-#: src/ui.cc:1383
+#: src/ui.cc:1377
 msgid "^Reload package cache"
 msgstr "^Last pakkelageret på nytt"
 
-#: src/ui.cc:1384
+#: src/ui.cc:1378
 msgid "Reload the package cache"
 msgstr "Last mellomlageret for pakker på nytt"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1384
 msgid "^Quit"
 msgstr "^Avslutt"
 
-#: src/ui.cc:1391
+#: src/ui.cc:1385
 msgid "Exit the program"
 msgstr "Avslutt programmet"
 
-#: src/ui.cc:1397 src/ui.cc:1669
+#: src/ui.cc:1391 src/ui.cc:1661
 msgid "Undo"
 msgstr "Angre"
 
-#: src/ui.cc:1398
+#: src/ui.cc:1392
 msgid "Undo the last package operation or group of operations"
 msgstr "Angre den siste pakkeoperasjonen eller en gruppe operasjoner"
 
-#: src/ui.cc:1405
+#: src/ui.cc:1399
 msgid "^Install"
 msgstr "^Installer"
 
-#: src/ui.cc:1406
+#: src/ui.cc:1400
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "Merk den valgte pakken for installasjon eller oppgradering"
 
-#: src/ui.cc:1409
+#: src/ui.cc:1403
 msgid "^Remove"
 msgstr "^Fjern"
 
-#: src/ui.cc:1410
+#: src/ui.cc:1404
 msgid "Flag the currently selected package for removal"
 msgstr "Merk den valgte pakken for fjerning"
 
-#: src/ui.cc:1413
+#: src/ui.cc:1407
 msgid "^Purge"
 msgstr "^Slett helt"
 
-#: src/ui.cc:1414
+#: src/ui.cc:1408
 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:1417
+#: src/ui.cc:1411
 msgid "^Keep"
 msgstr "^Behold"
 
-#: src/ui.cc:1418
+#: src/ui.cc:1412
 msgid "Cancel any action on the selected package"
 msgstr "Opphev alle handlinger med den valgte pakken"
 
-#: src/ui.cc:1421
+#: src/ui.cc:1415
 msgid "^Hold"
 msgstr "^Hold"
 
-#: src/ui.cc:1422
+#: src/ui.cc:1416
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -4194,11 +4209,11 @@
 "Opphev alle handlinger med den valgte pakken og beskytt den mot senere "
 "oppgradering"
 
-#: src/ui.cc:1425
+#: src/ui.cc:1419
 msgid "Mark ^Auto"
 msgstr "Merk ^Auto"
 
-#: src/ui.cc:1426
+#: src/ui.cc:1420
 #, fuzzy
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
@@ -4207,11 +4222,11 @@
 "Merk den valgte pakka som automatisk installert, \n"
 "den blir automatisk fjernet hvis ingen andre pakker avhenger av den"
 
-#: src/ui.cc:1429
+#: src/ui.cc:1423
 msgid "Mark ^Manual"
 msgstr "Merk ^Manuell"
 
-#: src/ui.cc:1430
+#: src/ui.cc:1424
 #, fuzzy
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
@@ -4220,11 +4235,11 @@
 "Merk den valgte pakka som manuelt installert,\n"
 "den blir ikke fjernet hvis du ikke fjerner den manuelt"
 
-#: src/ui.cc:1433
+#: src/ui.cc:1427
 msgid "^Forbid Version"
 msgstr "^Forby versjon"
 
-#: src/ui.cc:1434
+#: src/ui.cc:1428
 #, fuzzy
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
@@ -4233,207 +4248,207 @@
 "Forby installasjon av kandidatversjonen av den valgte pakka,\n"
 "nyere versjoner av pakka vil bli installert som vanlig"
 
-#: src/ui.cc:1438
+#: src/ui.cc:1432
 msgid "I^nformation"
 msgstr "I^nformasjon"
 
-#: src/ui.cc:1439
+#: src/ui.cc:1433
 msgid "Display more information about the selected package"
 msgstr "Vis mer informasjon om den valgte pakka"
 
-#: src/ui.cc:1442
+#: src/ui.cc:1436
 msgid "^Changelog"
 msgstr "^Endringslogg"
 
-#: src/ui.cc:1443
+#: src/ui.cc:1437
 msgid "Display the Debian changelog of the selected package"
 msgstr "Vis Debians endringslogg for den valgte pakka"
 
-#: src/ui.cc:1450
+#: src/ui.cc:1444
 msgid "^Find"
 msgstr "^Finn"
 
-#: src/ui.cc:1451
+#: src/ui.cc:1445
 msgid "Search for a package"
 msgstr "Søk etter en pakke"
 
-#: src/ui.cc:1454
+#: src/ui.cc:1448
 msgid "Find ^Again"
 msgstr "Finn ^igjen"
 
-#: src/ui.cc:1455
+#: src/ui.cc:1449
 msgid "Repeat the last search"
 msgstr "Gjenta siste søk"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1453
 msgid "^Limit Display"
 msgstr "Be^grens visning"
 
-#: src/ui.cc:1460
+#: src/ui.cc:1454
 msgid "Apply a filter to the package list"
 msgstr "Bruk et filter på pakkelista"
 
-#: src/ui.cc:1463
+#: src/ui.cc:1457
 msgid "^Un-Limit Display"
 msgstr "^Ubegrenset visning"
 
-#: src/ui.cc:1464
+#: src/ui.cc:1458
 msgid "Remove the filter from the package list"
 msgstr "Fjern filtrering av pakkelista"
 
-#: src/ui.cc:1468
+#: src/ui.cc:1462
 msgid "Find ^Broken"
 msgstr "Finn ^Ødelagt"
 
-#: src/ui.cc:1469
+#: src/ui.cc:1463
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Finn neste pakke med utilfredsstilte avhengigheter"
 
-#: src/ui.cc:1476
+#: src/ui.cc:1470
 msgid "^UI options"
 msgstr "^Innstillinger av grensesnittet"
 
-#: src/ui.cc:1477
+#: src/ui.cc:1471
 msgid "Change the settings which affect the user interface"
 msgstr "Gjør om på innstillingene som berører grensesnittet"
 
-#: src/ui.cc:1480
+#: src/ui.cc:1474
 msgid "^Dependency handling"
 msgstr "^HÃ¥ndtering av avhengigheter"
 
-#: src/ui.cc:1481
+#: src/ui.cc:1475
 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:1484
+#: src/ui.cc:1478
 msgid "^Miscellaneous"
 msgstr "^Annet"
 
-#: src/ui.cc:1485
+#: src/ui.cc:1479
 msgid "Change miscellaneous program settings"
 msgstr "Gjør endringer i andre programinnstillinger"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1484
 msgid "^Revert options"
 msgstr "^Slett valgene"
 
-#: src/ui.cc:1491
+#: src/ui.cc:1485
 msgid "Reset all settings to the system defaults"
 msgstr "Gjenopprett standardinnstillingene"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1496
 msgid "^Next"
 msgstr "^Neste"
 
-#: src/ui.cc:1503
+#: src/ui.cc:1497
 msgid "View next display"
 msgstr "Vis neste skjermbilde"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1500
 msgid "^Prev"
 msgstr "^Forh"
 
-#: src/ui.cc:1507
+#: src/ui.cc:1501
 msgid "View previous display"
 msgstr "Vis forrige skjermbilde"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1504
 msgid "^Close"
 msgstr "^Lukk"
 
-#: src/ui.cc:1511
+#: src/ui.cc:1505
 msgid "Close this display"
 msgstr "Lukk dette skjermbildet"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1510
 msgid "New Package ^View"
 msgstr "Ny pakke^visning"
 
-#: src/ui.cc:1517
+#: src/ui.cc:1511
 msgid "Create a new default package view"
 msgstr "Lag en ny pakkevisning"
 
-#: src/ui.cc:1520
+#: src/ui.cc:1514
 msgid "New Categorical ^Browser"
 msgstr "Ny visning etter ^kategori"
 
-#: src/ui.cc:1522
+#: src/ui.cc:1516
 msgid "Browse packages by category"
 msgstr "Vis pakker etter pakketype"
 
-#: src/ui.cc:1530
+#: src/ui.cc:1524
 msgid "^About"
 msgstr "^Om"
 
-#: src/ui.cc:1531
+#: src/ui.cc:1525
 msgid "View information about this program"
 msgstr "Vis informasjon om dette programmet"
 
-#: src/ui.cc:1534
+#: src/ui.cc:1528
 msgid "^Help"
 msgstr "^Hjelp"
 
-#: src/ui.cc:1535
+#: src/ui.cc:1529
 msgid "View the on-line help"
 msgstr "Vis hjelpen"
 
-#: src/ui.cc:1537
+#: src/ui.cc:1531
 msgid "User's ^Manual"
 msgstr "Bruker^håndbok"
 
-#: src/ui.cc:1538
+#: src/ui.cc:1532
 msgid "View the detailed program manual"
 msgstr "Vis en detaljert brukerhåndbok"
 
-#: src/ui.cc:1541
+#: src/ui.cc:1535
 msgid "^FAQ"
 msgstr "^OSS"
 
-#: src/ui.cc:1542
+#: src/ui.cc:1536
 msgid "View a list of frequently asked questions"
 msgstr "Vis en liste over Ofte Spurte Spørsmål"
 
-#: src/ui.cc:1545
+#: src/ui.cc:1539
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1546
+#: src/ui.cc:1540
 #, 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:1549
+#: src/ui.cc:1543
 msgid "^License"
 msgstr "^Lisens"
 
-#: src/ui.cc:1550
+#: src/ui.cc:1544
 msgid "View the terms under which you may copy the program"
 msgstr "Vis under hvilke betingelser du kan kopiere dette programmet"
 
-#: src/ui.cc:1668
+#: src/ui.cc:1660
 msgid "Actions"
 msgstr "Handlinger"
 
-#: src/ui.cc:1671
+#: src/ui.cc:1663
 msgid "Search"
 msgstr "Søk"
 
-#: src/ui.cc:1672
+#: src/ui.cc:1664
 msgid "Options"
 msgstr "Valg"
 
-#: src/ui.cc:1673
+#: src/ui.cc:1665
 msgid "Views"
 msgstr "Visninger"
 
-#: src/ui.cc:1674
+#: src/ui.cc:1666
 msgid "Help"
 msgstr "Hjelp"
 
-#: src/ui.cc:1734
+#: src/ui.cc:1726
 #, c-format
 msgid ""
 "%s: Menu  %s: Help  %s: Quit  %s: Update  %s: Download/Install/Remove Pkgs"
@@ -4441,28 +4456,28 @@
 "%s: Meny  %s: Hjelp  %s: avslutt  %s: Oppdater  %s: Last ned/installer/slett "
 "pakker"
 
-#: src/ui.cc:2003 src/vscreen/vscreen.cc:281
+#: src/ui.cc:1996 src/vscreen/vscreen.cc:281
 msgid "yes_key"
 msgstr "ja_tast"
 
-#: src/ui.cc:2004 src/vscreen/vscreen.cc:282
+#: src/ui.cc:1997 src/vscreen/vscreen.cc:282
 msgid "no_key"
 msgstr "nei_tast"
 
-#: src/view_changelog.cc:46
+#: src/view_changelog.cc:61
 msgid "You can only view changelogs of official Debian packages."
 msgstr "Du kan bare se på endringslogger til offisielle Debian-pakker."
 
-#: src/view_changelog.cc:52
+#: src/view_changelog.cc:67
 msgid "Downloading Changelog"
 msgstr "Laster ned endringslogg"
 
-#: src/view_changelog.cc:54
+#: src/view_changelog.cc:69
 #, fuzzy
 msgid "Download Changelog"
 msgstr "Laster ned endringslogg"
 
-#: src/view_changelog.cc:63
+#: src/view_changelog.cc:78
 #, c-format
 msgid "%s changes"
 msgstr ""
@@ -4561,14 +4576,189 @@
 #~ "Sett denne CD-en inn i CD-spilleren «%s»:\n"
 #~ "%s"
 
+#~ msgid "Need exactly two colors in color definition \"%s\""
+#~ msgstr "Trenger nøyaktig to farger i fargeangivelsen «%s»"
+
+#~ msgid "Can't parse foreground \"%s\"of color \"%s\""
+#~ msgstr "Klarer ikke å tolke forgrunn «%s» til fargen «%s»"
+
+#~ msgid "Can't parse background \"%s\" of color \"%s\""
+#~ msgstr "Klarer ikke å tolke bakgrunn «%s» til fargen «%s»"
+
 #~ msgid "Invalid option for interactive mode: -s\n"
 #~ msgstr "Ugyldig valg for interaktiv modus: -s\n"
 
+#~ 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."
+#~ msgstr ""
+#~ "Programmer for faksmodem og andre kommunikasjonsenheter\n"
+#~ " Pakkene i bolken «Kommunikasjon» brukes til å kontrollere modemer og "
+#~ "andre enheter på maskina, for eksempel faks eller mobiltelefoner, eller "
+#~ "programmer for å bruke FidoNet og BBS.Eksempler på slike programmer er: "
+#~ "PPP, zmodem og kermit."
+
+#~ 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"
+#~ " .\n"
+#~ " For more information about what Debian considers to be Free Software, "
+#~ "see http://www.debian.org/social_contract#guidelines"
+#~ msgstr ""
+#~ "Programmer som ikke er fri programvare \n"
+#~ " Pakkene i bolken «ufri» er ikke en del av Debian\n"
+#~ " .\n"
+#~ " Disse pakkene passet ikke med en eller flere av betingelsene i Debians "
+#~ "retningslinjer for fri programvare (Debian Free Software Guidelines; se "
+#~ "nedenfor). Du bør lese lisensen for programmene i denne bolken for å være "
+#~ "sikker på at du har rett til å bruke dem slik du har tenkt.\n"
+#~ " .\n"
+#~ " For mer informasjon om hva Debian mener med «Fri programvare», se http://"
+#~ "www.debian.org/social_contract#guidelines"
+
+#~ 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)"
+#~ msgstr ""
+#~ "Nye pakker\n"
+#~ " Disse pakkene er blitt lagt til Debian siden sist du slettet lista over "
+#~ "«nye» pakker (velg «glem nye pakker» fra handlingsmenyen for å slette "
+#~ "denne lista)"
+
+#~ msgid ""
+#~ "%s is an essential package!\n"
+#~ "\n"
+#~ "Are you sure you want to remove it?\n"
+#~ "Type '%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."
+
+#~ msgid "Available versions of "
+#~ msgstr "Tilgjengelige versjoner av "
+
+#~ 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."
+#~ 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."
+
 #~ msgid "Information about "
 #~ msgstr "Informasjon om "
 
+#~ msgid ""
+#~ "Aptitude %s\n"
+#~ "\n"
+#~ "Copyright 2000 Daniel Burrows.\n"
+#~ "\n"
+#~ "aptitude comes with ABSOLUTELY NO WARRANTY; for details see 'license' in "
+#~ "the\n"
+#~ "Help menu.  This is free software, and you are welcome to redistribute "
+#~ "it\n"
+#~ "under certain conditions; see 'license' for details."
+#~ msgstr ""
+#~ "Aptitude %s\n"
+#~ "\n"
+#~ "Copyright 2000 Daniel Burrows.\n"
+#~ "\n"
+#~ "aptitude gir ABSOLUTT INGEN GARANTI, for mer informasjon, se «lisens» i "
+#~ "hjelpemenyen. Dette er fri programvare, og du må gjerne kopiere det til "
+#~ "andre,\n"
+#~ "men under bestemte betingelser, se «lisens» for mer informasjon."
+
+#~ msgid "Some packages were broken and have been fixed"
+#~ msgstr "Noen pakker var skadet og har blitt reparert"
+
 #~ msgid "Some broken packages could not be fixed!"
 #~ msgstr "Noen pakker kunne ikke repareres!"
 
+#~ msgid "Some packages are broken.  Try to fix them?"
+#~ msgstr "Noen pakker er skadet.  Vil du prøve å fikse dem?"
+
+#~ msgid ""
+#~ "Installing/removing packages requires administrative privileges, which\n"
+#~ "you currently do not have.  Would you like to change to the root "
+#~ "account?\n"
+#~ 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"
+
+#~ msgid ""
+#~ "No packages will be installed, removed or upgraded.\n"
+#~ "\n"
+#~ "Some packages could be upgraded, but you have not chosen to upgrade "
+#~ "them.\n"
+#~ "Type \"U\" to prepare an upgrade."
+#~ msgstr ""
+#~ "Ingen pakker vil bli installert, oppgradert eller fjernet.\n"
+#~ "\n"
+#~ "Noen pakker kunne oppgraderes, men du har ikke valgt at de skulle "
+#~ "oppgraderes.\n"
+#~ "Tast «U» for å forberede oppgradering."
+
+#~ 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"
+#~ 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"
+
+#~ msgid "Obsolete downloaded package files have been deleted"
+#~ msgstr "Foreldede, nedlastede pakkefiler er blitt slettet"
+
+#~ msgid ""
+#~ "Run 'su' to become root; this will restart the program, but your\n"
+#~ "settings will be preserved"
+#~ msgstr ""
+#~ "Kjør «su» for å bli root.  Dette vil starte programmet på nytt, men \n"
+#~ "innstillingene blir bevart"
+
+#~ msgid ""
+#~ "Mark the selected package as having been automatically installed;\n"
+#~ "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"
+
+#~ msgid ""
+#~ "Mark the selected package as having been manually installed;\n"
+#~ "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"
+
+#~ msgid ""
+#~ "Forbid the candidate version of the selected package from being "
+#~ "installed;\n"
+#~ "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"
+
 #~ msgid "^ChangeLog"
 #~ msgstr "^Endringslogg"
+
+#~ msgid "View the important changes made in each version of the program"
+#~ msgstr ""
+#~ "Vis hvilke viktige endringer som er blitt gjort i hver ny versjon av "
+#~ "programmet"

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	Sun Jun 12 21:04:47 2005
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: aptitude\n"
+"Project-Id-Version: aptitude 0.2.15.9-1\n"
 "Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-05-01 14:08-0400\n"
-"PO-Revision-Date: 2004-08-17 15:21+0100\n"
+"POT-Creation-Date: 2005-06-12 22:42+0200\n"
+"PO-Revision-Date: 2005-03-28 21:03+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"
 "MIME-Version: 1.0\n"
@@ -158,14 +158,14 @@
 msgstr ""
 "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:219 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
-#: src/vscreen/vs_util.cc:328
+#: src/apt_options.cc:240 src/mine/cmine.cc:249 src/mine/cmine.cc:312
+#: src/ui.cc:215 src/vscreen/vs_util.cc:77 src/vscreen/vs_util.cc:90
+#: src/vscreen/vs_util.cc:264 src/vscreen/vs_util.cc:298
 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:328
+#: src/apt_options.cc:241 src/download_list.cc:69 src/mine/cmine.cc:250
+#: src/mine/cmine.cc:313 src/vscreen/vs_util.cc:298
 msgid "Cancel"
 msgstr "Annuleren"
 
@@ -246,15 +246,15 @@
 msgid "%s: Previous"
 msgstr ""
 
-#: src/broken_indicator.cc:233
+#: src/broken_indicator.cc:232
 #, c-format
-msgid "%CSolution search failed.  %s: try harder"
+msgid "Solution search failed.  %s: try harder"
 msgstr ""
 
-#: src/broken_indicator.cc:239
-#, c-format
-msgid "%CUnable to resolve dependencies."
-msgstr ""
+#: src/broken_indicator.cc:237
+#, fuzzy
+msgid "Unable to resolve dependencies."
+msgstr "Onmogelijk om %s te openen voor schrijven"
 
 #: src/cmdline/cmdline_action.cc:36
 #, c-format
@@ -338,12 +338,12 @@
 #: src/cmdline/cmdline_action.cc:238
 #, 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"
+msgstr "U kunt enkel een pakketversie aangeven met een 'install'-commando\n"
 
 #: src/cmdline/cmdline_action.cc:244
 #, 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"
+msgstr "U kunt enkel een pakketarchief aangeven met een 'install'-commando\n"
 
 #: src/cmdline/cmdline_action.cc:278
 #, c-format
@@ -401,7 +401,7 @@
 #: src/cmdline/cmdline_changelog.cc:71
 #, c-format
 msgid "%s is not an official Debian package, cannot display its changelog."
-msgstr "%s is geen officieel Debian-pakket, kan haar changelog niet tonen."
+msgstr "%s is geen officieel Debian-pakket, kan haar changelog niet tonen"
 
 #: src/cmdline/cmdline_changelog.cc:79
 #, c-format
@@ -538,12 +538,12 @@
 #: src/cmdline/cmdline_prompt.cc:235 src/cmdline/cmdline_show_broken.cc:87
 #, c-format
 msgid " which is a virtual package."
-msgstr " dat een virtueel pakket is."
+msgstr "dat een virtueel pakket is"
 
 #: src/cmdline/cmdline_prompt.cc:238 src/cmdline/cmdline_show_broken.cc:90
 #, c-format
 msgid " or"
-msgstr " of"
+msgstr "of"
 
 #: src/cmdline/cmdline_prompt.cc:250
 msgid "The following packages are BROKEN:"
@@ -630,31 +630,38 @@
 "this is what you want to do.\n"
 "\n"
 msgstr ""
+"WAARSCHUWING: de niet-vertrouwde versies van volgende pakketten worden "
+"geïnstalleerd!\n"
+"\n"
+"Niet-vertrouwde pakketten kunnen de veiligheid van uw systeem aantasten.\n"
+"Ga enkel verder met de installatie als u zeker\n"
+"bent dat u dat wilt.\n"
+"\n"
 
-#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
-#: src/vscreen/vs_util.cc:212
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:165
+#: src/vscreen/vs_util.cc:202
 msgid "Yes"
 msgstr "Ja"
 
-#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
-#: src/vscreen/vs_util.cc:212
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:165
+#: src/vscreen/vs_util.cc:202
 msgid "No"
 msgstr "Nee"
 
 #: src/cmdline/cmdline_prompt.cc:388
 #, c-format
 msgid "Do you want to ignore this warning and proceed anyway?\n"
-msgstr ""
+msgstr "Wilt u deze waarschuwing negeren en toch verdergaan?\n"
 
 #: src/cmdline/cmdline_prompt.cc:389
-#, fuzzy, c-format
+#, c-format
 msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
-msgstr "Om verder te gaan, typ de zin \"%s\":\n"
+msgstr "Geef \"%s\" in om verder te gaan, geef \"%s\" in om af te breken: "
 
 #: src/cmdline/cmdline_prompt.cc:400
 #, c-format
 msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
-msgstr ""
+msgstr "Niet-herkende invoer. Geef ofwel \"%s\" ofwel \"%s\".\n"
 
 #: src/cmdline/cmdline_prompt.cc:499
 #, c-format
@@ -955,7 +962,7 @@
 msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:212
+#: src/cmdline/cmdline_resolver.cc:212 src/cmdline/cmdline_resolver.cc:285
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
@@ -971,7 +978,7 @@
 #: src/cmdline/cmdline_resolver.cc:240 src/generic/apt.cc:142
 #, c-format
 msgid "Unable to open %s for writing"
-msgstr "Onmogelijk om %s te openen voor schrijven"
+msgstr "Kan %s niet openen om te schrijven"
 
 #: src/cmdline/cmdline_resolver.cc:245
 #, fuzzy, c-format
@@ -1010,196 +1017,201 @@
 msgid "The following packages have unmet dependencies:\n"
 msgstr "De volgende pakketten hebben niet-voldane afhankelijkheden:\n"
 
-#: src/cmdline/cmdline_show.cc:133
+#: src/cmdline/cmdline_show.cc:119 src/cmdline/cmdline_show.cc:305
+#: src/solution_fragment.cc:65
+msgid "<NULL>"
+msgstr ""
+
+#: src/cmdline/cmdline_show.cc:138
 msgid "not installed"
 msgstr "niet geïnstalleerd"
 
-#: src/cmdline/cmdline_show.cc:135 src/pkg_columnizer.cc:231
+#: src/cmdline/cmdline_show.cc:140 src/pkg_columnizer.cc:231
 #: src/pkg_ver_item.cc:225
 msgid "unpacked"
 msgstr "uitgepakt"
 
-#: src/cmdline/cmdline_show.cc:137
+#: src/cmdline/cmdline_show.cc:142
 msgid "partially configured"
 msgstr "gedeeltelijk geconfigureerd"
 
-#: src/cmdline/cmdline_show.cc:139
+#: src/cmdline/cmdline_show.cc:144
 msgid "partially installed"
 msgstr "gedeeltelijk geïnstalleerd"
 
-#: src/cmdline/cmdline_show.cc:141
+#: src/cmdline/cmdline_show.cc:146
 msgid "not installed (configuration files remain)"
 msgstr "niet geïnstalleerd (configuratiebestanden blijven behouden)"
 
-#: src/cmdline/cmdline_show.cc:143 src/pkg_columnizer.cc:239
+#: src/cmdline/cmdline_show.cc:148 src/pkg_columnizer.cc:239
 #: src/pkg_ver_item.cc:233
 msgid "installed"
 msgstr "geïnstalleerd"
 
-#: src/cmdline/cmdline_show.cc:152
+#: src/cmdline/cmdline_show.cc:157
 msgid "not a real package"
 msgstr "geen werkelijk pakket"
 
-#: src/cmdline/cmdline_show.cc:165
+#: src/cmdline/cmdline_show.cc:170
 msgid " [held]"
 msgstr " [behouden]"
 
-#: src/cmdline/cmdline_show.cc:174
+#: src/cmdline/cmdline_show.cc:179
 #, c-format
 msgid "%s; version %s will be installed"
 msgstr "%s; versie %s zal worden geïnstalleerd."
 
-#: src/cmdline/cmdline_show.cc:178
+#: src/cmdline/cmdline_show.cc:183
 #, c-format
 msgid "%s; version %s will be installed automatically"
 msgstr "%s; versie %s zal automatisch worden geïnstalleerd"
 
-#: src/cmdline/cmdline_show.cc:184 src/cmdline/cmdline_show.cc:199
+#: src/cmdline/cmdline_show.cc:189 src/cmdline/cmdline_show.cc:204
 #, c-format
 msgid "%s; will be purged"
 msgstr "%s; zal worden gewist (purged)."
 
-#: src/cmdline/cmdline_show.cc:197
+#: src/cmdline/cmdline_show.cc:202
 #, c-format
 msgid "%s; will be purged because nothing depends on it"
 msgstr "%s; zal worden gewist (purged) omdat niets er nog op steunt"
 
-#: src/cmdline/cmdline_show.cc:204
+#: src/cmdline/cmdline_show.cc:209
 #, c-format
 msgid "%s; will be removed because nothing depends on it"
 msgstr "%s; zal verwijderd worden omdat niets er nog op steunt"
 
-#: src/cmdline/cmdline_show.cc:206
+#: src/cmdline/cmdline_show.cc:211
 #, c-format
 msgid "%s; will be removed"
 msgstr "%s; zal worden verwijderd."
 
-#: src/cmdline/cmdline_show.cc:220
+#: src/cmdline/cmdline_show.cc:225
 #, c-format
 msgid "%s%s; will be downgraded [%s -> %s]"
 msgstr "%s%s; zal worden gedegradeerd [%s -> %s]"
 
-#: src/cmdline/cmdline_show.cc:223
+#: src/cmdline/cmdline_show.cc:228
 #, c-format
 msgid "%s%s; will be upgraded [%s -> %s]"
 msgstr "%s%s; zal worden opgewaardeerd [%s -> %s]"
 
-#: src/cmdline/cmdline_show.cc:235 src/cmdline/cmdline_show.cc:256
+#: src/cmdline/cmdline_show.cc:240 src/cmdline/cmdline_show.cc:261
 msgid "Package: "
 msgstr "Pakket: "
 
-#: src/cmdline/cmdline_show.cc:236 src/cmdline/cmdline_show.cc:264
+#: src/cmdline/cmdline_show.cc:241 src/cmdline/cmdline_show.cc:269
 #: src/pkg_columnizer.cc:87
 msgid "State"
 msgstr "Staat"
 
-#: src/cmdline/cmdline_show.cc:237 src/cmdline/cmdline_show.cc:318
+#: src/cmdline/cmdline_show.cc:242 src/cmdline/cmdline_show.cc:325
 msgid "Provided by"
 msgstr "Voorzien door"
 
-#: src/cmdline/cmdline_show.cc:258 src/pkg_info_screen.cc:105
+#: src/cmdline/cmdline_show.cc:263 src/pkg_info_screen.cc:105
 msgid "Essential: "
 msgstr "Essentieel: "
 
-#: src/cmdline/cmdline_show.cc:258 src/cmdline/cmdline_show.cc:262
-#: src/cmdline/cmdline_show.cc:273 src/pkg_info_screen.cc:105
+#: src/cmdline/cmdline_show.cc:263 src/cmdline/cmdline_show.cc:267
+#: src/cmdline/cmdline_show.cc:278 src/pkg_info_screen.cc:105
 msgid "yes"
 msgstr "ja"
 
-#: src/cmdline/cmdline_show.cc:262
+#: src/cmdline/cmdline_show.cc:267
 msgid "New"
 msgstr "Nieuw"
 
-#: src/cmdline/cmdline_show.cc:267
+#: src/cmdline/cmdline_show.cc:272
 msgid "Forbidden version"
 msgstr "Verboden versie"
 
-#: src/cmdline/cmdline_show.cc:271
+#: src/cmdline/cmdline_show.cc:276
 msgid "Automatically installed"
 msgstr "Automatisch geïnstalleerd"
 
-#: src/cmdline/cmdline_show.cc:273
+#: src/cmdline/cmdline_show.cc:278
 msgid "no"
 msgstr "nee"
 
-#: src/cmdline/cmdline_show.cc:275
+#: src/cmdline/cmdline_show.cc:280
 msgid "Version: "
 msgstr "Versie: "
 
-#: src/cmdline/cmdline_show.cc:276 src/pkg_info_screen.cc:113
+#: src/cmdline/cmdline_show.cc:281 src/pkg_info_screen.cc:113
 msgid "Priority: "
 msgstr "Prioriteit: "
 
-#: src/cmdline/cmdline_show.cc:277 src/cmdline/cmdline_show.cc:279
-#: src/cmdline/cmdline_show.cc:288
+#: src/cmdline/cmdline_show.cc:282 src/cmdline/cmdline_show.cc:284
+#: src/cmdline/cmdline_show.cc:293
 msgid "N/A"
 msgstr "NVT"
 
-#: src/cmdline/cmdline_show.cc:278 src/pkg_info_screen.cc:114
+#: src/cmdline/cmdline_show.cc:283 src/pkg_info_screen.cc:114
 msgid "Section: "
 msgstr "Sectie: "
 
-#: src/cmdline/cmdline_show.cc:280 src/pkg_info_screen.cc:115
+#: src/cmdline/cmdline_show.cc:285 src/pkg_info_screen.cc:115
 msgid "Maintainer: "
 msgstr "Beheerder: "
 
-#: src/cmdline/cmdline_show.cc:283
+#: src/cmdline/cmdline_show.cc:288
 msgid "Uncompressed Size: "
 msgstr "Niet gecomprimeerde grootte: "
 
-#: src/cmdline/cmdline_show.cc:287
+#: src/cmdline/cmdline_show.cc:292
 msgid "Architecture: "
 msgstr "Architectuur: "
 
-#: src/cmdline/cmdline_show.cc:289
+#: src/cmdline/cmdline_show.cc:294
 msgid "Compressed Size: "
 msgstr "Gecomprimeerde grootte: "
 
-#: src/cmdline/cmdline_show.cc:291
+#: src/cmdline/cmdline_show.cc:296
 msgid "Filename: "
 msgstr "Bestandsnaam: "
 
-#: src/cmdline/cmdline_show.cc:293
+#: src/cmdline/cmdline_show.cc:298
 msgid "MD5sum: "
 msgstr "MD5som: "
 
-#: src/cmdline/cmdline_show.cc:297 src/cmdline/cmdline_show.cc:299
+#: src/cmdline/cmdline_show.cc:302 src/cmdline/cmdline_show.cc:305
 msgid "Archive"
 msgstr "Archief"
 
-#: src/cmdline/cmdline_show.cc:303
+#: src/cmdline/cmdline_show.cc:310
 msgid "Depends"
 msgstr "Hangt af van"
 
-#: src/cmdline/cmdline_show.cc:305
+#: src/cmdline/cmdline_show.cc:312
 msgid "PreDepends"
 msgstr "Hangt af van voorgeconfigureerde"
 
-#: src/cmdline/cmdline_show.cc:307
+#: src/cmdline/cmdline_show.cc:314
 msgid "Recommends"
 msgstr "Beveelt aan"
 
-#: src/cmdline/cmdline_show.cc:309
+#: src/cmdline/cmdline_show.cc:316
 msgid "Suggests"
 msgstr "Suggereert"
 
-#: src/cmdline/cmdline_show.cc:311
+#: src/cmdline/cmdline_show.cc:318
 msgid "Conflicts"
 msgstr "Is in conflict met"
 
-#: src/cmdline/cmdline_show.cc:313
+#: src/cmdline/cmdline_show.cc:320
 msgid "Replaces"
 msgstr "Vervangt"
 
-#: src/cmdline/cmdline_show.cc:315
+#: src/cmdline/cmdline_show.cc:322
 msgid "Obsoletes"
 msgstr "Veroudert"
 
-#: src/cmdline/cmdline_show.cc:317
+#: src/cmdline/cmdline_show.cc:324
 msgid "Provides"
 msgstr "Voorziet"
 
-#: src/cmdline/cmdline_show.cc:321 src/pkg_info_screen.cc:97
+#: src/cmdline/cmdline_show.cc:328 src/pkg_info_screen.cc:97
 msgid "Description: "
 msgstr "Beschrijving: "
 
@@ -1242,34 +1254,34 @@
 msgid "You cannot specify both an archive and a version for a package\n"
 msgstr "U kunt niet èn een archief èn een versie aangeven voor een pakket\n"
 
-#: src/dep_item.cc:137
+#: src/dep_item.cc:139
 msgid "UNSATISFIED"
 msgstr "NIET VOLDAAN"
 
-#: src/dep_item.cc:137 src/reason_fragment.cc:247
+#: src/dep_item.cc:139 src/reason_fragment.cc:244
 msgid "UNAVAILABLE"
 msgstr "NIET AANWEZIG"
 
-#: src/download_bar.cc:56 src/download_list.cc:263 src/download_screen.cc:57
+#: src/download_bar.cc:56 src/download_list.cc:266 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_bar.cc:77 src/generic/acqprogress.cc:63
+#: src/download_bar.cc:75 src/generic/acqprogress.cc:63
 msgid "Hit "
-msgstr "Getroffen "
+msgstr "Geraakt: "
 
-#: src/download_bar.cc:90
+#: src/download_bar.cc:88
 msgid "Downloading "
-msgstr "Ophalen "
+msgstr "Ophalen van "
 
-#: src/download_bar.cc:103
+#: src/download_bar.cc:101
 msgid "Got "
-msgstr "Hebbes "
+msgstr "Gehaald: "
 
-#: src/download_bar.cc:157
+#: src/download_bar.cc:155
 msgid "Downloading..."
-msgstr "Ophalen..."
+msgstr "Bezig met ophalen..."
 
 #: src/download.cc:93
 msgid "Couldn't read list of package sources"
@@ -1295,7 +1307,7 @@
 msgid "Couldn't clean out list directories"
 msgstr "Kon lijstmappen niet opkuisen"
 
-#: src/download.cc:177 src/ui.cc:1153
+#: src/download.cc:177 src/ui.cc:1147
 msgid "Deleting obsolete downloaded files"
 msgstr "Verwijderen van verouderde, opgehaalde bestanden"
 
@@ -1434,7 +1446,7 @@
 "Bevestigd! Er is iets ergs gebeurd bij het installeren van pakketten. "
 "Erwordt geprobeerd van te herstellen:"
 
-#: src/download.cc:477 src/pkg_item.cc:432
+#: src/download.cc:477 src/pkg_item.cc:430
 msgid "Press return to continue.\n"
 msgstr "Druk op return om verder te gaan.\n"
 
@@ -1445,17 +1457,17 @@
 "Kon de systeemvergrendeling niet herwinnen! (Misschien is er een andere apt "
 "of dpkg aan het uitvoeren?)"
 
-#: src/download_item.cc:66 src/download_item.cc:70 src/download_item.cc:100
+#: src/download_item.cc:70 src/download_item.cc:74 src/download_item.cc:104
 #: src/generic/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
-msgstr " [Werkend]"
+msgstr "[Bezig]"
 
-#: src/download_item.cc:104 src/download_list.cc:283
+#: src/download_item.cc:108 src/download_list.cc:284
 msgid "[Hit]"
-msgstr "[Hit]"
+msgstr "[Geraakt]"
 
-#: src/download_item.cc:104 src/download_list.cc:303
+#: src/download_item.cc:108 src/download_list.cc:304
 msgid "[Downloaded]"
 msgstr "[Opgehaald]"
 
@@ -1469,34 +1481,34 @@
 msgid "%n%nSome files were not downloaded successfully."
 msgstr ""
 
-#: src/download_list.cc:68
+#: src/download_list.cc:66
 msgid "Continue"
 msgstr "Ga verder"
 
-#: src/download_list.cc:175 src/download_screen.cc:203
+#: src/download_list.cc:178 src/download_screen.cc:203
 msgid "Total Progress: "
-msgstr "Totale vooruitgang: "
+msgstr "Totale voortgang: "
 
-#: src/download_list.cc:194 src/download_screen.cc:218
+#: src/download_list.cc:197 src/download_screen.cc:218
 #, c-format
 msgid " [ %i%% ] (%sB/s, %s remaining)"
 msgstr " [ %i%% ] (%sB/s, %s overblijvend)"
 
-#: src/download_list.cc:196
+#: src/download_list.cc:199
 #, c-format
 msgid " [ %i%% ] (stalled)"
 msgstr " [ %i%% ] (blijft steken)"
 
-#: src/download_list.cc:198
+#: src/download_list.cc:201
 #, c-format
 msgid " [ %i%% ]"
-msgstr " [ %i%% ]"
+msgstr "[ %i%% ]"
 
-#: src/download_list.cc:323
+#: src/download_list.cc:324
 msgid "[IGNORED]"
 msgstr "[GENEGEERD]"
 
-#: src/download_list.cc:329
+#: src/download_list.cc:330
 msgid "[ERROR]"
 msgstr "[FOUT]"
 
@@ -1505,11 +1517,11 @@
 msgid "Downloaded %sB in %ss (%sB/s)."
 msgstr "%sB opgehaald in %ss (%sB/s)."
 
-#: src/edit_pkg_hier.cc:158
+#: src/edit_pkg_hier.cc:176
 msgid "No hierarchy information to edit"
 msgstr "Geen hiërarchie-informatie om te wijzigen"
 
-#: src/edit_pkg_hier.cc:258
+#: src/edit_pkg_hier.cc:276
 msgid "Couldn't open for writing"
 msgstr "Kon niet openen om te schrijven"
 
@@ -1583,7 +1595,7 @@
 #: 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 "
+"Kan afhankelijkheden niet corrigeren, enkele pakketten kunnen niet "
 "geïnstalleerd worden"
 
 #: src/generic/aptcache.cc:1572
@@ -1604,7 +1616,7 @@
 #: 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"
+msgstr "Kan %s niet vervangen door nieuw configuratiebestand"
 
 #: src/generic/apt.cc:227
 msgid "Warning: could not lock the cache file.  Opening in read-only mode"
@@ -1612,39 +1624,39 @@
 "Waarschuwing: kon het cachebestand niet vergrendelen. Openen in alleen-lezen-"
 "mode"
 
-#: src/generic/matchers.cc:797
+#: src/generic/matchers.cc:798
 msgid "Unmatched '('"
 msgstr "Ongebalanceerd '('"
 
-#: src/generic/matchers.cc:887 src/generic/matchers.cc:968
+#: src/generic/matchers.cc:888 src/generic/matchers.cc:969
 #, c-format
 msgid "Unknown dependency type: %s"
 msgstr "Onbekend afhankelijkheidstype: %s"
 
-#: src/generic/matchers.cc:950
+#: src/generic/matchers.cc:951
 #, c-format
 msgid "Unknown action type: %s"
 msgstr "Onbekend actietype: %s"
 
-#: src/generic/matchers.cc:1017
+#: src/generic/matchers.cc:1018
 #, c-format
 msgid "Unknown priority %s"
 msgstr "Onbekende prioriteit %s"
 
-#: src/generic/matchers.cc:1039
+#: src/generic/matchers.cc:1040
 #, c-format
 msgid "Unknown pattern type: %c"
 msgstr "Onbekend patroontype: %c"
 
-#: src/generic/matchers.cc:1084
+#: src/generic/matchers.cc:1105
 msgid "Unexpected empty expression"
 msgstr "Onverwachte lege expressie"
 
-#: src/generic/matchers.cc:1119
+#: src/generic/matchers.cc:1143
 msgid "Badly formed expression"
 msgstr "Slecht gevormde expressie"
 
-#: src/generic/matchers.cc:1148
+#: src/generic/matchers.cc:1175
 msgid "Unexpected ')'"
 msgstr "Onverwacht ')'"
 
@@ -1662,14 +1674,14 @@
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
-"De pakketindexbestanden zijn gecorumpeerd. Geen bestandsnaam:-veld voor "
-"pakket %s."
+"De pakketindexbestanden zijn gecorumpeerd. Veld bestandsnaam: voor pakket %s "
+"ontbreekt."
 
 #: src/generic/pkg_changelog.cc:105
 msgid "Can't get value of $HOME, using TMPDIR (insecure)"
-msgstr "Kan waarde van $HOME niet verkrijgen, gebruik TMPDIR(wat onveilig is)"
+msgstr "Kan waarde van $HOME niet verkrijgen, gebruik TMPDIR (wat onveilig is)"
 
-#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:61
+#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:76
 #, c-format
 msgid "ChangeLog of %s"
 msgstr "ChangeLog van %s"
@@ -1695,7 +1707,7 @@
 #: src/generic/pkg_hier.cc:180
 #, c-format
 msgid "Bad record encountered (Package=%s, Group=%s), skipping"
-msgstr "Slecht record aangetroffen (Pakket=%s, Groep=%s), negeren"
+msgstr "Foutief record aangetroffen (Pakket=%s, Groep=%s), negeren"
 
 #: src/generic/pkg_hier.cc:243
 #, c-format
@@ -1710,37 +1722,37 @@
 msgid "Reading task descriptions"
 msgstr "Lezen van taakbeschrijvingen"
 
-#: src/load_config.cc:30
-#, c-format
-msgid "Invalid entry in color definition group: \"%s\""
-msgstr "Ongeldige ingave in kleurdefinitiegroep:\"%s\""
+#: src/load_config.cc:42
+#, fuzzy, c-format
+msgid "Unrecognized color name \"%s\""
+msgstr "Niet herkende taken"
 
-#: src/load_config.cc:32
-#, c-format
-msgid "Invalid tagless entry in color definition group: \"%s\""
-msgstr "Ongeldige lege ingave in kleurdefinitiegroep:\"%s\""
+#: src/load_config.cc:69
+#, fuzzy, c-format
+msgid "Unrecognized attribute name \"%s\""
+msgstr "Niet herkende taken"
 
-#: src/load_config.cc:34
-#, c-format
-msgid "Need exactly two colors in color definition \"%s\""
-msgstr "Heb exact twee kleuren nodig in kleurdefinitie \"%s\""
+#: src/load_config.cc:106
+#, fuzzy, c-format
+msgid "Invalid entry in style definition group: \"%s\""
+msgstr "Ongeldige ingave in kleurdefinitiegroep:\"%s\""
 
-#: src/load_config.cc:50
-#, c-format
-msgid "Can't parse foreground \"%s\"of color \"%s\""
-msgstr "Kan voorgrond \"%s\" in kleur \"%s\" niet ontleden"
+#: src/load_config.cc:108
+#, fuzzy, c-format
+msgid "Invalid tagless entry in style definition group: \"%s\""
+msgstr "Ongeldige lege ingave in kleurdefinitiegroep:\"%s\""
 
-#: src/load_config.cc:53
-#, c-format
-msgid "Can't parse background \"%s\" of color \"%s\""
-msgstr "Kan achtergrond \"%s\" in kleur \"%s\" niet ontleden"
+#: src/load_config.cc:130
+#, fuzzy, c-format
+msgid "Unknown style attribute %s"
+msgstr "Onbekend actietype: %s"
 
-#: src/load_config.cc:72 src/load_config.cc:74
+#: src/load_config.cc:153 src/load_config.cc:155
 #, c-format
 msgid "Invalid entry in keybinding group: \"%s\""
 msgstr "Ongeldige ingave in toetsenbindingsgroep:\"%s\""
 
-#: src/load_config.cc:89
+#: src/load_config.cc:170
 #, c-format
 msgid "Ignoring invalid keybinding \"%s\" -> \"%s\""
 msgstr "Negeren van ongeldige toetsenbinding \"%s\" -> \"%s\""
@@ -1748,13 +1760,13 @@
 #: src/load_grouppolicy.cc:54
 #, c-format
 msgid "Bad section name '%s' (use 'none', 'topdir', or 'subdir')"
-msgstr "Slechte sectienaam '%s' (gebruik 'none', 'topdir', of 'subdir')"
+msgstr "Foutieve sectienaam '%s' (gebruik 'none', 'topdir', of 'subdir')"
 
 #: src/load_grouppolicy.cc:67
 #, c-format
 msgid "Bad passthrough setting '%s' (use 'passthrough' or 'nopassthrough')"
 msgstr ""
-"Slechte passthrough-instelling '%s' (gebruik 'passthrough' of "
+"Foutieve passthrough-instelling '%s' (gebruik 'passthrough' of "
 "'nopassthrough')"
 
 #: src/load_grouppolicy.cc:75
@@ -2042,7 +2054,7 @@
 #: src/main.cc:115
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
-msgstr " -s             Acties simuleren, maar ze niet werkelijk uitvoeren.\n"
+msgstr " -s             Acties simuleren, maar ze niet werkelijk uitvoeren\n"
 
 #: src/main.cc:116
 #, c-format
@@ -2054,7 +2066,7 @@
 #: src/main.cc:117
 #, c-format
 msgid " -P             Always prompt for confirmation or actions\n"
-msgstr " -P             Steeds naar bevestiging of actie vragen\n"
+msgstr "-P             Steeds naar bevestiging of actie vragen\n"
 
 #: src/main.cc:118
 #, c-format
@@ -2097,8 +2109,7 @@
 #: src/main.cc:123
 #, 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"
+msgstr " -V             Toont welke versies van pakketten geïnstalleerd zijn\n"
 
 #: src/main.cc:124
 #, c-format
@@ -2111,7 +2122,7 @@
 #: src/main.cc:125
 #, 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"
+msgstr " -Z\t\t    Toont de wijziging in installatiegrootte van elk pakket\n"
 
 #: src/main.cc:126
 #, c-format
@@ -2164,44 +2175,44 @@
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                  Deze aptitude heeft geen Super Koekrachten.\n"
 
-#: src/main.cc:255
+#: src/main.cc:252
 #, 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:301 src/main.cc:310
+#: src/main.cc:291 src/main.cc:300
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr "BIZAR: onbekende optiecode meegekregen\n"
 
-#: src/main.cc:319
+#: src/main.cc:309
 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:327
+#: src/main.cc:317
 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:348
+#: src/main.cc:338
 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:405
+#: src/main.cc:395
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr "Onbekend commando \"%s\"\n"
 
-#: src/main.cc:412 src/main.cc:469
+#: src/main.cc:402 src/main.cc:450
 msgid "Internal error: uncaught 'out of solutions' exception.\n"
 msgstr ""
 
-#: src/main.cc:417 src/main.cc:474
+#: src/main.cc:407 src/main.cc:455
 msgid "Internal error: uncaught 'out of time' exception.\n"
 msgstr ""
 
-#: src/main.cc:424
+#: src/main.cc:414
 #, c-format
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
@@ -2232,7 +2243,7 @@
 msgid "Lost"
 msgstr "Verloren"
 
-#: src/mine/cmine.cc:119 src/ui.cc:1090
+#: src/mine/cmine.cc:119 src/ui.cc:1084
 msgid "Minesweeper"
 msgstr "Mijnenveger"
 
@@ -2258,94 +2269,94 @@
 msgid "The number of mines must be a number"
 msgstr "Het aantal mijnen moet een getal zijn"
 
-#: src/mine/cmine.cc:240
+#: src/mine/cmine.cc:238
 msgid "Setup custom game"
 msgstr "Stel aangepast spel in"
 
-#: src/mine/cmine.cc:243
+#: src/mine/cmine.cc:240
 msgid "Height of board: "
 msgstr "Hoogte van het bord: "
 
-#: src/mine/cmine.cc:247
+#: src/mine/cmine.cc:243
 msgid "Width of board: "
 msgstr "Breedte van het bord: "
 
-#: src/mine/cmine.cc:251
+#: src/mine/cmine.cc:246
 msgid "Number of mines: "
 msgstr "Aantal mijnen: "
 
-#: src/mine/cmine.cc:316
+#: src/mine/cmine.cc:305
 msgid "Choose difficulty level"
 msgstr "Kies moeilijkheidsgraad"
 
-#: src/mine/cmine.cc:318
+#: src/mine/cmine.cc:307
 msgid "Easy"
 msgstr "Gemakkelijk"
 
-#: src/mine/cmine.cc:319
+#: src/mine/cmine.cc:308
 msgid "Medium"
 msgstr "Medium"
 
-#: src/mine/cmine.cc:320
+#: src/mine/cmine.cc:309
 msgid "Hard"
 msgstr "Moeilijk"
 
-#: src/mine/cmine.cc:321
+#: src/mine/cmine.cc:310
 msgid "Custom"
 msgstr "Aangepast"
 
-#: src/mine/cmine.cc:411
+#: src/mine/cmine.cc:392
 msgid "You have won."
-msgstr "U hebt gewonnen."
+msgstr "U hebt gewonnen"
 
-#: src/mine/cmine.cc:414
+#: src/mine/cmine.cc:395
 msgid "You lose!"
 msgstr "U verliest!"
 
-#: src/mine/cmine.cc:419
+#: src/mine/cmine.cc:400
 msgid "You die...  --More--"
 msgstr "U sterft... --Meer--"
 
-#: src/mine/cmine.cc:432
+#: src/mine/cmine.cc:413
 msgid "The spikes were poisoned!  The poison was deadly..  --More--"
 msgstr "De pieken zijn giftig! Het gif is doodelijk... --Meer--"
 
-#: src/mine/cmine.cc:435
+#: src/mine/cmine.cc:416
 msgid "You land on a set of sharp iron spikes!  --More--"
 msgstr "U landt op een stel sherpe ijzeren pieken! --Meer--"
 
-#: src/mine/cmine.cc:438
+#: src/mine/cmine.cc:419
 msgid "You fall into a pit!  --More--"
 msgstr "U valt in een put! --Meer--"
 
-#: src/mine/cmine.cc:441
+#: src/mine/cmine.cc:422
 msgid "KABOOM!  You step on a land mine.  --More--"
 msgstr "KABOEM! U bent op een landmijn gestapt. --Meer--"
 
-#: src/mine/cmine.cc:446
+#: src/mine/cmine.cc:427
 msgid "The dart was poisoned!  The poison was deadly...  --More--"
 msgstr "De pijl is giftig! Het gif is dodelijk... --Meer--"
 
-#: src/mine/cmine.cc:448
+#: src/mine/cmine.cc:429
 msgid ""
 "A little dart shoots out at you!  You are hit by a little dart!  --More--"
 msgstr ""
 "Een kleine pijl vliegt uw richting uit! U bent geraakt door een kleine pijl! "
 "--Meer--"
 
-#: src/mine/cmine.cc:452
+#: src/mine/cmine.cc:433
 msgid "You turn to stone... --More--"
 msgstr "U verandert in steen... --Meer--"
 
-#: src/mine/cmine.cc:454
+#: src/mine/cmine.cc:435
 msgid "Touching the cockatrice corpse was a fatal mistake.  --More--"
 msgstr "Het kippenreptielmonster aanraken was een fatale vergissing. --Meer--"
 
-#: src/mine/cmine.cc:456
+#: src/mine/cmine.cc:437
 msgid "You feel here a cockatrice corpse.  --More--"
 msgstr "U voelt hier een kippenreptielmonster. --Meer--"
 
-#: src/mine/cmine.cc:460
+#: src/mine/cmine.cc:441
 msgid ""
 "Click!  You trigger a rolling boulder trap!  You are hit by a boulder! --"
 "More--"
@@ -2353,56 +2364,56 @@
 "Klik! U zet een steenlawine in gang! U bent geraakt door een rotsblok! --"
 "Meer--"
 
-#: src/mine/cmine.cc:470
+#: src/mine/cmine.cc:451
 msgid "sleep"
 msgstr "slaap"
 
-#: src/mine/cmine.cc:473
+#: src/mine/cmine.cc:454
 msgid "striking"
 msgstr "slaan"
 
-#: src/mine/cmine.cc:476
+#: src/mine/cmine.cc:457
 msgid "death"
 msgstr "dood"
 
-#: src/mine/cmine.cc:479
+#: src/mine/cmine.cc:460
 msgid "polymorph"
 msgstr "polymorf"
 
-#: src/mine/cmine.cc:482
+#: src/mine/cmine.cc:463
 msgid "magic missile"
 msgstr "magische rakket"
 
-#: src/mine/cmine.cc:485
+#: src/mine/cmine.cc:466
 msgid "secret door detection"
 msgstr "geheime deur-detectie"
 
-#: src/mine/cmine.cc:488
+#: src/mine/cmine.cc:469
 msgid "invisibility"
 msgstr "onzichtbaar"
 
-#: src/mine/cmine.cc:491
+#: src/mine/cmine.cc:472
 msgid "cold"
 msgstr "koud"
 
-#: src/mine/cmine.cc:497
+#: src/mine/cmine.cc:478
 #, c-format
 msgid "Your wand of %s breaks apart and explodes!  --More--"
 msgstr "Uw %s-scepter breekt en ontploft! --Meer--"
 
-#: src/mine/cmine.cc:503
+#: src/mine/cmine.cc:484
 msgid "You are jolted by a surge of electricity!  --More--"
 msgstr "U bent door elkaar geschud door een elektrische golf! --Meer--"
 
-#: src/mine/cmine.cc:607
+#: src/mine/cmine.cc:588
 msgid "Enter the filename to load: "
 msgstr "Geef de in te laden bestandsnaam: "
 
-#: src/mine/cmine.cc:614
+#: src/mine/cmine.cc:595
 msgid "Enter the filename to save: "
 msgstr "Geef de te bewaren bestandsnaam: "
 
-#: src/mine/cmine.cc:624
+#: src/mine/cmine.cc:605
 msgid "mine-help.txt"
 msgstr "mine-help.txt"
 
@@ -2410,7 +2421,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:1670
+#: src/pkg_columnizer.cc:84 src/ui.cc:1662
 msgid "Package"
 msgstr "Pakket"
 
@@ -3479,52 +3490,52 @@
 "Bent u zeker dat u het wil verwijderen?\n"
 "Typ '%s' als u zeker bent."
 
-#: src/pkg_item.cc:222 src/pkg_ver_item.cc:625
+#: src/pkg_item.cc:220 src/pkg_ver_item.cc:626
 #, c-format
 msgid "Information about %s"
 msgstr "Informatie over %s"
 
-#: src/pkg_item.cc:224 src/pkg_ver_item.cc:627
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:628
 #, c-format
 msgid "%s info"
 msgstr ""
 
-#: src/pkg_item.cc:310
+#: src/pkg_item.cc:308
 #, fuzzy, c-format
 msgid "Available versions of %s"
 msgstr "Aanwezige versies van "
 
-#: src/pkg_item.cc:313
+#: src/pkg_item.cc:311
 #, fuzzy, c-format
 msgid "%s versions"
 msgstr "Versies"
 
-#: src/pkg_item.cc:325 src/pkg_ver_item.cc:655
+#: src/pkg_item.cc:323 src/pkg_ver_item.cc:656
 #, c-format
 msgid "Dependencies of %s"
 msgstr "Afhankelijkheden van %s"
 
-#: src/pkg_item.cc:327 src/pkg_ver_item.cc:657
+#: src/pkg_item.cc:325 src/pkg_ver_item.cc:658
 #, c-format
 msgid "%s deps"
 msgstr ""
 
-#: src/pkg_item.cc:338 src/pkg_ver_item.cc:667
+#: src/pkg_item.cc:336 src/pkg_ver_item.cc:668
 #, c-format
 msgid "Packages depending on %s"
 msgstr "Pakketten die afhangen van %s"
 
-#: src/pkg_item.cc:340 src/pkg_ver_item.cc:669
+#: src/pkg_item.cc:338 src/pkg_ver_item.cc:670
 #, c-format
 msgid "%s reverse deps"
 msgstr ""
 
-#: src/pkg_item.cc:392 src/pkg_ver_item.cc:707
+#: src/pkg_item.cc:390 src/pkg_ver_item.cc:708
 #, c-format
 msgid "Reporting a bug in %s:\n"
 msgstr "Een fout raporteren in %s:\n"
 
-#: src/pkg_item.cc:414
+#: src/pkg_item.cc:412
 #, fuzzy
 msgid ""
 "You are not root and I cannot find any way to become root.  To reconfigure "
@@ -3536,16 +3547,16 @@
 "installeer het menu-pakket, het login-pakket,\n"
 "of voer aptitude als root uit."
 
-#: src/pkg_item.cc:422
+#: src/pkg_item.cc:420
 #, c-format
 msgid "Reconfiguring %s\n"
 msgstr "Herconfigureren van %s\n"
 
-#: src/pkg_item.cc:447
+#: src/pkg_item.cc:445
 msgid "Hierarchy editor"
 msgstr "Hiërarchie-editor"
 
-#: src/pkg_item.cc:447
+#: src/pkg_item.cc:445
 #, fuzzy
 msgid "Hierarchy Editor"
 msgstr "Hiërarchie-editor"
@@ -3579,21 +3590,21 @@
 msgid "Enter the new package sorting mechanism for this display: "
 msgstr "Geef het nieuwe pakketsorteermechanisme voor deze weergave: "
 
-#: src/pkg_view.cc:344
+#: src/pkg_view.cc:359
 msgid "make_package_view: error in arguments -- two main widgets??"
 msgstr "make_package_view: fout in argumenten -- twee hoofd-widgets??"
 
-#: src/pkg_view.cc:350
+#: src/pkg_view.cc:365
 msgid ""
 "make_package_view: error in arguments -- bad column list for static item"
 msgstr ""
 "make_package_view: fout in argumenten -- foute kolomlijst voor statisch item"
 
-#: src/pkg_view.cc:443
+#: src/pkg_view.cc:458
 msgid "make_package_view: bad argument!"
 msgstr "make_package_view: slect argument!"
 
-#: src/pkg_view.cc:495
+#: src/pkg_view.cc:510
 msgid "make_package_view: no main widget found"
 msgstr "make_package_view: geen hoofd-widget gevonden"
 
@@ -3628,14 +3639,14 @@
 #: src/reason_fragment.cc:166
 #, c-format
 msgid " (provided by %F)"
-msgstr " (aangeboden door %F)"
+msgstr "(aangeboden door %F)"
 
-#: src/reason_fragment.cc:278
+#: src/reason_fragment.cc:275
 #, c-format
 msgid "%F%s %F %F"
 msgstr "%F%s %F %F"
 
-#: src/reason_fragment.cc:327
+#: src/reason_fragment.cc:324
 msgid ""
 "If you select a package, an explanation of its current state will appear in "
 "this space."
@@ -3643,7 +3654,7 @@
 "Als u een pakket selecteert, dan zal een uitleg over haar huidige staat "
 "verschijnen op deze plaats."
 
-#: src/reason_fragment.cc:361
+#: src/reason_fragment.cc:358
 msgid ""
 "%B%s%b was installed automatically;  it is being removed because all of the "
 "packages which depend upon it are being removed:"
@@ -3651,18 +3662,18 @@
 "%B%s%b was automatisch geïnstalleerd; het wordt verwijderd omdat alle "
 "pakketten die ervan afhangen worden verwijderd:"
 
-#: src/reason_fragment.cc:365
+#: src/reason_fragment.cc:362
 msgid "%B%s%b will be automatically removed because of dependency errors:"
 msgstr "%B%s%b zal automatisch verwijderd worden door afhankelijkheidsfouten:"
 
-#: src/reason_fragment.cc:369
+#: src/reason_fragment.cc:366
 msgid ""
 "%B%s%b will be automatically installed to satisfy the following dependencies:"
 msgstr ""
 "%B%s%b zal automatisch geïnstalleerd worden om te voldoen aan volgende "
 "afhankelijkheden:"
 
-#: src/reason_fragment.cc:375 src/reason_fragment.cc:387
+#: src/reason_fragment.cc:372 src/reason_fragment.cc:384
 msgid ""
 "%B%s%b cannot be upgraded now, but if it could be, it would still be held at "
 "version %B%s%b."
@@ -3670,7 +3681,7 @@
 "%B%s%b kan nu niet worden opgewaardeerd, maar als het kon, zou het nog op "
 "versie %B%s%b gehouden worden."
 
-#: src/reason_fragment.cc:378
+#: src/reason_fragment.cc:375
 msgid ""
 "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the "
 "following dependencies:"
@@ -3678,27 +3689,27 @@
 "%B%s%b zal niet opgewaardeerd worden naar versie %B%s%b, om beschadiging van "
 "volgende afhankelijkheden te vermijden:"
 
-#: src/reason_fragment.cc:390
+#: src/reason_fragment.cc:387
 msgid "%B%s%b is currently installed."
 msgstr "%B%s%b is op dit momet geïnstalleerd."
 
-#: src/reason_fragment.cc:396
+#: src/reason_fragment.cc:393
 msgid "%B%s%b is not currently installed."
 msgstr "%B%s%b is op dit moment niet geïnstalleerd."
 
-#: src/reason_fragment.cc:404
+#: src/reason_fragment.cc:401
 msgid "Some dependencies of %B%s%b are not satisfied:"
 msgstr "Enkele afhankelijkheden van %B%s%b zijn niet nagekomen:"
 
-#: src/reason_fragment.cc:408
+#: src/reason_fragment.cc:405
 msgid "%B%s%b will be downgraded."
 msgstr "%B%s%b zal worden gedegradeerd."
 
-#: src/reason_fragment.cc:415
+#: src/reason_fragment.cc:412
 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b."
 msgstr "%B%s%b zal niet worden opgewaardeerd naar de verboden versie %B%s%b."
 
-#: src/reason_fragment.cc:419
+#: src/reason_fragment.cc:416
 msgid ""
 "%B%s%b could be upgraded to version %B%s%b, but it is being held at version %"
 "B%s%b."
@@ -3706,34 +3717,34 @@
 "%B%s%b kan opgewaardeerd worden naar versie %B%s%b, maar wordt behouden op "
 "versie %B%s%b."
 
-#: src/reason_fragment.cc:426
+#: src/reason_fragment.cc:423
 msgid "%B%s%b will be re-installed."
 msgstr "%B%s%b zal worden geherinstalleerd."
 
-#: src/reason_fragment.cc:430
+#: src/reason_fragment.cc:427
 msgid "%B%s%b will be installed."
 msgstr "%B%s%b zal worden geïnstalleerd."
 
-#: src/reason_fragment.cc:434
+#: src/reason_fragment.cc:431
 msgid "%B%s%b will be removed."
 msgstr "%B%s%b zal worden verwijderd."
 
-#: src/reason_fragment.cc:439
+#: src/reason_fragment.cc:436
 msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b."
 msgstr "%B%s%b zal worden opgewaardeerd van versie %B%s%b naar versie %B%s%b."
 
-#: src/reason_fragment.cc:475
+#: src/reason_fragment.cc:472
 msgid ""
 "The following packages depend on %B%s%b and will be broken by its removal:"
 msgstr ""
 "De volgende pakketten hangen af van %B%s%b en zullen worden beschadigd door "
 "de verwijdering:"
 
-#: src/reason_fragment.cc:478
+#: src/reason_fragment.cc:475
 msgid "The following packages depend on %B%s%b and are broken:"
 msgstr "De volgende pakketten hangen af van %B%s%b en zijn beschadigd:"
 
-#: src/reason_fragment.cc:485
+#: src/reason_fragment.cc:482
 msgid ""
 "The following packages conflict with %B%s%b and will be broken by its "
 "installation:"
@@ -3741,7 +3752,7 @@
 "De volgende pakketten conflicteren met %B%s%b en zullen beschadigd worden "
 "bij haar installatie:"
 
-#: src/reason_fragment.cc:518
+#: src/reason_fragment.cc:515
 msgid ""
 "The following packages depend on a version of %B%s%b other than the "
 "currently installed version of %B%s%b, or conflict with the currently "
@@ -3751,7 +3762,7 @@
 "de huidig geïnstalleerde versie van %B%s%b, of conflicteren met de huidig "
 "geïnstalleerde versie:"
 
-#: src/reason_fragment.cc:522
+#: src/reason_fragment.cc:519
 msgid ""
 "The following packages conflict with %B%s%b, or depend on a version of it "
 "which is not going to be installed."
@@ -3759,11 +3770,11 @@
 "De volgende pakketten conflicteren met %B%s%b, of hangen af van een versie "
 "van haar die niet wordt geïnstalleerd:"
 
-#: src/reason_fragment.cc:526
+#: src/reason_fragment.cc:523
 msgid "The following packages conflict with %B%s%b:"
 msgstr "De volgende pakketten conflicteren met %B%s%b:"
 
-#: src/reason_fragment.cc:531
+#: src/reason_fragment.cc:528
 msgid ""
 "The following packages depend on a version of %B%s%b other than the "
 "currently installed version of %B%s%b:"
@@ -3771,7 +3782,7 @@
 "De volgende pakketten hangen af van een versie van %B%s%b verschillend van "
 "de huidig geïnstalleerde versie van %B%s%b:"
 
-#: src/reason_fragment.cc:535
+#: src/reason_fragment.cc:532
 msgid ""
 "The following packages depend on a version of %B%s%b which is not going to "
 "be installed."
@@ -3779,15 +3790,15 @@
 "De volgende pakketten hangen af van een versie van %B%s%b die niet wordt "
 "geïnstalleerd:"
 
-#: src/reason_fragment.cc:541
+#: src/reason_fragment.cc:538
 msgid "upgraded"
 msgstr "opgewaardeerd"
 
-#: src/reason_fragment.cc:541
+#: src/reason_fragment.cc:538
 msgid "downgraded"
 msgstr "gedegradeerd"
 
-#: src/reason_fragment.cc:547
+#: src/reason_fragment.cc:544
 msgid ""
 "The following packages depend on the currently installed version of %B%s%b (%"
 "B%s%b), or conflict with the version it will be %s to (%B%s%b), and will be "
@@ -3797,7 +3808,7 @@
 "b (%B%s%b), of conflicteren met de versie die het zal zijn %s naar (%B%s%b), "
 "en zullen beschadigd worden als het %s is."
 
-#: src/reason_fragment.cc:554
+#: src/reason_fragment.cc:551
 msgid ""
 "The following packages conflict with version %B%s%b of %B%s%b, and will be "
 "broken if it is %s."
@@ -3805,7 +3816,7 @@
 "De volgende pakketten conflicteren met versie %B%s%b van %B%s%b, en zullen "
 "beschadigd worden als het %s is:"
 
-#: src/reason_fragment.cc:559
+#: src/reason_fragment.cc:556
 msgid ""
 "The following packages depend on version %B%s%b of %B%s%b, and will be "
 "broken if it is %s."
@@ -3852,38 +3863,43 @@
 msgid "Close"
 msgstr "^Sluiten"
 
-#: src/solution_fragment.cc:125
+#: src/solution_fragment.cc:134
 #, fuzzy
 msgid "%BRemove%b the following packages:%n"
 msgstr "De volgende pakketten zijn BESCHADIGD:"
 
-#: src/solution_fragment.cc:135
+#: src/solution_fragment.cc:144
 #, fuzzy
 msgid "%BInstall%b the following packages:%n"
 msgstr "De volgende pakketten zijn BESCHADIGD:"
 
-#: src/solution_fragment.cc:148
+#: src/solution_fragment.cc:157
 msgid "%BKeep%b the following packages at their current version:%n"
 msgstr ""
 
-#: src/solution_fragment.cc:161
+#: src/solution_fragment.cc:164
+#, fuzzy
+msgid "Not Installed"
+msgstr "niet geïnstalleerd"
+
+#: src/solution_fragment.cc:177
 #, fuzzy
 msgid "%BUpgrade%b the following packages:%n"
 msgstr "De volgende pakketten zijn BESCHADIGD:"
 
-#: src/solution_fragment.cc:176
+#: src/solution_fragment.cc:192
 #, fuzzy
 msgid "%BDowngrade%b the following packages:%n"
 msgstr "Ophalen pakketten"
 
-#: src/solution_fragment.cc:190
+#: src/solution_fragment.cc:206
 #, c-format
 msgid "Score is %d"
 msgstr ""
 
 #: src/trust.cc:17 src/trust.cc:19
 msgid "WARNING"
-msgstr ""
+msgstr "WAARSCHUWING"
 
 #: src/trust.cc:18
 msgid ""
@@ -3891,6 +3907,9 @@
 "package could allow a malicious individual to damage or take control of your "
 "system."
 msgstr ""
+"%F: deze versie van %s is van een %Bniet-vertrouwde bron%b! Dit pakket "
+"installeren zou een kwaadwillige indringer kunnen binnenlaten die uw systeem "
+"beschadigt of overneemt."
 
 #: src/ui.cc:165
 msgid "Er, there aren't any errors, this shouldn't have happened.."
@@ -3904,45 +3923,45 @@
 msgid "W:"
 msgstr ""
 
-#: src/ui.cc:194
+#: src/ui.cc:193
 msgid "Search for:"
 msgstr "Zoek naar:"
 
-#: src/ui.cc:262
+#: src/ui.cc:258
 msgid "You already are root!"
 msgstr "U bent reeds root!"
 
-#: src/ui.cc:360
+#: src/ui.cc:356
 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:388
+#: src/ui.cc:384
 msgid "Loading cache"
 msgstr "Laden van cache"
 
-#: src/ui.cc:410
+#: src/ui.cc:406
 msgid "Really quit Aptitude?"
 msgstr "Aptitude echt afsluiten?"
 
-#: src/ui.cc:489
+#: src/ui.cc:485
 msgid "Really discard your personal settings and reload the defaults?"
 msgstr "Echt uw persoonlijke instellingen negeren en de standaarden herladen?"
 
-#: src/ui.cc:589 src/ui.cc:591 src/ui.cc:619 src/ui.cc:621
+#: src/ui.cc:585 src/ui.cc:587 src/ui.cc:615 src/ui.cc:617
 msgid "Packages"
 msgstr "Pakketten"
 
-#: src/ui.cc:590 src/ui.cc:620
+#: src/ui.cc:586 src/ui.cc:616
 msgid "View available packages and choose actions to perform"
 msgstr "Bekijk beschikbare pakketten en kies uit te voeren acties"
 
-#: src/ui.cc:667
+#: src/ui.cc:663
 #, fuzzy
 msgid ""
-"%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
+"Aptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
 "BABSOLUTELY NO WARRANTY%b; for details see 'license' in the Help menu.  This "
 "is free software, and you are welcome to redistribute it under certain "
 "conditions; see 'license' for details."
@@ -3956,61 +3975,69 @@
 "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:688
+#: src/ui.cc:684
 msgid "help.txt"
 msgstr "help.txt"
 
-#: src/ui.cc:704
+#: src/ui.cc:700
 msgid "README"
 msgstr "README"
 
-#: src/ui.cc:786
+#: src/ui.cc:782
 msgid ""
-"%C%BWARNING%b: untrusted versions of the following packages will be "
-"installed!%n%nUntrusted packages could %Bcompromise your system's security%"
-"b.  You should only proceed with the installation if you are certain that "
-"this is what you want to do.%n%n"
+"%BWARNING%b: untrusted versions of the following packages will be installed!%"
+"n%nUntrusted packages could %Bcompromise your system's security%b.  You "
+"should only proceed with the installation if you are certain that this is "
+"what you want to do.%n%n"
 msgstr ""
+"%BWAARSCHUWING%b: er worden niet-vertrouwde versies van de volgende "
+"pakketten geïnstalleerd!%n%nNiet-vertrouwde pakketten kunnen%Bde veiligheid "
+"van uw systeem compromiteren%b. Ga enkel verder met de installatie als u "
+"zeker bent dat u dat wilt.%n%n"
 
-#: src/ui.cc:800
+#: src/ui.cc:788
 #, fuzzy
+msgid "  %S*%N %s [version %s]%n"
+msgstr "Versies"
+
+#: src/ui.cc:795
 msgid "Really Continue"
-msgstr "Ga verder"
+msgstr "Werkelijk verdergaan"
 
-#: src/ui.cc:802
+#: src/ui.cc:797
 msgid "Abort Installation"
-msgstr ""
+msgstr "Breek installatie af"
 
-#: src/ui.cc:863
+#: src/ui.cc:858
 msgid "Preview of package installation"
 msgstr "Preview van de pakketinstallatie."
 
-#: src/ui.cc:864
+#: src/ui.cc:859
 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:865
+#: src/ui.cc:860
 #, fuzzy
 msgid "Preview"
 msgstr "V^orige"
 
-#: src/ui.cc:901
+#: src/ui.cc:896
 #, fuzzy
 msgid "Some packages were broken and have been fixed:"
 msgstr "Enkele pakketten zijn beschadigd en zijn gerepareerd"
 
-#: src/ui.cc:907
+#: src/ui.cc:902
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:913
-#, c-format
+#: src/ui.cc:908
+#, fuzzy, c-format
 msgid ""
-"Ran out of time while trying to resolver dependencies (press \"%s\" to try "
+"Ran out of time while trying to resolve dependencies (press \"%s\" to try "
 "harder)"
-msgstr ""
+msgstr "Tijd verliezen bij het proberen vinden van mijnen"
 
-#: src/ui.cc:959
+#: src/ui.cc:954
 #, fuzzy
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
@@ -4020,27 +4047,27 @@
 "die\n"
 "u momenteel niet heeft. Wenst u te wijzigen naar de root-account?\n"
 
-#: src/ui.cc:962 src/ui.cc:1078
+#: src/ui.cc:957 src/ui.cc:1072
 msgid "Become root"
 msgstr "Word root"
 
-#: src/ui.cc:964 src/ui.cc:1080
+#: src/ui.cc:959 src/ui.cc:1074
 msgid "Don't become root"
 msgstr "Word geen root"
 
-#: src/ui.cc:969 src/ui.cc:1085
+#: src/ui.cc:964 src/ui.cc:1079
 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:996
+#: src/ui.cc:991
 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:1002
+#: src/ui.cc:997
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -4053,7 +4080,7 @@
 "ze\n"
 "op te waarderen. Typ \"U\" om een opwaardering voor te bereiden."
 
-#: src/ui.cc:1074
+#: src/ui.cc:1069
 #, fuzzy
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
@@ -4062,114 +4089,114 @@
 "Bijwerken van pakketlijsten vereist administratieve privileges, die\n"
 "u momenteel niet heeft. Wenst u te wijzigen naar de root-account?\n"
 
-#: src/ui.cc:1090 src/ui.cc:1377
+#: src/ui.cc:1084 src/ui.cc:1371
 msgid "Waste time trying to find mines"
 msgstr "Tijd verliezen bij het proberen vinden van mijnen"
 
-#: src/ui.cc:1097 src/ui.cc:1150
+#: src/ui.cc:1091 src/ui.cc:1144
 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:1100
+#: src/ui.cc:1094
 msgid "Deleting downloaded files"
 msgstr "Opgehaalde bestanden verwijderen"
 
-#: src/ui.cc:1114
+#: src/ui.cc:1108
 msgid "Downloaded package files have been deleted"
 msgstr "Opgehaalde pakketbestanden zijn verwijderd"
 
-#: src/ui.cc:1175
+#: src/ui.cc:1169
 #, 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:1247
+#: src/ui.cc:1241
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1252 src/ui.cc:1283
+#: src/ui.cc:1246 src/ui.cc:1277
 #, fuzzy
 msgid "Ran out of time while trying to find a solution."
 msgstr "Tijd verliezen bij het proberen vinden van mijnen"
 
-#: src/ui.cc:1277
+#: src/ui.cc:1271
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1307
+#: src/ui.cc:1301
 #, fuzzy, c-format
 msgid "Unable to open %s"
 msgstr "Onmogelijk om %s te openen voor schrijven"
 
-#: src/ui.cc:1313
+#: src/ui.cc:1307
 msgid "Error while dumping resolver state"
 msgstr ""
 
-#: src/ui.cc:1323
+#: src/ui.cc:1317
 msgid "File to which the resolver state should be dumped:"
 msgstr ""
 
-#: src/ui.cc:1353
+#: src/ui.cc:1347
 msgid "^Install/remove packages"
 msgstr "^Installeer/verwijder pakketten"
 
-#: src/ui.cc:1354
+#: src/ui.cc:1348
 msgid "Perform all pending installs and removals"
 msgstr "Doe alle uitstaande installaties en verwijderingen"
 
-#: src/ui.cc:1356
+#: src/ui.cc:1350
 msgid "^Update package list"
 msgstr "^Werk pakketlijst bij"
 
-#: src/ui.cc:1357
+#: src/ui.cc:1351
 msgid "Check for new versions of packages"
 msgstr "Controleer op nieuwe versies van pakketten"
 
-#: src/ui.cc:1360
+#: src/ui.cc:1354
 msgid "^Forget new packages"
 msgstr "^Vergeet nieuwe pakketten"
 
-#: src/ui.cc:1361
+#: src/ui.cc:1355
 msgid "Forget which packages are \"new\""
 msgstr "Vergeet welke pakketten \"nieuw\" zijn"
 
-#: src/ui.cc:1364
+#: src/ui.cc:1358
 msgid "^Clean package cache"
 msgstr "Kuis de ^pakketcache"
 
-#: src/ui.cc:1365
+#: src/ui.cc:1359
 msgid "Delete package files which were previously downloaded"
 msgstr "Verwijder pakketbestanden die vroeger opgehaald zijn"
 
-#: src/ui.cc:1368
+#: src/ui.cc:1362
 msgid "Clean ^obsolete files"
 msgstr "^Kuis de veroudere bestanden uit"
 
-#: src/ui.cc:1369
+#: src/ui.cc:1363
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Verwijder pakketbestanden die niet langer kunnen opgehaald worden"
 
-#: src/ui.cc:1372
+#: src/ui.cc:1366
 msgid "Mark ^Upgradable"
 msgstr "^Markeer opwaardeerbaar"
 
-#: src/ui.cc:1373
+#: src/ui.cc:1367
 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:1376
+#: src/ui.cc:1370
 msgid "^Play Minesweeper"
 msgstr "^Speel Mijnenveger"
 
-#: src/ui.cc:1379
+#: src/ui.cc:1373
 msgid "^Become root"
 msgstr "Word ^root"
 
-#: src/ui.cc:1380
+#: src/ui.cc:1374
 #, fuzzy
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
@@ -4178,71 +4205,71 @@
 "Voer 'su' uit om root te worden; dit zal het programma herstarten, maar uw\n"
 "instellingen zullen bewaard blijven."
 
-#: src/ui.cc:1383
+#: src/ui.cc:1377
 msgid "^Reload package cache"
 msgstr "^Herlaad pakketcache"
 
-#: src/ui.cc:1384
+#: src/ui.cc:1378
 msgid "Reload the package cache"
 msgstr "Herlaad de pakketcache"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1384
 msgid "^Quit"
 msgstr "^Afsluiten"
 
-#: src/ui.cc:1391
+#: src/ui.cc:1385
 msgid "Exit the program"
 msgstr "Sluit het programma af"
 
-#: src/ui.cc:1397 src/ui.cc:1669
+#: src/ui.cc:1391 src/ui.cc:1661
 msgid "Undo"
 msgstr "Ongedaan maken"
 
-#: src/ui.cc:1398
+#: src/ui.cc:1392
 msgid "Undo the last package operation or group of operations"
 msgstr "Maak de laatste pakketoperatie of groep van operaties ongedaan."
 
-#: src/ui.cc:1405
+#: src/ui.cc:1399
 msgid "^Install"
 msgstr "^Installeren"
 
-#: src/ui.cc:1406
+#: src/ui.cc:1400
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr ""
 "Duid het momenteel geselecteerde pakket aan voor installatie of opwaardering"
 
-#: src/ui.cc:1409
+#: src/ui.cc:1403
 msgid "^Remove"
 msgstr "^Verwijderen"
 
-#: src/ui.cc:1410
+#: src/ui.cc:1404
 msgid "Flag the currently selected package for removal"
 msgstr "Duid het momenteel geselecteerde pakket aan voor verwijdering"
 
-#: src/ui.cc:1413
+#: src/ui.cc:1407
 msgid "^Purge"
 msgstr "^Wissen (purge)"
 
-#: src/ui.cc:1414
+#: src/ui.cc:1408
 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:1417
+#: src/ui.cc:1411
 msgid "^Keep"
 msgstr "Be^houden"
 
-#: src/ui.cc:1418
+#: src/ui.cc:1412
 msgid "Cancel any action on the selected package"
 msgstr "Annuleer alle acties voor het geselecteerde pakket"
 
-#: src/ui.cc:1421
+#: src/ui.cc:1415
 msgid "^Hold"
 msgstr "^Bevriezen"
 
-#: src/ui.cc:1422
+#: src/ui.cc:1416
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -4250,11 +4277,11 @@
 "Annuleer alle acties voor het geselecteerde pakket en bescherm het voor "
 "toekomstige opwaarderingen"
 
-#: src/ui.cc:1425
+#: src/ui.cc:1419
 msgid "Mark ^Auto"
 msgstr "Markeer ^automatisch"
 
-#: src/ui.cc:1426
+#: src/ui.cc:1420
 #, fuzzy
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
@@ -4263,11 +4290,11 @@
 "Markeer het geselecteerde pakket als automatisch geïnstalleerd;\n"
 "het zal automatisch worden verwijderd als er geen pakketten meer op steunen"
 
-#: src/ui.cc:1429
+#: src/ui.cc:1423
 msgid "Mark ^Manual"
 msgstr "^Markeer handmatig"
 
-#: src/ui.cc:1430
+#: src/ui.cc:1424
 #, fuzzy
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
@@ -4276,11 +4303,11 @@
 "Markeer het geselecteerde pakket als handmatig geïnstalleerd;\n"
 "het zal niet worden verwijderd tenzij u het handmatig verwijdert"
 
-#: src/ui.cc:1433
+#: src/ui.cc:1427
 msgid "^Forbid Version"
 msgstr "V^erboden versie"
 
-#: src/ui.cc:1434
+#: src/ui.cc:1428
 #, fuzzy
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
@@ -4291,207 +4318,207 @@
 "nieuwere versies van het pakket zullen zoals gebruikelijk worden "
 "geïnstalleerd"
 
-#: src/ui.cc:1438
+#: src/ui.cc:1432
 msgid "I^nformation"
 msgstr "I^nformatie"
 
-#: src/ui.cc:1439
+#: src/ui.cc:1433
 msgid "Display more information about the selected package"
 msgstr "Toon meer informatie over het geselecteerde pakket"
 
-#: src/ui.cc:1442
+#: src/ui.cc:1436
 msgid "^Changelog"
 msgstr "^Changelog"
 
-#: src/ui.cc:1443
+#: src/ui.cc:1437
 msgid "Display the Debian changelog of the selected package"
 msgstr "Toon de Debian-changelog van het geselecteerde pakket"
 
-#: src/ui.cc:1450
+#: src/ui.cc:1444
 msgid "^Find"
 msgstr "^Zoek"
 
-#: src/ui.cc:1451
+#: src/ui.cc:1445
 msgid "Search for a package"
 msgstr "Zoek naar een pakket"
 
-#: src/ui.cc:1454
+#: src/ui.cc:1448
 msgid "Find ^Again"
 msgstr "Zoek ^Opnieuw"
 
-#: src/ui.cc:1455
+#: src/ui.cc:1449
 msgid "Repeat the last search"
 msgstr "Herhaal de laatste zoekopdracht"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1453
 msgid "^Limit Display"
 msgstr "^Beperk Weergave"
 
-#: src/ui.cc:1460
+#: src/ui.cc:1454
 msgid "Apply a filter to the package list"
 msgstr "Pas een filter toe op de pakketlijst"
 
-#: src/ui.cc:1463
+#: src/ui.cc:1457
 msgid "^Un-Limit Display"
 msgstr "^Hef Beperking Weergave Op"
 
-#: src/ui.cc:1464
+#: src/ui.cc:1458
 msgid "Remove the filter from the package list"
 msgstr "Verwijder de filter van de pakketlijst"
 
-#: src/ui.cc:1468
+#: src/ui.cc:1462
 msgid "Find ^Broken"
 msgstr "Zo^ek Beschadigde"
 
-#: src/ui.cc:1469
+#: src/ui.cc:1463
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Zoek het volgende pakket met niet-voldane afhankelijkheden"
 
-#: src/ui.cc:1476
+#: src/ui.cc:1470
 msgid "^UI options"
 msgstr "^UI-opties"
 
-#: src/ui.cc:1477
+#: src/ui.cc:1471
 msgid "Change the settings which affect the user interface"
 msgstr "Wijzig de instellingen die de gebruikersinterface aangaan"
 
-#: src/ui.cc:1480
+#: src/ui.cc:1474
 msgid "^Dependency handling"
 msgstr "^Afhankelijkheidsafhandeling"
 
-#: src/ui.cc:1481
+#: src/ui.cc:1475
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr ""
 "Wijzig de instellingen die bepalen hoe pakketafhankelijkheden worden "
 "behandeld"
 
-#: src/ui.cc:1484
+#: src/ui.cc:1478
 msgid "^Miscellaneous"
 msgstr "A^llerlei"
 
-#: src/ui.cc:1485
+#: src/ui.cc:1479
 msgid "Change miscellaneous program settings"
 msgstr "Wijzig allerlei programma-instellingen"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1484
 msgid "^Revert options"
 msgstr "^Inverteer opties"
 
-#: src/ui.cc:1491
+#: src/ui.cc:1485
 msgid "Reset all settings to the system defaults"
 msgstr "Zet alle instellingen op de systeemstandaard"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1496
 msgid "^Next"
 msgstr "^Volgende"
 
-#: src/ui.cc:1503
+#: src/ui.cc:1497
 msgid "View next display"
 msgstr "Bekijk volgende weergave"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1500
 msgid "^Prev"
 msgstr "V^orige"
 
-#: src/ui.cc:1507
+#: src/ui.cc:1501
 msgid "View previous display"
 msgstr "Bekijk vorige weergave"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1504
 msgid "^Close"
 msgstr "^Sluiten"
 
-#: src/ui.cc:1511
+#: src/ui.cc:1505
 msgid "Close this display"
 msgstr "Sluit deze weergave"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1510
 msgid "New Package ^View"
 msgstr "Nieuwe ^Pakket-View"
 
-#: src/ui.cc:1517
+#: src/ui.cc:1511
 msgid "Create a new default package view"
 msgstr "Maak een nieuwe standaard pakketview"
 
-#: src/ui.cc:1520
+#: src/ui.cc:1514
 msgid "New Categorical ^Browser"
 msgstr "Nieuwe ^Categorische Bladeraar"
 
-#: src/ui.cc:1522
+#: src/ui.cc:1516
 msgid "Browse packages by category"
 msgstr "Doorblader pakketten per categorie"
 
-#: src/ui.cc:1530
+#: src/ui.cc:1524
 msgid "^About"
 msgstr "^Over"
 
-#: src/ui.cc:1531
+#: src/ui.cc:1525
 msgid "View information about this program"
 msgstr "Bekijk informatie over dit programma"
 
-#: src/ui.cc:1534
+#: src/ui.cc:1528
 msgid "^Help"
 msgstr "^Help"
 
-#: src/ui.cc:1535
+#: src/ui.cc:1529
 msgid "View the on-line help"
 msgstr "Bekijk de online help"
 
-#: src/ui.cc:1537
+#: src/ui.cc:1531
 msgid "User's ^Manual"
 msgstr "^Gebruikershandleiding"
 
-#: src/ui.cc:1538
+#: src/ui.cc:1532
 msgid "View the detailed program manual"
 msgstr "Bekijk de gedetailleerde programmahandleiding"
 
-#: src/ui.cc:1541
+#: src/ui.cc:1535
 msgid "^FAQ"
 msgstr "^FAQ"
 
-#: src/ui.cc:1542
+#: src/ui.cc:1536
 msgid "View a list of frequently asked questions"
 msgstr "Bekijk een lijst van veel gestelde vragen"
 
-#: src/ui.cc:1545
+#: src/ui.cc:1539
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1546
+#: src/ui.cc:1540
 #, 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:1549
+#: src/ui.cc:1543
 msgid "^License"
 msgstr "^Licentie"
 
-#: src/ui.cc:1550
+#: src/ui.cc:1544
 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:1668
+#: src/ui.cc:1660
 msgid "Actions"
 msgstr "Acties"
 
-#: src/ui.cc:1671
+#: src/ui.cc:1663
 msgid "Search"
 msgstr "Zoek"
 
-#: src/ui.cc:1672
+#: src/ui.cc:1664
 msgid "Options"
 msgstr "Opties"
 
-#: src/ui.cc:1673
+#: src/ui.cc:1665
 msgid "Views"
 msgstr "Views"
 
-#: src/ui.cc:1674
+#: src/ui.cc:1666
 msgid "Help"
 msgstr "Help"
 
-#: src/ui.cc:1734
+#: src/ui.cc:1726
 #, c-format
 msgid ""
 "%s: Menu  %s: Help  %s: Quit  %s: Update  %s: Download/Install/Remove Pkgs"
@@ -4499,28 +4526,28 @@
 "%s: Menu  %s: Help  %s: Afsluiten  %s: Bijwerken  %s: Ophalen/Inst./Verw. "
 "Pakketten"
 
-#: src/ui.cc:2003 src/vscreen/vscreen.cc:281
+#: src/ui.cc:1996 src/vscreen/vscreen.cc:281
 msgid "yes_key"
 msgstr "ja-toets"
 
-#: src/ui.cc:2004 src/vscreen/vscreen.cc:282
+#: src/ui.cc:1997 src/vscreen/vscreen.cc:282
 msgid "no_key"
 msgstr "nee-toets"
 
-#: src/view_changelog.cc:46
+#: src/view_changelog.cc:61
 msgid "You can only view changelogs of official Debian packages."
 msgstr "U kunt enkel changelogs van officiële Debian-pakketten bekijken."
 
-#: src/view_changelog.cc:52
+#: src/view_changelog.cc:67
 msgid "Downloading Changelog"
 msgstr "Changelog ophalen"
 
-#: src/view_changelog.cc:54
+#: src/view_changelog.cc:69
 #, fuzzy
 msgid "Download Changelog"
 msgstr "Changelog ophalen"
 
-#: src/view_changelog.cc:63
+#: src/view_changelog.cc:78
 #, c-format
 msgid "%s changes"
 msgstr ""
@@ -4619,18 +4646,203 @@
 #~ "Steek de volgende schijf in het station \"%s\":\n"
 #~ "%s"
 
+#~ msgid "Need exactly two colors in color definition \"%s\""
+#~ msgstr "Heb exact twee kleuren nodig in kleurdefinitie \"%s\""
+
+#~ msgid "Can't parse foreground \"%s\"of color \"%s\""
+#~ msgstr "Kan voorgrond \"%s\" in kleur \"%s\" niet ontleden"
+
+#~ msgid "Can't parse background \"%s\" of color \"%s\""
+#~ msgstr "Kan achtergrond \"%s\" in kleur \"%s\" niet ontleden"
+
 #~ msgid "Invalid option for interactive mode: -s\n"
 #~ msgstr "Ongeldige optie voor interactieve modus: -s\n"
 
+#~ 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."
+#~ msgstr ""
+#~ "Programma's voor faxmodems en andere communicatietoestellen\n"
+#~ " Pakketten in de 'comm'-sectie worden gebruikt om modems en andere "
+#~ "communicatietoestellen te besturen. Dit is software om faxmodems te "
+#~ "besturen (bijvoorbeeld, PPP voor internetinbelverbindingen en programma's "
+#~ "origineel voor dat doel geschreven (zmodem/kermit), alsook software om "
+#~ "mobiele telefoons te besturen, steunen op FidoNet, en voeren een BBS uit."
+
+#~ 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"
+#~ " .\n"
+#~ " For more information about what Debian considers to be Free Software, "
+#~ "see http://www.debian.org/social_contract#guidelines"
+#~ msgstr ""
+#~ "Programma's die geen vrije software zijn\n"
+#~ " Pakketten in de 'non-free'-sectie zijn geen deel van Debian.\n"
+#~ " .\n"
+#~ " Deze pakketten slagen niet in één of meer vereisten van de Debian Free "
+#~ "Software Guidelines (zie hieronder). U zou best de licentie van de "
+#~ "programma's in deze sectie lezen om zeker te zijn dat u ze mag gebruiken "
+#~ "zoals u wenst.\n"
+#~ " .\n"
+#~ " Voor meer informatie over wat Debian denkt over Vrije Software, zie "
+#~ "http://www.debian.org/social_contract#guidelines"
+
+#~ 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)"
+#~ msgstr ""
+#~ "Nieuwe pakketten\n"
+#~ " Deze pakketen zijn toegevoegd aan Debian sinds de laatste keer dat u de "
+#~ "lijst van \"nieuwe\" pakketten opkuiste. (kies \"Vergeet nieuwe pakketten"
+#~ "\" van het actiemenu om deze lijst te ledigen)"
+
+#~ msgid ""
+#~ "%s is an essential package!\n"
+#~ "\n"
+#~ "Are you sure you want to remove it?\n"
+#~ "Type '%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."
+
+#~ msgid "Available versions of "
+#~ msgstr "Aanwezige versies van "
+
+#~ 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."
+#~ 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."
+
 #~ msgid "Information about "
 #~ msgstr "Informatie over "
 
+#~ msgid ""
+#~ "Aptitude %s\n"
+#~ "\n"
+#~ "Copyright 2000 Daniel Burrows.\n"
+#~ "\n"
+#~ "aptitude comes with ABSOLUTELY NO WARRANTY; for details see 'license' in "
+#~ "the\n"
+#~ "Help menu.  This is free software, and you are welcome to redistribute "
+#~ "it\n"
+#~ "under certain conditions; see 'license' for details."
+#~ msgstr ""
+#~ "Aptitude %s\n"
+#~ "\n"
+#~ "Copyright 2000 Daniel Burrows.\n"
+#~ "\n"
+#~ "aptitude komt met ABSOLUUT GEEN GARANTIE; voor details zie 'licentie' in "
+#~ "het\n"
+#~ "Help-menu. Dit is vrije software, en u bent vrij om het te verspreiden\n"
+#~ "onder zekere voorwaarden, zie 'licentie' voor details."
+
+#~ msgid "Some packages were broken and have been fixed"
+#~ msgstr "Enkele pakketten zijn beschadigd en zijn gerepareerd"
+
 #~ msgid "Some broken packages could not be fixed!"
 #~ msgstr "Enkele beschadigde pakketten konden niet gerepareerd worden!"
 
+#~ msgid "Some packages are broken.  Try to fix them?"
+#~ msgstr "Enkele pakketten zijn beschadigd. Proberen om ze te repareren?"
+
+#~ msgid ""
+#~ "Installing/removing packages requires administrative privileges, which\n"
+#~ "you currently do not have.  Would you like to change to the root "
+#~ "account?\n"
+#~ msgstr ""
+#~ "Installeren/verwijderen van pakketten vereist administratieve privileges, "
+#~ "die\n"
+#~ "u momenteel niet heeft. Wenst u te wijzigen naar de root-account?\n"
+
+#~ msgid ""
+#~ "No packages will be installed, removed or upgraded.\n"
+#~ "\n"
+#~ "Some packages could be upgraded, but you have not chosen to upgrade "
+#~ "them.\n"
+#~ "Type \"U\" to prepare an upgrade."
+#~ msgstr ""
+#~ "Er zullen geen pakketten worden geïnstalleerd, verwijderd of "
+#~ "opgewaardeerd.\n"
+#~ "\n"
+#~ "Enkele pakketten kunnen worden opgewaardeerd, maar u hebt niet gekozen om "
+#~ "ze\n"
+#~ "op te waarderen. Typ \"U\" om een opwaardering voor te bereiden."
+
+#~ 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"
+#~ msgstr ""
+#~ "Bijwerken van pakketlijsten vereist administratieve privileges, die\n"
+#~ "u momenteel niet heeft. Wenst u te wijzigen naar de root-account?\n"
+
+#~ msgid "Obsolete downloaded package files have been deleted"
+#~ msgstr "Verouderde opgehaalde pakketbestanden zijn verwijderd"
+
+#~ msgid ""
+#~ "Run 'su' to become root; this will restart the program, but your\n"
+#~ "settings will be preserved"
+#~ msgstr ""
+#~ "Voer 'su' uit om root te worden; dit zal het programma herstarten, maar "
+#~ "uw\n"
+#~ "instellingen zullen bewaard blijven."
+
+#~ msgid ""
+#~ "Mark the selected package as having been automatically installed;\n"
+#~ "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"
+
+#~ msgid ""
+#~ "Mark the selected package as having been manually installed;\n"
+#~ "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"
+
+#~ msgid ""
+#~ "Forbid the candidate version of the selected package from being "
+#~ "installed;\n"
+#~ "newer versions of the package will be installed as usual"
+#~ msgstr ""
+#~ "Verbied de installatie van de kandidaat versie van het geselecteerde "
+#~ "pakket;\n"
+#~ "nieuwere versies van het pakket zullen zoals gebruikelijk worden "
+#~ "geïnstalleerd"
+
 #~ msgid "^ChangeLog"
 #~ msgstr "^ChangeLog"
 
+#~ msgid "View the important changes made in each version of the program"
+#~ msgstr ""
+#~ "Bekijk de belangrijke gemaakte wijzigingen in elke versie van het "
+#~ "programma"
+
+#~ msgid "Should I go ahead and install the packages anyway?\n"
+#~ msgstr "De pakketten toch installeren?\n"
+
 #~ msgid "Go away, I'm trying to think.\n"
 #~ msgstr "Deixeu-me tranquil, estic intentant pensar.\n"
 
@@ -4675,7 +4887,7 @@
 
 #, fuzzy
 #~ msgid "Description of "
-#~ msgstr "Beschrijving:"
+#~ msgstr "Beschrijving: "
 
 #, fuzzy
 #~ msgid " -S fname: read the aptitude extended status info from fname.\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	Sun Jun 12 21:04:47 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-05-01 14:08-0400\n"
+"POT-Creation-Date: 2005-06-12 22:42+0200\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"
@@ -155,14 +155,14 @@
 msgid "Automatically remove unused packages matching this filter"
 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:219 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
-#: src/vscreen/vs_util.cc:328
+#: src/apt_options.cc:240 src/mine/cmine.cc:249 src/mine/cmine.cc:312
+#: src/ui.cc:215 src/vscreen/vs_util.cc:77 src/vscreen/vs_util.cc:90
+#: src/vscreen/vs_util.cc:264 src/vscreen/vs_util.cc:298
 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:328
+#: src/apt_options.cc:241 src/download_list.cc:69 src/mine/cmine.cc:250
+#: src/mine/cmine.cc:313 src/vscreen/vs_util.cc:298
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -243,15 +243,15 @@
 msgid "%s: Previous"
 msgstr ""
 
-#: src/broken_indicator.cc:233
+#: src/broken_indicator.cc:232
 #, c-format
-msgid "%CSolution search failed.  %s: try harder"
+msgid "Solution search failed.  %s: try harder"
 msgstr ""
 
-#: src/broken_indicator.cc:239
-#, c-format
-msgid "%CUnable to resolve dependencies."
-msgstr ""
+#: src/broken_indicator.cc:237
+#, fuzzy
+msgid "Unable to resolve dependencies."
+msgstr "Klarer ikkje opna %s for å skriva til ho"
 
 #: src/cmdline/cmdline_action.cc:36
 #, c-format
@@ -623,13 +623,13 @@
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
-#: src/vscreen/vs_util.cc:212
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:165
+#: src/vscreen/vs_util.cc:202
 msgid "Yes"
 msgstr "Ja"
 
-#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
-#: src/vscreen/vs_util.cc:212
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:165
+#: src/vscreen/vs_util.cc:202
 msgid "No"
 msgstr "Nei"
 
@@ -939,7 +939,7 @@
 msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:212
+#: src/cmdline/cmdline_resolver.cc:212 src/cmdline/cmdline_resolver.cc:285
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
@@ -994,196 +994,201 @@
 msgid "The following packages have unmet dependencies:\n"
 msgstr "Desse pakkane hadde utilfredsstilte pakkekrav:\n"
 
-#: src/cmdline/cmdline_show.cc:133
+#: src/cmdline/cmdline_show.cc:119 src/cmdline/cmdline_show.cc:305
+#: src/solution_fragment.cc:65
+msgid "<NULL>"
+msgstr ""
+
+#: src/cmdline/cmdline_show.cc:138
 msgid "not installed"
 msgstr "ikkje installert"
 
-#: src/cmdline/cmdline_show.cc:135 src/pkg_columnizer.cc:231
+#: src/cmdline/cmdline_show.cc:140 src/pkg_columnizer.cc:231
 #: src/pkg_ver_item.cc:225
 msgid "unpacked"
 msgstr "ikkje-pakka"
 
-#: src/cmdline/cmdline_show.cc:137
+#: src/cmdline/cmdline_show.cc:142
 msgid "partially configured"
 msgstr "delvis sett opp"
 
-#: src/cmdline/cmdline_show.cc:139
+#: src/cmdline/cmdline_show.cc:144
 msgid "partially installed"
 msgstr "delvis installert"
 
-#: src/cmdline/cmdline_show.cc:141
+#: src/cmdline/cmdline_show.cc:146
 msgid "not installed (configuration files remain)"
 msgstr "ikkje installert (oppsettsfiler gjenstår)"
 
-#: src/cmdline/cmdline_show.cc:143 src/pkg_columnizer.cc:239
+#: src/cmdline/cmdline_show.cc:148 src/pkg_columnizer.cc:239
 #: src/pkg_ver_item.cc:233
 msgid "installed"
 msgstr "installert"
 
-#: src/cmdline/cmdline_show.cc:152
+#: src/cmdline/cmdline_show.cc:157
 msgid "not a real package"
 msgstr "ikkje ein verkeleg pakke"
 
-#: src/cmdline/cmdline_show.cc:165
+#: src/cmdline/cmdline_show.cc:170
 msgid " [held]"
 msgstr " [hald]"
 
-#: src/cmdline/cmdline_show.cc:174
+#: src/cmdline/cmdline_show.cc:179
 #, c-format
 msgid "%s; version %s will be installed"
 msgstr "%s; versjon %s vil bli installert"
 
-#: src/cmdline/cmdline_show.cc:178
+#: src/cmdline/cmdline_show.cc:183
 #, c-format
 msgid "%s; version %s will be installed automatically"
 msgstr "%s; versjon %s vil bli installert automatisk"
 
-#: src/cmdline/cmdline_show.cc:184 src/cmdline/cmdline_show.cc:199
+#: src/cmdline/cmdline_show.cc:189 src/cmdline/cmdline_show.cc:204
 #, c-format
 msgid "%s; will be purged"
 msgstr "%s; vil bli fjerna og sletta"
 
-#: src/cmdline/cmdline_show.cc:197
+#: src/cmdline/cmdline_show.cc:202
 #, c-format
 msgid "%s; will be purged because nothing depends on it"
 msgstr "%s; vil bli fjerna og sletta sidan ingen pakkar har trong for han"
 
-#: src/cmdline/cmdline_show.cc:204
+#: src/cmdline/cmdline_show.cc:209
 #, c-format
 msgid "%s; will be removed because nothing depends on it"
 msgstr "%s; vil bli fjerna sidan ingen pakkar har trong for han"
 
-#: src/cmdline/cmdline_show.cc:206
+#: src/cmdline/cmdline_show.cc:211
 #, c-format
 msgid "%s; will be removed"
 msgstr "%s; vil bli fjerna"
 
-#: src/cmdline/cmdline_show.cc:220
+#: src/cmdline/cmdline_show.cc:225
 #, c-format
 msgid "%s%s; will be downgraded [%s -> %s]"
 msgstr "%s%s; vil bli nedgradert [%s -> %s]"
 
-#: src/cmdline/cmdline_show.cc:223
+#: src/cmdline/cmdline_show.cc:228
 #, c-format
 msgid "%s%s; will be upgraded [%s -> %s]"
 msgstr "%s%s; vil bli oppgradert [%s -> %s]"
 
-#: src/cmdline/cmdline_show.cc:235 src/cmdline/cmdline_show.cc:256
+#: src/cmdline/cmdline_show.cc:240 src/cmdline/cmdline_show.cc:261
 msgid "Package: "
 msgstr "Pakke: "
 
-#: src/cmdline/cmdline_show.cc:236 src/cmdline/cmdline_show.cc:264
+#: src/cmdline/cmdline_show.cc:241 src/cmdline/cmdline_show.cc:269
 #: src/pkg_columnizer.cc:87
 msgid "State"
 msgstr "Tilstand"
 
-#: src/cmdline/cmdline_show.cc:237 src/cmdline/cmdline_show.cc:318
+#: src/cmdline/cmdline_show.cc:242 src/cmdline/cmdline_show.cc:325
 msgid "Provided by"
 msgstr "Skaffa av"
 
-#: src/cmdline/cmdline_show.cc:258 src/pkg_info_screen.cc:105
+#: src/cmdline/cmdline_show.cc:263 src/pkg_info_screen.cc:105
 msgid "Essential: "
 msgstr "Vesentleg: "
 
-#: src/cmdline/cmdline_show.cc:258 src/cmdline/cmdline_show.cc:262
-#: src/cmdline/cmdline_show.cc:273 src/pkg_info_screen.cc:105
+#: src/cmdline/cmdline_show.cc:263 src/cmdline/cmdline_show.cc:267
+#: src/cmdline/cmdline_show.cc:278 src/pkg_info_screen.cc:105
 msgid "yes"
 msgstr "ja"
 
-#: src/cmdline/cmdline_show.cc:262
+#: src/cmdline/cmdline_show.cc:267
 msgid "New"
 msgstr "Ny"
 
-#: src/cmdline/cmdline_show.cc:267
+#: src/cmdline/cmdline_show.cc:272
 msgid "Forbidden version"
 msgstr "Forboden versjon"
 
-#: src/cmdline/cmdline_show.cc:271
+#: src/cmdline/cmdline_show.cc:276
 msgid "Automatically installed"
 msgstr "Automatisk installert"
 
-#: src/cmdline/cmdline_show.cc:273
+#: src/cmdline/cmdline_show.cc:278
 msgid "no"
 msgstr "ingen"
 
-#: src/cmdline/cmdline_show.cc:275
+#: src/cmdline/cmdline_show.cc:280
 msgid "Version: "
 msgstr "Versjon: "
 
-#: src/cmdline/cmdline_show.cc:276 src/pkg_info_screen.cc:113
+#: src/cmdline/cmdline_show.cc:281 src/pkg_info_screen.cc:113
 msgid "Priority: "
 msgstr "Prioritet: "
 
-#: src/cmdline/cmdline_show.cc:277 src/cmdline/cmdline_show.cc:279
-#: src/cmdline/cmdline_show.cc:288
+#: src/cmdline/cmdline_show.cc:282 src/cmdline/cmdline_show.cc:284
+#: src/cmdline/cmdline_show.cc:293
 msgid "N/A"
 msgstr "I/T"
 
-#: src/cmdline/cmdline_show.cc:278 src/pkg_info_screen.cc:114
+#: src/cmdline/cmdline_show.cc:283 src/pkg_info_screen.cc:114
 msgid "Section: "
 msgstr "Seksjon: "
 
-#: src/cmdline/cmdline_show.cc:280 src/pkg_info_screen.cc:115
+#: src/cmdline/cmdline_show.cc:285 src/pkg_info_screen.cc:115
 msgid "Maintainer: "
 msgstr "Vedlikehaldar: "
 
-#: src/cmdline/cmdline_show.cc:283
+#: src/cmdline/cmdline_show.cc:288
 msgid "Uncompressed Size: "
 msgstr "Ukomprimert storleik: "
 
-#: src/cmdline/cmdline_show.cc:287
+#: src/cmdline/cmdline_show.cc:292
 msgid "Architecture: "
 msgstr "Arkitektur: "
 
-#: src/cmdline/cmdline_show.cc:289
+#: src/cmdline/cmdline_show.cc:294
 msgid "Compressed Size: "
 msgstr "Komprimert storleik: "
 
-#: src/cmdline/cmdline_show.cc:291
+#: src/cmdline/cmdline_show.cc:296
 msgid "Filename: "
 msgstr "Filnamn: "
 
-#: src/cmdline/cmdline_show.cc:293
+#: src/cmdline/cmdline_show.cc:298
 msgid "MD5sum: "
 msgstr "MD5sum: "
 
-#: src/cmdline/cmdline_show.cc:297 src/cmdline/cmdline_show.cc:299
+#: src/cmdline/cmdline_show.cc:302 src/cmdline/cmdline_show.cc:305
 msgid "Archive"
 msgstr "Arkiv"
 
-#: src/cmdline/cmdline_show.cc:303
+#: src/cmdline/cmdline_show.cc:310
 msgid "Depends"
 msgstr "Krav"
 
-#: src/cmdline/cmdline_show.cc:305
+#: src/cmdline/cmdline_show.cc:312
 msgid "PreDepends"
 msgstr "Forkrav"
 
-#: src/cmdline/cmdline_show.cc:307
+#: src/cmdline/cmdline_show.cc:314
 msgid "Recommends"
 msgstr "Tilrådingar"
 
-#: src/cmdline/cmdline_show.cc:309
+#: src/cmdline/cmdline_show.cc:316
 msgid "Suggests"
 msgstr "Forslag"
 
-#: src/cmdline/cmdline_show.cc:311
+#: src/cmdline/cmdline_show.cc:318
 msgid "Conflicts"
 msgstr "Konfliktar"
 
-#: src/cmdline/cmdline_show.cc:313
+#: src/cmdline/cmdline_show.cc:320
 msgid "Replaces"
 msgstr "Byter ut"
 
-#: src/cmdline/cmdline_show.cc:315
+#: src/cmdline/cmdline_show.cc:322
 msgid "Obsoletes"
 msgstr "Foreldar"
 
-#: src/cmdline/cmdline_show.cc:317
+#: src/cmdline/cmdline_show.cc:324
 msgid "Provides"
 msgstr "Skaffar"
 
-#: src/cmdline/cmdline_show.cc:321 src/pkg_info_screen.cc:97
+#: src/cmdline/cmdline_show.cc:328 src/pkg_info_screen.cc:97
 msgid "Description: "
 msgstr "Skildring: "
 
@@ -1226,32 +1231,32 @@
 msgid "You cannot specify both an archive and a version for a package\n"
 msgstr "Du kan ikkje oppgje både eit arkiv og ein versjon for ein pakke\n"
 
-#: src/dep_item.cc:137
+#: src/dep_item.cc:139
 msgid "UNSATISFIED"
 msgstr "IKKJE TILFREDSSTILT"
 
-#: src/dep_item.cc:137 src/reason_fragment.cc:247
+#: src/dep_item.cc:139 src/reason_fragment.cc:244
 msgid "UNAVAILABLE"
 msgstr "IKKJE TILGJENGELEG"
 
-#: src/download_bar.cc:56 src/download_list.cc:263 src/download_screen.cc:57
+#: src/download_bar.cc:56 src/download_list.cc:266 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_bar.cc:77 src/generic/acqprogress.cc:63
+#: src/download_bar.cc:75 src/generic/acqprogress.cc:63
 msgid "Hit "
 msgstr "Treff "
 
-#: src/download_bar.cc:90
+#: src/download_bar.cc:88
 msgid "Downloading "
 msgstr "Lastar ned "
 
-#: src/download_bar.cc:103
+#: src/download_bar.cc:101
 msgid "Got "
 msgstr "Fekk "
 
-#: src/download_bar.cc:157
+#: src/download_bar.cc:155
 msgid "Downloading..."
 msgstr "Lastar ned ..."
 
@@ -1279,7 +1284,7 @@
 msgid "Couldn't clean out list directories"
 msgstr "Klarte ikkje reinska ut listekatalogane"
 
-#: src/download.cc:177 src/ui.cc:1153
+#: src/download.cc:177 src/ui.cc:1147
 msgid "Deleting obsolete downloaded files"
 msgstr "Slettar nedlasta filer som er forelda"
 
@@ -1418,7 +1423,7 @@
 msgstr ""
 "Uff! Noko gjekk gale under installasjonen av pakkar. Prøver å gjenskape."
 
-#: src/download.cc:477 src/pkg_item.cc:432
+#: src/download.cc:477 src/pkg_item.cc:430
 msgid "Press return to continue.\n"
 msgstr "Trykk enter for å halda fram.\n"
 
@@ -1429,17 +1434,17 @@
 "Klarte ikkje ta tilbake symbollåsen! (Kanskje ein anna apt eller dpkg "
 "køyrer?)"
 
-#: src/download_item.cc:66 src/download_item.cc:70 src/download_item.cc:100
+#: src/download_item.cc:70 src/download_item.cc:74 src/download_item.cc:104
 #: src/generic/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr " [Arbeider]"
 
-#: src/download_item.cc:104 src/download_list.cc:283
+#: src/download_item.cc:108 src/download_list.cc:284
 msgid "[Hit]"
 msgstr "[Treff]"
 
-#: src/download_item.cc:104 src/download_list.cc:303
+#: src/download_item.cc:108 src/download_list.cc:304
 msgid "[Downloaded]"
 msgstr "[Nedlasta]"
 
@@ -1453,34 +1458,34 @@
 msgid "%n%nSome files were not downloaded successfully."
 msgstr ""
 
-#: src/download_list.cc:68
+#: src/download_list.cc:66
 msgid "Continue"
 msgstr "Hald fram"
 
-#: src/download_list.cc:175 src/download_screen.cc:203
+#: src/download_list.cc:178 src/download_screen.cc:203
 msgid "Total Progress: "
 msgstr "Totalt utført: "
 
-#: src/download_list.cc:194 src/download_screen.cc:218
+#: src/download_list.cc:197 src/download_screen.cc:218
 #, c-format
 msgid " [ %i%% ] (%sB/s, %s remaining)"
 msgstr " [ %i%% ] (%sB/s, %s igjen)"
 
-#: src/download_list.cc:196
+#: src/download_list.cc:199
 #, c-format
 msgid " [ %i%% ] (stalled)"
 msgstr " [ %i%% ] (stoppa)"
 
-#: src/download_list.cc:198
+#: src/download_list.cc:201
 #, c-format
 msgid " [ %i%% ]"
 msgstr " [ %i%% ]"
 
-#: src/download_list.cc:323
+#: src/download_list.cc:324
 msgid "[IGNORED]"
 msgstr "[IGNORERT]"
 
-#: src/download_list.cc:329
+#: src/download_list.cc:330
 msgid "[ERROR]"
 msgstr "[FEIL]"
 
@@ -1489,11 +1494,11 @@
 msgid "Downloaded %sB in %ss (%sB/s)."
 msgstr "Lasta ned %sB på %ss (%sB/s)."
 
-#: src/edit_pkg_hier.cc:158
+#: src/edit_pkg_hier.cc:176
 msgid "No hierarchy information to edit"
 msgstr "Ingen hierarkiinformasjon å redigera"
 
-#: src/edit_pkg_hier.cc:258
+#: src/edit_pkg_hier.cc:276
 msgid "Couldn't open for writing"
 msgstr "Klarte ikkje opna for skriving"
 
@@ -1588,39 +1593,39 @@
 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:797
+#: src/generic/matchers.cc:798
 msgid "Unmatched '('"
 msgstr "Passa ikkje «(»"
 
-#: src/generic/matchers.cc:887 src/generic/matchers.cc:968
+#: src/generic/matchers.cc:888 src/generic/matchers.cc:969
 #, c-format
 msgid "Unknown dependency type: %s"
 msgstr "Ukjend kravtype: %s"
 
-#: src/generic/matchers.cc:950
+#: src/generic/matchers.cc:951
 #, c-format
 msgid "Unknown action type: %s"
 msgstr "Ukjent handlingstype: %s"
 
-#: src/generic/matchers.cc:1017
+#: src/generic/matchers.cc:1018
 #, c-format
 msgid "Unknown priority %s"
 msgstr "Ukjent prioritet %s"
 
-#: src/generic/matchers.cc:1039
+#: src/generic/matchers.cc:1040
 #, c-format
 msgid "Unknown pattern type: %c"
 msgstr "Ukjent mønstertype: %c"
 
-#: src/generic/matchers.cc:1084
+#: src/generic/matchers.cc:1105
 msgid "Unexpected empty expression"
 msgstr "Uventa tomt uttrykk"
 
-#: src/generic/matchers.cc:1119
+#: src/generic/matchers.cc:1143
 msgid "Badly formed expression"
 msgstr "DÃ¥rleg utforma uttrykk"
 
-#: src/generic/matchers.cc:1148
+#: src/generic/matchers.cc:1175
 msgid "Unexpected ')'"
 msgstr "Uventa «)»"
 
@@ -1644,7 +1649,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:61
+#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:76
 #, c-format
 msgid "ChangeLog of %s"
 msgstr "Endringslogg for %s"
@@ -1686,37 +1691,37 @@
 msgid "Reading task descriptions"
 msgstr "Les oppgåveskildringar"
 
-#: src/load_config.cc:30
-#, c-format
-msgid "Invalid entry in color definition group: \"%s\""
-msgstr "Ugyldig oppføring i gruppa for fargedefinisjon: «%s»"
+#: src/load_config.cc:42
+#, fuzzy, c-format
+msgid "Unrecognized color name \"%s\""
+msgstr "Ikkje gjenkjende oppgåver"
 
-#: src/load_config.cc:32
-#, c-format
-msgid "Invalid tagless entry in color definition group: \"%s\""
-msgstr "Ugyldig oppføring utan tagg i gruppa for fargedefinisjon «%s»"
+#: src/load_config.cc:69
+#, fuzzy, c-format
+msgid "Unrecognized attribute name \"%s\""
+msgstr "Ikkje gjenkjende oppgåver"
 
-#: src/load_config.cc:34
-#, c-format
-msgid "Need exactly two colors in color definition \"%s\""
-msgstr "Treng nøyaktig to fargar i fargedefinisjon «%s»"
+#: src/load_config.cc:106
+#, fuzzy, c-format
+msgid "Invalid entry in style definition group: \"%s\""
+msgstr "Ugyldig oppføring i gruppa for fargedefinisjon: «%s»"
 
-#: src/load_config.cc:50
-#, c-format
-msgid "Can't parse foreground \"%s\"of color \"%s\""
-msgstr "Klarer ikkje tolka forgrunnsfargen «%s» til fargen «%s»"
+#: src/load_config.cc:108
+#, fuzzy, c-format
+msgid "Invalid tagless entry in style definition group: \"%s\""
+msgstr "Ugyldig oppføring utan tagg i gruppa for fargedefinisjon «%s»"
 
-#: src/load_config.cc:53
-#, c-format
-msgid "Can't parse background \"%s\" of color \"%s\""
-msgstr "Klarer ikkje tolka bakgrunnsfargen «%s» til fargen «%s»"
+#: src/load_config.cc:130
+#, fuzzy, c-format
+msgid "Unknown style attribute %s"
+msgstr "Ukjent handlingstype: %s"
 
-#: src/load_config.cc:72 src/load_config.cc:74
+#: src/load_config.cc:153 src/load_config.cc:155
 #, c-format
 msgid "Invalid entry in keybinding group: \"%s\""
 msgstr "Ugyldig oppføring i gruppa med tastebindingar: «%s»"
 
-#: src/load_config.cc:89
+#: src/load_config.cc:170
 #, c-format
 msgid "Ignoring invalid keybinding \"%s\" -> \"%s\""
 msgstr "Ignorerer ugyldige tastebindingar «%s» -> «%s»"
@@ -2128,43 +2133,43 @@
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                  Denne aptituden har ikkje Super Cow Powers.\n"
 
-#: src/main.cc:255
+#: src/main.cc:252
 #, 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:301 src/main.cc:310
+#: src/main.cc:291 src/main.cc:300
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr "MERKJELEG: mottok ein ukjent valkode\n"
 
-#: src/main.cc:319
+#: src/main.cc:309
 msgid "Only one of -u and -i may be specified\n"
 msgstr "Berre ein av -u og -i kan oppgjevast\n"
 
-#: src/main.cc:327
+#: src/main.cc:317
 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:348
+#: src/main.cc:338
 msgid "-u and -i may not be specified with a command"
 msgstr "-u og -i kan ikkje oppgjevast med ein kommando"
 
-#: src/main.cc:405
+#: src/main.cc:395
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr "Ukjent kommando «%s»\n"
 
-#: src/main.cc:412 src/main.cc:469
+#: src/main.cc:402 src/main.cc:450
 msgid "Internal error: uncaught 'out of solutions' exception.\n"
 msgstr ""
 
-#: src/main.cc:417 src/main.cc:474
+#: src/main.cc:407 src/main.cc:455
 msgid "Internal error: uncaught 'out of time' exception.\n"
 msgstr ""
 
-#: src/main.cc:424
+#: src/main.cc:414
 #, c-format
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
@@ -2195,7 +2200,7 @@
 msgid "Lost"
 msgstr "Tapt"
 
-#: src/mine/cmine.cc:119 src/ui.cc:1090
+#: src/mine/cmine.cc:119 src/ui.cc:1084
 msgid "Minesweeper"
 msgstr "Minesveiper"
 
@@ -2221,93 +2226,93 @@
 msgid "The number of mines must be a number"
 msgstr "Talet på miner må vera eit tal"
 
-#: src/mine/cmine.cc:240
+#: src/mine/cmine.cc:238
 msgid "Setup custom game"
 msgstr "Set opp eit tilpassa spel"
 
-#: src/mine/cmine.cc:243
+#: src/mine/cmine.cc:240
 msgid "Height of board: "
 msgstr "Høgda på brettet: "
 
-#: src/mine/cmine.cc:247
+#: src/mine/cmine.cc:243
 msgid "Width of board: "
 msgstr "Breidda på brettet: "
 
-#: src/mine/cmine.cc:251
+#: src/mine/cmine.cc:246
 msgid "Number of mines: "
 msgstr "Tal på miner: "
 
-#: src/mine/cmine.cc:316
+#: src/mine/cmine.cc:305
 msgid "Choose difficulty level"
 msgstr "Vel vanskegrad"
 
-#: src/mine/cmine.cc:318
+#: src/mine/cmine.cc:307
 msgid "Easy"
 msgstr "Lett"
 
-#: src/mine/cmine.cc:319
+#: src/mine/cmine.cc:308
 msgid "Medium"
 msgstr "Middels"
 
-#: src/mine/cmine.cc:320
+#: src/mine/cmine.cc:309
 msgid "Hard"
 msgstr "Vanskeleg"
 
-#: src/mine/cmine.cc:321
+#: src/mine/cmine.cc:310
 msgid "Custom"
 msgstr "Tilpassa"
 
-#: src/mine/cmine.cc:411
+#: src/mine/cmine.cc:392
 msgid "You have won."
 msgstr "Du har vunne."
 
-#: src/mine/cmine.cc:414
+#: src/mine/cmine.cc:395
 msgid "You lose!"
 msgstr "Du tapte!"
 
-#: src/mine/cmine.cc:419
+#: src/mine/cmine.cc:400
 msgid "You die...  --More--"
 msgstr "Du dør ...  --Meir--"
 
-#: src/mine/cmine.cc:432
+#: src/mine/cmine.cc:413
 msgid "The spikes were poisoned!  The poison was deadly..  --More--"
 msgstr "Spyda var forgifta!  Gifta var dødeleg ...  --Meir--"
 
-#: src/mine/cmine.cc:435
+#: src/mine/cmine.cc:416
 msgid "You land on a set of sharp iron spikes!  --More--"
 msgstr "Du landa på nokre skarpe jernspyd!  --Meir--"
 
-#: src/mine/cmine.cc:438
+#: src/mine/cmine.cc:419
 msgid "You fall into a pit!  --More--"
 msgstr "Du datt ned i eit hol!  --Meir--"
 
-#: src/mine/cmine.cc:441
+#: src/mine/cmine.cc:422
 msgid "KABOOM!  You step on a land mine.  --More--"
 msgstr "KABOOM!  Du trakka på ei landmine.  --Meir--"
 
-#: src/mine/cmine.cc:446
+#: src/mine/cmine.cc:427
 msgid "The dart was poisoned!  The poison was deadly...  --More--"
 msgstr "Pila var forgifta!  Gifta var dødeleg ...  --Meir--"
 
-#: src/mine/cmine.cc:448
+#: src/mine/cmine.cc:429
 msgid ""
 "A little dart shoots out at you!  You are hit by a little dart!  --More--"
 msgstr "Ei lita pil skyt i mot deg!  Du bli treft av den vesle pila!  --Meir--"
 
-#: src/mine/cmine.cc:452
+#: src/mine/cmine.cc:433
 msgid "You turn to stone... --More--"
 msgstr "Du blir til stein ...  --Meir--"
 
-#: src/mine/cmine.cc:454
+#: src/mine/cmine.cc:435
 msgid "Touching the cockatrice corpse was a fatal mistake.  --More--"
 msgstr ""
 "Det var ein dødeleg feil å ta borti kadaveret til basilisken.  --Meir--"
 
-#: src/mine/cmine.cc:456
+#: src/mine/cmine.cc:437
 msgid "You feel here a cockatrice corpse.  --More--"
 msgstr "Her kan du kjenne kadaveret til ein basilisk.  --Meir--"
 
-#: src/mine/cmine.cc:460
+#: src/mine/cmine.cc:441
 msgid ""
 "Click!  You trigger a rolling boulder trap!  You are hit by a boulder! --"
 "More--"
@@ -2315,56 +2320,56 @@
 "Klikk!  Du utløyste ein rullande kampestein! Du blir truffe av den store "
 "steinen! --Meir--"
 
-#: src/mine/cmine.cc:470
+#: src/mine/cmine.cc:451
 msgid "sleep"
 msgstr "sove"
 
-#: src/mine/cmine.cc:473
+#: src/mine/cmine.cc:454
 msgid "striking"
 msgstr "angrep"
 
-#: src/mine/cmine.cc:476
+#: src/mine/cmine.cc:457
 msgid "death"
 msgstr "død"
 
-#: src/mine/cmine.cc:479
+#: src/mine/cmine.cc:460
 msgid "polymorph"
 msgstr "mangeforma"
 
-#: src/mine/cmine.cc:482
+#: src/mine/cmine.cc:463
 msgid "magic missile"
 msgstr "magisk missil"
 
-#: src/mine/cmine.cc:485
+#: src/mine/cmine.cc:466
 msgid "secret door detection"
 msgstr "oppdaging av hemmelege dører"
 
-#: src/mine/cmine.cc:488
+#: src/mine/cmine.cc:469
 msgid "invisibility"
 msgstr "usynleg"
 
-#: src/mine/cmine.cc:491
+#: src/mine/cmine.cc:472
 msgid "cold"
 msgstr "kald"
 
-#: src/mine/cmine.cc:497
+#: src/mine/cmine.cc:478
 #, c-format
 msgid "Your wand of %s breaks apart and explodes!  --More--"
 msgstr "Tryllestaven din frå %s går i stykker og eksploderer!  --Meir--"
 
-#: src/mine/cmine.cc:503
+#: src/mine/cmine.cc:484
 msgid "You are jolted by a surge of electricity!  --More--"
 msgstr "Du får eit elektrisk støt!  --Meir--"
 
-#: src/mine/cmine.cc:607
+#: src/mine/cmine.cc:588
 msgid "Enter the filename to load: "
 msgstr "Skriv inn namnet på fila som skal lastast: "
 
-#: src/mine/cmine.cc:614
+#: src/mine/cmine.cc:595
 msgid "Enter the filename to save: "
 msgstr "Skriv inn namnet på fila som skal lagrast: "
 
-#: src/mine/cmine.cc:624
+#: src/mine/cmine.cc:605
 msgid "mine-help.txt"
 msgstr "mine-hjelp.txt"
 
@@ -2372,7 +2377,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:1670
+#: src/pkg_columnizer.cc:84 src/ui.cc:1662
 msgid "Package"
 msgstr "Pakke"
 
@@ -3435,52 +3440,52 @@
 "Er du sikker på at du vil gjerna han?\n"
 "Skriv «%s» viss du er det."
 
-#: src/pkg_item.cc:222 src/pkg_ver_item.cc:625
+#: src/pkg_item.cc:220 src/pkg_ver_item.cc:626
 #, c-format
 msgid "Information about %s"
 msgstr "Informasjon om %s"
 
-#: src/pkg_item.cc:224 src/pkg_ver_item.cc:627
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:628
 #, c-format
 msgid "%s info"
 msgstr ""
 
-#: src/pkg_item.cc:310
+#: src/pkg_item.cc:308
 #, fuzzy, c-format
 msgid "Available versions of %s"
 msgstr "Tilgjengelege versjonar av "
 
-#: src/pkg_item.cc:313
+#: src/pkg_item.cc:311
 #, fuzzy, c-format
 msgid "%s versions"
 msgstr "Versjonar"
 
-#: src/pkg_item.cc:325 src/pkg_ver_item.cc:655
+#: src/pkg_item.cc:323 src/pkg_ver_item.cc:656
 #, c-format
 msgid "Dependencies of %s"
 msgstr "Pakkekrav for %s"
 
-#: src/pkg_item.cc:327 src/pkg_ver_item.cc:657
+#: src/pkg_item.cc:325 src/pkg_ver_item.cc:658
 #, c-format
 msgid "%s deps"
 msgstr ""
 
-#: src/pkg_item.cc:338 src/pkg_ver_item.cc:667
+#: src/pkg_item.cc:336 src/pkg_ver_item.cc:668
 #, c-format
 msgid "Packages depending on %s"
 msgstr "Pakkar som krev %s"
 
-#: src/pkg_item.cc:340 src/pkg_ver_item.cc:669
+#: src/pkg_item.cc:338 src/pkg_ver_item.cc:670
 #, c-format
 msgid "%s reverse deps"
 msgstr ""
 
-#: src/pkg_item.cc:392 src/pkg_ver_item.cc:707
+#: src/pkg_item.cc:390 src/pkg_ver_item.cc:708
 #, c-format
 msgid "Reporting a bug in %s:\n"
 msgstr "Rapporterer ein feil i %s:\n"
 
-#: src/pkg_item.cc:414
+#: src/pkg_item.cc:412
 #, fuzzy
 msgid ""
 "You are not root and I cannot find any way to become root.  To reconfigure "
@@ -3492,16 +3497,16 @@
 "eller køyr aptitude som root for å setja opp\n"
 "denne pakken på ny."
 
-#: src/pkg_item.cc:422
+#: src/pkg_item.cc:420
 #, c-format
 msgid "Reconfiguring %s\n"
 msgstr "Set opp %s på ny\n"
 
-#: src/pkg_item.cc:447
+#: src/pkg_item.cc:445
 msgid "Hierarchy editor"
 msgstr "Hierarkisk redigering"
 
-#: src/pkg_item.cc:447
+#: src/pkg_item.cc:445
 #, fuzzy
 msgid "Hierarchy Editor"
 msgstr "Hierarkisk redigering"
@@ -3535,21 +3540,21 @@
 msgid "Enter the new package sorting mechanism for this display: "
 msgstr "Oppgje den nye mekansimen for pakkesortering for denne visinga: "
 
-#: src/pkg_view.cc:344
+#: src/pkg_view.cc:359
 msgid "make_package_view: error in arguments -- two main widgets??"
 msgstr "make_package_view: feil i argument -- to hovudelement?"
 
-#: src/pkg_view.cc:350
+#: src/pkg_view.cc:365
 msgid ""
 "make_package_view: error in arguments -- bad column list for static item"
 msgstr ""
 "make_package_view: feil i argument -- dårleg kolonneliste for statisk element"
 
-#: src/pkg_view.cc:443
+#: src/pkg_view.cc:458
 msgid "make_package_view: bad argument!"
 msgstr "make_package_view: dårleg argument!"
 
-#: src/pkg_view.cc:495
+#: src/pkg_view.cc:510
 msgid "make_package_view: no main widget found"
 msgstr "make_package_view: fann ingen hovudelement"
 
@@ -3586,19 +3591,19 @@
 msgid " (provided by %F)"
 msgstr " (skaffa til vege av %F)"
 
-#: src/reason_fragment.cc:278
+#: src/reason_fragment.cc:275
 #, c-format
 msgid "%F%s %F %F"
 msgstr "%F%s %F %F"
 
-#: src/reason_fragment.cc:327
+#: src/reason_fragment.cc:324
 msgid ""
 "If you select a package, an explanation of its current state will appear in "
 "this space."
 msgstr ""
 "Viss du vel ein pakke vil ei forklaring på tilstanden til pakka koma her."
 
-#: src/reason_fragment.cc:361
+#: src/reason_fragment.cc:358
 msgid ""
 "%B%s%b was installed automatically;  it is being removed because all of the "
 "packages which depend upon it are being removed:"
@@ -3606,17 +3611,17 @@
 "%B%s%b blei installert automatisk; han blir fjerna fordi alle pakkane som "
 "krev denne pakken er/blir fjerna:"
 
-#: src/reason_fragment.cc:365
+#: src/reason_fragment.cc:362
 msgid "%B%s%b will be automatically removed because of dependency errors:"
 msgstr "%B%s%b vil bli fjerna automatisk på grunn av feil med pakkekrava:"
 
-#: src/reason_fragment.cc:369
+#: src/reason_fragment.cc:366
 msgid ""
 "%B%s%b will be automatically installed to satisfy the following dependencies:"
 msgstr ""
 "%B%s%b vil bli installert automatisk for å tilfredsstilla desse pakkekrava:"
 
-#: src/reason_fragment.cc:375 src/reason_fragment.cc:387
+#: src/reason_fragment.cc:372 src/reason_fragment.cc:384
 msgid ""
 "%B%s%b cannot be upgraded now, but if it could be, it would still be held at "
 "version %B%s%b."
@@ -3624,7 +3629,7 @@
 "%B%s%b kan ikkje oppgraderast no, men viss han hadde kunna det, så ville han "
 "framleis blitt halden på versjon %B%s%b."
 
-#: src/reason_fragment.cc:378
+#: src/reason_fragment.cc:375
 msgid ""
 "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the "
 "following dependencies:"
@@ -3632,59 +3637,59 @@
 "%B%s%b vil ikkje bli oppgradert til versjon %B%s%b for å unngå å øydeleggja "
 "desse pakkekrava:"
 
-#: src/reason_fragment.cc:390
+#: src/reason_fragment.cc:387
 msgid "%B%s%b is currently installed."
 msgstr "%B%s%b er installert."
 
-#: src/reason_fragment.cc:396
+#: src/reason_fragment.cc:393
 msgid "%B%s%b is not currently installed."
 msgstr "%B%s%b er ikkje installert."
 
-#: src/reason_fragment.cc:404
+#: src/reason_fragment.cc:401
 msgid "Some dependencies of %B%s%b are not satisfied:"
 msgstr "Nokre av pakkekrava til %B%s%b er ikkje tilfredsstilt:"
 
-#: src/reason_fragment.cc:408
+#: src/reason_fragment.cc:405
 msgid "%B%s%b will be downgraded."
 msgstr "%B%s%b vil bli nedgradert."
 
-#: src/reason_fragment.cc:415
+#: src/reason_fragment.cc:412
 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b."
 msgstr "%B%s%b vil ikkje bli oppgradert til den forbodne versjonen %B%s%b."
 
-#: src/reason_fragment.cc:419
+#: src/reason_fragment.cc:416
 msgid ""
 "%B%s%b could be upgraded to version %B%s%b, but it is being held at version %"
 "B%s%b."
 msgstr ""
 "%B%s%b kan oppgraderast til versjon %B%s%b, men blir haldt på versjon %B%s%b."
 
-#: src/reason_fragment.cc:426
+#: src/reason_fragment.cc:423
 msgid "%B%s%b will be re-installed."
 msgstr "%B%s%b vil bli installert på ny."
 
-#: src/reason_fragment.cc:430
+#: src/reason_fragment.cc:427
 msgid "%B%s%b will be installed."
 msgstr "%B%s%b vil bli installert."
 
-#: src/reason_fragment.cc:434
+#: src/reason_fragment.cc:431
 msgid "%B%s%b will be removed."
 msgstr "%B%s%b vil bli fjerna."
 
-#: src/reason_fragment.cc:439
+#: src/reason_fragment.cc:436
 msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b."
 msgstr "%B%s%b vil bli oppgradert frå versjon %B%s%b til versjon %B%s%b."
 
-#: src/reason_fragment.cc:475
+#: src/reason_fragment.cc:472
 msgid ""
 "The following packages depend on %B%s%b and will be broken by its removal:"
 msgstr "Desse pakkane krev %B%s%b og vil bli øydelagde viss han vert fjerna:"
 
-#: src/reason_fragment.cc:478
+#: src/reason_fragment.cc:475
 msgid "The following packages depend on %B%s%b and are broken:"
 msgstr "Desse pakkane krev %B%s%b og er øydelagde:"
 
-#: src/reason_fragment.cc:485
+#: src/reason_fragment.cc:482
 msgid ""
 "The following packages conflict with %B%s%b and will be broken by its "
 "installation:"
@@ -3692,7 +3697,7 @@
 "Desse pakkane er i konflikt med %B%s%b og vil bli øydelagde viss han bli "
 "installert:"
 
-#: src/reason_fragment.cc:518
+#: src/reason_fragment.cc:515
 msgid ""
 "The following packages depend on a version of %B%s%b other than the "
 "currently installed version of %B%s%b, or conflict with the currently "
@@ -3701,7 +3706,7 @@
 "Desse pakkane krev ein anna versjon av %B%s%b enn den versjonen som er "
 "installert, eller er i konflikt med den installerte versjonen:"
 
-#: src/reason_fragment.cc:522
+#: src/reason_fragment.cc:519
 msgid ""
 "The following packages conflict with %B%s%b, or depend on a version of it "
 "which is not going to be installed."
@@ -3709,11 +3714,11 @@
 "Desse pakkane er i konflikt med %B%s%b, eller krev ein versjon som ikkje "
 "kjem til å bli installert."
 
-#: src/reason_fragment.cc:526
+#: src/reason_fragment.cc:523
 msgid "The following packages conflict with %B%s%b:"
 msgstr "Desse pakkane er i konflikt med %B%s%b:"
 
-#: src/reason_fragment.cc:531
+#: src/reason_fragment.cc:528
 msgid ""
 "The following packages depend on a version of %B%s%b other than the "
 "currently installed version of %B%s%b:"
@@ -3721,22 +3726,22 @@
 "Desse pakkane krev ein anna versjon av %B%s%b enn den versjonen som er "
 "installert av %B%s%b:"
 
-#: src/reason_fragment.cc:535
+#: src/reason_fragment.cc:532
 msgid ""
 "The following packages depend on a version of %B%s%b which is not going to "
 "be installed."
 msgstr ""
 "Desse pakkane krev ein versjon av %B%s%b som ikkje kjem til å bli installert."
 
-#: src/reason_fragment.cc:541
+#: src/reason_fragment.cc:538
 msgid "upgraded"
 msgstr "oppgradert"
 
-#: src/reason_fragment.cc:541
+#: src/reason_fragment.cc:538
 msgid "downgraded"
 msgstr "nedgradert"
 
-#: src/reason_fragment.cc:547
+#: src/reason_fragment.cc:544
 msgid ""
 "The following packages depend on the currently installed version of %B%s%b (%"
 "B%s%b), or conflict with the version it will be %s to (%B%s%b), and will be "
@@ -3746,7 +3751,7 @@
 "dei er i konlikt med den versjonen han vil bli %s til (%B%s%b), og vil bli "
 "øydelagde viss han blir %s."
 
-#: src/reason_fragment.cc:554
+#: src/reason_fragment.cc:551
 msgid ""
 "The following packages conflict with version %B%s%b of %B%s%b, and will be "
 "broken if it is %s."
@@ -3754,7 +3759,7 @@
 "Desse pakkane er i konflikt med versjon %B%s%b av %B%s%b, og vil bli "
 "øydelagde viss han blir %s."
 
-#: src/reason_fragment.cc:559
+#: src/reason_fragment.cc:556
 msgid ""
 "The following packages depend on version %B%s%b of %B%s%b, and will be "
 "broken if it is %s."
@@ -3801,31 +3806,36 @@
 msgid "Close"
 msgstr "^Lukk"
 
-#: src/solution_fragment.cc:125
+#: src/solution_fragment.cc:134
 #, fuzzy
 msgid "%BRemove%b the following packages:%n"
 msgstr "Desse pakkane er ØYDELAGDE:"
 
-#: src/solution_fragment.cc:135
+#: src/solution_fragment.cc:144
 #, fuzzy
 msgid "%BInstall%b the following packages:%n"
 msgstr "Desse pakkane er ØYDELAGDE:"
 
-#: src/solution_fragment.cc:148
+#: src/solution_fragment.cc:157
 msgid "%BKeep%b the following packages at their current version:%n"
 msgstr ""
 
-#: src/solution_fragment.cc:161
+#: src/solution_fragment.cc:164
+#, fuzzy
+msgid "Not Installed"
+msgstr "ikkje installert"
+
+#: src/solution_fragment.cc:177
 #, fuzzy
 msgid "%BUpgrade%b the following packages:%n"
 msgstr "Desse pakkane er ØYDELAGDE:"
 
-#: src/solution_fragment.cc:176
+#: src/solution_fragment.cc:192
 #, fuzzy
 msgid "%BDowngrade%b the following packages:%n"
 msgstr "Lastar ned pakkar"
 
-#: src/solution_fragment.cc:190
+#: src/solution_fragment.cc:206
 #, c-format
 msgid "Score is %d"
 msgstr ""
@@ -3853,45 +3863,45 @@
 msgid "W:"
 msgstr ""
 
-#: src/ui.cc:194
+#: src/ui.cc:193
 msgid "Search for:"
 msgstr "Søk etter:"
 
-#: src/ui.cc:262
+#: src/ui.cc:258
 msgid "You already are root!"
 msgstr "Du er allereie root!"
 
-#: src/ui.cc:360
+#: src/ui.cc:356
 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:388
+#: src/ui.cc:384
 msgid "Loading cache"
 msgstr "Lastar mellomlager"
 
-#: src/ui.cc:410
+#: src/ui.cc:406
 msgid "Really quit Aptitude?"
 msgstr "Vil du verkeleg avslutta Aptitude?"
 
-#: src/ui.cc:489
+#: src/ui.cc:485
 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:589 src/ui.cc:591 src/ui.cc:619 src/ui.cc:621
+#: src/ui.cc:585 src/ui.cc:587 src/ui.cc:615 src/ui.cc:617
 msgid "Packages"
 msgstr "Pakkar"
 
-#: src/ui.cc:590 src/ui.cc:620
+#: src/ui.cc:586 src/ui.cc:616
 msgid "View available packages and choose actions to perform"
 msgstr "Vis tilgjengelege pakkar og vel kva handlingar som skal utførast"
 
-#: src/ui.cc:667
+#: src/ui.cc:663
 #, fuzzy
 msgid ""
-"%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
+"Aptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
 "BABSOLUTELY NO WARRANTY%b; for details see 'license' in the Help menu.  This "
 "is free software, and you are welcome to redistribute it under certain "
 "conditions; see 'license' for details."
@@ -3905,61 +3915,66 @@
 "Dette er fri programvare og du er velkomen til å dela vidare programmet\n"
 "under visse vilkår; sjå «lisens» for detaljar."
 
-#: src/ui.cc:688
+#: src/ui.cc:684
 msgid "help.txt"
 msgstr "hjelp.txt"
 
-#: src/ui.cc:704
+#: src/ui.cc:700
 msgid "README"
 msgstr "LESMEG"
 
-#: src/ui.cc:786
+#: src/ui.cc:782
 msgid ""
-"%C%BWARNING%b: untrusted versions of the following packages will be "
-"installed!%n%nUntrusted packages could %Bcompromise your system's security%"
-"b.  You should only proceed with the installation if you are certain that "
-"this is what you want to do.%n%n"
+"%BWARNING%b: untrusted versions of the following packages will be installed!%"
+"n%nUntrusted packages could %Bcompromise your system's security%b.  You "
+"should only proceed with the installation if you are certain that this is "
+"what you want to do.%n%n"
 msgstr ""
 
-#: src/ui.cc:800
+#: src/ui.cc:788
+#, fuzzy
+msgid "  %S*%N %s [version %s]%n"
+msgstr "Versjonar"
+
+#: src/ui.cc:795
 #, fuzzy
 msgid "Really Continue"
 msgstr "Hald fram"
 
-#: src/ui.cc:802
+#: src/ui.cc:797
 msgid "Abort Installation"
 msgstr ""
 
-#: src/ui.cc:863
+#: src/ui.cc:858
 msgid "Preview of package installation"
 msgstr "Førehandsvising av pakkeinstallasjon"
 
-#: src/ui.cc:864
+#: src/ui.cc:859
 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:865
+#: src/ui.cc:860
 #, fuzzy
 msgid "Preview"
 msgstr "^Førre"
 
-#: src/ui.cc:901
+#: src/ui.cc:896
 #, fuzzy
 msgid "Some packages were broken and have been fixed:"
 msgstr "Nokre pakkar var øydelagde og har blitt fiksa"
 
-#: src/ui.cc:907
+#: src/ui.cc:902
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:913
-#, c-format
+#: src/ui.cc:908
+#, fuzzy, c-format
 msgid ""
-"Ran out of time while trying to resolver dependencies (press \"%s\" to try "
+"Ran out of time while trying to resolve dependencies (press \"%s\" to try "
 "harder)"
-msgstr ""
+msgstr "Bruke tida på å finna miner"
 
-#: src/ui.cc:959
+#: src/ui.cc:954
 #, fuzzy
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
@@ -3968,23 +3983,23 @@
 "Ã… 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:962 src/ui.cc:1078
+#: src/ui.cc:957 src/ui.cc:1072
 msgid "Become root"
 msgstr "Bli root"
 
-#: src/ui.cc:964 src/ui.cc:1080
+#: src/ui.cc:959 src/ui.cc:1074
 msgid "Don't become root"
 msgstr "Ikkje bli root"
 
-#: src/ui.cc:969 src/ui.cc:1085
+#: src/ui.cc:964 src/ui.cc:1079
 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:996
+#: src/ui.cc:991
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "Ingen pakkar vil bli installert, oppgradert eller fjerna."
 
-#: src/ui.cc:1002
+#: src/ui.cc:997
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -3997,7 +4012,7 @@
 "oppgraderast.\n"
 "Tast «U» for å førebu oppgradering."
 
-#: src/ui.cc:1074
+#: src/ui.cc:1069
 #, fuzzy
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
@@ -4006,112 +4021,112 @@
 "Oppdatering av pakkelister krev administrative rettar, som\n"
 "du ikkje har no. Vil du endra til root-kontoen?\n"
 
-#: src/ui.cc:1090 src/ui.cc:1377
+#: src/ui.cc:1084 src/ui.cc:1371
 msgid "Waste time trying to find mines"
 msgstr "Bruke tida på å finna miner"
 
-#: src/ui.cc:1097 src/ui.cc:1150
+#: src/ui.cc:1091 src/ui.cc:1144
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "Å vaske medan ei nedlasting held på er ikkje tillatt!"
 
-#: src/ui.cc:1100
+#: src/ui.cc:1094
 msgid "Deleting downloaded files"
 msgstr "Slettar nedlasta filer"
 
-#: src/ui.cc:1114
+#: src/ui.cc:1108
 msgid "Downloaded package files have been deleted"
 msgstr "Nedlasta pakkefiler er blitt sletta"
 
-#: src/ui.cc:1175
+#: src/ui.cc:1169
 #, 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:1247
+#: src/ui.cc:1241
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1252 src/ui.cc:1283
+#: src/ui.cc:1246 src/ui.cc:1277
 #, fuzzy
 msgid "Ran out of time while trying to find a solution."
 msgstr "Bruke tida på å finna miner"
 
-#: src/ui.cc:1277
+#: src/ui.cc:1271
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1307
+#: src/ui.cc:1301
 #, fuzzy, c-format
 msgid "Unable to open %s"
 msgstr "Klarer ikkje opna %s for å skriva til ho"
 
-#: src/ui.cc:1313
+#: src/ui.cc:1307
 msgid "Error while dumping resolver state"
 msgstr ""
 
-#: src/ui.cc:1323
+#: src/ui.cc:1317
 msgid "File to which the resolver state should be dumped:"
 msgstr ""
 
-#: src/ui.cc:1353
+#: src/ui.cc:1347
 msgid "^Install/remove packages"
 msgstr "^Installer/fjern pakkar"
 
-#: src/ui.cc:1354
+#: src/ui.cc:1348
 msgid "Perform all pending installs and removals"
 msgstr "Utfør installering og fjerning av pakkar"
 
-#: src/ui.cc:1356
+#: src/ui.cc:1350
 msgid "^Update package list"
 msgstr "^Oppdater pakkeliste"
 
-#: src/ui.cc:1357
+#: src/ui.cc:1351
 msgid "Check for new versions of packages"
 msgstr "Sjå etter nye versjonar av pakkar"
 
-#: src/ui.cc:1360
+#: src/ui.cc:1354
 msgid "^Forget new packages"
 msgstr "^Gløym nye pakkar"
 
-#: src/ui.cc:1361
+#: src/ui.cc:1355
 msgid "Forget which packages are \"new\""
 msgstr "Gløym kva for pakkar som er «nye»"
 
-#: src/ui.cc:1364
+#: src/ui.cc:1358
 msgid "^Clean package cache"
 msgstr "^Reinsk pakkemellomlageret"
 
-#: src/ui.cc:1365
+#: src/ui.cc:1359
 msgid "Delete package files which were previously downloaded"
 msgstr "Slett tidlegare nedlasta pakkefiler"
 
-#: src/ui.cc:1368
+#: src/ui.cc:1362
 msgid "Clean ^obsolete files"
 msgstr "Slett ^forelda filer"
 
-#: src/ui.cc:1369
+#: src/ui.cc:1363
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Slett pakkefiler som ikkje kan hentast lenger"
 
-#: src/ui.cc:1372
+#: src/ui.cc:1366
 msgid "Mark ^Upgradable"
 msgstr "Marker ^Oppgraderbare"
 
-#: src/ui.cc:1373
+#: src/ui.cc:1367
 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:1376
+#: src/ui.cc:1370
 msgid "^Play Minesweeper"
 msgstr "^Spel minesveipar"
 
-#: src/ui.cc:1379
+#: src/ui.cc:1373
 msgid "^Become root"
 msgstr "Bli ^root"
 
-#: src/ui.cc:1380
+#: src/ui.cc:1374
 #, fuzzy
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
@@ -4120,68 +4135,68 @@
 "Køyrer «su» for å bli root. Dette vil starta programmet på ny, men\n"
 "instillingane vil bli tatt vare på."
 
-#: src/ui.cc:1383
+#: src/ui.cc:1377
 msgid "^Reload package cache"
 msgstr "^Last inn igjen pakkemellomlageret"
 
-#: src/ui.cc:1384
+#: src/ui.cc:1378
 msgid "Reload the package cache"
 msgstr "Lastar pakkelagert inn på ny"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1384
 msgid "^Quit"
 msgstr "^Avslutt"
 
-#: src/ui.cc:1391
+#: src/ui.cc:1385
 msgid "Exit the program"
 msgstr "Avsluttar programmet"
 
-#: src/ui.cc:1397 src/ui.cc:1669
+#: src/ui.cc:1391 src/ui.cc:1661
 msgid "Undo"
 msgstr "Angra"
 
-#: src/ui.cc:1398
+#: src/ui.cc:1392
 msgid "Undo the last package operation or group of operations"
 msgstr "Angrar den siste pakkehandlinga eller gruppe av handlingar"
 
-#: src/ui.cc:1405
+#: src/ui.cc:1399
 msgid "^Install"
 msgstr "^Installer"
 
-#: src/ui.cc:1406
+#: src/ui.cc:1400
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "Merkjer den valde pakke for installasjon eller oppgradering"
 
-#: src/ui.cc:1409
+#: src/ui.cc:1403
 msgid "^Remove"
 msgstr "^Fjern"
 
-#: src/ui.cc:1410
+#: src/ui.cc:1404
 msgid "Flag the currently selected package for removal"
 msgstr "Merkjer den valde pakke for fjerning"
 
-#: src/ui.cc:1413
+#: src/ui.cc:1407
 msgid "^Purge"
 msgstr "^Reinsk ut"
 
-#: src/ui.cc:1414
+#: src/ui.cc:1408
 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:1417
+#: src/ui.cc:1411
 msgid "^Keep"
 msgstr "^Ta vare på"
 
-#: src/ui.cc:1418
+#: src/ui.cc:1412
 msgid "Cancel any action on the selected package"
 msgstr "Avbryt handlingane på den valde pakken"
 
-#: src/ui.cc:1421
+#: src/ui.cc:1415
 msgid "^Hold"
 msgstr "^Hald tilbake"
 
-#: src/ui.cc:1422
+#: src/ui.cc:1416
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -4189,11 +4204,11 @@
 "Avbryt handlinar på den valde pakken og vernar han mot framtidige "
 "oppgraderingar."
 
-#: src/ui.cc:1425
+#: src/ui.cc:1419
 msgid "Mark ^Auto"
 msgstr "Merk ^Auto"
 
-#: src/ui.cc:1426
+#: src/ui.cc:1420
 #, fuzzy
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
@@ -4202,11 +4217,11 @@
 "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:1429
+#: src/ui.cc:1423
 msgid "Mark ^Manual"
 msgstr "Merk ^Manuell"
 
-#: src/ui.cc:1430
+#: src/ui.cc:1424
 #, fuzzy
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
@@ -4215,11 +4230,11 @@
 "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:1433
+#: src/ui.cc:1427
 msgid "^Forbid Version"
 msgstr "^Forby versjon"
 
-#: src/ui.cc:1434
+#: src/ui.cc:1428
 #, fuzzy
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
@@ -4228,204 +4243,204 @@
 "Forby versjonskandidaten til den valde pakken frå å bli installert.\n"
 "Nyare versjonar av pakken vil bli installert som vanleg"
 
-#: src/ui.cc:1438
+#: src/ui.cc:1432
 msgid "I^nformation"
 msgstr "I^nformasjon"
 
-#: src/ui.cc:1439
+#: src/ui.cc:1433
 msgid "Display more information about the selected package"
 msgstr "Vis meir informasjon om den valde pakken"
 
-#: src/ui.cc:1442
+#: src/ui.cc:1436
 msgid "^Changelog"
 msgstr "^Endringslogg"
 
-#: src/ui.cc:1443
+#: src/ui.cc:1437
 msgid "Display the Debian changelog of the selected package"
 msgstr "Vis debianendringsloggen til den valde pakken"
 
-#: src/ui.cc:1450
+#: src/ui.cc:1444
 msgid "^Find"
 msgstr "^Finn"
 
-#: src/ui.cc:1451
+#: src/ui.cc:1445
 msgid "Search for a package"
 msgstr "Søk etter ein pakke"
 
-#: src/ui.cc:1454
+#: src/ui.cc:1448
 msgid "Find ^Again"
 msgstr "Finn i^gjen"
 
-#: src/ui.cc:1455
+#: src/ui.cc:1449
 msgid "Repeat the last search"
 msgstr "Gjer opp igjen det siste søket"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1453
 msgid "^Limit Display"
 msgstr "^Filtrer vising"
 
-#: src/ui.cc:1460
+#: src/ui.cc:1454
 msgid "Apply a filter to the package list"
 msgstr "Bruk eit filter på pakkelista"
 
-#: src/ui.cc:1463
+#: src/ui.cc:1457
 msgid "^Un-Limit Display"
 msgstr "^Avfiltrer vising"
 
-#: src/ui.cc:1464
+#: src/ui.cc:1458
 msgid "Remove the filter from the package list"
 msgstr "Fjernar filteret frå pakkelista"
 
-#: src/ui.cc:1468
+#: src/ui.cc:1462
 msgid "Find ^Broken"
 msgstr "Finn ^Øydelagd"
 
-#: src/ui.cc:1469
+#: src/ui.cc:1463
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Finn den neste pakken med pakkekrav som ikkje er tilfredsstilt"
 
-#: src/ui.cc:1476
+#: src/ui.cc:1470
 msgid "^UI options"
 msgstr "^Brukargrensesnitt"
 
-#: src/ui.cc:1477
+#: src/ui.cc:1471
 msgid "Change the settings which affect the user interface"
 msgstr "Endrar innstillingane for brukargrenseflata"
 
-#: src/ui.cc:1480
+#: src/ui.cc:1474
 msgid "^Dependency handling"
 msgstr "^Handsaming av pakkekrav"
 
-#: src/ui.cc:1481
+#: src/ui.cc:1475
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr "Endra innstillingar som påverkar handtering av pakkekrav"
 
-#: src/ui.cc:1484
+#: src/ui.cc:1478
 msgid "^Miscellaneous"
 msgstr "^Ymse"
 
-#: src/ui.cc:1485
+#: src/ui.cc:1479
 msgid "Change miscellaneous program settings"
 msgstr "Endra ymse programinnstillingar"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1484
 msgid "^Revert options"
 msgstr "^Tilbakestill innstillingar"
 
-#: src/ui.cc:1491
+#: src/ui.cc:1485
 msgid "Reset all settings to the system defaults"
 msgstr "Stiller tilbake alle innstillingar til standardverdiar"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1496
 msgid "^Next"
 msgstr "^Neste"
 
-#: src/ui.cc:1503
+#: src/ui.cc:1497
 msgid "View next display"
 msgstr "Vis neste skjermbilete"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1500
 msgid "^Prev"
 msgstr "^Førre"
 
-#: src/ui.cc:1507
+#: src/ui.cc:1501
 msgid "View previous display"
 msgstr "Vis førre skjermbilete"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1504
 msgid "^Close"
 msgstr "^Lukk"
 
-#: src/ui.cc:1511
+#: src/ui.cc:1505
 msgid "Close this display"
 msgstr "Lukk dette skjermbilete"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1510
 msgid "New Package ^View"
 msgstr "Ny pakke^vising"
 
-#: src/ui.cc:1517
+#: src/ui.cc:1511
 msgid "Create a new default package view"
 msgstr "Lag ei ny standard for pakkevising"
 
-#: src/ui.cc:1520
+#: src/ui.cc:1514
 msgid "New Categorical ^Browser"
 msgstr "Ny ^katagorivising"
 
-#: src/ui.cc:1522
+#: src/ui.cc:1516
 msgid "Browse packages by category"
 msgstr "Bla i pakkar etter kategori"
 
-#: src/ui.cc:1530
+#: src/ui.cc:1524
 msgid "^About"
 msgstr "^Om"
 
-#: src/ui.cc:1531
+#: src/ui.cc:1525
 msgid "View information about this program"
 msgstr "Vis informasjon om dette programmet"
 
-#: src/ui.cc:1534
+#: src/ui.cc:1528
 msgid "^Help"
 msgstr "^Hjelp"
 
-#: src/ui.cc:1535
+#: src/ui.cc:1529
 msgid "View the on-line help"
 msgstr "Vis hjelp"
 
-#: src/ui.cc:1537
+#: src/ui.cc:1531
 msgid "User's ^Manual"
 msgstr "^Brukarvegleiing"
 
-#: src/ui.cc:1538
+#: src/ui.cc:1532
 msgid "View the detailed program manual"
 msgstr "Vis den detaljerte programmanualen"
 
-#: src/ui.cc:1541
+#: src/ui.cc:1535
 msgid "^FAQ"
 msgstr "^SOS"
 
-#: src/ui.cc:1542
+#: src/ui.cc:1536
 msgid "View a list of frequently asked questions"
 msgstr "Vis ei liste over spørsmål og svar"
 
-#: src/ui.cc:1545
+#: src/ui.cc:1539
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1546
+#: src/ui.cc:1540
 #, 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:1549
+#: src/ui.cc:1543
 msgid "^License"
 msgstr "^Lisens"
 
-#: src/ui.cc:1550
+#: src/ui.cc:1544
 msgid "View the terms under which you may copy the program"
 msgstr "Vis vilkåra for å kopiera programmet"
 
-#: src/ui.cc:1668
+#: src/ui.cc:1660
 msgid "Actions"
 msgstr "Handlingar"
 
-#: src/ui.cc:1671
+#: src/ui.cc:1663
 msgid "Search"
 msgstr "Søk"
 
-#: src/ui.cc:1672
+#: src/ui.cc:1664
 msgid "Options"
 msgstr "Val"
 
-#: src/ui.cc:1673
+#: src/ui.cc:1665
 msgid "Views"
 msgstr "Visingar"
 
-#: src/ui.cc:1674
+#: src/ui.cc:1666
 msgid "Help"
 msgstr "Hjelp"
 
-#: src/ui.cc:1734
+#: src/ui.cc:1726
 #, c-format
 msgid ""
 "%s: Menu  %s: Help  %s: Quit  %s: Update  %s: Download/Install/Remove Pkgs"
@@ -4433,28 +4448,28 @@
 "%s: Meny  %s: Hjelp  %s: Avslutt  %s:Oppdater  %s: Lasta ned/Installer/"
 "Fjerna pakkar"
 
-#: src/ui.cc:2003 src/vscreen/vscreen.cc:281
+#: src/ui.cc:1996 src/vscreen/vscreen.cc:281
 msgid "yes_key"
 msgstr "j"
 
-#: src/ui.cc:2004 src/vscreen/vscreen.cc:282
+#: src/ui.cc:1997 src/vscreen/vscreen.cc:282
 msgid "no_key"
 msgstr "n"
 
-#: src/view_changelog.cc:46
+#: src/view_changelog.cc:61
 msgid "You can only view changelogs of official Debian packages."
 msgstr "Du kan berre lesa endringsloggar for offisielle debianpakkar."
 
-#: src/view_changelog.cc:52
+#: src/view_changelog.cc:67
 msgid "Downloading Changelog"
 msgstr "Lastar ned endringslogg"
 
-#: src/view_changelog.cc:54
+#: src/view_changelog.cc:69
 #, fuzzy
 msgid "Download Changelog"
 msgstr "Lastar ned endringslogg"
 
-#: src/view_changelog.cc:63
+#: src/view_changelog.cc:78
 #, c-format
 msgid "%s changes"
 msgstr ""
@@ -4553,18 +4568,193 @@
 #~ "Set inn denne disken i CD-drevet «%s»:\n"
 #~ "%s"
 
+#~ msgid "Need exactly two colors in color definition \"%s\""
+#~ msgstr "Treng nøyaktig to fargar i fargedefinisjon «%s»"
+
+#~ msgid "Can't parse foreground \"%s\"of color \"%s\""
+#~ msgstr "Klarer ikkje tolka forgrunnsfargen «%s» til fargen «%s»"
+
+#~ msgid "Can't parse background \"%s\" of color \"%s\""
+#~ msgstr "Klarer ikkje tolka bakgrunnsfargen «%s» til fargen «%s»"
+
 #~ msgid "Invalid option for interactive mode: -s\n"
 #~ msgstr "Ugyldig val for interaktiv modus: -s\n"
 
+#~ 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."
+#~ msgstr ""
+#~ "Program for faxmodem og andre kommunikasjonseiningar\n"
+#~ " Pakkar i «komm»-seksjonen blir brukt til å kontrollera modem og anna "
+#~ "maskinvare for kommunikasjonseiningar. Dette inkluderer programvare for å "
+#~ "kontollera faxmodem (til dømes PPP for internettoppkopling ved hjelp av "
+#~ "oppringing, og program som i utgangspunktet blei skrive for det føremålet "
+#~ "(zmodem/kermit), i tillegg til programvare for å kontrollera "
+#~ "mobiltelefonar, grensesnitt med FidoNet og køyring av BBS."
+
+#~ 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"
+#~ " .\n"
+#~ " For more information about what Debian considers to be Free Software, "
+#~ "see http://www.debian.org/social_contract#guidelines"
+#~ msgstr ""
+#~ "Program som ikkje er fri programvare\n"
+#~ " Pakkar i «ikkje-fri»-seksjonen er ikkje ein del av Debian.\n"
+#~ " .\n"
+#~ " Desse pakkane møter ikkje ein eller fleire av krava til Debian sine fri "
+#~ "programvare retningslinjer (sjå nedanfor). Du bør lesa lisensen til "
+#~ "program i denne seksjonen for å vera sikker på at du har lov til å bruka "
+#~ "dei på den måten du har tenkt.\n"
+#~ " .\n"
+#~ " For meir informasjon om kva Debian ser på som fri programvare, sjå "
+#~ "http://www.debian.org/social_contract#guidelines"
+
+#~ 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)"
+#~ msgstr ""
+#~ "Nye pakkar\n"
+#~ " Desse pakkane er blitt lagt til Debian sidan førre gong du reinska lista "
+#~ "over «nye» pakkar. (Vel «Gløym nye pakkar» frå handlingsmenyen for å "
+#~ "reinske denne lista)"
+
+#~ msgid ""
+#~ "%s is an essential package!\n"
+#~ "\n"
+#~ "Are you sure you want to remove it?\n"
+#~ "Type '%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."
+
+#~ msgid "Available versions of "
+#~ msgstr "Tilgjengelege versjonar av "
+
+#~ 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."
+#~ 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."
+
 #~ msgid "Information about "
 #~ msgstr "Informasjon om "
 
+#~ msgid ""
+#~ "Aptitude %s\n"
+#~ "\n"
+#~ "Copyright 2000 Daniel Burrows.\n"
+#~ "\n"
+#~ "aptitude comes with ABSOLUTELY NO WARRANTY; for details see 'license' in "
+#~ "the\n"
+#~ "Help menu.  This is free software, and you are welcome to redistribute "
+#~ "it\n"
+#~ "under certain conditions; see 'license' for details."
+#~ msgstr ""
+#~ "Aptitude  %s\n"
+#~ "\n"
+#~ "Kopivern 2000 Daniel Burrows.\n"
+#~ "\n"
+#~ "aptitude kjem med INGEN GARANTIAR; sjå «lisens» i hjelpemenyen for "
+#~ "detaljar.\n"
+#~ "Dette er fri programvare og du er velkomen til å dela vidare programmet\n"
+#~ "under visse vilkår; sjå «lisens» for detaljar."
+
+#~ msgid "Some packages were broken and have been fixed"
+#~ msgstr "Nokre pakkar var øydelagde og har blitt fiksa"
+
 #~ msgid "Some broken packages could not be fixed!"
 #~ msgstr "Somme av dei øydelagde pakkane kunne ikkje bli fiksa!"
 
+#~ msgid "Some packages are broken.  Try to fix them?"
+#~ msgstr "Nokre pakkar er øydelagde. Prøve å fiksa dei?"
+
+#~ msgid ""
+#~ "Installing/removing packages requires administrative privileges, which\n"
+#~ "you currently do not have.  Would you like to change to the root "
+#~ "account?\n"
+#~ msgstr ""
+#~ "Ã… installera/fjerna pakkar krev at du har administrative rettar, som\n"
+#~ "du ikkje har no. Vil du endra til root-kontoen?\n"
+
+#~ msgid ""
+#~ "No packages will be installed, removed or upgraded.\n"
+#~ "\n"
+#~ "Some packages could be upgraded, but you have not chosen to upgrade "
+#~ "them.\n"
+#~ "Type \"U\" to prepare an upgrade."
+#~ msgstr ""
+#~ "Ingen pakkar vil bli installert, oppgradert eller fjerna.\n"
+#~ "\n"
+#~ "Nokre pakkar kunne oppgraderast, men du har ikkje valt at dei skulle "
+#~ "oppgraderast.\n"
+#~ "Tast «U» for å førebu oppgradering."
+
+#~ 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"
+#~ msgstr ""
+#~ "Oppdatering av pakkelister krev administrative rettar, som\n"
+#~ "du ikkje har no. Vil du endra til root-kontoen?\n"
+
+#~ msgid "Obsolete downloaded package files have been deleted"
+#~ msgstr "Forelda nedlasta pakkefiler er blitt sletta"
+
+#~ msgid ""
+#~ "Run 'su' to become root; this will restart the program, but your\n"
+#~ "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å."
+
+#~ msgid ""
+#~ "Mark the selected package as having been automatically installed;\n"
+#~ "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."
+
+#~ msgid ""
+#~ "Mark the selected package as having been manually installed;\n"
+#~ "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."
+
+#~ msgid ""
+#~ "Forbid the candidate version of the selected package from being "
+#~ "installed;\n"
+#~ "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"
+
 #~ msgid "^ChangeLog"
 #~ msgstr "^Endringslogg"
 
+#~ msgid "View the important changes made in each version of the program"
+#~ msgstr "Vis viktige endringar som er gjort i kvar versjon av programmet"
+
 #~ 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	Sun Jun 12 21:04:47 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-05-01 14:08-0400\n"
+"POT-Creation-Date: 2005-06-12 22:42+0200\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"
@@ -148,14 +148,14 @@
 msgid "Automatically remove unused packages matching this filter"
 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:219 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
-#: src/vscreen/vs_util.cc:328
+#: src/apt_options.cc:240 src/mine/cmine.cc:249 src/mine/cmine.cc:312
+#: src/ui.cc:215 src/vscreen/vs_util.cc:77 src/vscreen/vs_util.cc:90
+#: src/vscreen/vs_util.cc:264 src/vscreen/vs_util.cc:298
 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:328
+#: src/apt_options.cc:241 src/download_list.cc:69 src/mine/cmine.cc:250
+#: src/mine/cmine.cc:313 src/vscreen/vs_util.cc:298
 msgid "Cancel"
 msgstr "Anuluj"
 
@@ -236,15 +236,15 @@
 msgid "%s: Previous"
 msgstr ""
 
-#: src/broken_indicator.cc:233
+#: src/broken_indicator.cc:232
 #, c-format
-msgid "%CSolution search failed.  %s: try harder"
+msgid "Solution search failed.  %s: try harder"
 msgstr ""
 
-#: src/broken_indicator.cc:239
-#, c-format
-msgid "%CUnable to resolve dependencies."
-msgstr ""
+#: src/broken_indicator.cc:237
+#, fuzzy
+msgid "Unable to resolve dependencies."
+msgstr "Nie mo¿na otworzyæ %s do zapisu"
 
 #: src/cmdline/cmdline_action.cc:36
 #, c-format
@@ -610,13 +610,13 @@
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
-#: src/vscreen/vs_util.cc:212
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:165
+#: src/vscreen/vs_util.cc:202
 msgid "Yes"
 msgstr "Tak"
 
-#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
-#: src/vscreen/vs_util.cc:212
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:165
+#: src/vscreen/vs_util.cc:202
 msgid "No"
 msgstr "Nie"
 
@@ -930,7 +930,7 @@
 msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:212
+#: src/cmdline/cmdline_resolver.cc:212 src/cmdline/cmdline_resolver.cc:285
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
@@ -989,196 +989,201 @@
 msgid "The following packages have unmet dependencies:\n"
 msgstr "Nastêpuj±ce pakiety maj± niespe³nione zale¿no¶ci:\n"
 
-#: src/cmdline/cmdline_show.cc:133
+#: src/cmdline/cmdline_show.cc:119 src/cmdline/cmdline_show.cc:305
+#: src/solution_fragment.cc:65
+msgid "<NULL>"
+msgstr ""
+
+#: src/cmdline/cmdline_show.cc:138
 msgid "not installed"
 msgstr "niezainstalowany"
 
-#: src/cmdline/cmdline_show.cc:135 src/pkg_columnizer.cc:231
+#: src/cmdline/cmdline_show.cc:140 src/pkg_columnizer.cc:231
 #: src/pkg_ver_item.cc:225
 msgid "unpacked"
 msgstr "rozpakowany"
 
-#: src/cmdline/cmdline_show.cc:137
+#: src/cmdline/cmdline_show.cc:142
 msgid "partially configured"
 msgstr "czê¶ciowo skonfigurowany"
 
-#: src/cmdline/cmdline_show.cc:139
+#: src/cmdline/cmdline_show.cc:144
 msgid "partially installed"
 msgstr "czê¶ciowo zainstalowany"
 
-#: src/cmdline/cmdline_show.cc:141
+#: src/cmdline/cmdline_show.cc:146
 msgid "not installed (configuration files remain)"
 msgstr "niezainstalowany (pozostawione pliki konfiguracyjne)"
 
-#: src/cmdline/cmdline_show.cc:143 src/pkg_columnizer.cc:239
+#: src/cmdline/cmdline_show.cc:148 src/pkg_columnizer.cc:239
 #: src/pkg_ver_item.cc:233
 msgid "installed"
 msgstr "zainstalowany"
 
-#: src/cmdline/cmdline_show.cc:152
+#: src/cmdline/cmdline_show.cc:157
 msgid "not a real package"
 msgstr "nie jest prawdziwym pakietem"
 
-#: src/cmdline/cmdline_show.cc:165
+#: src/cmdline/cmdline_show.cc:170
 msgid " [held]"
 msgstr " [zatrzymany]"
 
-#: src/cmdline/cmdline_show.cc:174
+#: src/cmdline/cmdline_show.cc:179
 #, c-format
 msgid "%s; version %s will be installed"
 msgstr "%s, zostanie zainstalowana wersja %s"
 
-#: src/cmdline/cmdline_show.cc:178
+#: src/cmdline/cmdline_show.cc:183
 #, c-format
 msgid "%s; version %s will be installed automatically"
 msgstr "%s, wersja %s zostanie zainstalowana automatycznie"
 
-#: src/cmdline/cmdline_show.cc:184 src/cmdline/cmdline_show.cc:199
+#: src/cmdline/cmdline_show.cc:189 src/cmdline/cmdline_show.cc:204
 #, c-format
 msgid "%s; will be purged"
 msgstr "%s, zostanie wyczyszczony"
 
-#: src/cmdline/cmdline_show.cc:197
+#: src/cmdline/cmdline_show.cc:202
 #, c-format
 msgid "%s; will be purged because nothing depends on it"
 msgstr "%s, zostanie wyczyszczony, poniewa¿ nie jest przez nic wymagany"
 
-#: src/cmdline/cmdline_show.cc:204
+#: src/cmdline/cmdline_show.cc:209
 #, c-format
 msgid "%s; will be removed because nothing depends on it"
 msgstr "%s, zostanie usuniêty, poniewa¿ nie jest przez nic wymagany"
 
-#: src/cmdline/cmdline_show.cc:206
+#: src/cmdline/cmdline_show.cc:211
 #, c-format
 msgid "%s; will be removed"
 msgstr "%s, zostanie usuniety"
 
-#: src/cmdline/cmdline_show.cc:220
+#: src/cmdline/cmdline_show.cc:225
 #, c-format
 msgid "%s%s; will be downgraded [%s -> %s]"
 msgstr "%s%s, zostanie cofniêty [%s -> %s]"
 
-#: src/cmdline/cmdline_show.cc:223
+#: src/cmdline/cmdline_show.cc:228
 #, c-format
 msgid "%s%s; will be upgraded [%s -> %s]"
 msgstr "%s%s, zostanie uaktualniony [%s -> %s]"
 
-#: src/cmdline/cmdline_show.cc:235 src/cmdline/cmdline_show.cc:256
+#: src/cmdline/cmdline_show.cc:240 src/cmdline/cmdline_show.cc:261
 msgid "Package: "
 msgstr "Pakiet: "
 
-#: src/cmdline/cmdline_show.cc:236 src/cmdline/cmdline_show.cc:264
+#: src/cmdline/cmdline_show.cc:241 src/cmdline/cmdline_show.cc:269
 #: src/pkg_columnizer.cc:87
 msgid "State"
 msgstr "Stan"
 
-#: src/cmdline/cmdline_show.cc:237 src/cmdline/cmdline_show.cc:318
+#: src/cmdline/cmdline_show.cc:242 src/cmdline/cmdline_show.cc:325
 msgid "Provided by"
 msgstr "Udostêpniany przez"
 
-#: src/cmdline/cmdline_show.cc:258 src/pkg_info_screen.cc:105
+#: src/cmdline/cmdline_show.cc:263 src/pkg_info_screen.cc:105
 msgid "Essential: "
 msgstr "Istotny: "
 
-#: src/cmdline/cmdline_show.cc:258 src/cmdline/cmdline_show.cc:262
-#: src/cmdline/cmdline_show.cc:273 src/pkg_info_screen.cc:105
+#: src/cmdline/cmdline_show.cc:263 src/cmdline/cmdline_show.cc:267
+#: src/cmdline/cmdline_show.cc:278 src/pkg_info_screen.cc:105
 msgid "yes"
 msgstr "tak"
 
-#: src/cmdline/cmdline_show.cc:262
+#: src/cmdline/cmdline_show.cc:267
 msgid "New"
 msgstr "Nowy"
 
-#: src/cmdline/cmdline_show.cc:267
+#: src/cmdline/cmdline_show.cc:272
 msgid "Forbidden version"
 msgstr "Zablokowana wersja"
 
-#: src/cmdline/cmdline_show.cc:271
+#: src/cmdline/cmdline_show.cc:276
 msgid "Automatically installed"
 msgstr "Zainstalowany automatycznie"
 
-#: src/cmdline/cmdline_show.cc:273
+#: src/cmdline/cmdline_show.cc:278
 msgid "no"
 msgstr "nie"
 
-#: src/cmdline/cmdline_show.cc:275
+#: src/cmdline/cmdline_show.cc:280
 msgid "Version: "
 msgstr "Wersja: "
 
-#: src/cmdline/cmdline_show.cc:276 src/pkg_info_screen.cc:113
+#: src/cmdline/cmdline_show.cc:281 src/pkg_info_screen.cc:113
 msgid "Priority: "
 msgstr "Priorytet: "
 
-#: src/cmdline/cmdline_show.cc:277 src/cmdline/cmdline_show.cc:279
-#: src/cmdline/cmdline_show.cc:288
+#: src/cmdline/cmdline_show.cc:282 src/cmdline/cmdline_show.cc:284
+#: src/cmdline/cmdline_show.cc:293
 msgid "N/A"
 msgstr "N/D"
 
-#: src/cmdline/cmdline_show.cc:278 src/pkg_info_screen.cc:114
+#: src/cmdline/cmdline_show.cc:283 src/pkg_info_screen.cc:114
 msgid "Section: "
 msgstr "Sekcja: "
 
-#: src/cmdline/cmdline_show.cc:280 src/pkg_info_screen.cc:115
+#: src/cmdline/cmdline_show.cc:285 src/pkg_info_screen.cc:115
 msgid "Maintainer: "
 msgstr "Opiekun: "
 
-#: src/cmdline/cmdline_show.cc:283
+#: src/cmdline/cmdline_show.cc:288
 msgid "Uncompressed Size: "
 msgstr "Rozmiar rozpakowanego: "
 
-#: src/cmdline/cmdline_show.cc:287
+#: src/cmdline/cmdline_show.cc:292
 msgid "Architecture: "
 msgstr "Architektura: "
 
-#: src/cmdline/cmdline_show.cc:289
+#: src/cmdline/cmdline_show.cc:294
 msgid "Compressed Size: "
 msgstr "Rozmiar pakietu: "
 
-#: src/cmdline/cmdline_show.cc:291
+#: src/cmdline/cmdline_show.cc:296
 msgid "Filename: "
 msgstr "Plik: "
 
-#: src/cmdline/cmdline_show.cc:293
+#: src/cmdline/cmdline_show.cc:298
 msgid "MD5sum: "
 msgstr "Suma MD5: "
 
-#: src/cmdline/cmdline_show.cc:297 src/cmdline/cmdline_show.cc:299
+#: src/cmdline/cmdline_show.cc:302 src/cmdline/cmdline_show.cc:305
 msgid "Archive"
 msgstr "Archiwum"
 
-#: src/cmdline/cmdline_show.cc:303
+#: src/cmdline/cmdline_show.cc:310
 msgid "Depends"
 msgstr "Wymaga"
 
-#: src/cmdline/cmdline_show.cc:305
+#: src/cmdline/cmdline_show.cc:312
 msgid "PreDepends"
 msgstr "Wymaga wstêpnie"
 
-#: src/cmdline/cmdline_show.cc:307
+#: src/cmdline/cmdline_show.cc:314
 msgid "Recommends"
 msgstr "Poleca"
 
-#: src/cmdline/cmdline_show.cc:309
+#: src/cmdline/cmdline_show.cc:316
 msgid "Suggests"
 msgstr "Sugeruje"
 
-#: src/cmdline/cmdline_show.cc:311
+#: src/cmdline/cmdline_show.cc:318
 msgid "Conflicts"
 msgstr "Jest w konflikcie z"
 
-#: src/cmdline/cmdline_show.cc:313
+#: src/cmdline/cmdline_show.cc:320
 msgid "Replaces"
 msgstr "Zastêpuje"
 
-#: src/cmdline/cmdline_show.cc:315
+#: src/cmdline/cmdline_show.cc:322
 msgid "Obsoletes"
 msgstr "Dezaktualizuje"
 
-#: src/cmdline/cmdline_show.cc:317
+#: src/cmdline/cmdline_show.cc:324
 msgid "Provides"
 msgstr "Udostêpnia"
 
-#: src/cmdline/cmdline_show.cc:321 src/pkg_info_screen.cc:97
+#: src/cmdline/cmdline_show.cc:328 src/pkg_info_screen.cc:97
 msgid "Description: "
 msgstr "Opis: "
 
@@ -1222,32 +1227,32 @@
 msgid "You cannot specify both an archive and a version for a package\n"
 msgstr "Nie mo¿na podawaæ jednocze¶nie archiwum i wersji pakietu\n"
 
-#: src/dep_item.cc:137
+#: src/dep_item.cc:139
 msgid "UNSATISFIED"
 msgstr "NIESPE£NIONE"
 
-#: src/dep_item.cc:137 src/reason_fragment.cc:247
+#: src/dep_item.cc:139 src/reason_fragment.cc:244
 msgid "UNAVAILABLE"
 msgstr "NIEDOSTÊPNY"
 
-#: src/download_bar.cc:56 src/download_list.cc:263 src/download_screen.cc:57
+#: src/download_bar.cc:56 src/download_list.cc:266 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_bar.cc:77 src/generic/acqprogress.cc:63
+#: src/download_bar.cc:75 src/generic/acqprogress.cc:63
 msgid "Hit "
 msgstr "Stary "
 
-#: src/download_bar.cc:90
+#: src/download_bar.cc:88
 msgid "Downloading "
 msgstr "Pobieranie "
 
-#: src/download_bar.cc:103
+#: src/download_bar.cc:101
 msgid "Got "
 msgstr "Nowy "
 
-#: src/download_bar.cc:157
+#: src/download_bar.cc:155
 msgid "Downloading..."
 msgstr "Pobieranie..."
 
@@ -1275,7 +1280,7 @@
 msgid "Couldn't clean out list directories"
 msgstr "Nie mo¿na wyczy¶ciæ katalogów z listami"
 
-#: src/download.cc:177 src/ui.cc:1153
+#: src/download.cc:177 src/ui.cc:1147
 msgid "Deleting obsolete downloaded files"
 msgstr "Usuwanie nieaktualnych plików pakietów"
 
@@ -1411,7 +1416,7 @@
 "Ack!  Something bad happened while installing packages.  Trying to recover:"
 msgstr "W czasie instalacji wyst±pi³y problemy. Próba naprawy: "
 
-#: src/download.cc:477 src/pkg_item.cc:432
+#: src/download.cc:477 src/pkg_item.cc:430
 msgid "Press return to continue.\n"
 msgstr "Wci¶nij return.\n"
 
@@ -1421,17 +1426,17 @@
 msgstr ""
 "Nie uda³o siê odzyskaæ blokady systemowej! (Mo¿e pracuje inny apt lub dpkg?)"
 
-#: src/download_item.cc:66 src/download_item.cc:70 src/download_item.cc:100
+#: src/download_item.cc:70 src/download_item.cc:74 src/download_item.cc:104
 #: src/generic/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr "[Pracuje]"
 
-#: src/download_item.cc:104 src/download_list.cc:283
+#: src/download_item.cc:108 src/download_list.cc:284
 msgid "[Hit]"
 msgstr "[Stary]"
 
-#: src/download_item.cc:104 src/download_list.cc:303
+#: src/download_item.cc:108 src/download_list.cc:304
 msgid "[Downloaded]"
 msgstr "[Pobrany]"
 
@@ -1445,35 +1450,35 @@
 msgid "%n%nSome files were not downloaded successfully."
 msgstr ""
 
-#: src/download_list.cc:68
+#: src/download_list.cc:66
 msgid "Continue"
 msgstr "Dalej"
 
-#: src/download_list.cc:175 src/download_screen.cc:203
+#: src/download_list.cc:178 src/download_screen.cc:203
 msgid "Total Progress: "
 msgstr "Ogó³em: "
 
-#: src/download_list.cc:194 src/download_screen.cc:218
+#: src/download_list.cc:197 src/download_screen.cc:218
 #, c-format
 msgid " [ %i%% ] (%sB/s, %s remaining)"
 msgstr " [ %i%% ] (%sB/s, do koñca %s)"
 
 # kiepskie
-#: src/download_list.cc:196
+#: src/download_list.cc:199
 #, c-format
 msgid " [ %i%% ] (stalled)"
 msgstr " [ %i%% ] (zatrzymane)"
 
-#: src/download_list.cc:198
+#: src/download_list.cc:201
 #, c-format
 msgid " [ %i%% ]"
 msgstr " [ %i%% ]"
 
-#: src/download_list.cc:323
+#: src/download_list.cc:324
 msgid "[IGNORED]"
 msgstr "[ZIGNOROWANY]"
 
-#: src/download_list.cc:329
+#: src/download_list.cc:330
 msgid "[ERROR]"
 msgstr "[B£¡D]"
 
@@ -1482,11 +1487,11 @@
 msgid "Downloaded %sB in %ss (%sB/s)."
 msgstr "Pobrano %sB w %s (%sB/s)."
 
-#: src/edit_pkg_hier.cc:158
+#: src/edit_pkg_hier.cc:176
 msgid "No hierarchy information to edit"
 msgstr "Nie ma informacji o hierarchii do edycji"
 
-#: src/edit_pkg_hier.cc:258
+#: src/edit_pkg_hier.cc:276
 msgid "Couldn't open for writing"
 msgstr "Nie mo¿na otworzyæ do zapisu"
 
@@ -1583,39 +1588,39 @@
 msgstr ""
 "Uwaga: nie uda³o siê zablokowaæ pliku bufora. Otwarty tylko do odczytu."
 
-#: src/generic/matchers.cc:797
+#: src/generic/matchers.cc:798
 msgid "Unmatched '('"
 msgstr "Niesparowany nawias '('"
 
-#: src/generic/matchers.cc:887 src/generic/matchers.cc:968
+#: src/generic/matchers.cc:888 src/generic/matchers.cc:969
 #, c-format
 msgid "Unknown dependency type: %s"
 msgstr "Nieznany typ zale¿no¶ci: %s"
 
-#: src/generic/matchers.cc:950
+#: src/generic/matchers.cc:951
 #, c-format
 msgid "Unknown action type: %s"
 msgstr "Nieznana akcja: %s"
 
-#: src/generic/matchers.cc:1017
+#: src/generic/matchers.cc:1018
 #, c-format
 msgid "Unknown priority %s"
 msgstr "Nieznany priorytet: %s"
 
-#: src/generic/matchers.cc:1039
+#: src/generic/matchers.cc:1040
 #, c-format
 msgid "Unknown pattern type: %c"
 msgstr "Nieznany typ wzorca: %c"
 
-#: src/generic/matchers.cc:1084
+#: src/generic/matchers.cc:1105
 msgid "Unexpected empty expression"
 msgstr "Niespodziewane puste wyra¿enie"
 
-#: src/generic/matchers.cc:1119
+#: src/generic/matchers.cc:1143
 msgid "Badly formed expression"
 msgstr "Niepoprawne wyra¿enie"
 
-#: src/generic/matchers.cc:1148
+#: src/generic/matchers.cc:1175
 msgid "Unexpected ')'"
 msgstr "Niespodziewany nawias ')'"
 
@@ -1640,7 +1645,7 @@
 msgstr ""
 "Nie mo¿na pobraæ warto¶ci $HOME, zostanie u¿yty $TMPDIR (niebezpieczne)"
 
-#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:61
+#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:76
 #, c-format
 msgid "ChangeLog of %s"
 msgstr "Dziennik zmian dla %s"
@@ -1681,37 +1686,37 @@
 msgid "Reading task descriptions"
 msgstr "Odczyt opisów zadañ"
 
-#: src/load_config.cc:30
-#, c-format
-msgid "Invalid entry in color definition group: \"%s\""
-msgstr "Nieprawid³owy wpis w grupie definicji kolorów: \"%s\""
+#: src/load_config.cc:42
+#, fuzzy, c-format
+msgid "Unrecognized color name \"%s\""
+msgstr "Nierozpoznane zadania"
 
-#: src/load_config.cc:32
-#, c-format
-msgid "Invalid tagless entry in color definition group: \"%s\""
-msgstr "Wpis bez etykiety w grupie definicji kolorów: \"%s\""
+#: src/load_config.cc:69
+#, fuzzy, c-format
+msgid "Unrecognized attribute name \"%s\""
+msgstr "Nierozpoznane zadania"
 
-#: src/load_config.cc:34
-#, c-format
-msgid "Need exactly two colors in color definition \"%s\""
-msgstr "Definicja \"%s\" wymaga podania dok³adnie dwóch kolorów"
+#: src/load_config.cc:106
+#, fuzzy, c-format
+msgid "Invalid entry in style definition group: \"%s\""
+msgstr "Nieprawid³owy wpis w grupie definicji kolorów: \"%s\""
 
-#: src/load_config.cc:50
-#, c-format
-msgid "Can't parse foreground \"%s\"of color \"%s\""
-msgstr "Nierozpoznany kolor pierwszoplanowy \"%s\" w definicji \"%s\""
+#: src/load_config.cc:108
+#, fuzzy, c-format
+msgid "Invalid tagless entry in style definition group: \"%s\""
+msgstr "Wpis bez etykiety w grupie definicji kolorów: \"%s\""
 
-#: src/load_config.cc:53
-#, c-format
-msgid "Can't parse background \"%s\" of color \"%s\""
-msgstr "Nierozpoznany kolor t³a \"%s\" w definicji \"%s\""
+#: src/load_config.cc:130
+#, fuzzy, c-format
+msgid "Unknown style attribute %s"
+msgstr "Nieznana akcja: %s"
 
-#: src/load_config.cc:72 src/load_config.cc:74
+#: src/load_config.cc:153 src/load_config.cc:155
 #, c-format
 msgid "Invalid entry in keybinding group: \"%s\""
 msgstr "Nieprawid³owy wpis w grupie definicji klawiatury: \"%s\""
 
-#: src/load_config.cc:89
+#: src/load_config.cc:170
 #, c-format
 msgid "Ignoring invalid keybinding \"%s\" -> \"%s\""
 msgstr "Zignorowano nieprawid³owe przypisanie klawisza: \"%s\" -> \"%s\""
@@ -2125,43 +2130,43 @@
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                  Ten aptitude nie posiada Mocy Super Krowy.\n"
 
-#: src/main.cc:255
+#: src/main.cc:252
 #, 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:301 src/main.cc:310
+#: src/main.cc:291 src/main.cc:300
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr "DZIWNE: otrzymano nieznany kod opcji\n"
 
-#: src/main.cc:319
+#: src/main.cc:309
 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:327
+#: src/main.cc:317
 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:348
+#: src/main.cc:338
 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:405
+#: src/main.cc:395
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr "Nieznane polecenie:\"%s\"\n"
 
-#: src/main.cc:412 src/main.cc:469
+#: src/main.cc:402 src/main.cc:450
 msgid "Internal error: uncaught 'out of solutions' exception.\n"
 msgstr ""
 
-#: src/main.cc:417 src/main.cc:474
+#: src/main.cc:407 src/main.cc:455
 msgid "Internal error: uncaught 'out of time' exception.\n"
 msgstr ""
 
-#: src/main.cc:424
+#: src/main.cc:414
 #, c-format
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
@@ -2192,7 +2197,7 @@
 msgid "Lost"
 msgstr "Przegrana"
 
-#: src/mine/cmine.cc:119 src/ui.cc:1090
+#: src/mine/cmine.cc:119 src/ui.cc:1084
 msgid "Minesweeper"
 msgstr "Saper"
 
@@ -2218,148 +2223,148 @@
 msgid "The number of mines must be a number"
 msgstr "Liczba min musi byæ liczb±"
 
-#: src/mine/cmine.cc:240
+#: src/mine/cmine.cc:238
 msgid "Setup custom game"
 msgstr "W³asna gra"
 
-#: src/mine/cmine.cc:243
+#: src/mine/cmine.cc:240
 msgid "Height of board: "
 msgstr "Wysoko¶æ planszy: "
 
-#: src/mine/cmine.cc:247
+#: src/mine/cmine.cc:243
 msgid "Width of board: "
 msgstr "Szeroko¶æ planszy: "
 
-#: src/mine/cmine.cc:251
+#: src/mine/cmine.cc:246
 msgid "Number of mines: "
 msgstr "Liczba min: "
 
-#: src/mine/cmine.cc:316
+#: src/mine/cmine.cc:305
 msgid "Choose difficulty level"
 msgstr "Poziom trudno¶ci"
 
-#: src/mine/cmine.cc:318
+#: src/mine/cmine.cc:307
 msgid "Easy"
 msgstr "£atwy"
 
-#: src/mine/cmine.cc:319
+#: src/mine/cmine.cc:308
 msgid "Medium"
 msgstr "¦redni"
 
-#: src/mine/cmine.cc:320
+#: src/mine/cmine.cc:309
 msgid "Hard"
 msgstr "Trudny"
 
-#: src/mine/cmine.cc:321
+#: src/mine/cmine.cc:310
 msgid "Custom"
 msgstr "W³asny"
 
-#: src/mine/cmine.cc:411
+#: src/mine/cmine.cc:392
 msgid "You have won."
 msgstr "Wygrywasz."
 
-#: src/mine/cmine.cc:414
+#: src/mine/cmine.cc:395
 msgid "You lose!"
 msgstr "Przegrywasz!"
 
-#: src/mine/cmine.cc:419
+#: src/mine/cmine.cc:400
 msgid "You die...  --More--"
 msgstr "Giniesz...  --Dalej--"
 
-#: src/mine/cmine.cc:432
+#: src/mine/cmine.cc:413
 msgid "The spikes were poisoned!  The poison was deadly..  --More--"
 msgstr "Kolce by³y zatrute! Zabójcz± trucizn±...  --Dalej--"
 
-#: src/mine/cmine.cc:435
+#: src/mine/cmine.cc:416
 msgid "You land on a set of sharp iron spikes!  --More--"
 msgstr "Trafiasz na ostre ¿elazne kolce!  --Dalej--"
 
-#: src/mine/cmine.cc:438
+#: src/mine/cmine.cc:419
 msgid "You fall into a pit!  --More--"
 msgstr "Wpadasz do jamy!  --Dalej--"
 
-#: src/mine/cmine.cc:441
+#: src/mine/cmine.cc:422
 msgid "KABOOM!  You step on a land mine.  --More--"
 msgstr "BUM! Trafiasz na minê.  --Dalej--"
 
-#: src/mine/cmine.cc:446
+#: src/mine/cmine.cc:427
 msgid "The dart was poisoned!  The poison was deadly...  --More--"
 msgstr "Grot by³ zatruty! Zabójcz± trucizn±...  --Dalej--"
 
-#: src/mine/cmine.cc:448
+#: src/mine/cmine.cc:429
 msgid ""
 "A little dart shoots out at you!  You are hit by a little dart!  --More--"
 msgstr "W twoim kierunku wystrzela niewielki grot! Trafia ciê!  --Dalej--"
 
-#: src/mine/cmine.cc:452
+#: src/mine/cmine.cc:433
 msgid "You turn to stone... --More--"
 msgstr "Zamieniasz siê w kamieñ...  --Dalej--"
 
-#: src/mine/cmine.cc:454
+#: src/mine/cmine.cc:435
 msgid "Touching the cockatrice corpse was a fatal mistake.  --More--"
 msgstr "Dotykanie bazyliszka by³o ¶miertelnym b³êdem.  --Dalej--"
 
-#: src/mine/cmine.cc:456
+#: src/mine/cmine.cc:437
 msgid "You feel here a cockatrice corpse.  --More--"
 msgstr "Wyczuwasz zw³oki bazyliszka.  --Dalej--"
 
-#: src/mine/cmine.cc:460
+#: src/mine/cmine.cc:441
 msgid ""
 "Click!  You trigger a rolling boulder trap!  You are hit by a boulder! --"
 "More--"
 msgstr ""
 "Klik! Uruchamiasz pu³apkê tocz±cych siê g³azów! Trafia ciê g³az! --Dalej--"
 
-#: src/mine/cmine.cc:470
+#: src/mine/cmine.cc:451
 msgid "sleep"
 msgstr "snu"
 
-#: src/mine/cmine.cc:473
+#: src/mine/cmine.cc:454
 msgid "striking"
 msgstr "uderzenia"
 
-#: src/mine/cmine.cc:476
+#: src/mine/cmine.cc:457
 msgid "death"
 msgstr "¶mierci"
 
-#: src/mine/cmine.cc:479
+#: src/mine/cmine.cc:460
 msgid "polymorph"
 msgstr "polimorfizmu"
 
-#: src/mine/cmine.cc:482
+#: src/mine/cmine.cc:463
 msgid "magic missile"
 msgstr "magicznych pocisków"
 
-#: src/mine/cmine.cc:485
+#: src/mine/cmine.cc:466
 msgid "secret door detection"
 msgstr "wykrywania ukrytych drzwi"
 
-#: src/mine/cmine.cc:488
+#: src/mine/cmine.cc:469
 msgid "invisibility"
 msgstr "niewidzialno¶ci"
 
-#: src/mine/cmine.cc:491
+#: src/mine/cmine.cc:472
 msgid "cold"
 msgstr "ch³odu"
 
-#: src/mine/cmine.cc:497
+#: src/mine/cmine.cc:478
 #, c-format
 msgid "Your wand of %s breaks apart and explodes!  --More--"
 msgstr "Twoja ró¿d¿ka %s ³amie siê eksploduj±c!  --Dalej--"
 
-#: src/mine/cmine.cc:503
+#: src/mine/cmine.cc:484
 msgid "You are jolted by a surge of electricity!  --More--"
 msgstr "Pora¿a ciê wy³adowanie elektryczne!  --Dalej--"
 
-#: src/mine/cmine.cc:607
+#: src/mine/cmine.cc:588
 msgid "Enter the filename to load: "
 msgstr "Nazwa pliku do odczytania: "
 
-#: src/mine/cmine.cc:614
+#: src/mine/cmine.cc:595
 msgid "Enter the filename to save: "
 msgstr "Nazwa pliku do zapisania:"
 
-#: src/mine/cmine.cc:624
+#: src/mine/cmine.cc:605
 msgid "mine-help.txt"
 msgstr "mine-help.txt"
 
@@ -2367,7 +2372,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:1670
+#: src/pkg_columnizer.cc:84 src/ui.cc:1662
 msgid "Package"
 msgstr "Pakiet"
 
@@ -3425,52 +3430,52 @@
 "Czy na pewno chcesz go usun±æ?\n"
 "Je¶li tak, wpisz '%s'."
 
-#: src/pkg_item.cc:222 src/pkg_ver_item.cc:625
+#: src/pkg_item.cc:220 src/pkg_ver_item.cc:626
 #, c-format
 msgid "Information about %s"
 msgstr "Informacje o %s"
 
-#: src/pkg_item.cc:224 src/pkg_ver_item.cc:627
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:628
 #, c-format
 msgid "%s info"
 msgstr ""
 
-#: src/pkg_item.cc:310
+#: src/pkg_item.cc:308
 #, fuzzy, c-format
 msgid "Available versions of %s"
 msgstr "Dostêpne wersje "
 
-#: src/pkg_item.cc:313
+#: src/pkg_item.cc:311
 #, fuzzy, c-format
 msgid "%s versions"
 msgstr "Wersje"
 
-#: src/pkg_item.cc:325 src/pkg_ver_item.cc:655
+#: src/pkg_item.cc:323 src/pkg_ver_item.cc:656
 #, c-format
 msgid "Dependencies of %s"
 msgstr "Zale¿no¶ci %s"
 
-#: src/pkg_item.cc:327 src/pkg_ver_item.cc:657
+#: src/pkg_item.cc:325 src/pkg_ver_item.cc:658
 #, c-format
 msgid "%s deps"
 msgstr ""
 
-#: src/pkg_item.cc:338 src/pkg_ver_item.cc:667
+#: src/pkg_item.cc:336 src/pkg_ver_item.cc:668
 #, c-format
 msgid "Packages depending on %s"
 msgstr "Pakiety zale¿ne od %s"
 
-#: src/pkg_item.cc:340 src/pkg_ver_item.cc:669
+#: src/pkg_item.cc:338 src/pkg_ver_item.cc:670
 #, c-format
 msgid "%s reverse deps"
 msgstr ""
 
-#: src/pkg_item.cc:392 src/pkg_ver_item.cc:707
+#: src/pkg_item.cc:390 src/pkg_ver_item.cc:708
 #, c-format
 msgid "Reporting a bug in %s:\n"
 msgstr "Zg³aszanie b³êdu w %s:\n"
 
-#: src/pkg_item.cc:414
+#: src/pkg_item.cc:412
 #, fuzzy
 msgid ""
 "You are not root and I cannot find any way to become root.  To reconfigure "
@@ -3482,16 +3487,16 @@
 "By móc rekonfigurowaæ pakiety, zainstaluj pakiet menu,\n"
 "login lub uruchamiaj aptitude jako administrator."
 
-#: src/pkg_item.cc:422
+#: src/pkg_item.cc:420
 #, c-format
 msgid "Reconfiguring %s\n"
 msgstr "Rekonfigurowanie pakietu \"%s\"\n"
 
-#: src/pkg_item.cc:447
+#: src/pkg_item.cc:445
 msgid "Hierarchy editor"
 msgstr "Edytor hierarchii"
 
-#: src/pkg_item.cc:447
+#: src/pkg_item.cc:445
 #, fuzzy
 msgid "Hierarchy Editor"
 msgstr "Edytor hierarchii"
@@ -3525,22 +3530,22 @@
 msgid "Enter the new package sorting mechanism for this display: "
 msgstr "Nowy sposób sortowania pakietów w tym widoku: "
 
-#: src/pkg_view.cc:344
+#: src/pkg_view.cc:359
 msgid "make_package_view: error in arguments -- two main widgets??"
 msgstr "make_package_view: b³êdne argumenty -- dwa g³ówne elementy??"
 
-#: src/pkg_view.cc:350
+#: src/pkg_view.cc:365
 msgid ""
 "make_package_view: error in arguments -- bad column list for static item"
 msgstr ""
 "make_package_view: b³êdne argumenty -- nieprawid³owa lista kolumn elementu "
 "statycznego"
 
-#: src/pkg_view.cc:443
+#: src/pkg_view.cc:458
 msgid "make_package_view: bad argument!"
 msgstr "make_package_view: b³êdny argument!"
 
-#: src/pkg_view.cc:495
+#: src/pkg_view.cc:510
 msgid "make_package_view: no main widget found"
 msgstr "make_package_view: brak g³ównego elementu"
 
@@ -3577,19 +3582,19 @@
 msgid " (provided by %F)"
 msgstr " (udostêpniany przez %F)"
 
-#: src/reason_fragment.cc:278
+#: src/reason_fragment.cc:275
 #, c-format
 msgid "%F%s %F %F"
 msgstr "%F%s %F %F"
 
-#: src/reason_fragment.cc:327
+#: src/reason_fragment.cc:324
 msgid ""
 "If you select a package, an explanation of its current state will appear in "
 "this space."
 msgstr ""
 "Po wybraniu pakietu zostanie tu wy¶wietlony opis jego bie¿±cego stanu. "
 
-#: src/reason_fragment.cc:361
+#: src/reason_fragment.cc:358
 msgid ""
 "%B%s%b was installed automatically;  it is being removed because all of the "
 "packages which depend upon it are being removed:"
@@ -3597,20 +3602,20 @@
 "Pakiet %B%s%b by³ zainstalowany automatycznie; zostanie usuniêty, poniewa¿ "
 "usuwane s± wszystke wymagaj±ce go pakiety:"
 
-#: src/reason_fragment.cc:365
+#: src/reason_fragment.cc:362
 msgid "%B%s%b will be automatically removed because of dependency errors:"
 msgstr ""
 "Pakiet %B%s%b zostanie automatycznie usuniêty z powodu niespe³nionych "
 "zale¿no¶ci:"
 
-#: src/reason_fragment.cc:369
+#: src/reason_fragment.cc:366
 msgid ""
 "%B%s%b will be automatically installed to satisfy the following dependencies:"
 msgstr ""
 "Pakiet %B%s%b zostanie automatycznie zainstalowany w celu spe³nienia "
 "nastêpuj±cych zale¿no¶ci:"
 
-#: src/reason_fragment.cc:375 src/reason_fragment.cc:387
+#: src/reason_fragment.cc:372 src/reason_fragment.cc:384
 msgid ""
 "%B%s%b cannot be upgraded now, but if it could be, it would still be held at "
 "version %B%s%b."
@@ -3618,7 +3623,7 @@
 "Pakiet %B%s%b nie mo¿e teraz zostaæ uaktualniony. Nawet gdyby móg³, zosta³by "
 "zatrzymany na wersji %B%s%b."
 
-#: src/reason_fragment.cc:378
+#: src/reason_fragment.cc:375
 msgid ""
 "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the "
 "following dependencies:"
@@ -3626,27 +3631,27 @@
 "Pakiet %B%s%b nie zostanie uaktualniony do wersji %B%s%b, aby zapobiec "
 "niespe³nieniu nastêpuj±cych zale¿no¶ci:"
 
-#: src/reason_fragment.cc:390
+#: src/reason_fragment.cc:387
 msgid "%B%s%b is currently installed."
 msgstr "Pakiet %B%s%b jest zainstalowany."
 
-#: src/reason_fragment.cc:396
+#: src/reason_fragment.cc:393
 msgid "%B%s%b is not currently installed."
 msgstr "Pakiet %B%s%b nie jest zainstalowany."
 
-#: src/reason_fragment.cc:404
+#: src/reason_fragment.cc:401
 msgid "Some dependencies of %B%s%b are not satisfied:"
 msgstr "Niektóre zale¿no¶ci pakietu %B%s%b nie s± spe³nione:"
 
-#: src/reason_fragment.cc:408
+#: src/reason_fragment.cc:405
 msgid "%B%s%b will be downgraded."
 msgstr "Pakiet %B%s%b zostanie cofniêty."
 
-#: src/reason_fragment.cc:415
+#: src/reason_fragment.cc:412
 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b."
 msgstr "Pakiet %B%s%b nie zostanie uaktualniony do zablokowanej wersji %B%s%b."
 
-#: src/reason_fragment.cc:419
+#: src/reason_fragment.cc:416
 msgid ""
 "%B%s%b could be upgraded to version %B%s%b, but it is being held at version %"
 "B%s%b."
@@ -3654,35 +3659,35 @@
 "Pakiet %B%s%b mo¿e byæ uaktualniony do wersji %B%s%b, jest jednak zatrzymany "
 "na wersji %B%s%b."
 
-#: src/reason_fragment.cc:426
+#: src/reason_fragment.cc:423
 msgid "%B%s%b will be re-installed."
 msgstr "Pakiet %B%s%b zostanie ponownie zainstalowany."
 
-#: src/reason_fragment.cc:430
+#: src/reason_fragment.cc:427
 msgid "%B%s%b will be installed."
 msgstr "Pakiet %B%s%b zostanie zainstalowany."
 
-#: src/reason_fragment.cc:434
+#: src/reason_fragment.cc:431
 msgid "%B%s%b will be removed."
 msgstr "Pakiet %B%s%b zostanie usuniety."
 
-#: src/reason_fragment.cc:439
+#: src/reason_fragment.cc:436
 msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b."
 msgstr "Pakiet %B%s%b zostanie uaktualniony z wersji %B%s%b do wersji %B%s%b."
 
-#: src/reason_fragment.cc:475
+#: src/reason_fragment.cc:472
 msgid ""
 "The following packages depend on %B%s%b and will be broken by its removal:"
 msgstr ""
 "Nastêpuj±ce pakiety wymagaj± pakietu %B%s%b i po jego usuniêciu bêd± mia³y "
 "niespe³nione zale¿no¶ci:"
 
-#: src/reason_fragment.cc:478
+#: src/reason_fragment.cc:475
 msgid "The following packages depend on %B%s%b and are broken:"
 msgstr ""
 "Nastêpuj±ce pakiety wymagaj± pakietu %B%s%b i maj± niespe³nione zale¿no¶ci:"
 
-#: src/reason_fragment.cc:485
+#: src/reason_fragment.cc:482
 msgid ""
 "The following packages conflict with %B%s%b and will be broken by its "
 "installation:"
@@ -3690,7 +3695,7 @@
 "Nastêpuj±ce pakiety s± w konflikcie z pakietem %B%s%b i po jego instalacji "
 "bêd± mia³y niespe³nione zale¿no¶ci:"
 
-#: src/reason_fragment.cc:518
+#: src/reason_fragment.cc:515
 msgid ""
 "The following packages depend on a version of %B%s%b other than the "
 "currently installed version of %B%s%b, or conflict with the currently "
@@ -3699,7 +3704,7 @@
 "Nastêpuj±ce pakiety wymagaj± wersji pakietu %B%s%b innej ni¿ obecnie "
 "zainstalowana wersja %B%s%b lub s± w konflikcie z obecn± wersj±:"
 
-#: src/reason_fragment.cc:522
+#: src/reason_fragment.cc:519
 msgid ""
 "The following packages conflict with %B%s%b, or depend on a version of it "
 "which is not going to be installed."
@@ -3707,11 +3712,11 @@
 "Nastêpuj±ce pakiety s± w konflikcie z pakietem %B%s%b lub wymagaj± takiej "
 "jego wersji, która nie jest planowana do instalacji."
 
-#: src/reason_fragment.cc:526
+#: src/reason_fragment.cc:523
 msgid "The following packages conflict with %B%s%b:"
 msgstr "Nastêpuj±ce pakiety s± w konflikcie z pakietem %B%s%b:"
 
-#: src/reason_fragment.cc:531
+#: src/reason_fragment.cc:528
 msgid ""
 "The following packages depend on a version of %B%s%b other than the "
 "currently installed version of %B%s%b:"
@@ -3719,7 +3724,7 @@
 "Nastêpuj±ce pakiety wymagaj± wersji pakietu %B%s%b ró¿nej od obecnie "
 "zainstalowanej wersji %B%s%b:"
 
-#: src/reason_fragment.cc:535
+#: src/reason_fragment.cc:532
 msgid ""
 "The following packages depend on a version of %B%s%b which is not going to "
 "be installed."
@@ -3727,15 +3732,15 @@
 "Nastêpuj±ce pakiety wymagaj± wersji pakietu %B%s%b, która nie jest planowana "
 "do instalacji."
 
-#: src/reason_fragment.cc:541
+#: src/reason_fragment.cc:538
 msgid "upgraded"
 msgstr "uaktualniony"
 
-#: src/reason_fragment.cc:541
+#: src/reason_fragment.cc:538
 msgid "downgraded"
 msgstr "cofniêty"
 
-#: src/reason_fragment.cc:547
+#: src/reason_fragment.cc:544
 msgid ""
 "The following packages depend on the currently installed version of %B%s%b (%"
 "B%s%b), or conflict with the version it will be %s to (%B%s%b), and will be "
@@ -3745,7 +3750,7 @@
 "(%B%s%b) lub s± w konflikcie z wersj± do której ma byæ %s (%B%s%b), bêd± "
 "wiêc mia³y niespe³nione zale¿no¶ci je¶li zostanie %s."
 
-#: src/reason_fragment.cc:554
+#: src/reason_fragment.cc:551
 msgid ""
 "The following packages conflict with version %B%s%b of %B%s%b, and will be "
 "broken if it is %s."
@@ -3753,7 +3758,7 @@
 "Nastêpuj±ce pakiety s± w konflikcie z pakietem %B%2$s%b w wersji %B%1$s%b, i "
 "bêd± mia³y niespe³nione zale¿no¶ci je¶li zostanie %3$s."
 
-#: src/reason_fragment.cc:559
+#: src/reason_fragment.cc:556
 msgid ""
 "The following packages depend on version %B%s%b of %B%s%b, and will be "
 "broken if it is %s."
@@ -3800,31 +3805,36 @@
 msgid "Close"
 msgstr "^Zamknij"
 
-#: src/solution_fragment.cc:125
+#: src/solution_fragment.cc:134
 #, fuzzy
 msgid "%BRemove%b the following packages:%n"
 msgstr "Nastêpuj±ce pakiety maj± NIESPE£NIONE zale¿no¶ci:"
 
-#: src/solution_fragment.cc:135
+#: src/solution_fragment.cc:144
 #, fuzzy
 msgid "%BInstall%b the following packages:%n"
 msgstr "Nastêpuj±ce pakiety maj± NIESPE£NIONE zale¿no¶ci:"
 
-#: src/solution_fragment.cc:148
+#: src/solution_fragment.cc:157
 msgid "%BKeep%b the following packages at their current version:%n"
 msgstr ""
 
-#: src/solution_fragment.cc:161
+#: src/solution_fragment.cc:164
+#, fuzzy
+msgid "Not Installed"
+msgstr "niezainstalowany"
+
+#: src/solution_fragment.cc:177
 #, fuzzy
 msgid "%BUpgrade%b the following packages:%n"
 msgstr "Nastêpuj±ce pakiety maj± NIESPE£NIONE zale¿no¶ci:"
 
-#: src/solution_fragment.cc:176
+#: src/solution_fragment.cc:192
 #, fuzzy
 msgid "%BDowngrade%b the following packages:%n"
 msgstr "Pobieranie pakietów"
 
-#: src/solution_fragment.cc:190
+#: src/solution_fragment.cc:206
 #, c-format
 msgid "Score is %d"
 msgstr ""
@@ -3852,43 +3862,43 @@
 msgid "W:"
 msgstr ""
 
-#: src/ui.cc:194
+#: src/ui.cc:193
 msgid "Search for:"
 msgstr "Znajd¼:"
 
-#: src/ui.cc:262
+#: src/ui.cc:258
 msgid "You already are root!"
 msgstr "Ju¿ jeste¶ administratorem."
 
-#: src/ui.cc:360
+#: src/ui.cc:356
 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:388
+#: src/ui.cc:384
 msgid "Loading cache"
 msgstr "Odczyt stanu"
 
-#: src/ui.cc:410
+#: src/ui.cc:406
 msgid "Really quit Aptitude?"
 msgstr "Zakoñczyæ Aptitude?"
 
-#: src/ui.cc:489
+#: src/ui.cc:485
 msgid "Really discard your personal settings and reload the defaults?"
 msgstr "Przywróciæ ustawienia domy¶lne rezygnuj±c z wprowadzonych zmian?"
 
-#: src/ui.cc:589 src/ui.cc:591 src/ui.cc:619 src/ui.cc:621
+#: src/ui.cc:585 src/ui.cc:587 src/ui.cc:615 src/ui.cc:617
 msgid "Packages"
 msgstr "Pakiety"
 
-#: src/ui.cc:590 src/ui.cc:620
+#: src/ui.cc:586 src/ui.cc:616
 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:667
+#: src/ui.cc:663
 #, fuzzy
 msgid ""
-"%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
+"Aptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
 "BABSOLUTELY NO WARRANTY%b; for details see 'license' in the Help menu.  This "
 "is free software, and you are welcome to redistribute it under certain "
 "conditions; see 'license' for details."
@@ -3903,61 +3913,66 @@
 "na okre¶lonych warunkach; szczegó³owe informacje mo¿na znale¼æ\n"
 "wybieraj±c pozycjê Licencja z menu Pomoc."
 
-#: src/ui.cc:688
+#: src/ui.cc:684
 msgid "help.txt"
 msgstr "help-pl.txt"
 
-#: src/ui.cc:704
+#: src/ui.cc:700
 msgid "README"
 msgstr "README"
 
-#: src/ui.cc:786
+#: src/ui.cc:782
 msgid ""
-"%C%BWARNING%b: untrusted versions of the following packages will be "
-"installed!%n%nUntrusted packages could %Bcompromise your system's security%"
-"b.  You should only proceed with the installation if you are certain that "
-"this is what you want to do.%n%n"
+"%BWARNING%b: untrusted versions of the following packages will be installed!%"
+"n%nUntrusted packages could %Bcompromise your system's security%b.  You "
+"should only proceed with the installation if you are certain that this is "
+"what you want to do.%n%n"
 msgstr ""
 
-#: src/ui.cc:800
+#: src/ui.cc:788
+#, fuzzy
+msgid "  %S*%N %s [version %s]%n"
+msgstr "Wersje"
+
+#: src/ui.cc:795
 #, fuzzy
 msgid "Really Continue"
 msgstr "Dalej"
 
-#: src/ui.cc:802
+#: src/ui.cc:797
 msgid "Abort Installation"
 msgstr ""
 
-#: src/ui.cc:863
+#: src/ui.cc:858
 msgid "Preview of package installation"
 msgstr "Przegl±d planowanych dzia³añ"
 
-#: src/ui.cc:864
+#: src/ui.cc:859
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Przegl±danie i modyfikowanie akcji do wykonania"
 
-#: src/ui.cc:865
+#: src/ui.cc:860
 #, fuzzy
 msgid "Preview"
 msgstr "^Poprzedni"
 
-#: src/ui.cc:901
+#: src/ui.cc:896
 #, fuzzy
 msgid "Some packages were broken and have been fixed:"
 msgstr "Niektóre pakiety mia³y niespe³nione zale¿no¶ci"
 
-#: src/ui.cc:907
+#: src/ui.cc:902
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:913
-#, c-format
+#: src/ui.cc:908
+#, fuzzy, c-format
 msgid ""
-"Ran out of time while trying to resolver dependencies (press \"%s\" to try "
+"Ran out of time while trying to resolve dependencies (press \"%s\" to try "
 "harder)"
-msgstr ""
+msgstr "Strata czasu na poszukiwanie min"
 
-#: src/ui.cc:959
+#: src/ui.cc:954
 #, fuzzy
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
@@ -3966,25 +3981,25 @@
 "Instalowanie/usuwanie pakietów wymaga uprawnieñ administratora,\n"
 "których nie posiadasz. Czy chcesz siê prze³±czyæ na konto administratora?\n"
 
-#: src/ui.cc:962 src/ui.cc:1078
+#: src/ui.cc:957 src/ui.cc:1072
 msgid "Become root"
 msgstr "Prze³±cz"
 
-#: src/ui.cc:964 src/ui.cc:1080
+#: src/ui.cc:959 src/ui.cc:1074
 msgid "Don't become root"
 msgstr "Nie prze³±czaj"
 
-#: src/ui.cc:969 src/ui.cc:1085
+#: src/ui.cc:964 src/ui.cc:1079
 msgid "A package-list update or install run is already taking place."
 msgstr "Trwa uaktualnianie listy pakietów lub instalacja."
 
-#: src/ui.cc:996
+#: src/ui.cc:991
 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:1002
+#: src/ui.cc:997
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -3997,7 +4012,7 @@
 "w bie¿±cych wersjach.\n"
 "Wci¶nij \"U\" aby przygotowaæ uaktualnienie."
 
-#: src/ui.cc:1074
+#: src/ui.cc:1069
 #, fuzzy
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
@@ -4006,112 +4021,112 @@
 "Uaktualnianie listy pakietów wymaga uprawnieñ administratora,\n"
 "których nie posiadasz. Czy chcesz siê prze³±czyæ na konto administratora?\n"
 
-#: src/ui.cc:1090 src/ui.cc:1377
+#: src/ui.cc:1084 src/ui.cc:1371
 msgid "Waste time trying to find mines"
 msgstr "Strata czasu na poszukiwanie min"
 
-#: src/ui.cc:1097 src/ui.cc:1150
+#: src/ui.cc:1091 src/ui.cc:1144
 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:1100
+#: src/ui.cc:1094
 msgid "Deleting downloaded files"
 msgstr "Usuwanie pobranych plików"
 
-#: src/ui.cc:1114
+#: src/ui.cc:1108
 msgid "Downloaded package files have been deleted"
 msgstr "Usuniêto pobrane pliki pakietów"
 
-#: src/ui.cc:1175
+#: src/ui.cc:1169
 #, 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:1247
+#: src/ui.cc:1241
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1252 src/ui.cc:1283
+#: src/ui.cc:1246 src/ui.cc:1277
 #, fuzzy
 msgid "Ran out of time while trying to find a solution."
 msgstr "Strata czasu na poszukiwanie min"
 
-#: src/ui.cc:1277
+#: src/ui.cc:1271
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1307
+#: src/ui.cc:1301
 #, fuzzy, c-format
 msgid "Unable to open %s"
 msgstr "Nie mo¿na otworzyæ %s do zapisu"
 
-#: src/ui.cc:1313
+#: src/ui.cc:1307
 msgid "Error while dumping resolver state"
 msgstr ""
 
-#: src/ui.cc:1323
+#: src/ui.cc:1317
 msgid "File to which the resolver state should be dumped:"
 msgstr ""
 
-#: src/ui.cc:1353
+#: src/ui.cc:1347
 msgid "^Install/remove packages"
 msgstr "Za^instaluj/usuñ pakiety"
 
-#: src/ui.cc:1354
+#: src/ui.cc:1348
 msgid "Perform all pending installs and removals"
 msgstr "Przeprowadza zaplanowane instalacje/usuniêcia"
 
-#: src/ui.cc:1356
+#: src/ui.cc:1350
 msgid "^Update package list"
 msgstr "^Uaktualnij listê pakietów"
 
-#: src/ui.cc:1357
+#: src/ui.cc:1351
 msgid "Check for new versions of packages"
 msgstr "Sprawdza dostêpno¶æ nowszych wersji pakietów"
 
-#: src/ui.cc:1360
+#: src/ui.cc:1354
 msgid "^Forget new packages"
 msgstr "^Zapomnij o nowo¶ciach"
 
-#: src/ui.cc:1361
+#: src/ui.cc:1355
 msgid "Forget which packages are \"new\""
 msgstr "Usuwa informacje, które pakiety s± nowe"
 
-#: src/ui.cc:1364
+#: src/ui.cc:1358
 msgid "^Clean package cache"
 msgstr "Wyczy¶æ ^archiwum pakietów"
 
-#: src/ui.cc:1365
+#: src/ui.cc:1359
 msgid "Delete package files which were previously downloaded"
 msgstr "Usuwa wszystkie pobrane wcze¶niej pliki"
 
-#: src/ui.cc:1368
+#: src/ui.cc:1362
 msgid "Clean ^obsolete files"
 msgstr "^Usuñ nieaktualne pliki"
 
-#: src/ui.cc:1369
+#: src/ui.cc:1363
 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:1372
+#: src/ui.cc:1366
 msgid "Mark ^Upgradable"
 msgstr "Zaznacz ^do uaktualnienia"
 
-#: src/ui.cc:1373
+#: src/ui.cc:1367
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr "Zaznacza do uaktualnienia wszystkie mo¿liwe nie zatrzymane pakiety"
 
-#: src/ui.cc:1376
+#: src/ui.cc:1370
 msgid "^Play Minesweeper"
 msgstr "^Saper"
 
-#: src/ui.cc:1379
+#: src/ui.cc:1373
 msgid "^Become root"
 msgstr "^Administrator"
 
-#: src/ui.cc:1380
+#: src/ui.cc:1374
 #, fuzzy
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
@@ -4120,68 +4135,68 @@
 "U¿ywa \"su\" do uzyskania uprawnieñ administratora.\n"
 "Program zostanie zrestartowany, ale ustawienia zostan± zachowane"
 
-#: src/ui.cc:1383
+#: src/ui.cc:1377
 msgid "^Reload package cache"
 msgstr "^Od¶wie¿ archiwum pakietów"
 
-#: src/ui.cc:1384
+#: src/ui.cc:1378
 msgid "Reload the package cache"
 msgstr "Ponownie odczytuje archiwum pakietów"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1384
 msgid "^Quit"
 msgstr "^Zakoñcz"
 
-#: src/ui.cc:1391
+#: src/ui.cc:1385
 msgid "Exit the program"
 msgstr "Koñczy program"
 
-#: src/ui.cc:1397 src/ui.cc:1669
+#: src/ui.cc:1391 src/ui.cc:1661
 msgid "Undo"
 msgstr "Cofnij"
 
-#: src/ui.cc:1398
+#: src/ui.cc:1392
 msgid "Undo the last package operation or group of operations"
 msgstr "Cofa ostatni± operacjê lub grupê operacji"
 
-#: src/ui.cc:1405
+#: src/ui.cc:1399
 msgid "^Install"
 msgstr "^Instaluj"
 
-#: src/ui.cc:1406
+#: src/ui.cc:1400
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "Dodaje wybrany pakiet do instalowanych/uaktualnianych"
 
-#: src/ui.cc:1409
+#: src/ui.cc:1403
 msgid "^Remove"
 msgstr "^Usuñ"
 
-#: src/ui.cc:1410
+#: src/ui.cc:1404
 msgid "Flag the currently selected package for removal"
 msgstr "Dodaje wybrany pakiet do usuwanych"
 
-#: src/ui.cc:1413
+#: src/ui.cc:1407
 msgid "^Purge"
 msgstr "^Wyczy¶æ"
 
-#: src/ui.cc:1414
+#: src/ui.cc:1408
 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:1417
+#: src/ui.cc:1411
 msgid "^Keep"
 msgstr "^Pozostaw"
 
-#: src/ui.cc:1418
+#: src/ui.cc:1412
 msgid "Cancel any action on the selected package"
 msgstr "Odwo³uje planowane dzia³ania na wybranym pakiecie"
 
-#: src/ui.cc:1421
+#: src/ui.cc:1415
 msgid "^Hold"
 msgstr "^Zatrzymaj"
 
-#: src/ui.cc:1422
+#: src/ui.cc:1416
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -4189,11 +4204,11 @@
 "Odwo³uje planowane dzia³ania na wybranym pakiecie i zapobiega jego "
 "uaktualnieniom w przysz³o¶ci"
 
-#: src/ui.cc:1425
+#: src/ui.cc:1419
 msgid "Mark ^Auto"
 msgstr "^Automatyczny"
 
-#: src/ui.cc:1426
+#: src/ui.cc:1420
 #, fuzzy
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
@@ -4202,11 +4217,11 @@
 "Oznacza wybrany pakiet jako zainstalowany automatycznie,\n"
 "czyli przeznaczony do usuniêcia, gdy nie bêdzie przez nic wymagany"
 
-#: src/ui.cc:1429
+#: src/ui.cc:1423
 msgid "Mark ^Manual"
 msgstr "¯±^dany"
 
-#: src/ui.cc:1430
+#: src/ui.cc:1424
 #, fuzzy
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
@@ -4215,11 +4230,11 @@
 "Oznacza wybrany pakiet jako zainstalowany na ¿±danie\n"
 "i nie podlegaj±cy automatycznemu usuwaniu"
 
-#: src/ui.cc:1433
+#: src/ui.cc:1427
 msgid "^Forbid Version"
 msgstr "Za^blokuj wersjê"
 
-#: src/ui.cc:1434
+#: src/ui.cc:1428
 #, fuzzy
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
@@ -4228,233 +4243,233 @@
 "Nie zezwala na instalacjê kandyduj±cej wersji wybranego pakietu;\n"
 "nowsze wersje bed± instalowane normalnie"
 
-#: src/ui.cc:1438
+#: src/ui.cc:1432
 msgid "I^nformation"
 msgstr "I^nformacje"
 
-#: src/ui.cc:1439
+#: src/ui.cc:1433
 msgid "Display more information about the selected package"
 msgstr "Wy¶wietla szczegó³owe informacje o wybranym pakiecie"
 
-#: src/ui.cc:1442
+#: src/ui.cc:1436
 msgid "^Changelog"
 msgstr "^Dziennik zmian"
 
-#: src/ui.cc:1443
+#: src/ui.cc:1437
 msgid "Display the Debian changelog of the selected package"
 msgstr "Wy¶wietla dziennik zmian wybranego pakietu"
 
-#: src/ui.cc:1450
+#: src/ui.cc:1444
 msgid "^Find"
 msgstr "^Znajd¼"
 
-#: src/ui.cc:1451
+#: src/ui.cc:1445
 msgid "Search for a package"
 msgstr "Szuka pakietu"
 
-#: src/ui.cc:1454
+#: src/ui.cc:1448
 msgid "Find ^Again"
 msgstr "Znajd¼ ^nastêpny"
 
-#: src/ui.cc:1455
+#: src/ui.cc:1449
 msgid "Repeat the last search"
 msgstr "Powtarza wyszukiwanie"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1453
 msgid "^Limit Display"
 msgstr "^Filtruj"
 
-#: src/ui.cc:1460
+#: src/ui.cc:1454
 msgid "Apply a filter to the package list"
 msgstr "Ogranicza wy¶wietlan± listê pakietów"
 
-#: src/ui.cc:1463
+#: src/ui.cc:1457
 msgid "^Un-Limit Display"
 msgstr "^Usuñ filtr"
 
-#: src/ui.cc:1464
+#: src/ui.cc:1458
 msgid "Remove the filter from the package list"
 msgstr "Usuwa ograniczenie wy¶wietlanej listy pakietów"
 
-#: src/ui.cc:1468
+#: src/ui.cc:1462
 msgid "Find ^Broken"
 msgstr "Znajd¼ ^problem"
 
-#: src/ui.cc:1469
+#: src/ui.cc:1463
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Szuka kolejnego pakietu z niespe³nionymi zale¿no¶ciami"
 
-#: src/ui.cc:1476
+#: src/ui.cc:1470
 msgid "^UI options"
 msgstr "Opcje ^interfejsu"
 
-#: src/ui.cc:1477
+#: src/ui.cc:1471
 msgid "Change the settings which affect the user interface"
 msgstr "Zmienia opcje dotycz±ce interfejsu u¿ytkownika"
 
-#: src/ui.cc:1480
+#: src/ui.cc:1474
 msgid "^Dependency handling"
 msgstr "^Zale¿no¶ci"
 
-#: src/ui.cc:1481
+#: src/ui.cc:1475
 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:1484
+#: src/ui.cc:1478
 msgid "^Miscellaneous"
 msgstr "^Ró¿ne"
 
-#: src/ui.cc:1485
+#: src/ui.cc:1479
 msgid "Change miscellaneous program settings"
 msgstr "Zmienia ró¿ne inne opcje programu"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1484
 msgid "^Revert options"
 msgstr "^Przywróæ domy¶lne"
 
-#: src/ui.cc:1491
+#: src/ui.cc:1485
 msgid "Reset all settings to the system defaults"
 msgstr "Przywraca wszystkim opcjom warto¶ci domy¶lne"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1496
 msgid "^Next"
 msgstr "^Nastêpny"
 
-#: src/ui.cc:1503
+#: src/ui.cc:1497
 msgid "View next display"
 msgstr "Wy¶wietla nastêpny widok"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1500
 msgid "^Prev"
 msgstr "^Poprzedni"
 
-#: src/ui.cc:1507
+#: src/ui.cc:1501
 msgid "View previous display"
 msgstr "Wy¶wietla poprzedni widok"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1504
 msgid "^Close"
 msgstr "^Zamknij"
 
-#: src/ui.cc:1511
+#: src/ui.cc:1505
 msgid "Close this display"
 msgstr "Zamyka bie¿±cy widok"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1510
 msgid "New Package ^View"
 msgstr "Nowy ^widok pakietów"
 
-#: src/ui.cc:1517
+#: src/ui.cc:1511
 msgid "Create a new default package view"
 msgstr "Tworzy nowy, standardowy widok listy pakietów"
 
-#: src/ui.cc:1520
+#: src/ui.cc:1514
 msgid "New Categorical ^Browser"
 msgstr "Nowa przegl±darka ^kategorii"
 
-#: src/ui.cc:1522
+#: src/ui.cc:1516
 msgid "Browse packages by category"
 msgstr "Pozwala na przegl±danie pakietów wed³ug kategorii"
 
-#: src/ui.cc:1530
+#: src/ui.cc:1524
 msgid "^About"
 msgstr "^O Aptitude"
 
-#: src/ui.cc:1531
+#: src/ui.cc:1525
 msgid "View information about this program"
 msgstr "Wy¶wietla informacje o programie"
 
-#: src/ui.cc:1534
+#: src/ui.cc:1528
 msgid "^Help"
 msgstr "^Pomoc"
 
-#: src/ui.cc:1535
+#: src/ui.cc:1529
 msgid "View the on-line help"
 msgstr "Wy¶wietla pomoc Aptitude"
 
-#: src/ui.cc:1537
+#: src/ui.cc:1531
 msgid "User's ^Manual"
 msgstr "Podrêcznik ^u¿ytkownika"
 
-#: src/ui.cc:1538
+#: src/ui.cc:1532
 msgid "View the detailed program manual"
 msgstr "Wy¶wietla podrêcznik u¿ytkownika programu"
 
-#: src/ui.cc:1541
+#: src/ui.cc:1535
 msgid "^FAQ"
 msgstr "^FAQ"
 
-#: src/ui.cc:1542
+#: src/ui.cc:1536
 msgid "View a list of frequently asked questions"
 msgstr "Wy¶wietla najczê¶ciej zadawane pytania na temat Aptitude"
 
-#: src/ui.cc:1545
+#: src/ui.cc:1539
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1546
+#: src/ui.cc:1540
 #, fuzzy
 msgid "View the important changes made in each version of "
 msgstr "Wy¶wietla najwa¿niejsze zmiany w kolejnych wersjach programu"
 
-#: src/ui.cc:1549
+#: src/ui.cc:1543
 msgid "^License"
 msgstr "^Licencja"
 
-#: src/ui.cc:1550
+#: src/ui.cc:1544
 msgid "View the terms under which you may copy the program"
 msgstr "Wy¶wietla warunki rozpowszechniania programu"
 
-#: src/ui.cc:1668
+#: src/ui.cc:1660
 msgid "Actions"
 msgstr "Akcje"
 
-#: src/ui.cc:1671
+#: src/ui.cc:1663
 msgid "Search"
 msgstr "Znajd¼"
 
-#: src/ui.cc:1672
+#: src/ui.cc:1664
 msgid "Options"
 msgstr "Opcje"
 
-#: src/ui.cc:1673
+#: src/ui.cc:1665
 msgid "Views"
 msgstr "Widoki"
 
-#: src/ui.cc:1674
+#: src/ui.cc:1666
 msgid "Help"
 msgstr "Pomoc"
 
-#: src/ui.cc:1734
+#: src/ui.cc:1726
 #, 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:2003 src/vscreen/vscreen.cc:281
+#: src/ui.cc:1996 src/vscreen/vscreen.cc:281
 msgid "yes_key"
 msgstr "t"
 
-#: src/ui.cc:2004 src/vscreen/vscreen.cc:282
+#: src/ui.cc:1997 src/vscreen/vscreen.cc:282
 msgid "no_key"
 msgstr "n"
 
-#: src/view_changelog.cc:46
+#: src/view_changelog.cc:61
 msgid "You can only view changelogs of official Debian packages."
 msgstr ""
 "Mo¿liwe wy¶wietlanie wy³±cznie dzienników zmian oficjalnych pakietów Debiana."
 
-#: src/view_changelog.cc:52
+#: src/view_changelog.cc:67
 msgid "Downloading Changelog"
 msgstr "Pobieranie dziennika zmian"
 
-#: src/view_changelog.cc:54
+#: src/view_changelog.cc:69
 #, fuzzy
 msgid "Download Changelog"
 msgstr "Pobieranie dziennika zmian"
 
-#: src/view_changelog.cc:63
+#: src/view_changelog.cc:78
 #, c-format
 msgid "%s changes"
 msgstr ""
@@ -4550,14 +4565,191 @@
 #~ "Proszê w³o¿yæ nastêpuj±cy dysk do napêdu \"%s\":\n"
 #~ "%s"
 
+#~ msgid "Need exactly two colors in color definition \"%s\""
+#~ msgstr "Definicja \"%s\" wymaga podania dok³adnie dwóch kolorów"
+
+#~ msgid "Can't parse foreground \"%s\"of color \"%s\""
+#~ msgstr "Nierozpoznany kolor pierwszoplanowy \"%s\" w definicji \"%s\""
+
+#~ msgid "Can't parse background \"%s\" of color \"%s\""
+#~ msgstr "Nierozpoznany kolor t³a \"%s\" w definicji \"%s\""
+
 #~ msgid "Invalid option for interactive mode: -s\n"
 #~ msgstr "Nieprawid³owa opcja dla trybu interaktywnego: -s\n"
 
+#~ 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."
+#~ 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ñ komunikacyjnych. Znajduj± siê tu programy takie jak PPP, zmodem/"
+#~ "kermit, a tak¿e np. oprogramowanie do obs³ugi telefonów komórkowych, "
+#~ "³±czno¶ci z FidoNetem czy prowadzenia BBS-u."
+
+#~ 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"
+#~ " .\n"
+#~ " For more information about what Debian considers to be Free Software, "
+#~ "see http://www.debian.org/social_contract#guidelines"
+#~ msgstr ""
+#~ "Programy nie bêd±ce wolnym oprogramowaniem\n"
+#~ " Pakiety w sekcji \"non-free\" nie nale¿± do systemu Debian.\n"
+#~ " .\n"
+#~ " Te pakiety nie spe³niaj± jakich¶ wymagañ Wytycznych Debiana dotycz±cych "
+#~ "Oprogramowania Wolnodostêpnego (patrz ni¿ej).Aby mieæ pewno¶æ, ¿e wolno "
+#~ "u¿ywaæ programów z tej sekcji w zamierzony sposób nale¿y zapoznaæ siê z "
+#~ "ich licencjami.\n"
+#~ " .\n"
+#~ " Aby uzyskaæ wiêcej informacji o tym co Debian uwa¿a za wolne "
+#~ "oprogramowanie nale¿y przeczytaæ http://www.debian.org/"
+#~ "social_contract#guidelines"
+
+#~ 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)"
+#~ msgstr ""
+#~ "Nowe pakiety\n"
+#~ " Te pakiety zosta³y dodane do Debiana od czasu ostatniego usuniêcia "
+#~ "informacji o nowo¶ciach (aby wyczy¶ciæ tê listê nale¿y wybraæ \"Zapomnij "
+#~ "o nowo¶ciach\" z menu \"Akcje\")."
+
+#~ msgid ""
+#~ "%s is an essential package!\n"
+#~ "\n"
+#~ "Are you sure you want to remove it?\n"
+#~ "Type '%s' if you are."
+#~ msgstr ""
+#~ "%s jest istotnym pakietem!\n"
+#~ "\n"
+#~ "Czy na pewno chcesz go usun±æ?\n"
+#~ "Je¶li tak, wpisz '%s'."
+
+#~ msgid "Available versions of "
+#~ msgstr "Dostêpne wersje "
+
+#~ 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."
+#~ 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."
+
 #~ msgid "Information about "
 #~ msgstr "Informacje o "
 
+#~ msgid ""
+#~ "Aptitude %s\n"
+#~ "\n"
+#~ "Copyright 2000 Daniel Burrows.\n"
+#~ "\n"
+#~ "aptitude comes with ABSOLUTELY NO WARRANTY; for details see 'license' in "
+#~ "the\n"
+#~ "Help menu.  This is free software, and you are welcome to redistribute "
+#~ "it\n"
+#~ "under certain conditions; see 'license' for details."
+#~ msgstr ""
+#~ "Aptitude %s\n"
+#~ "\n"
+#~ "Copyright 2000 Daniel Burrows.\n"
+#~ "\n"
+#~ "Aptitude rozpowszechniany jest BEZ JAKIEJKOLWIEK GWARANCJI;\n"
+#~ "aby poznaæ szczegó³y nale¿y wybraæ polecenie Licencja w menu Pomoc.\n"
+#~ "Ten program jest wolnym oprogramowaniem, mo¿na go rozpowszechniaæ\n"
+#~ "na okre¶lonych warunkach; szczegó³owe informacje mo¿na znale¼æ\n"
+#~ "wybieraj±c pozycjê Licencja z menu Pomoc."
+
+#~ msgid "Some packages were broken and have been fixed"
+#~ msgstr "Niektóre pakiety mia³y niespe³nione zale¿no¶ci"
+
 #~ msgid "Some broken packages could not be fixed!"
 #~ msgstr "Nie uda³o siê naprawiæ zale¿no¶ci niektórych pakietów."
 
+#~ msgid "Some packages are broken.  Try to fix them?"
+#~ msgstr "Niektóre pakiety maj± niespe³nione zale¿no¶ci. Naprawiæ je? "
+
+#~ msgid ""
+#~ "Installing/removing packages requires administrative privileges, which\n"
+#~ "you currently do not have.  Would you like to change to the root "
+#~ "account?\n"
+#~ msgstr ""
+#~ "Instalowanie/usuwanie pakietów wymaga uprawnieñ administratora,\n"
+#~ "których nie posiadasz. Czy chcesz siê prze³±czyæ na konto "
+#~ "administratora?\n"
+
+#~ msgid ""
+#~ "No packages will be installed, removed or upgraded.\n"
+#~ "\n"
+#~ "Some packages could be upgraded, but you have not chosen to upgrade "
+#~ "them.\n"
+#~ "Type \"U\" to prepare an upgrade."
+#~ msgstr ""
+#~ "¯adne pakiety nie zostan± zainstalowane, uaktualnione ani usuniête.\n"
+#~ "\n"
+#~ "Pewne pakiety mog³yby zostaæ uaktualnione, jednak wybrano pozostawienie "
+#~ "ich w bie¿±cych wersjach.\n"
+#~ "Wci¶nij \"U\" aby przygotowaæ uaktualnienie."
+
+#~ 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"
+#~ msgstr ""
+#~ "Uaktualnianie listy pakietów wymaga uprawnieñ administratora,\n"
+#~ "których nie posiadasz. Czy chcesz siê prze³±czyæ na konto "
+#~ "administratora?\n"
+
+#~ msgid "Obsolete downloaded package files have been deleted"
+#~ msgstr "Usuniêto nieaktualne pliki pakietów"
+
+#~ msgid ""
+#~ "Run 'su' to become root; this will restart the program, but your\n"
+#~ "settings will be preserved"
+#~ msgstr ""
+#~ "U¿ywa \"su\" do uzyskania uprawnieñ administratora.\n"
+#~ "Program zostanie zrestartowany, ale ustawienia zostan± zachowane"
+
+#~ msgid ""
+#~ "Mark the selected package as having been automatically installed;\n"
+#~ "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"
+
+#~ msgid ""
+#~ "Mark the selected package as having been manually installed;\n"
+#~ "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"
+
+#~ msgid ""
+#~ "Forbid the candidate version of the selected package from being "
+#~ "installed;\n"
+#~ "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"
+
 #~ msgid "^ChangeLog"
 #~ msgstr "^Dziennik zmian"
+
+#~ msgid "View the important changes made in each version of the program"
+#~ msgstr "Wy¶wietla najwa¿niejsze zmiany w kolejnych wersjach programu"

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	Sun Jun 12 21:04:47 2005
@@ -1,11 +1,15 @@
 # Portuguese (Portugal) Translation Project <traduz at debianpt.org>
 # 2004 Nuno Sénica
+#
+# 2005-03-28 - Miguel Figueiredo - 2f7u
+# 2005-05-17 - Miguel Figueiredo - fixed typos.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: aptitude 0.2.14-3\n"
 "Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-05-01 14:08-0400\n"
-"PO-Revision-Date: 2004-08-26 18:00+0000\n"
+"POT-Creation-Date: 2005-06-12 22:42+0200\n"
+"PO-Revision-Date: 2005-03-28 17:42+0000\n"
 "Last-Translator: Miguel Figueiredo <elmig at debianPT.org>\n"
 "Language-Team: Portuguese <traduz at debianpt.org>\n"
 "MIME-Version: 1.0\n"
@@ -156,14 +160,14 @@
 msgstr ""
 "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:219 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
-#: src/vscreen/vs_util.cc:328
+#: src/apt_options.cc:240 src/mine/cmine.cc:249 src/mine/cmine.cc:312
+#: src/ui.cc:215 src/vscreen/vs_util.cc:77 src/vscreen/vs_util.cc:90
+#: src/vscreen/vs_util.cc:264 src/vscreen/vs_util.cc:298
 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:328
+#: src/apt_options.cc:241 src/download_list.cc:69 src/mine/cmine.cc:250
+#: src/mine/cmine.cc:313 src/vscreen/vs_util.cc:298
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -244,15 +248,15 @@
 msgid "%s: Previous"
 msgstr ""
 
-#: src/broken_indicator.cc:233
+#: src/broken_indicator.cc:232
 #, c-format
-msgid "%CSolution search failed.  %s: try harder"
+msgid "Solution search failed.  %s: try harder"
 msgstr ""
 
-#: src/broken_indicator.cc:239
-#, c-format
-msgid "%CUnable to resolve dependencies."
-msgstr ""
+#: src/broken_indicator.cc:237
+#, fuzzy
+msgid "Unable to resolve dependencies."
+msgstr "Não foi possível abrir %s para gravação"
 
 #: src/cmdline/cmdline_action.cc:36
 #, c-format
@@ -624,31 +628,37 @@
 "this is what you want to do.\n"
 "\n"
 msgstr ""
+"AVISO: serão instaladas versões não confiáveis dos seguintes pacotes!\n"
+"\n"
+"Pacotes não confiáveis podem compremeter a segurança do seu sistema.\n"
+"Você só deve prosseguir com a instalação se tiver a certeza de que é\n"
+"isto o que deseja fazer.\n"
 
-#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
-#: src/vscreen/vs_util.cc:212
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:165
+#: src/vscreen/vs_util.cc:202
 msgid "Yes"
 msgstr "Sim"
 
-#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
-#: src/vscreen/vs_util.cc:212
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:165
+#: src/vscreen/vs_util.cc:202
 msgid "No"
 msgstr "Não"
 
 #: src/cmdline/cmdline_prompt.cc:388
 #, c-format
 msgid "Do you want to ignore this warning and proceed anyway?\n"
-msgstr ""
+msgstr "Deseja ignorar este aviso e continuar de qualquer forma?\n"
 
 #: src/cmdline/cmdline_prompt.cc:389
-#, fuzzy, c-format
+#, c-format
 msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
-msgstr "Para continuar, introduza a frase \"%s\":\n"
+msgstr ""
+"Para continuar, introduza a frase \"%s\"; para abortar, introduza \"%s\": "
 
 #: src/cmdline/cmdline_prompt.cc:400
 #, c-format
 msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
-msgstr ""
+msgstr "Entrada não reconhecida.  Introduza ou \"%s\" ou \"%s\".\n"
 
 #: src/cmdline/cmdline_prompt.cc:499
 #, c-format
@@ -948,7 +958,7 @@
 msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:212
+#: src/cmdline/cmdline_resolver.cc:212 src/cmdline/cmdline_resolver.cc:285
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
@@ -1007,196 +1017,201 @@
 msgid "The following packages have unmet dependencies:\n"
 msgstr "Os seguintes pacotes possuem dependências não satisfeitas:\n"
 
-#: src/cmdline/cmdline_show.cc:133
+#: src/cmdline/cmdline_show.cc:119 src/cmdline/cmdline_show.cc:305
+#: src/solution_fragment.cc:65
+msgid "<NULL>"
+msgstr ""
+
+#: src/cmdline/cmdline_show.cc:138
 msgid "not installed"
 msgstr "não instalado"
 
-#: src/cmdline/cmdline_show.cc:135 src/pkg_columnizer.cc:231
+#: src/cmdline/cmdline_show.cc:140 src/pkg_columnizer.cc:231
 #: src/pkg_ver_item.cc:225
 msgid "unpacked"
 msgstr "desempacotado"
 
-#: src/cmdline/cmdline_show.cc:137
+#: src/cmdline/cmdline_show.cc:142
 msgid "partially configured"
 msgstr "parcialmente configurado"
 
-#: src/cmdline/cmdline_show.cc:139
+#: src/cmdline/cmdline_show.cc:144
 msgid "partially installed"
 msgstr "parcialmente instalado"
 
-#: src/cmdline/cmdline_show.cc:141
+#: src/cmdline/cmdline_show.cc:146
 msgid "not installed (configuration files remain)"
 msgstr "não instalado (mantêm-se os ficheiros de configuração)"
 
-#: src/cmdline/cmdline_show.cc:143 src/pkg_columnizer.cc:239
+#: src/cmdline/cmdline_show.cc:148 src/pkg_columnizer.cc:239
 #: src/pkg_ver_item.cc:233
 msgid "installed"
 msgstr "instalado"
 
-#: src/cmdline/cmdline_show.cc:152
+#: src/cmdline/cmdline_show.cc:157
 msgid "not a real package"
 msgstr "não é um pacote verdadeiro"
 
-#: src/cmdline/cmdline_show.cc:165
+#: src/cmdline/cmdline_show.cc:170
 msgid " [held]"
 msgstr ".[mantido]"
 
-#: src/cmdline/cmdline_show.cc:174
+#: src/cmdline/cmdline_show.cc:179
 #, c-format
 msgid "%s; version %s will be installed"
 msgstr "%s; versão %s será instalado"
 
-#: src/cmdline/cmdline_show.cc:178
+#: src/cmdline/cmdline_show.cc:183
 #, c-format
 msgid "%s; version %s will be installed automatically"
 msgstr "%s; versão %s será instalado automaticamente"
 
-#: src/cmdline/cmdline_show.cc:184 src/cmdline/cmdline_show.cc:199
+#: src/cmdline/cmdline_show.cc:189 src/cmdline/cmdline_show.cc:204
 #, c-format
 msgid "%s; will be purged"
 msgstr "%s; será purgado"
 
-#: src/cmdline/cmdline_show.cc:197
+#: src/cmdline/cmdline_show.cc:202
 #, c-format
 msgid "%s; will be purged because nothing depends on it"
 msgstr "%s; será purgado porque nada depende dele"
 
-#: src/cmdline/cmdline_show.cc:204
+#: src/cmdline/cmdline_show.cc:209
 #, c-format
 msgid "%s; will be removed because nothing depends on it"
 msgstr "%s; será removido porque nada depende dele"
 
-#: src/cmdline/cmdline_show.cc:206
+#: src/cmdline/cmdline_show.cc:211
 #, c-format
 msgid "%s; will be removed"
 msgstr "%s; será removido"
 
-#: src/cmdline/cmdline_show.cc:220
+#: src/cmdline/cmdline_show.cc:225
 #, c-format
 msgid "%s%s; will be downgraded [%s -> %s]"
 msgstr "%s%s; será feito o downgrade [%s ->%s]"
 
-#: src/cmdline/cmdline_show.cc:223
+#: src/cmdline/cmdline_show.cc:228
 #, c-format
 msgid "%s%s; will be upgraded [%s -> %s]"
 msgstr "%s%s; será feito o downgrade [%s ->%s]"
 
-#: src/cmdline/cmdline_show.cc:235 src/cmdline/cmdline_show.cc:256
+#: src/cmdline/cmdline_show.cc:240 src/cmdline/cmdline_show.cc:261
 msgid "Package: "
 msgstr "Pacote: "
 
-#: src/cmdline/cmdline_show.cc:236 src/cmdline/cmdline_show.cc:264
+#: src/cmdline/cmdline_show.cc:241 src/cmdline/cmdline_show.cc:269
 #: src/pkg_columnizer.cc:87
 msgid "State"
 msgstr "Estado"
 
-#: src/cmdline/cmdline_show.cc:237 src/cmdline/cmdline_show.cc:318
+#: src/cmdline/cmdline_show.cc:242 src/cmdline/cmdline_show.cc:325
 msgid "Provided by"
 msgstr "Disponibilizado por"
 
-#: src/cmdline/cmdline_show.cc:258 src/pkg_info_screen.cc:105
+#: src/cmdline/cmdline_show.cc:263 src/pkg_info_screen.cc:105
 msgid "Essential: "
 msgstr "Essencial: "
 
-#: src/cmdline/cmdline_show.cc:258 src/cmdline/cmdline_show.cc:262
-#: src/cmdline/cmdline_show.cc:273 src/pkg_info_screen.cc:105
+#: src/cmdline/cmdline_show.cc:263 src/cmdline/cmdline_show.cc:267
+#: src/cmdline/cmdline_show.cc:278 src/pkg_info_screen.cc:105
 msgid "yes"
 msgstr "sim"
 
-#: src/cmdline/cmdline_show.cc:262
+#: src/cmdline/cmdline_show.cc:267
 msgid "New"
 msgstr "Novo"
 
-#: src/cmdline/cmdline_show.cc:267
+#: src/cmdline/cmdline_show.cc:272
 msgid "Forbidden version"
-msgstr "Versão proíbida"
+msgstr "Versão proibida"
 
-#: src/cmdline/cmdline_show.cc:271
+#: src/cmdline/cmdline_show.cc:276
 msgid "Automatically installed"
 msgstr "Automaticamente instalado"
 
-#: src/cmdline/cmdline_show.cc:273
+#: src/cmdline/cmdline_show.cc:278
 msgid "no"
 msgstr "não"
 
-#: src/cmdline/cmdline_show.cc:275
+#: src/cmdline/cmdline_show.cc:280
 msgid "Version: "
 msgstr "Versão: "
 
-#: src/cmdline/cmdline_show.cc:276 src/pkg_info_screen.cc:113
+#: src/cmdline/cmdline_show.cc:281 src/pkg_info_screen.cc:113
 msgid "Priority: "
 msgstr "Prioridade: "
 
-#: src/cmdline/cmdline_show.cc:277 src/cmdline/cmdline_show.cc:279
-#: src/cmdline/cmdline_show.cc:288
+#: src/cmdline/cmdline_show.cc:282 src/cmdline/cmdline_show.cc:284
+#: src/cmdline/cmdline_show.cc:293
 msgid "N/A"
 msgstr "N/D"
 
-#: src/cmdline/cmdline_show.cc:278 src/pkg_info_screen.cc:114
+#: src/cmdline/cmdline_show.cc:283 src/pkg_info_screen.cc:114
 msgid "Section: "
 msgstr "Secção: "
 
-#: src/cmdline/cmdline_show.cc:280 src/pkg_info_screen.cc:115
+#: src/cmdline/cmdline_show.cc:285 src/pkg_info_screen.cc:115
 msgid "Maintainer: "
 msgstr "Maintainer: "
 
-#: src/cmdline/cmdline_show.cc:283
+#: src/cmdline/cmdline_show.cc:288
 msgid "Uncompressed Size: "
 msgstr "Tamanho Descomprimido: "
 
-#: src/cmdline/cmdline_show.cc:287
+#: src/cmdline/cmdline_show.cc:292
 msgid "Architecture: "
 msgstr "Arquitectura: "
 
-#: src/cmdline/cmdline_show.cc:289
+#: src/cmdline/cmdline_show.cc:294
 msgid "Compressed Size: "
 msgstr "Tamanho Comprimido: "
 
-#: src/cmdline/cmdline_show.cc:291
+#: src/cmdline/cmdline_show.cc:296
 msgid "Filename: "
 msgstr "Nome do Ficheiro: "
 
-#: src/cmdline/cmdline_show.cc:293
+#: src/cmdline/cmdline_show.cc:298
 msgid "MD5sum: "
 msgstr "MD5sum: "
 
-#: src/cmdline/cmdline_show.cc:297 src/cmdline/cmdline_show.cc:299
+#: src/cmdline/cmdline_show.cc:302 src/cmdline/cmdline_show.cc:305
 msgid "Archive"
 msgstr "Repositório"
 
-#: src/cmdline/cmdline_show.cc:303
+#: src/cmdline/cmdline_show.cc:310
 msgid "Depends"
 msgstr "Dependente de"
 
-#: src/cmdline/cmdline_show.cc:305
+#: src/cmdline/cmdline_show.cc:312
 msgid "PreDepends"
 msgstr "PréDependente de"
 
-#: src/cmdline/cmdline_show.cc:307
+#: src/cmdline/cmdline_show.cc:314
 msgid "Recommends"
 msgstr "Recomenda"
 
-#: src/cmdline/cmdline_show.cc:309
+#: src/cmdline/cmdline_show.cc:316
 msgid "Suggests"
 msgstr "Sugere"
 
-#: src/cmdline/cmdline_show.cc:311
+#: src/cmdline/cmdline_show.cc:318
 msgid "Conflicts"
 msgstr "Tem conflitos com"
 
-#: src/cmdline/cmdline_show.cc:313
+#: src/cmdline/cmdline_show.cc:320
 msgid "Replaces"
 msgstr "Substitui"
 
-#: src/cmdline/cmdline_show.cc:315
+#: src/cmdline/cmdline_show.cc:322
 msgid "Obsoletes"
 msgstr "Obsoleta"
 
-#: src/cmdline/cmdline_show.cc:317
+#: src/cmdline/cmdline_show.cc:324
 msgid "Provides"
 msgstr "Fornece"
 
-#: src/cmdline/cmdline_show.cc:321 src/pkg_info_screen.cc:97
+#: src/cmdline/cmdline_show.cc:328 src/pkg_info_screen.cc:97
 msgid "Description: "
 msgstr "Descrição: "
 
@@ -1241,32 +1256,32 @@
 msgstr ""
 "Não pode especificar ambos um repositório e uma versão para um pacote\n"
 
-#: src/dep_item.cc:137
+#: src/dep_item.cc:139
 msgid "UNSATISFIED"
-msgstr "(NÂO SATISFEITAS)"
+msgstr "(NÃO SATISFEITAS)"
 
-#: src/dep_item.cc:137 src/reason_fragment.cc:247
+#: src/dep_item.cc:139 src/reason_fragment.cc:244
 msgid "UNAVAILABLE"
 msgstr "INDISPONÍVEL"
 
-#: src/download_bar.cc:56 src/download_list.cc:263 src/download_screen.cc:57
+#: src/download_bar.cc:56 src/download_list.cc:266 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_bar.cc:77 src/generic/acqprogress.cc:63
+#: src/download_bar.cc:75 src/generic/acqprogress.cc:63
 msgid "Hit "
 msgstr "Acertou "
 
-#: src/download_bar.cc:90
+#: src/download_bar.cc:88
 msgid "Downloading "
 msgstr "A fazer download de "
 
-#: src/download_bar.cc:103
+#: src/download_bar.cc:101
 msgid "Got "
 msgstr "Obtido "
 
-#: src/download_bar.cc:157
+#: src/download_bar.cc:155
 msgid "Downloading..."
 msgstr "A fazer download ..."
 
@@ -1277,7 +1292,7 @@
 #: 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?"
+"Não foi possível obter acesso exclusivo à lista de directórios..é root?"
 
 #: src/download.cc:111
 msgid "Updating package lists"
@@ -1293,9 +1308,9 @@
 
 #: src/download.cc:160
 msgid "Couldn't clean out list directories"
-msgstr "Não foi possível limpar a lista de diretorias"
+msgstr "Não foi possível limpar a lista de directórios"
 
-#: src/download.cc:177 src/ui.cc:1153
+#: src/download.cc:177 src/ui.cc:1147
 msgid "Deleting obsolete downloaded files"
 msgstr "A apagar os ficheiros obsoletos a que foi feito o download"
 
@@ -1433,7 +1448,7 @@
 "Ack! Algo de mau aconteceu durante a instalação dos pacotes. A tentar "
 "recuperar:"
 
-#: src/download.cc:477 src/pkg_item.cc:432
+#: src/download.cc:477 src/pkg_item.cc:430
 msgid "Press return to continue.\n"
 msgstr "Pressione Enter para continuar.\n"
 
@@ -1444,17 +1459,17 @@
 "Não foi possível recuperar o acesso exclusivo ao sistema! (Talvez outro apt "
 "ou dpkg esteja a correr?)"
 
-#: src/download_item.cc:66 src/download_item.cc:70 src/download_item.cc:100
+#: src/download_item.cc:70 src/download_item.cc:74 src/download_item.cc:104
 #: src/generic/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr " [A trabalhar]"
 
-#: src/download_item.cc:104 src/download_list.cc:283
+#: src/download_item.cc:108 src/download_list.cc:284
 msgid "[Hit]"
 msgstr "[Acertou]"
 
-#: src/download_item.cc:104 src/download_list.cc:303
+#: src/download_item.cc:108 src/download_list.cc:304
 msgid "[Downloaded]"
 msgstr "[Download Concluído]"
 
@@ -1468,34 +1483,34 @@
 msgid "%n%nSome files were not downloaded successfully."
 msgstr ""
 
-#: src/download_list.cc:68
+#: src/download_list.cc:66
 msgid "Continue"
 msgstr "Continuar"
 
-#: src/download_list.cc:175 src/download_screen.cc:203
+#: src/download_list.cc:178 src/download_screen.cc:203
 msgid "Total Progress: "
 msgstr "Progresso Total: "
 
-#: src/download_list.cc:194 src/download_screen.cc:218
+#: src/download_list.cc:197 src/download_screen.cc:218
 #, c-format
 msgid " [ %i%% ] (%sB/s, %s remaining)"
 msgstr " [ %i%% ] (%sB/s, %s restantes)"
 
-#: src/download_list.cc:196
+#: src/download_list.cc:199
 #, c-format
 msgid " [ %i%% ] (stalled)"
 msgstr " [ %i%% ] (parado)"
 
-#: src/download_list.cc:198
+#: src/download_list.cc:201
 #, c-format
 msgid " [ %i%% ]"
 msgstr " [ %i%% ]"
 
-#: src/download_list.cc:323
+#: src/download_list.cc:324
 msgid "[IGNORED]"
 msgstr "[IGNORADO]"
 
-#: src/download_list.cc:329
+#: src/download_list.cc:330
 msgid "[ERROR]"
 msgstr "[ERRO]"
 
@@ -1504,11 +1519,11 @@
 msgid "Downloaded %sB in %ss (%sB/s)."
 msgstr "Foi feito o download de %sB em %ss (%sB/s)."
 
-#: src/edit_pkg_hier.cc:158
+#: src/edit_pkg_hier.cc:176
 msgid "No hierarchy information to edit"
 msgstr "Não existe informação de hierarquia para ser editada"
 
-#: src/edit_pkg_hier.cc:258
+#: src/edit_pkg_hier.cc:276
 msgid "Couldn't open for writing"
 msgstr "Não foi possível abrir para escrita"
 
@@ -1612,39 +1627,39 @@
 "Aviso: não foi possível obter acesso exclusivo ao ficheiro de cache. A abrir "
 "apenas para leitura"
 
-#: src/generic/matchers.cc:797
+#: src/generic/matchers.cc:798
 msgid "Unmatched '('"
-msgstr "Parentese '(' sem par"
+msgstr "Parêntesis '(' sem par"
 
-#: src/generic/matchers.cc:887 src/generic/matchers.cc:968
+#: src/generic/matchers.cc:888 src/generic/matchers.cc:969
 #, c-format
 msgid "Unknown dependency type: %s"
 msgstr "Tipo de dependência desconhecida: %s"
 
-#: src/generic/matchers.cc:950
+#: src/generic/matchers.cc:951
 #, c-format
 msgid "Unknown action type: %s"
 msgstr "Tipo de acção desconhecida: %s"
 
-#: src/generic/matchers.cc:1017
+#: src/generic/matchers.cc:1018
 #, c-format
 msgid "Unknown priority %s"
 msgstr "Prioridade desconhecida %s"
 
-#: src/generic/matchers.cc:1039
+#: src/generic/matchers.cc:1040
 #, c-format
 msgid "Unknown pattern type: %c"
 msgstr "Tipo de padrão desconhecido: %c"
 
-#: src/generic/matchers.cc:1084
+#: src/generic/matchers.cc:1105
 msgid "Unexpected empty expression"
 msgstr "Expressão vazia não esperada"
 
-#: src/generic/matchers.cc:1119
+#: src/generic/matchers.cc:1143
 msgid "Badly formed expression"
 msgstr "Expressão mal formada"
 
-#: src/generic/matchers.cc:1148
+#: src/generic/matchers.cc:1175
 msgid "Unexpected ')'"
 msgstr "')' inesperado"
 
@@ -1670,7 +1685,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:61
+#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:76
 #, c-format
 msgid "ChangeLog of %s"
 msgstr "Log de alterações de %s"
@@ -1715,37 +1730,37 @@
 msgid "Reading task descriptions"
 msgstr "A ler as descrições das tarefas"
 
-#: src/load_config.cc:30
-#, c-format
-msgid "Invalid entry in color definition group: \"%s\""
-msgstr "Registo inválido no grupo de definição de cor: \"%s\""
+#: src/load_config.cc:42
+#, fuzzy, c-format
+msgid "Unrecognized color name \"%s\""
+msgstr "Tarefas não reconhecidas"
 
-#: src/load_config.cc:32
-#, c-format
-msgid "Invalid tagless entry in color definition group: \"%s\""
-msgstr "Registo sem tag inválido no grupo de definição de cor: \"%s\""
+#: src/load_config.cc:69
+#, fuzzy, c-format
+msgid "Unrecognized attribute name \"%s\""
+msgstr "Tarefas não reconhecidas"
 
-#: src/load_config.cc:34
-#, c-format
-msgid "Need exactly two colors in color definition \"%s\""
-msgstr "São necessárias exactamente duas cores na definição de cor \"%s\""
+#: src/load_config.cc:106
+#, fuzzy, c-format
+msgid "Invalid entry in style definition group: \"%s\""
+msgstr "Registo inválido no grupo de definição de cor: \"%s\""
 
-#: src/load_config.cc:50
-#, c-format
-msgid "Can't parse foreground \"%s\"of color \"%s\""
-msgstr "Não foi possível interpretar a frente \"%s\" da frente \"%s\""
+#: src/load_config.cc:108
+#, fuzzy, c-format
+msgid "Invalid tagless entry in style definition group: \"%s\""
+msgstr "Registo sem tag inválido no grupo de definição de cor: \"%s\""
 
-#: src/load_config.cc:53
-#, c-format
-msgid "Can't parse background \"%s\" of color \"%s\""
-msgstr "Nao foi possível interpretar o fundo \"%s\" da cor \"%s\""
+#: src/load_config.cc:130
+#, fuzzy, c-format
+msgid "Unknown style attribute %s"
+msgstr "Tipo de acção desconhecida: %s"
 
-#: src/load_config.cc:72 src/load_config.cc:74
+#: src/load_config.cc:153 src/load_config.cc:155
 #, c-format
 msgid "Invalid entry in keybinding group: \"%s\""
 msgstr "Registo inválido no grupo de definições de teclas: \"%s\""
 
-#: src/load_config.cc:89
+#: src/load_config.cc:170
 #, c-format
 msgid "Ignoring invalid keybinding \"%s\" -> \"%s\""
 msgstr "A ignorar as definições de teclas inválidas \"%s\" -> \"%s\""
@@ -1797,7 +1812,7 @@
 #: src/load_grouppolicy.cc:165
 msgid "Version-generating grouping policies must be the tail of a chain"
 msgstr ""
-"Políticas de agrupamento por versão geradada devem ser o fim de uma cadeia"
+"Políticas de agrupamento por versão gerada devem ser o fim de uma cadeia"
 
 #: src/load_grouppolicy.cc:177
 msgid "Dep-generating grouping policies take no arguments"
@@ -1823,7 +1838,7 @@
 
 #: src/load_grouppolicy.cc:302
 msgid "Unmatched '(' in grouping policy description"
-msgstr "Parentese '(' sem par na descrição da política de agrupamento"
+msgstr "Parêntesis '(' sem par na descrição da política de agrupamento"
 
 #: src/load_grouppolicy.cc:329
 #, c-format
@@ -1879,7 +1894,7 @@
 
 #: src/load_sortpolicy.cc:137
 msgid "Unmatched '(' in sorting policy description"
-msgstr "Parentese '(' sem par na descrição da política de ordenação "
+msgstr "Parêntesis '(' sem par na descrição da política de ordenação "
 
 #: src/load_sortpolicy.cc:164
 #, c-format
@@ -1982,7 +1997,7 @@
 " forbid-version - Forbid aptitude from upgrading to a specific package "
 "version.\n"
 msgstr ""
-" forbid-version - Proíbir o aptitude de actualizar para uma versão "
+" forbid-version - Proibir o aptitude de actualizar para uma versão "
 "específica de um pacote.\n"
 
 #: src/main.cc:102
@@ -2002,7 +2017,7 @@
 " dist-upgrade - Perform an upgrade, possibly installing and removing "
 "packages\n"
 msgstr ""
-" dist-upgrade - Executar uma actualização, possivelmente instalando e "
+" dist-upgrade - Executar uma actualização, possívelmente instalando e "
 "removendo pacotes\n"
 
 #: src/main.cc:105
@@ -2104,7 +2119,8 @@
 #: src/main.cc:122
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
-msgstr " -f             Tentar agressivamente corrigir pacotes danificados.\n"
+msgstr ""
+" -f             Tentar agressivamente corrigir os pacotes danificados.\n"
 
 #: src/main.cc:123
 #, c-format
@@ -2143,7 +2159,7 @@
 #, 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 "
+" -o chave=val     Define directamente a configuração da opção chamada "
 "'chave'\n"
 
 #: src/main.cc:129
@@ -2176,44 +2192,44 @@
 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:255
+#: src/main.cc:252
 #, 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:301 src/main.cc:310
+#: src/main.cc:291 src/main.cc:300
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr "ESTRANHO: recebida uma opção de código desconhecida\n"
 
-#: src/main.cc:319
+#: src/main.cc:309
 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:327
+#: src/main.cc:317
 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:348
+#: src/main.cc:338
 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:405
+#: src/main.cc:395
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr "Comando desconhecido \"%s\"\n"
 
-#: src/main.cc:412 src/main.cc:469
+#: src/main.cc:402 src/main.cc:450
 msgid "Internal error: uncaught 'out of solutions' exception.\n"
 msgstr ""
 
-#: src/main.cc:417 src/main.cc:474
+#: src/main.cc:407 src/main.cc:455
 msgid "Internal error: uncaught 'out of time' exception.\n"
 msgstr ""
 
-#: src/main.cc:424
+#: src/main.cc:414
 #, c-format
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
@@ -2244,7 +2260,7 @@
 msgid "Lost"
 msgstr "Perdeu"
 
-#: src/mine/cmine.cc:119 src/ui.cc:1090
+#: src/mine/cmine.cc:119 src/ui.cc:1084
 msgid "Minesweeper"
 msgstr "Campo Minado"
 
@@ -2270,94 +2286,94 @@
 msgid "The number of mines must be a number"
 msgstr "O número de minas deve ser um número"
 
-#: src/mine/cmine.cc:240
+#: src/mine/cmine.cc:238
 msgid "Setup custom game"
 msgstr "Configurar jogo personalizado"
 
-#: src/mine/cmine.cc:243
+#: src/mine/cmine.cc:240
 msgid "Height of board: "
 msgstr "Altura da mesa: "
 
-#: src/mine/cmine.cc:247
+#: src/mine/cmine.cc:243
 msgid "Width of board: "
 msgstr "Largura da mesa: "
 
-#: src/mine/cmine.cc:251
+#: src/mine/cmine.cc:246
 msgid "Number of mines: "
 msgstr "Número de minas: "
 
-#: src/mine/cmine.cc:316
+#: src/mine/cmine.cc:305
 msgid "Choose difficulty level"
 msgstr "Escolha o nível de dificuldade"
 
-#: src/mine/cmine.cc:318
+#: src/mine/cmine.cc:307
 msgid "Easy"
 msgstr "Fácil"
 
-#: src/mine/cmine.cc:319
+#: src/mine/cmine.cc:308
 msgid "Medium"
 msgstr "Médio"
 
-#: src/mine/cmine.cc:320
+#: src/mine/cmine.cc:309
 msgid "Hard"
 msgstr "Difícil"
 
-#: src/mine/cmine.cc:321
+#: src/mine/cmine.cc:310
 msgid "Custom"
 msgstr "Personalizado"
 
-#: src/mine/cmine.cc:411
+#: src/mine/cmine.cc:392
 msgid "You have won."
 msgstr "Você ganhou."
 
-#: src/mine/cmine.cc:414
+#: src/mine/cmine.cc:395
 msgid "You lose!"
 msgstr "Você perdeu!"
 
-#: src/mine/cmine.cc:419
+#: src/mine/cmine.cc:400
 msgid "You die...  --More--"
 msgstr "Você morreu ... --Mais--"
 
-#: src/mine/cmine.cc:432
+#: src/mine/cmine.cc:413
 msgid "The spikes were poisoned!  The poison was deadly..  --More--"
 msgstr "As estacas foram envenenadas! O veneno foi mortal.. --Mais--"
 
-#: src/mine/cmine.cc:435
+#: src/mine/cmine.cc:416
 msgid "You land on a set of sharp iron spikes!  --More--"
 msgstr "Aterrou num conjunto de estacas de ferro afiadas! --Mais--"
 
-#: src/mine/cmine.cc:438
+#: src/mine/cmine.cc:419
 msgid "You fall into a pit!  --More--"
 msgstr "Caiu num buraco! --Mais--"
 
-#: src/mine/cmine.cc:441
+#: src/mine/cmine.cc:422
 msgid "KABOOM!  You step on a land mine.  --More--"
 msgstr "KABOOM! Pisou numa mina terrestre. --Mais--"
 
-#: src/mine/cmine.cc:446
+#: src/mine/cmine.cc:427
 msgid "The dart was poisoned!  The poison was deadly...  --More--"
 msgstr "O dardo foi envenenado! O envenenamento foi mortal... --Mais"
 
-#: src/mine/cmine.cc:448
+#: src/mine/cmine.cc:429
 msgid ""
 "A little dart shoots out at you!  You are hit by a little dart!  --More--"
 msgstr ""
 "Um pequeno dardo foi atirado contra si! Foi atingido por um pequeno dardo! --"
 "Mais--"
 
-#: src/mine/cmine.cc:452
+#: src/mine/cmine.cc:433
 msgid "You turn to stone... --More--"
 msgstr "Foi transformado em pedra... --Mais--"
 
-#: src/mine/cmine.cc:454
+#: src/mine/cmine.cc:435
 msgid "Touching the cockatrice corpse was a fatal mistake.  --More--"
 msgstr "Tocar no cadáver de cockatrice foi um erro fatal.  --Mais--"
 
-#: src/mine/cmine.cc:456
+#: src/mine/cmine.cc:437
 msgid "You feel here a cockatrice corpse.  --More--"
 msgstr "Sentiu aqui um cadáver de cockatrice.  --Mais--"
 
-#: src/mine/cmine.cc:460
+#: src/mine/cmine.cc:441
 msgid ""
 "Click!  You trigger a rolling boulder trap!  You are hit by a boulder! --"
 "More--"
@@ -2365,56 +2381,56 @@
 "Click! Disparou uma armadilha de rocha rolante! Foi atingido por uma rocha! "
 "--Mais--"
 
-#: src/mine/cmine.cc:470
+#: src/mine/cmine.cc:451
 msgid "sleep"
 msgstr "dormir"
 
-#: src/mine/cmine.cc:473
+#: src/mine/cmine.cc:454
 msgid "striking"
 msgstr "golpe"
 
-#: src/mine/cmine.cc:476
+#: src/mine/cmine.cc:457
 msgid "death"
 msgstr "morte"
 
-#: src/mine/cmine.cc:479
+#: src/mine/cmine.cc:460
 msgid "polymorph"
 msgstr "polimorfia"
 
-#: src/mine/cmine.cc:482
+#: src/mine/cmine.cc:463
 msgid "magic missile"
 msgstr "míssil mágico"
 
-#: src/mine/cmine.cc:485
+#: src/mine/cmine.cc:466
 msgid "secret door detection"
 msgstr "detecção de porta secreta"
 
-#: src/mine/cmine.cc:488
+#: src/mine/cmine.cc:469
 msgid "invisibility"
 msgstr "invisibilidade"
 
-#: src/mine/cmine.cc:491
+#: src/mine/cmine.cc:472
 msgid "cold"
 msgstr "frio"
 
-#: src/mine/cmine.cc:497
+#: src/mine/cmine.cc:478
 #, c-format
 msgid "Your wand of %s breaks apart and explodes!  --More--"
 msgstr "A sua varinha de %s desfez-se e explodiu!  --Mais--"
 
-#: src/mine/cmine.cc:503
+#: src/mine/cmine.cc:484
 msgid "You are jolted by a surge of electricity!  --More--"
 msgstr "Foi sacudido por um pico de electricidade!  --Mais--"
 
-#: src/mine/cmine.cc:607
+#: src/mine/cmine.cc:588
 msgid "Enter the filename to load: "
 msgstr "Introduza o nome do ficheiro para ler: "
 
-#: src/mine/cmine.cc:614
+#: src/mine/cmine.cc:595
 msgid "Enter the filename to save: "
 msgstr "Introduza o nome do ficheiro para gravar: "
 
-#: src/mine/cmine.cc:624
+#: src/mine/cmine.cc:605
 msgid "mine-help.txt"
 msgstr "mine-help.txt"
 
@@ -2422,7 +2438,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:1670
+#: src/pkg_columnizer.cc:84 src/ui.cc:1662
 msgid "Package"
 msgstr "Pacote"
 
@@ -2735,8 +2751,8 @@
 "are not necessarily word processors, although some word processors may be "
 "found in this section."
 msgstr ""
-"Editores e processores de texto\n"
-" Pacotes na secção 'editors' permitem-lhe editar texto puro ASCII. Não são "
+"Editores e processadores de texto\n"
+" Pacotes na secção 'editores' permitem-lhe editar texto puro ASCII. Não são "
 "necessariamente processadores de texto, no entanto alguns processadores de "
 "texto podem ser encontradas nesta secção."
 
@@ -2746,7 +2762,7 @@
 " Packages in the 'electronics' section include circuit design tools, "
 "simulators and assemblers for microcontrollers, and other related software."
 msgstr ""
-"Programas para trabalhar com circuitos e eletrónica\n"
+"Programas para trabalhar com circuitos e electrónica\n"
 " Pacotes na secção 'electronics' incluem ferramentas de desenho de "
 "circuitos, simuladores e montadores para microcontroladores e outros "
 "programas relacionados."
@@ -2772,7 +2788,7 @@
 "GNOME environment or closely integrated into it."
 msgstr ""
 "O Sistema de Ambiente de Trabalho GNOME\n"
-" O GNOME é uma coleção de software que fornece um ambiente de trabalho de "
+" O GNOME é uma colecção de software que fornece um ambiente de trabalho de "
 "fácil uso para Linux. Pacotes na secção 'gnome' fazem parte do ambiente "
 "GNOME ou já estão integrados no ambiente."
 
@@ -2795,7 +2811,7 @@
 "Utilitários para criar, visualizar e editar ficheiros gráficos\n"
 " Pacotes na secção 'graphics' incluem visualizadores para ficheiros de "
 "imagem, processamento de imagens e software de manipulação, software para "
-"interagir com hardware gráfico (como placas de vídeo, scanners e camaras "
+"interagir com hardware gráfico (como placas de vídeo, scanners e camêras "
 "digitais) e ferramentas de programação para trabalhos gráficos."
 
 #: src/pkg_grouppolicy.cc:167
@@ -2826,7 +2842,7 @@
 "environment or closely integrated into it."
 msgstr ""
 "O Sistema de Ambiente de Trabalho KDE\n"
-" O KDE é uma coleção de software que fornece um ambiente de trabalho de "
+" O KDE é uma colecção de software que fornece um ambiente de trabalho de "
 "fácil uso para Linux. Pacotes na secção 'kde' fazem parte do ambiente KDE ou "
 "já estão integrados no ambiente."
 
@@ -2839,7 +2855,7 @@
 msgstr ""
 "Ficheiros de desenvolvimento para bibliotecas\n"
 " Pacotes na secção 'libdevel' contém ficheiro necessários para criar "
-"programas que usam bibliotecas na seção 'libs'. Não necessita de pacotes "
+"programas que usam bibliotecas na secção 'libs'. Não necessita de pacotes "
 "desta secção a não ser que pretenda compilar software por si próprio."
 
 #: src/pkg_grouppolicy.cc:171
@@ -2894,7 +2910,7 @@
 "Programas para gravar, enviar e encaminhar mensagens de correio\n"
 " Pacotes na secção 'mail' incluem leitores de correio, daemons de transporte "
 "de correio, software de listas de discussão e filtros de spam, bem como "
-"diversos outros programas relacionados com o correio eletrónico."
+"diversos outros programas relacionados com o correio electrónico."
 
 #: src/pkg_grouppolicy.cc:175
 msgid ""
@@ -2975,7 +2991,7 @@
 "operativos e plataformas de hardware. (por exemplo, utilitários para ler "
 "disquetes DOS e utilitários para comunicação com Palm Pilots)\n"
 " .\n"
-" É importante mencionar que programas para gravação de CDs estão incluidos "
+" É importante mencionar que programas para gravação de CDs estão incluídos "
 "NESTA secção."
 
 #: src/pkg_grouppolicy.cc:181
@@ -2986,7 +3002,7 @@
 msgstr ""
 "Software para trabalho científico\n"
 " Pacotes na secção 'science' incluem ferramentas para astronomia, biologia e "
-"química, bem como outros programas relaccionados com ciências."
+"química, bem como outros programas relacionados com ciências."
 
 #: src/pkg_grouppolicy.cc:182
 msgid ""
@@ -3038,7 +3054,7 @@
 msgstr ""
 "Utilitários de processamento de textos\n"
 " Pacotes na secção 'text' incluem filtros de texto e processadores, "
-"corretores ortográficos, programas de dicionários, utilitários para "
+"correctores ortográficos, programas de dicionários, utilitários para "
 "converter entre codificações de caracteres e formatos de ficheiros texto "
 "(ex. Unix e DOS), formatadores de texto e impressão e outros programas que "
 "operam em texto puro."
@@ -3132,7 +3148,7 @@
 "changes in export policies. Most packages which were formerly found in this "
 "section, therefore, are now in 'main'."
 msgstr ""
-"Programas armazenados fora dos Estados Unidos devido a controlos de "
+"Programas armazenados fora dos Estados Unidos devido a controlo de "
 "exportação\n"
 " Pacotes na secção 'non-US' geralmente contém criptografia; alguns contém "
 "algoritmos patenteados. Devido a esse facto, não podem ser exportados do "
@@ -3478,7 +3494,7 @@
 
 #: 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."
+msgstr "Sim, estou ciente de que não é uma boa ideia."
 
 #: src/pkg_item.cc:80
 #, fuzzy, c-format
@@ -3491,52 +3507,52 @@
 "Tem certeza de que deseja removê-lo?\n"
 "Digite '%s' se tiver a certeza."
 
-#: src/pkg_item.cc:222 src/pkg_ver_item.cc:625
+#: src/pkg_item.cc:220 src/pkg_ver_item.cc:626
 #, c-format
 msgid "Information about %s"
 msgstr "Informação sobre %s"
 
-#: src/pkg_item.cc:224 src/pkg_ver_item.cc:627
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:628
 #, c-format
 msgid "%s info"
 msgstr ""
 
-#: src/pkg_item.cc:310
+#: src/pkg_item.cc:308
 #, fuzzy, c-format
 msgid "Available versions of %s"
 msgstr "Versões disponíveis de "
 
-#: src/pkg_item.cc:313
+#: src/pkg_item.cc:311
 #, fuzzy, c-format
 msgid "%s versions"
 msgstr "Versões"
 
-#: src/pkg_item.cc:325 src/pkg_ver_item.cc:655
+#: src/pkg_item.cc:323 src/pkg_ver_item.cc:656
 #, c-format
 msgid "Dependencies of %s"
 msgstr "Dependências de %s"
 
-#: src/pkg_item.cc:327 src/pkg_ver_item.cc:657
+#: src/pkg_item.cc:325 src/pkg_ver_item.cc:658
 #, c-format
 msgid "%s deps"
 msgstr ""
 
-#: src/pkg_item.cc:338 src/pkg_ver_item.cc:667
+#: src/pkg_item.cc:336 src/pkg_ver_item.cc:668
 #, c-format
 msgid "Packages depending on %s"
 msgstr "Pacotes que dependem de %s"
 
-#: src/pkg_item.cc:340 src/pkg_ver_item.cc:669
+#: src/pkg_item.cc:338 src/pkg_ver_item.cc:670
 #, c-format
 msgid "%s reverse deps"
 msgstr ""
 
-#: src/pkg_item.cc:392 src/pkg_ver_item.cc:707
+#: src/pkg_item.cc:390 src/pkg_ver_item.cc:708
 #, c-format
 msgid "Reporting a bug in %s:\n"
 msgstr "A reportar um erro em %s:\n"
 
-#: src/pkg_item.cc:414
+#: src/pkg_item.cc:412
 #, fuzzy
 msgid ""
 "You are not root and I cannot find any way to become root.  To reconfigure "
@@ -3548,16 +3564,16 @@
 "instale o pacote menu, o pacote login ou execute o \n"
 "aptitude como root."
 
-#: src/pkg_item.cc:422
+#: src/pkg_item.cc:420
 #, c-format
 msgid "Reconfiguring %s\n"
 msgstr "A reconfigurar %s\n"
 
-#: src/pkg_item.cc:447
+#: src/pkg_item.cc:445
 msgid "Hierarchy editor"
 msgstr "Editor de hierarquia"
 
-#: src/pkg_item.cc:447
+#: src/pkg_item.cc:445
 #, fuzzy
 msgid "Hierarchy Editor"
 msgstr "Editor de hierarquia"
@@ -3591,22 +3607,22 @@
 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_view.cc:344
+#: src/pkg_view.cc:359
 msgid "make_package_view: error in arguments -- two main widgets??"
 msgstr "make_package_view: erro nos argumentos -- dois widgets principais??"
 
-#: src/pkg_view.cc:350
+#: src/pkg_view.cc:365
 msgid ""
 "make_package_view: error in arguments -- bad column list for static item"
 msgstr ""
 "make_package_view: erro nos argumentos -- lista de colunas inválida para "
 "itens estáticos"
 
-#: src/pkg_view.cc:443
+#: src/pkg_view.cc:458
 msgid "make_package_view: bad argument!"
 msgstr "make_package_view: argumento inválido!"
 
-#: src/pkg_view.cc:495
+#: src/pkg_view.cc:510
 msgid "make_package_view: no main widget found"
 msgstr "make_package_view: nenhum widget principal encontrado"
 
@@ -3643,12 +3659,12 @@
 msgid " (provided by %F)"
 msgstr " (disponibilizado por %F)"
 
-#: src/reason_fragment.cc:278
+#: src/reason_fragment.cc:275
 #, c-format
 msgid "%F%s %F %F"
 msgstr "%F%s %F %F"
 
-#: src/reason_fragment.cc:327
+#: src/reason_fragment.cc:324
 msgid ""
 "If you select a package, an explanation of its current state will appear in "
 "this space."
@@ -3656,7 +3672,7 @@
 "Se seleccionar um pacote, uma explicação de seu estado actual aparecerá "
 "neste espaço."
 
-#: src/reason_fragment.cc:361
+#: src/reason_fragment.cc:358
 msgid ""
 "%B%s%b was installed automatically;  it is being removed because all of the "
 "packages which depend upon it are being removed:"
@@ -3664,18 +3680,18 @@
 "%B%s%b foi instalado automaticamente; ele está agora a ser removido dado que "
 "todos os pacotes que dependiam dele estão também a ser removidos:"
 
-#: src/reason_fragment.cc:365
+#: src/reason_fragment.cc:362
 msgid "%B%s%b will be automatically removed because of dependency errors:"
 msgstr "%B%s%b será removido automaticamente devido a erros de dependência:"
 
-#: src/reason_fragment.cc:369
+#: src/reason_fragment.cc:366
 msgid ""
 "%B%s%b will be automatically installed to satisfy the following dependencies:"
 msgstr ""
 "%B%s%b será instalado automaticamente para satisfazer as seguintes "
 "dependências:"
 
-#: src/reason_fragment.cc:375 src/reason_fragment.cc:387
+#: src/reason_fragment.cc:372 src/reason_fragment.cc:384
 msgid ""
 "%B%s%b cannot be upgraded now, but if it could be, it would still be held at "
 "version %B%s%b."
@@ -3683,7 +3699,7 @@
 "%B%s%b não pode ser actualizado neste momento, mas se pudesse, ainda assim "
 "seria mantido na versão %B%s%b."
 
-#: src/reason_fragment.cc:378
+#: src/reason_fragment.cc:375
 msgid ""
 "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the "
 "following dependencies:"
@@ -3691,27 +3707,27 @@
 "%B%s%b não será actualizado para a versão %B%s%b para evitar quebrar as "
 "seguintes dependências :"
 
-#: src/reason_fragment.cc:390
+#: src/reason_fragment.cc:387
 msgid "%B%s%b is currently installed."
 msgstr "%B%s%b está actualmente instalado."
 
-#: src/reason_fragment.cc:396
+#: src/reason_fragment.cc:393
 msgid "%B%s%b is not currently installed."
 msgstr "%B%s%b não está actualmente instalado."
 
-#: src/reason_fragment.cc:404
+#: src/reason_fragment.cc:401
 msgid "Some dependencies of %B%s%b are not satisfied:"
 msgstr "Algumas dependências de %B%s%b não estão satisfeitas:"
 
-#: src/reason_fragment.cc:408
+#: src/reason_fragment.cc:405
 msgid "%B%s%b will be downgraded."
 msgstr "%B%s%b será downgraded."
 
-#: src/reason_fragment.cc:415
+#: src/reason_fragment.cc:412
 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b."
 msgstr "%B%s%b não será actualizado para a versão %B%s%b que está proibida."
 
-#: src/reason_fragment.cc:419
+#: src/reason_fragment.cc:416
 msgid ""
 "%B%s%b could be upgraded to version %B%s%b, but it is being held at version %"
 "B%s%b."
@@ -3719,33 +3735,33 @@
 "%B%s%b poderia ser actualizado para a versão %B%s%b, mas será mantido na "
 "versão %B%s%b."
 
-#: src/reason_fragment.cc:426
+#: src/reason_fragment.cc:423
 msgid "%B%s%b will be re-installed."
 msgstr "%B%s%b será reinstalado."
 
-#: src/reason_fragment.cc:430
+#: src/reason_fragment.cc:427
 msgid "%B%s%b will be installed."
 msgstr "%B%s%b será instalado."
 
-#: src/reason_fragment.cc:434
+#: src/reason_fragment.cc:431
 msgid "%B%s%b will be removed."
 msgstr "%B%s%b será removido."
 
-#: src/reason_fragment.cc:439
+#: src/reason_fragment.cc:436
 msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b."
 msgstr "%B%s%b será actualizado da versão %B%s%b para a versão %B%s%b."
 
-#: src/reason_fragment.cc:475
+#: src/reason_fragment.cc:472
 msgid ""
 "The following packages depend on %B%s%b and will be broken by its removal:"
 msgstr ""
 "Os pacotes seguintes dependem de %B%s%b e serão quebrados com a sua remoção:"
 
-#: src/reason_fragment.cc:478
+#: src/reason_fragment.cc:475
 msgid "The following packages depend on %B%s%b and are broken:"
 msgstr "Os pacotes seguintes depende de %B%s%b e estão quebrados:"
 
-#: src/reason_fragment.cc:485
+#: src/reason_fragment.cc:482
 msgid ""
 "The following packages conflict with %B%s%b and will be broken by its "
 "installation:"
@@ -3753,7 +3769,7 @@
 "Os pacotes seguintes entram em conflito com %B%s%b e ficarão quebrados pela "
 "sua instalação:"
 
-#: src/reason_fragment.cc:518
+#: src/reason_fragment.cc:515
 msgid ""
 "The following packages depend on a version of %B%s%b other than the "
 "currently installed version of %B%s%b, or conflict with the currently "
@@ -3763,7 +3779,7 @@
 "s%b presentemente instalada, ou entra em conflito com a versão presentemente "
 "instalada:"
 
-#: src/reason_fragment.cc:522
+#: src/reason_fragment.cc:519
 msgid ""
 "The following packages conflict with %B%s%b, or depend on a version of it "
 "which is not going to be installed."
@@ -3771,11 +3787,11 @@
 "Os pacotes seguintes entram em conflito com %B%s%b, ou dependem de uma "
 "versão desse pacote que irá ser instalada."
 
-#: src/reason_fragment.cc:526
+#: src/reason_fragment.cc:523
 msgid "The following packages conflict with %B%s%b:"
 msgstr "Os pacotes seguintes estão em conflito com %B%s%b:"
 
-#: src/reason_fragment.cc:531
+#: src/reason_fragment.cc:528
 msgid ""
 "The following packages depend on a version of %B%s%b other than the "
 "currently installed version of %B%s%b:"
@@ -3783,7 +3799,7 @@
 "Os pacotes seguintes depende de uma versão de %B%s%b em vez da versão de %B%s"
 "%b presentemente instalada:"
 
-#: src/reason_fragment.cc:535
+#: src/reason_fragment.cc:532
 msgid ""
 "The following packages depend on a version of %B%s%b which is not going to "
 "be installed."
@@ -3791,15 +3807,15 @@
 "Os pacotes seguintes dependem de uma versão de %B%s%b que não vai ser "
 "instalada."
 
-#: src/reason_fragment.cc:541
+#: src/reason_fragment.cc:538
 msgid "upgraded"
 msgstr "actualizados"
 
-#: src/reason_fragment.cc:541
+#: src/reason_fragment.cc:538
 msgid "downgraded"
 msgstr "downgraded"
 
-#: src/reason_fragment.cc:547
+#: src/reason_fragment.cc:544
 msgid ""
 "The following packages depend on the currently installed version of %B%s%b (%"
 "B%s%b), or conflict with the version it will be %s to (%B%s%b), and will be "
@@ -3809,7 +3825,7 @@
 "instalada, ou entra em conflito com a versão que será %s para (%B%s%b), e "
 "ficará quebrada se for %s."
 
-#: src/reason_fragment.cc:554
+#: src/reason_fragment.cc:551
 msgid ""
 "The following packages conflict with version %B%s%b of %B%s%b, and will be "
 "broken if it is %s."
@@ -3817,7 +3833,7 @@
 "Os pacotes seguintes estão em conflito com a versão %B%s%b de %B%s%b, e "
 "ficarão quebrados se for %s."
 
-#: src/reason_fragment.cc:559
+#: src/reason_fragment.cc:556
 msgid ""
 "The following packages depend on version %B%s%b of %B%s%b, and will be "
 "broken if it is %s."
@@ -3864,38 +3880,43 @@
 msgid "Close"
 msgstr "^C Fechar"
 
-#: src/solution_fragment.cc:125
+#: src/solution_fragment.cc:134
 #, fuzzy
 msgid "%BRemove%b the following packages:%n"
 msgstr "Os seguintes pacotes estão DANIFICADOS:"
 
-#: src/solution_fragment.cc:135
+#: src/solution_fragment.cc:144
 #, fuzzy
 msgid "%BInstall%b the following packages:%n"
 msgstr "Os seguintes pacotes estão DANIFICADOS:"
 
-#: src/solution_fragment.cc:148
+#: src/solution_fragment.cc:157
 msgid "%BKeep%b the following packages at their current version:%n"
 msgstr ""
 
-#: src/solution_fragment.cc:161
+#: src/solution_fragment.cc:164
+#, fuzzy
+msgid "Not Installed"
+msgstr "não instalado"
+
+#: src/solution_fragment.cc:177
 #, fuzzy
 msgid "%BUpgrade%b the following packages:%n"
 msgstr "Os seguintes pacotes estão DANIFICADOS:"
 
-#: src/solution_fragment.cc:176
+#: src/solution_fragment.cc:192
 #, fuzzy
 msgid "%BDowngrade%b the following packages:%n"
 msgstr "A efectuar o download dos pacotes"
 
-#: src/solution_fragment.cc:190
+#: src/solution_fragment.cc:206
 #, c-format
 msgid "Score is %d"
 msgstr ""
 
 #: src/trust.cc:17 src/trust.cc:19
 msgid "WARNING"
-msgstr ""
+msgstr "AVISO"
 
 #: src/trust.cc:18
 msgid ""
@@ -3903,6 +3924,9 @@
 "package could allow a malicious individual to damage or take control of your "
 "system."
 msgstr ""
+"%F: Esta versão de %s vem de uma %Bfonte não confiável%b!  Instalar este "
+"pacote pode permitir a um indivíduo malicioso danificar ou tomar o controle "
+"do seu sistema."
 
 #: src/ui.cc:165
 msgid "Er, there aren't any errors, this shouldn't have happened.."
@@ -3916,45 +3940,45 @@
 msgid "W:"
 msgstr ""
 
-#: src/ui.cc:194
+#: src/ui.cc:193
 msgid "Search for:"
 msgstr "Procurar por: "
 
-#: src/ui.cc:262
+#: src/ui.cc:258
 msgid "You already are root!"
 msgstr "Você já é root!"
 
-#: src/ui.cc:360
+#: src/ui.cc:356
 msgid ""
 "Subprocess exited with an error -- did you type your password correctly?"
 msgstr ""
-"Subprocesso saiu com um erro -- introduziu a sua password corretamente?"
+"Subprocesso saiu com um erro -- introduziu a sua password correctamente?"
 
-#: src/ui.cc:388
+#: src/ui.cc:384
 msgid "Loading cache"
 msgstr "A carregar a cache"
 
-#: src/ui.cc:410
+#: src/ui.cc:406
 msgid "Really quit Aptitude?"
 msgstr "Deseja realmente sair do Aptitude?"
 
-#: src/ui.cc:489
+#: src/ui.cc:485
 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:589 src/ui.cc:591 src/ui.cc:619 src/ui.cc:621
+#: src/ui.cc:585 src/ui.cc:587 src/ui.cc:615 src/ui.cc:617
 msgid "Packages"
 msgstr "Pacotes"
 
-#: src/ui.cc:590 src/ui.cc:620
+#: src/ui.cc:586 src/ui.cc:616
 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:667
+#: src/ui.cc:663
 #, fuzzy
 msgid ""
-"%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
+"Aptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
 "BABSOLUTELY NO WARRANTY%b; for details see 'license' in the Help menu.  This "
 "is free software, and you are welcome to redistribute it under certain "
 "conditions; see 'license' for details."
@@ -3967,61 +3991,69 @@
 "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:688
+#: src/ui.cc:684
 msgid "help.txt"
 msgstr "help.txt"
 
-#: src/ui.cc:704
+#: src/ui.cc:700
 msgid "README"
 msgstr "README"
 
-#: src/ui.cc:786
+#: src/ui.cc:782
 msgid ""
-"%C%BWARNING%b: untrusted versions of the following packages will be "
-"installed!%n%nUntrusted packages could %Bcompromise your system's security%"
-"b.  You should only proceed with the installation if you are certain that "
-"this is what you want to do.%n%n"
+"%BWARNING%b: untrusted versions of the following packages will be installed!%"
+"n%nUntrusted packages could %Bcompromise your system's security%b.  You "
+"should only proceed with the installation if you are certain that this is "
+"what you want to do.%n%n"
 msgstr ""
+"%BAVISO%b: serão instaladas versões não confiáveis dos seguintes pacotes!%n%"
+"nPacotes não confiáveis podem %Bcomprometer a segurança do seu sistema%b.  "
+"Você deve apenas proceder com a instalação se tiver a certeza de que é isto "
+"que deseja fazer.%n%n"
 
-#: src/ui.cc:800
+#: src/ui.cc:788
 #, fuzzy
+msgid "  %S*%N %s [version %s]%n"
+msgstr "Versões"
+
+#: src/ui.cc:795
 msgid "Really Continue"
-msgstr "Continuar"
+msgstr "Continuar Mesmo"
 
-#: src/ui.cc:802
+#: src/ui.cc:797
 msgid "Abort Installation"
-msgstr ""
+msgstr "Abortar a Instalação"
 
-#: src/ui.cc:863
+#: src/ui.cc:858
 msgid "Preview of package installation"
 msgstr "Previsão da instalação de pacotes"
 
-#: src/ui.cc:864
+#: src/ui.cc:859
 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:865
+#: src/ui.cc:860
 #, fuzzy
 msgid "Preview"
 msgstr "^P Anterior"
 
-#: src/ui.cc:901
+#: src/ui.cc:896
 #, fuzzy
 msgid "Some packages were broken and have been fixed:"
 msgstr "Alguns pacotes tinham dependências quebradas e foram corrigidos"
 
-#: src/ui.cc:907
+#: src/ui.cc:902
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:913
-#, c-format
+#: src/ui.cc:908
+#, fuzzy, c-format
 msgid ""
-"Ran out of time while trying to resolver dependencies (press \"%s\" to try "
+"Ran out of time while trying to resolve dependencies (press \"%s\" to try "
 "harder)"
-msgstr ""
+msgstr "Perca tempo tentando encontrar minas"
 
-#: src/ui.cc:959
+#: src/ui.cc:954
 #, fuzzy
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
@@ -4030,26 +4062,26 @@
 "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:962 src/ui.cc:1078
+#: src/ui.cc:957 src/ui.cc:1072
 msgid "Become root"
 msgstr "Tornar-se root"
 
-#: src/ui.cc:964 src/ui.cc:1080
+#: src/ui.cc:959 src/ui.cc:1074
 msgid "Don't become root"
 msgstr "Não tornar-se root"
 
-#: src/ui.cc:969 src/ui.cc:1085
+#: src/ui.cc:964 src/ui.cc:1079
 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:996
+#: src/ui.cc:991
 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:1002
+#: src/ui.cc:997
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -4061,7 +4093,7 @@
 "Alguns pacotes podiam ser actualizados, mas escolheu não os actualizar.\n"
 "Carregue em \"U\" para preparar uma actualização."
 
-#: src/ui.cc:1074
+#: src/ui.cc:1069
 #, fuzzy
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
@@ -4070,114 +4102,114 @@
 "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:1090 src/ui.cc:1377
+#: src/ui.cc:1084 src/ui.cc:1371
 msgid "Waste time trying to find mines"
 msgstr "Perca tempo tentando encontrar minas"
 
-#: src/ui.cc:1097 src/ui.cc:1150
+#: src/ui.cc:1091 src/ui.cc:1144
 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:1100
+#: src/ui.cc:1094
 msgid "Deleting downloaded files"
 msgstr "A apagar ficheiros transferidos"
 
-#: src/ui.cc:1114
+#: src/ui.cc:1108
 msgid "Downloaded package files have been deleted"
 msgstr "Ficheiros de pacotes transferidos foram apagados"
 
-#: src/ui.cc:1175
+#: src/ui.cc:1169
 #, 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:1247
+#: src/ui.cc:1241
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1252 src/ui.cc:1283
+#: src/ui.cc:1246 src/ui.cc:1277
 #, fuzzy
 msgid "Ran out of time while trying to find a solution."
 msgstr "Perca tempo tentando encontrar minas"
 
-#: src/ui.cc:1277
+#: src/ui.cc:1271
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1307
+#: src/ui.cc:1301
 #, fuzzy, c-format
 msgid "Unable to open %s"
 msgstr "Não foi possível abrir %s para gravação"
 
-#: src/ui.cc:1313
+#: src/ui.cc:1307
 msgid "Error while dumping resolver state"
 msgstr ""
 
-#: src/ui.cc:1323
+#: src/ui.cc:1317
 msgid "File to which the resolver state should be dumped:"
 msgstr ""
 
-#: src/ui.cc:1353
+#: src/ui.cc:1347
 msgid "^Install/remove packages"
 msgstr "^Instalar/remover pacotes"
 
-#: src/ui.cc:1354
+#: src/ui.cc:1348
 msgid "Perform all pending installs and removals"
 msgstr "Executar todas as instalações e remoções pendentes"
 
-#: src/ui.cc:1356
+#: src/ui.cc:1350
 msgid "^Update package list"
 msgstr "^U Actualizar a lista de pacotes"
 
-#: src/ui.cc:1357
+#: src/ui.cc:1351
 msgid "Check for new versions of packages"
-msgstr "Checar por novas versões de pacotes"
+msgstr "Procurar por novas versões de pacotes"
 
-#: src/ui.cc:1360
+#: src/ui.cc:1354
 msgid "^Forget new packages"
 msgstr "^F Esquecer novos pacotes"
 
-#: src/ui.cc:1361
+#: src/ui.cc:1355
 msgid "Forget which packages are \"new\""
 msgstr "Esquecer que pacotes são \"novos\""
 
-#: src/ui.cc:1364
+#: src/ui.cc:1358
 msgid "^Clean package cache"
 msgstr "^C Limpar cache de pacotes"
 
-#: src/ui.cc:1365
+#: src/ui.cc:1359
 msgid "Delete package files which were previously downloaded"
 msgstr "Apagar ficheiros de pacotes que foram previamente transferidos"
 
-#: src/ui.cc:1368
+#: src/ui.cc:1362
 msgid "Clean ^obsolete files"
 msgstr "Limpar ficheiros ^obsoletos"
 
-#: src/ui.cc:1369
+#: src/ui.cc:1363
 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:1372
+#: src/ui.cc:1366
 msgid "Mark ^Upgradable"
 msgstr "^U Marcar Actualizáveis"
 
-#: src/ui.cc:1373
+#: src/ui.cc:1367
 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:1376
+#: src/ui.cc:1370
 msgid "^Play Minesweeper"
 msgstr "^P Jogar Campo Minado"
 
-#: src/ui.cc:1379
+#: src/ui.cc:1373
 msgid "^Become root"
 msgstr "^B Tornar-se root"
 
-#: src/ui.cc:1380
+#: src/ui.cc:1374
 #, fuzzy
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
@@ -4186,71 +4218,71 @@
 "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:1383
+#: src/ui.cc:1377
 msgid "^Reload package cache"
 msgstr "^Reler cache de pacotes"
 
-#: src/ui.cc:1384
+#: src/ui.cc:1378
 msgid "Reload the package cache"
 msgstr "Reler a cache de pacotes"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1384
 msgid "^Quit"
 msgstr "^Q Terminar"
 
-#: src/ui.cc:1391
+#: src/ui.cc:1385
 msgid "Exit the program"
 msgstr "Sair do programa"
 
-#: src/ui.cc:1397 src/ui.cc:1669
+#: src/ui.cc:1391 src/ui.cc:1661
 msgid "Undo"
 msgstr "Desfazer"
 
-#: src/ui.cc:1398
+#: src/ui.cc:1392
 msgid "Undo the last package operation or group of operations"
 msgstr "Desfaz a última operação ou grupo de operações"
 
-#: src/ui.cc:1405
+#: src/ui.cc:1399
 msgid "^Install"
 msgstr "^Instalar"
 
-#: src/ui.cc:1406
+#: src/ui.cc:1400
 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:1409
+#: src/ui.cc:1403
 msgid "^Remove"
 msgstr "^Remover"
 
-#: src/ui.cc:1410
+#: src/ui.cc:1404
 msgid "Flag the currently selected package for removal"
 msgstr "Marcar o pacote actualmente seleccionado para remoção"
 
-#: src/ui.cc:1413
+#: src/ui.cc:1407
 msgid "^Purge"
 msgstr "^Purgar"
 
-#: src/ui.cc:1414
+#: src/ui.cc:1408
 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:1417
+#: src/ui.cc:1411
 msgid "^Keep"
 msgstr "^Ficar com"
 
-#: src/ui.cc:1418
+#: src/ui.cc:1412
 msgid "Cancel any action on the selected package"
 msgstr "Cancelar qualquer acção no pacote seleccionado"
 
-#: src/ui.cc:1421
+#: src/ui.cc:1415
 msgid "^Hold"
 msgstr "^Manter"
 
-#: src/ui.cc:1422
+#: src/ui.cc:1416
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -4258,11 +4290,11 @@
 "Cancelar qualquer acção no pacote seleccionado e protegê-lo de futuras "
 "actualizações"
 
-#: src/ui.cc:1425
+#: src/ui.cc:1419
 msgid "Mark ^Auto"
 msgstr "Marcar ^Auto"
 
-#: src/ui.cc:1426
+#: src/ui.cc:1420
 #, fuzzy
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
@@ -4271,11 +4303,11 @@
 "Marcar o pacote seleccionado como tendo sido automaticamente instalado;\n"
 "será automaticamente removido se nenhum outro pacote depender dele"
 
-#: src/ui.cc:1429
+#: src/ui.cc:1423
 msgid "Mark ^Manual"
 msgstr "Marcar ^Manual"
 
-#: src/ui.cc:1430
+#: src/ui.cc:1424
 #, fuzzy
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
@@ -4284,11 +4316,11 @@
 "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:1433
+#: src/ui.cc:1427
 msgid "^Forbid Version"
-msgstr "^F Proíbir Versão"
+msgstr "^F Proibir Versão"
 
-#: src/ui.cc:1434
+#: src/ui.cc:1428
 #, fuzzy
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
@@ -4297,234 +4329,234 @@
 "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:1438
+#: src/ui.cc:1432
 msgid "I^nformation"
 msgstr "I^nformação"
 
-#: src/ui.cc:1439
+#: src/ui.cc:1433
 msgid "Display more information about the selected package"
 msgstr "Mostrar mais informações acerca do pacote seleccionado"
 
-#: src/ui.cc:1442
+#: src/ui.cc:1436
 msgid "^Changelog"
 msgstr "^C Registo de alterações"
 
-#: src/ui.cc:1443
+#: src/ui.cc:1437
 msgid "Display the Debian changelog of the selected package"
 msgstr "Mostrar o registo de alterações Debian do pacote seleccionado"
 
-#: src/ui.cc:1450
+#: src/ui.cc:1444
 msgid "^Find"
 msgstr "^F Procurar"
 
-#: src/ui.cc:1451
+#: src/ui.cc:1445
 msgid "Search for a package"
 msgstr "Procurar por um pacote"
 
-#: src/ui.cc:1454
+#: src/ui.cc:1448
 msgid "Find ^Again"
 msgstr "^A Procurar de novo"
 
-#: src/ui.cc:1455
+#: src/ui.cc:1449
 msgid "Repeat the last search"
 msgstr "Repetir a última procura"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1453
 msgid "^Limit Display"
 msgstr "^Limitar a vista"
 
-#: src/ui.cc:1460
+#: src/ui.cc:1454
 msgid "Apply a filter to the package list"
 msgstr "Aplicar um filtro à lista de pacotes"
 
-#: src/ui.cc:1463
+#: src/ui.cc:1457
 msgid "^Un-Limit Display"
 msgstr "^U Retirar limite à vista"
 
-#: src/ui.cc:1464
+#: src/ui.cc:1458
 msgid "Remove the filter from the package list"
 msgstr "Remover o filtro da lista de pacotes"
 
-#: src/ui.cc:1468
+#: src/ui.cc:1462
 msgid "Find ^Broken"
 msgstr "^B Procurar Quebrado"
 
-#: src/ui.cc:1469
+#: src/ui.cc:1463
 msgid "Find the next package with unsatisfied dependencies"
-msgstr "Procurar o próximo pacote com depedências não satisfeitas:"
+msgstr "Procurar o próximo pacote com dependências não satisfeitas:"
 
-#: src/ui.cc:1476
+#: src/ui.cc:1470
 msgid "^UI options"
 msgstr "^UI Opções da interface"
 
-#: src/ui.cc:1477
+#: src/ui.cc:1471
 msgid "Change the settings which affect the user interface"
 msgstr "Altera as configurações que afectam a interface do utilizador"
 
-#: src/ui.cc:1480
+#: src/ui.cc:1474
 msgid "^Dependency handling"
 msgstr "Gestão de ^Dependências"
 
-#: src/ui.cc:1481
+#: src/ui.cc:1475
 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:1484
+#: src/ui.cc:1478
 msgid "^Miscellaneous"
 msgstr "^Miscelânea"
 
-#: src/ui.cc:1485
+#: src/ui.cc:1479
 msgid "Change miscellaneous program settings"
 msgstr "Altera as configurações diversas do programa"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1484
 msgid "^Revert options"
 msgstr "^Reverter as opções"
 
-#: src/ui.cc:1491
+#: src/ui.cc:1485
 msgid "Reset all settings to the system defaults"
 msgstr "Reset a todas as configurações para os padrões do sistema"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1496
 msgid "^Next"
 msgstr "^N Próximo"
 
-#: src/ui.cc:1503
+#: src/ui.cc:1497
 msgid "View next display"
 msgstr "Visualizar a próxima página"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1500
 msgid "^Prev"
 msgstr "^P Anterior"
 
-#: src/ui.cc:1507
+#: src/ui.cc:1501
 msgid "View previous display"
 msgstr "Visualizar a página anterior"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1504
 msgid "^Close"
 msgstr "^C Fechar"
 
-#: src/ui.cc:1511
+#: src/ui.cc:1505
 msgid "Close this display"
 msgstr "Fechar esta página"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1510
 msgid "New Package ^View"
 msgstr "Nova ^Visão de Pacote"
 
-#: src/ui.cc:1517
+#: src/ui.cc:1511
 msgid "Create a new default package view"
 msgstr "Criar uma nova visão de pacote padrão"
 
-#: src/ui.cc:1520
+#: src/ui.cc:1514
 msgid "New Categorical ^Browser"
 msgstr "^B Novo Navegador de Categorias"
 
-#: src/ui.cc:1522
+#: src/ui.cc:1516
 msgid "Browse packages by category"
 msgstr "Navega pelos pacotes por categoria"
 
-#: src/ui.cc:1530
+#: src/ui.cc:1524
 msgid "^About"
 msgstr "^A Sobre"
 
-#: src/ui.cc:1531
+#: src/ui.cc:1525
 msgid "View information about this program"
 msgstr "Ver informações sobre este programa."
 
-#: src/ui.cc:1534
+#: src/ui.cc:1528
 msgid "^Help"
 msgstr "^H Ajuda"
 
-#: src/ui.cc:1535
+#: src/ui.cc:1529
 msgid "View the on-line help"
 msgstr "Visualiza a ajuda on-line"
 
-#: src/ui.cc:1537
+#: src/ui.cc:1531
 msgid "User's ^Manual"
 msgstr "^Manual do Utilizador"
 
-#: src/ui.cc:1538
+#: src/ui.cc:1532
 msgid "View the detailed program manual"
 msgstr "Ver o manual do programa detalhado"
 
-#: src/ui.cc:1541
+#: src/ui.cc:1535
 msgid "^FAQ"
 msgstr "^FAQ"
 
-#: src/ui.cc:1542
+#: src/ui.cc:1536
 msgid "View a list of frequently asked questions"
 msgstr "Ver a lista de perguntas frequentes"
 
-#: src/ui.cc:1545
+#: src/ui.cc:1539
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1546
+#: src/ui.cc:1540
 #, 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:1549
+#: src/ui.cc:1543
 msgid "^License"
 msgstr "^Licença"
 
-#: src/ui.cc:1550
+#: src/ui.cc:1544
 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:1668
+#: src/ui.cc:1660
 msgid "Actions"
 msgstr "Acções"
 
-#: src/ui.cc:1671
+#: src/ui.cc:1663
 msgid "Search"
 msgstr "Procurar"
 
-#: src/ui.cc:1672
+#: src/ui.cc:1664
 msgid "Options"
 msgstr "Opções"
 
-#: src/ui.cc:1673
+#: src/ui.cc:1665
 msgid "Views"
 msgstr "Vistas"
 
-#: src/ui.cc:1674
+#: src/ui.cc:1666
 msgid "Help"
 msgstr "Ajuda"
 
-#: src/ui.cc:1734
+#: src/ui.cc:1726
 #, 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:2003 src/vscreen/vscreen.cc:281
+#: src/ui.cc:1996 src/vscreen/vscreen.cc:281
 msgid "yes_key"
 msgstr "chave_sim"
 
-#: src/ui.cc:2004 src/vscreen/vscreen.cc:282
+#: src/ui.cc:1997 src/vscreen/vscreen.cc:282
 msgid "no_key"
 msgstr "chave_não"
 
-#: src/view_changelog.cc:46
+#: src/view_changelog.cc:61
 msgid "You can only view changelogs of official Debian packages."
 msgstr "Só pode ver registos de alterações de pacotes oficiais Debian."
 
-#: src/view_changelog.cc:52
+#: src/view_changelog.cc:67
 msgid "Downloading Changelog"
 msgstr "A efectuar o download do registo de alterações"
 
-#: src/view_changelog.cc:54
+#: src/view_changelog.cc:69
 #, fuzzy
 msgid "Download Changelog"
 msgstr "A efectuar o download do registo de alterações"
 
-#: src/view_changelog.cc:63
+#: src/view_changelog.cc:78
 #, c-format
 msgid "%s changes"
 msgstr ""
@@ -4593,7 +4625,7 @@
 #~ "  pacotes. (Pode especificar acções adicionais; cada acção será\n"
 #~ "  aplicada a todos os pacotes que a seguirem)\n"
 #~ "\n"
-#~ "Ações :\n"
+#~ "Acções :\n"
 #~ "  + : Instalar\n"
 #~ "  - : Remover\n"
 #~ "  _ : Apagar\n"
@@ -4619,19 +4651,193 @@
 #~ "Por favor, introduza o seguinte disco na drive \"%s\":\n"
 #~ "%s"
 
+#~ msgid "Need exactly two colors in color definition \"%s\""
+#~ msgstr "São necessárias exactamente duas cores na definição de cor \"%s\""
+
+#~ msgid "Can't parse foreground \"%s\"of color \"%s\""
+#~ msgstr "Não foi possível interpretar a frente \"%s\" da frente \"%s\""
+
+#~ msgid "Can't parse background \"%s\" of color \"%s\""
+#~ msgstr "Não foi possível interpretar o fundo \"%s\" da cor \"%s\""
+
 #~ msgid "Invalid option for interactive mode: -s\n"
 #~ msgstr "Opção inválida para modo interativo: -s\n"
 
+#~ 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."
+#~ 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 "
+#~ "dispositivos de hardware de comunicação. Inclui software para controlar "
+#~ "fax-modems (por exemplo, ligações PPP ou ligações internet de acesso "
+#~ "telefónico e programas originalmente escritos para este propósito (zmodem/"
+#~ "kermit), bem como software para controlar telefones celulares, interfaces "
+#~ "com a FidoNet e correr uma BBS."
+
+#~ 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"
+#~ " .\n"
+#~ " For more information about what Debian considers to be Free Software, "
+#~ "see http://www.debian.org/social_contract#guidelines"
+#~ msgstr ""
+#~ "Programas que não são software livre\n"
+#~ " Pacotes na secção 'non-free' não são parte do Debian.\n"
+#~ " .\n"
+#~ " Estes pacotes falham em cumprir um ou mais requisitos do Debian Free "
+#~ "Software Guidelines (ver em baixo). Deverá ler a licença dos programas "
+#~ "nesta secção para certificar-se de que é permitido utilizá-los da maneira "
+#~ "que pretende.\n"
+#~ ".\n"
+#~ " Para mais informações sobre o que o Debian considera ser Software Livre, "
+#~ "veja http://www.debian.org/social_contract.pt.html#guidelines"
+
+#~ 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)"
+#~ msgstr ""
+#~ "Novos Pacotes\n"
+#~ " Estes pacotes foram adicionados ao Debian desde a última vez que você "
+#~ "limpou a lista de \"novos\" pacotes. (escolha \"Esquecer novos pacotes\" "
+#~ "a partir do menu Acções para limpar esta lista)"
+
+#~ msgid ""
+#~ "%s is an essential package!\n"
+#~ "\n"
+#~ "Are you sure you want to remove it?\n"
+#~ "Type '%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."
+
+#~ msgid "Available versions of "
+#~ msgstr "Versões disponíveis de "
+
+#~ 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."
+#~ 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."
+
 #~ msgid "Information about "
 #~ msgstr "Informação sobre "
 
+#~ msgid ""
+#~ "Aptitude %s\n"
+#~ "\n"
+#~ "Copyright 2000 Daniel Burrows.\n"
+#~ "\n"
+#~ "aptitude comes with ABSOLUTELY NO WARRANTY; for details see 'license' in "
+#~ "the\n"
+#~ "Help menu.  This is free software, and you are welcome to redistribute "
+#~ "it\n"
+#~ "under certain conditions; see 'license' for details."
+#~ msgstr ""
+#~ "Aptitude %s\n"
+#~ "\n"
+#~ "Copyright 2000 Daniel Burrows.\n"
+#~ "\n"
+#~ "O aptitude é fornecido SEM GARANTIA NENHUMA; para detalhes\n"
+#~ "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."
+
+#~ msgid "Some packages were broken and have been fixed"
+#~ msgstr "Alguns pacotes tinham dependências quebradas e foram corrigidos"
+
 #~ msgid "Some broken packages could not be fixed!"
 #~ msgstr ""
 #~ "Alguns pacotes tinham dependências quebradas e não puderam ser corrigidos!"
 
+#~ msgid "Some packages are broken.  Try to fix them?"
+#~ msgstr ""
+#~ "Alguns pacotes têm dependências quebradas. Deseja tentar corrigi-las?"
+
+#~ msgid ""
+#~ "Installing/removing packages requires administrative privileges, which\n"
+#~ "you currently do not have.  Would you like to change to the root "
+#~ "account?\n"
+#~ msgstr ""
+#~ "Instalar/remover pacotes requer privilégios de administrador, que\n"
+#~ "actualmente não possui. Deseja mudar para a conta de root?\n"
+
+#~ msgid ""
+#~ "No packages will be installed, removed or upgraded.\n"
+#~ "\n"
+#~ "Some packages could be upgraded, but you have not chosen to upgrade "
+#~ "them.\n"
+#~ "Type \"U\" to prepare an upgrade."
+#~ msgstr ""
+#~ "Nenhuns pacotes serão instalados removidos ou actualizados.\n"
+#~ "\n"
+#~ "Alguns pacotes podiam ser actualizados, mas escolheu não os actualizar.\n"
+#~ "Carregue em \"U\" para preparar uma actualização."
+
+#~ 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"
+#~ 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"
+
+#~ msgid "Obsolete downloaded package files have been deleted"
+#~ msgstr "Ficheiros de pacotes obsoletos transferidos foram apagados"
+
+#~ msgid ""
+#~ "Run 'su' to become root; this will restart the program, but your\n"
+#~ "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."
+
+#~ msgid ""
+#~ "Mark the selected package as having been automatically installed;\n"
+#~ "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"
+
+#~ msgid ""
+#~ "Mark the selected package as having been manually installed;\n"
+#~ "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"
+
+#~ msgid ""
+#~ "Forbid the candidate version of the selected package from being "
+#~ "installed;\n"
+#~ "newer versions of the package will be installed as usual"
+#~ msgstr ""
+#~ "Proibir a versão candidata do pacote seleccionado de ser instalada;\n"
+#~ "versões mais recentes deste pacote serão instaladas como de costume"
+
 #~ msgid "^ChangeLog"
 #~ msgstr "^C Log de alterações"
 
+#~ msgid "View the important changes made in each version of the program"
+#~ msgstr "Ver as alterações importantes feitas em cada versão do programa"
+
 #~ 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	Sun Jun 12 21:04:47 2005
@@ -3,13 +3,14 @@
 # Copyright (C) 2002, Debian Project.
 # Copyright (C) 2003, Debian Project.
 # Copyright (C) 2004, Debian Project.
+# Copyright (C) 2005, Debian Project.
 msgid ""
 msgstr ""
 "Project-Id-Version: aptitude\n"
 "Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-05-01 14:08-0400\n"
-"PO-Revision-Date: 2004-10-06 15:35-0300\n"
-"Last-Translator: Goedson Teixeira Paixão <goedson at debian.org>\n"
+"POT-Creation-Date: 2005-06-12 22:42+0200\n"
+"PO-Revision-Date: 2005-05-18 11:23-0300\n"
+"Last-Translator: André Luís Lopes <andrelop at debian.org>\n"
 "Language-Team: Debian-BR Project <debian-l10n-portuguese at lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -157,14 +158,14 @@
 msgid "Automatically remove unused packages matching this filter"
 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:219 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
-#: src/vscreen/vs_util.cc:328
+#: src/apt_options.cc:240 src/mine/cmine.cc:249 src/mine/cmine.cc:312
+#: src/ui.cc:215 src/vscreen/vs_util.cc:77 src/vscreen/vs_util.cc:90
+#: src/vscreen/vs_util.cc:264 src/vscreen/vs_util.cc:298
 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:328
+#: src/apt_options.cc:241 src/download_list.cc:69 src/mine/cmine.cc:250
+#: src/mine/cmine.cc:313 src/vscreen/vs_util.cc:298
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -245,15 +246,15 @@
 msgid "%s: Previous"
 msgstr ""
 
-#: src/broken_indicator.cc:233
+#: src/broken_indicator.cc:232
 #, c-format
-msgid "%CSolution search failed.  %s: try harder"
+msgid "Solution search failed.  %s: try harder"
 msgstr ""
 
-#: src/broken_indicator.cc:239
-#, c-format
-msgid "%CUnable to resolve dependencies."
-msgstr ""
+#: src/broken_indicator.cc:237
+#, fuzzy
+msgid "Unable to resolve dependencies."
+msgstr "Não foi possível abrir %s para gravação"
 
 #: src/cmdline/cmdline_action.cc:36
 #, c-format
@@ -628,31 +629,37 @@
 "this is what you want to do.\n"
 "\n"
 msgstr ""
+"AVISO : versões não confiáveis dos seguintes pacotes serinstaladas !\n"
+"\n"
+"Pacotes não confiáveis podem comprometer a segurança de seu sistema.\n"
+"Você deveria prosseguir com a instalação somente caso esteja certo de \n"
+"que isso é realmente o que você deseja fazer.\n"
+"\n"
 
-#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
-#: src/vscreen/vs_util.cc:212
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:165
+#: src/vscreen/vs_util.cc:202
 msgid "Yes"
 msgstr "Sim"
 
-#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
-#: src/vscreen/vs_util.cc:212
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:165
+#: src/vscreen/vs_util.cc:202
 msgid "No"
 msgstr "Não"
 
 #: src/cmdline/cmdline_prompt.cc:388
 #, c-format
 msgid "Do you want to ignore this warning and proceed anyway?\n"
-msgstr ""
+msgstr "Você deseja ignorar esse aviso e continuar mesma assim ?\n"
 
 #: src/cmdline/cmdline_prompt.cc:389
-#, fuzzy, c-format
+#, c-format
 msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
-msgstr "Para continuar, digite a frase \"%s\":\n"
+msgstr "Para continuar, informe \"%s\"; para abortar, informe \"%s\" :"
 
 #: src/cmdline/cmdline_prompt.cc:400
 #, c-format
 msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
-msgstr ""
+msgstr "Entrada desconhecida. Informe \"%s\" ou \"%s\".\n"
 
 #: src/cmdline/cmdline_prompt.cc:499
 #, c-format
@@ -950,7 +957,7 @@
 msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:212
+#: src/cmdline/cmdline_resolver.cc:212 src/cmdline/cmdline_resolver.cc:285
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
@@ -1007,196 +1014,201 @@
 msgid "The following packages have unmet dependencies:\n"
 msgstr "Os pacotes a seguir possuem dependências não satisfeitas :\n"
 
-#: src/cmdline/cmdline_show.cc:133
+#: src/cmdline/cmdline_show.cc:119 src/cmdline/cmdline_show.cc:305
+#: src/solution_fragment.cc:65
+msgid "<NULL>"
+msgstr ""
+
+#: src/cmdline/cmdline_show.cc:138
 msgid "not installed"
 msgstr "não instalado"
 
-#: src/cmdline/cmdline_show.cc:135 src/pkg_columnizer.cc:231
+#: src/cmdline/cmdline_show.cc:140 src/pkg_columnizer.cc:231
 #: src/pkg_ver_item.cc:225
 msgid "unpacked"
 msgstr "desempacotado"
 
-#: src/cmdline/cmdline_show.cc:137
+#: src/cmdline/cmdline_show.cc:142
 msgid "partially configured"
 msgstr "parcialmente configurado"
 
-#: src/cmdline/cmdline_show.cc:139
+#: src/cmdline/cmdline_show.cc:144
 msgid "partially installed"
 msgstr "parcialmente instalado"
 
-#: src/cmdline/cmdline_show.cc:141
+#: src/cmdline/cmdline_show.cc:146
 msgid "not installed (configuration files remain)"
 msgstr "não instalado (arquivos de configuração permanecem)"
 
-#: src/cmdline/cmdline_show.cc:143 src/pkg_columnizer.cc:239
+#: src/cmdline/cmdline_show.cc:148 src/pkg_columnizer.cc:239
 #: src/pkg_ver_item.cc:233
 msgid "installed"
 msgstr "instalado"
 
-#: src/cmdline/cmdline_show.cc:152
+#: src/cmdline/cmdline_show.cc:157
 msgid "not a real package"
 msgstr "não é um pacote real"
 
-#: src/cmdline/cmdline_show.cc:165
+#: src/cmdline/cmdline_show.cc:170
 msgid " [held]"
 msgstr " [mantido]"
 
-#: src/cmdline/cmdline_show.cc:174
+#: src/cmdline/cmdline_show.cc:179
 #, c-format
 msgid "%s; version %s will be installed"
 msgstr "%s; versão %s será instalado"
 
-#: src/cmdline/cmdline_show.cc:178
+#: src/cmdline/cmdline_show.cc:183
 #, c-format
 msgid "%s; version %s will be installed automatically"
 msgstr "%s; versão %s será instalado automaticamente"
 
-#: src/cmdline/cmdline_show.cc:184 src/cmdline/cmdline_show.cc:199
+#: src/cmdline/cmdline_show.cc:189 src/cmdline/cmdline_show.cc:204
 #, c-format
 msgid "%s; will be purged"
 msgstr "%s; será expurgado"
 
-#: src/cmdline/cmdline_show.cc:197
+#: src/cmdline/cmdline_show.cc:202
 #, c-format
 msgid "%s; will be purged because nothing depends on it"
 msgstr "%s; será expurgado devido a nenhum pacote depender dele"
 
-#: src/cmdline/cmdline_show.cc:204
+#: src/cmdline/cmdline_show.cc:209
 #, c-format
 msgid "%s; will be removed because nothing depends on it"
 msgstr "%s; será removido devido a nenhum pacote depende dele"
 
-#: src/cmdline/cmdline_show.cc:206
+#: src/cmdline/cmdline_show.cc:211
 #, c-format
 msgid "%s; will be removed"
 msgstr "%s; será removido"
 
-#: src/cmdline/cmdline_show.cc:220
+#: src/cmdline/cmdline_show.cc:225
 #, c-format
 msgid "%s%s; will be downgraded [%s -> %s]"
 msgstr "%s%s; será rebaixado [%s -> %s ]"
 
-#: src/cmdline/cmdline_show.cc:223
+#: src/cmdline/cmdline_show.cc:228
 #, c-format
 msgid "%s%s; will be upgraded [%s -> %s]"
 msgstr "%s%s; será atualizado [%s -> %s]"
 
-#: src/cmdline/cmdline_show.cc:235 src/cmdline/cmdline_show.cc:256
+#: src/cmdline/cmdline_show.cc:240 src/cmdline/cmdline_show.cc:261
 msgid "Package: "
 msgstr "Pacote: "
 
-#: src/cmdline/cmdline_show.cc:236 src/cmdline/cmdline_show.cc:264
+#: src/cmdline/cmdline_show.cc:241 src/cmdline/cmdline_show.cc:269
 #: src/pkg_columnizer.cc:87
 msgid "State"
 msgstr "Estado"
 
-#: src/cmdline/cmdline_show.cc:237 src/cmdline/cmdline_show.cc:318
+#: src/cmdline/cmdline_show.cc:242 src/cmdline/cmdline_show.cc:325
 msgid "Provided by"
 msgstr "Fornecido por"
 
-#: src/cmdline/cmdline_show.cc:258 src/pkg_info_screen.cc:105
+#: src/cmdline/cmdline_show.cc:263 src/pkg_info_screen.cc:105
 msgid "Essential: "
 msgstr "Essencial: "
 
-#: src/cmdline/cmdline_show.cc:258 src/cmdline/cmdline_show.cc:262
-#: src/cmdline/cmdline_show.cc:273 src/pkg_info_screen.cc:105
+#: src/cmdline/cmdline_show.cc:263 src/cmdline/cmdline_show.cc:267
+#: src/cmdline/cmdline_show.cc:278 src/pkg_info_screen.cc:105
 msgid "yes"
 msgstr "sim"
 
-#: src/cmdline/cmdline_show.cc:262
+#: src/cmdline/cmdline_show.cc:267
 msgid "New"
 msgstr "Novo"
 
-#: src/cmdline/cmdline_show.cc:267
+#: src/cmdline/cmdline_show.cc:272
 msgid "Forbidden version"
 msgstr "Versão proibida"
 
-#: src/cmdline/cmdline_show.cc:271
+#: src/cmdline/cmdline_show.cc:276
 msgid "Automatically installed"
 msgstr "Automaticamente instalado"
 
-#: src/cmdline/cmdline_show.cc:273
+#: src/cmdline/cmdline_show.cc:278
 msgid "no"
 msgstr "não"
 
-#: src/cmdline/cmdline_show.cc:275
+#: src/cmdline/cmdline_show.cc:280
 msgid "Version: "
 msgstr "Versão: "
 
-#: src/cmdline/cmdline_show.cc:276 src/pkg_info_screen.cc:113
+#: src/cmdline/cmdline_show.cc:281 src/pkg_info_screen.cc:113
 msgid "Priority: "
 msgstr "Prioridade: "
 
-#: src/cmdline/cmdline_show.cc:277 src/cmdline/cmdline_show.cc:279
-#: src/cmdline/cmdline_show.cc:288
+#: src/cmdline/cmdline_show.cc:282 src/cmdline/cmdline_show.cc:284
+#: src/cmdline/cmdline_show.cc:293
 msgid "N/A"
 msgstr "N/A"
 
-#: src/cmdline/cmdline_show.cc:278 src/pkg_info_screen.cc:114
+#: src/cmdline/cmdline_show.cc:283 src/pkg_info_screen.cc:114
 msgid "Section: "
 msgstr "Seção: "
 
-#: src/cmdline/cmdline_show.cc:280 src/pkg_info_screen.cc:115
+#: src/cmdline/cmdline_show.cc:285 src/pkg_info_screen.cc:115
 msgid "Maintainer: "
 msgstr "Mantenedor: "
 
-#: src/cmdline/cmdline_show.cc:283
+#: src/cmdline/cmdline_show.cc:288
 msgid "Uncompressed Size: "
 msgstr "Tamanho Descompactado: "
 
-#: src/cmdline/cmdline_show.cc:287
+#: src/cmdline/cmdline_show.cc:292
 msgid "Architecture: "
 msgstr "Arquitetuta: "
 
-#: src/cmdline/cmdline_show.cc:289
+#: src/cmdline/cmdline_show.cc:294
 msgid "Compressed Size: "
 msgstr "Tamanho Compactado: "
 
-#: src/cmdline/cmdline_show.cc:291
+#: src/cmdline/cmdline_show.cc:296
 msgid "Filename: "
 msgstr "Nome do Arquivo: "
 
-#: src/cmdline/cmdline_show.cc:293
+#: src/cmdline/cmdline_show.cc:298
 msgid "MD5sum: "
 msgstr "MD5sum: "
 
-#: src/cmdline/cmdline_show.cc:297 src/cmdline/cmdline_show.cc:299
+#: src/cmdline/cmdline_show.cc:302 src/cmdline/cmdline_show.cc:305
 msgid "Archive"
 msgstr "Repositório"
 
-#: src/cmdline/cmdline_show.cc:303
+#: src/cmdline/cmdline_show.cc:310
 msgid "Depends"
 msgstr "Depende de"
 
-#: src/cmdline/cmdline_show.cc:305
+#: src/cmdline/cmdline_show.cc:312
 msgid "PreDepends"
 msgstr "Pré-Depende de"
 
-#: src/cmdline/cmdline_show.cc:307
+#: src/cmdline/cmdline_show.cc:314
 msgid "Recommends"
 msgstr "Recomenda"
 
-#: src/cmdline/cmdline_show.cc:309
+#: src/cmdline/cmdline_show.cc:316
 msgid "Suggests"
 msgstr "Sugere"
 
-#: src/cmdline/cmdline_show.cc:311
+#: src/cmdline/cmdline_show.cc:318
 msgid "Conflicts"
 msgstr "Conflita com"
 
-#: src/cmdline/cmdline_show.cc:313
+#: src/cmdline/cmdline_show.cc:320
 msgid "Replaces"
 msgstr "Substitui"
 
-#: src/cmdline/cmdline_show.cc:315
+#: src/cmdline/cmdline_show.cc:322
 msgid "Obsoletes"
 msgstr "Torna obsoleto"
 
-#: src/cmdline/cmdline_show.cc:317
+#: src/cmdline/cmdline_show.cc:324
 msgid "Provides"
 msgstr "Fornece"
 
-#: src/cmdline/cmdline_show.cc:321 src/pkg_info_screen.cc:97
+#: src/cmdline/cmdline_show.cc:328 src/pkg_info_screen.cc:97
 msgid "Description: "
 msgstr "Descrição: "
 
@@ -1241,32 +1253,32 @@
 msgstr ""
 "Você não pode especificar ambos um repositório e uma versão para um pacote\n"
 
-#: src/dep_item.cc:137
+#: src/dep_item.cc:139
 msgid "UNSATISFIED"
 msgstr "NÂO SATISFEITAS"
 
-#: src/dep_item.cc:137 src/reason_fragment.cc:247
+#: src/dep_item.cc:139 src/reason_fragment.cc:244
 msgid "UNAVAILABLE"
 msgstr "NÂO DISPONÍVEIS"
 
-#: src/download_bar.cc:56 src/download_list.cc:263 src/download_screen.cc:57
+#: src/download_bar.cc:56 src/download_list.cc:266 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_bar.cc:77 src/generic/acqprogress.cc:63
+#: src/download_bar.cc:75 src/generic/acqprogress.cc:63
 msgid "Hit "
 msgstr "Atingido "
 
-#: src/download_bar.cc:90
+#: src/download_bar.cc:88
 msgid "Downloading "
 msgstr "Fazendo download de "
 
-#: src/download_bar.cc:103
+#: src/download_bar.cc:101
 msgid "Got "
 msgstr "Obtido "
 
-#: src/download_bar.cc:157
+#: src/download_bar.cc:155
 msgid "Downloading..."
 msgstr "Fazendo download..."
 
@@ -1294,7 +1306,7 @@
 msgid "Couldn't clean out list directories"
 msgstr "Não foi possível limpar os diretórios de listas"
 
-#: src/download.cc:177 src/ui.cc:1153
+#: src/download.cc:177 src/ui.cc:1147
 msgid "Deleting obsolete downloaded files"
 msgstr "Apagando arquivos baixados obsoletos"
 
@@ -1432,7 +1444,7 @@
 msgstr ""
 "Ack! Algo ruim aconteceu durante a instalação de pacotes. Tentando recuperar:"
 
-#: src/download.cc:477 src/pkg_item.cc:432
+#: src/download.cc:477 src/pkg_item.cc:430
 msgid "Press return to continue.\n"
 msgstr "Pressione Enter para continuar.\n"
 
@@ -1443,17 +1455,17 @@
 "Não foi possível recuperar a trava do sistema! (Talvez outro apt ou dpkg "
 "esteja rodando?)"
 
-#: src/download_item.cc:66 src/download_item.cc:70 src/download_item.cc:100
+#: src/download_item.cc:70 src/download_item.cc:74 src/download_item.cc:104
 #: src/generic/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr " [Trabalhando]"
 
-#: src/download_item.cc:104 src/download_list.cc:283
+#: src/download_item.cc:108 src/download_list.cc:284
 msgid "[Hit]"
 msgstr "[Atingido]"
 
-#: src/download_item.cc:104 src/download_list.cc:303
+#: src/download_item.cc:108 src/download_list.cc:304
 msgid "[Downloaded]"
 msgstr "[Baixado]"
 
@@ -1467,34 +1479,34 @@
 msgid "%n%nSome files were not downloaded successfully."
 msgstr ""
 
-#: src/download_list.cc:68
+#: src/download_list.cc:66
 msgid "Continue"
 msgstr "Continuar"
 
-#: src/download_list.cc:175 src/download_screen.cc:203
+#: src/download_list.cc:178 src/download_screen.cc:203
 msgid "Total Progress: "
 msgstr "Progresso Total: "
 
-#: src/download_list.cc:194 src/download_screen.cc:218
+#: src/download_list.cc:197 src/download_screen.cc:218
 #, c-format
 msgid " [ %i%% ] (%sB/s, %s remaining)"
 msgstr " [ %i%% ] (%sB/s, %s restantes)"
 
-#: src/download_list.cc:196
+#: src/download_list.cc:199
 #, c-format
 msgid " [ %i%% ] (stalled)"
 msgstr " [ %i%% ] (parado)"
 
-#: src/download_list.cc:198
+#: src/download_list.cc:201
 #, c-format
 msgid " [ %i%% ]"
 msgstr " [ %i%% ]"
 
-#: src/download_list.cc:323
+#: src/download_list.cc:324
 msgid "[IGNORED]"
 msgstr "[IGNORADO]"
 
-#: src/download_list.cc:329
+#: src/download_list.cc:330
 msgid "[ERROR]"
 msgstr "[ERRO]"
 
@@ -1503,11 +1515,11 @@
 msgid "Downloaded %sB in %ss (%sB/s)."
 msgstr "Baixados %sB em %ss (%sB/s)."
 
-#: src/edit_pkg_hier.cc:158
+#: src/edit_pkg_hier.cc:176
 msgid "No hierarchy information to edit"
 msgstr "Nenhuma informação de hierarquia a ser editada"
 
-#: src/edit_pkg_hier.cc:258
+#: src/edit_pkg_hier.cc:276
 msgid "Couldn't open for writing"
 msgstr "Não foi possível abrir para gravação"
 
@@ -1611,39 +1623,39 @@
 "Aviso: não foi possível travar o arquivo de cache. Abrindo em modo somente-"
 "leitura"
 
-#: src/generic/matchers.cc:797
+#: src/generic/matchers.cc:798
 msgid "Unmatched '('"
 msgstr "Parentese '(' sem par"
 
-#: src/generic/matchers.cc:887 src/generic/matchers.cc:968
+#: src/generic/matchers.cc:888 src/generic/matchers.cc:969
 #, c-format
 msgid "Unknown dependency type: %s"
 msgstr "Tipo de dependência desconhecida: %s"
 
-#: src/generic/matchers.cc:950
+#: src/generic/matchers.cc:951
 #, c-format
 msgid "Unknown action type: %s"
 msgstr "Tipo de ação desconhecida: %s"
 
-#: src/generic/matchers.cc:1017
+#: src/generic/matchers.cc:1018
 #, c-format
 msgid "Unknown priority %s"
 msgstr "Prioridade %s desconhecida"
 
-#: src/generic/matchers.cc:1039
+#: src/generic/matchers.cc:1040
 #, c-format
 msgid "Unknown pattern type: %c"
 msgstr "Tipo de padrão desconhecido: %c"
 
-#: src/generic/matchers.cc:1084
+#: src/generic/matchers.cc:1105
 msgid "Unexpected empty expression"
 msgstr "Expressão vazia não esperada"
 
-#: src/generic/matchers.cc:1119
+#: src/generic/matchers.cc:1143
 msgid "Badly formed expression"
 msgstr "Expressão mal formada"
 
-#: src/generic/matchers.cc:1148
+#: src/generic/matchers.cc:1175
 msgid "Unexpected ')'"
 msgstr "')' inesperado"
 
@@ -1669,7 +1681,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:61
+#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:76
 #, c-format
 msgid "ChangeLog of %s"
 msgstr "Log de mudanças de %s"
@@ -1710,37 +1722,37 @@
 msgid "Reading task descriptions"
 msgstr "Lendo descrições de tarefas"
 
-#: src/load_config.cc:30
-#, c-format
-msgid "Invalid entry in color definition group: \"%s\""
-msgstr "Entrada inválida no grupo de definição de cor: \"%s\""
+#: src/load_config.cc:42
+#, fuzzy, c-format
+msgid "Unrecognized color name \"%s\""
+msgstr "Tarefas não reconhecidas"
 
-#: src/load_config.cc:32
-#, c-format
-msgid "Invalid tagless entry in color definition group: \"%s\""
-msgstr "Entrada sem tag inválida no grupo de definição de cor: \"%s\""
+#: src/load_config.cc:69
+#, fuzzy, c-format
+msgid "Unrecognized attribute name \"%s\""
+msgstr "Tarefas não reconhecidas"
 
-#: src/load_config.cc:34
-#, c-format
-msgid "Need exactly two colors in color definition \"%s\""
-msgstr "São necessárias exatamente duas cores na definição de cor \"%s\""
+#: src/load_config.cc:106
+#, fuzzy, c-format
+msgid "Invalid entry in style definition group: \"%s\""
+msgstr "Entrada inválida no grupo de definição de cor: \"%s\""
 
-#: src/load_config.cc:50
-#, c-format
-msgid "Can't parse foreground \"%s\"of color \"%s\""
-msgstr "Não foi possível interpretar a frente \"%s\" da cor \"%s\""
+#: src/load_config.cc:108
+#, fuzzy, c-format
+msgid "Invalid tagless entry in style definition group: \"%s\""
+msgstr "Entrada sem tag inválida no grupo de definição de cor: \"%s\""
 
-#: src/load_config.cc:53
-#, c-format
-msgid "Can't parse background \"%s\" of color \"%s\""
-msgstr "Nao foi possível interpretar o fundo \"%s\" da cor \"%s\""
+#: src/load_config.cc:130
+#, fuzzy, c-format
+msgid "Unknown style attribute %s"
+msgstr "Tipo de ação desconhecida: %s"
 
-#: src/load_config.cc:72 src/load_config.cc:74
+#: src/load_config.cc:153 src/load_config.cc:155
 #, c-format
 msgid "Invalid entry in keybinding group: \"%s\""
 msgstr "Entrada inválida no grupo de definição de teclas: \"%s\""
 
-#: src/load_config.cc:89
+#: src/load_config.cc:170
 #, c-format
 msgid "Ignoring invalid keybinding \"%s\" -> \"%s\""
 msgstr "Ignorando definição de teclas inválida \"%s\" -> \"%s\""
@@ -2173,44 +2185,44 @@
 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:255
+#: src/main.cc:252
 #, 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:301 src/main.cc:310
+#: src/main.cc:291 src/main.cc:300
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr "ESTRANHEZA: opção de código desconhecida recebida\n"
 
-#: src/main.cc:319
+#: src/main.cc:309
 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:327
+#: src/main.cc:317
 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:348
+#: src/main.cc:338
 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:405
+#: src/main.cc:395
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr "Comando desconhecido \"%s\"\n"
 
-#: src/main.cc:412 src/main.cc:469
+#: src/main.cc:402 src/main.cc:450
 msgid "Internal error: uncaught 'out of solutions' exception.\n"
 msgstr ""
 
-#: src/main.cc:417 src/main.cc:474
+#: src/main.cc:407 src/main.cc:455
 msgid "Internal error: uncaught 'out of time' exception.\n"
 msgstr ""
 
-#: src/main.cc:424
+#: src/main.cc:414
 #, c-format
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
@@ -2241,7 +2253,7 @@
 msgid "Lost"
 msgstr "Perdeu"
 
-#: src/mine/cmine.cc:119 src/ui.cc:1090
+#: src/mine/cmine.cc:119 src/ui.cc:1084
 msgid "Minesweeper"
 msgstr "Campo Minado"
 
@@ -2267,94 +2279,94 @@
 msgid "The number of mines must be a number"
 msgstr "O número de minas deve ser um número"
 
-#: src/mine/cmine.cc:240
+#: src/mine/cmine.cc:238
 msgid "Setup custom game"
 msgstr "Configurar jogo personalizado"
 
-#: src/mine/cmine.cc:243
+#: src/mine/cmine.cc:240
 msgid "Height of board: "
 msgstr "Altura do tabuleiro: "
 
-#: src/mine/cmine.cc:247
+#: src/mine/cmine.cc:243
 msgid "Width of board: "
 msgstr "Largura do tabuleiro: "
 
-#: src/mine/cmine.cc:251
+#: src/mine/cmine.cc:246
 msgid "Number of mines: "
 msgstr "Número de minas: "
 
-#: src/mine/cmine.cc:316
+#: src/mine/cmine.cc:305
 msgid "Choose difficulty level"
 msgstr "Escolha o nível de dificuldade"
 
-#: src/mine/cmine.cc:318
+#: src/mine/cmine.cc:307
 msgid "Easy"
 msgstr "Fácil"
 
-#: src/mine/cmine.cc:319
+#: src/mine/cmine.cc:308
 msgid "Medium"
 msgstr "Médio"
 
-#: src/mine/cmine.cc:320
+#: src/mine/cmine.cc:309
 msgid "Hard"
 msgstr "Difícil"
 
-#: src/mine/cmine.cc:321
+#: src/mine/cmine.cc:310
 msgid "Custom"
 msgstr "Personalizado"
 
-#: src/mine/cmine.cc:411
+#: src/mine/cmine.cc:392
 msgid "You have won."
 msgstr "Você ganhou."
 
-#: src/mine/cmine.cc:414
+#: src/mine/cmine.cc:395
 msgid "You lose!"
 msgstr "Você perdeu!"
 
-#: src/mine/cmine.cc:419
+#: src/mine/cmine.cc:400
 msgid "You die...  --More--"
 msgstr "Você morreu ... --Mais--"
 
-#: src/mine/cmine.cc:432
+#: src/mine/cmine.cc:413
 msgid "The spikes were poisoned!  The poison was deadly..  --More--"
 msgstr "As estacas estavam envenenadas! O veneno foi mortal.. --Mais--"
 
-#: src/mine/cmine.cc:435
+#: src/mine/cmine.cc:416
 msgid "You land on a set of sharp iron spikes!  --More--"
 msgstr "Você aterrizou em um conjunto de estacas de ferro afiadas! --Mais--"
 
-#: src/mine/cmine.cc:438
+#: src/mine/cmine.cc:419
 msgid "You fall into a pit!  --More--"
 msgstr "Você caiu em um buraco! --Mais--"
 
-#: src/mine/cmine.cc:441
+#: src/mine/cmine.cc:422
 msgid "KABOOM!  You step on a land mine.  --More--"
 msgstr "KABOOM! Você pisou em uma mina terrestre. --Mais--"
 
-#: src/mine/cmine.cc:446
+#: src/mine/cmine.cc:427
 msgid "The dart was poisoned!  The poison was deadly...  --More--"
 msgstr "O dardo estava envenenado! O veneno foi mortal... --Mais--"
 
-#: src/mine/cmine.cc:448
+#: src/mine/cmine.cc:429
 msgid ""
 "A little dart shoots out at you!  You are hit by a little dart!  --More--"
 msgstr ""
 "Um pequeno dardo foi atirado em você! Você foi atingido por um pequeno "
 "dardo! --Mais--"
 
-#: src/mine/cmine.cc:452
+#: src/mine/cmine.cc:433
 msgid "You turn to stone... --More--"
 msgstr "Você virou pedra... --Mais--"
 
-#: src/mine/cmine.cc:454
+#: src/mine/cmine.cc:435
 msgid "Touching the cockatrice corpse was a fatal mistake.  --More--"
 msgstr "Tocar o cadáver do basilisco foi um erro fatal.  --Mais--"
 
-#: src/mine/cmine.cc:456
+#: src/mine/cmine.cc:437
 msgid "You feel here a cockatrice corpse.  --More--"
 msgstr "Você sentiu aqui um cadáver de basilisco.  --Mais--"
 
-#: src/mine/cmine.cc:460
+#: src/mine/cmine.cc:441
 msgid ""
 "Click!  You trigger a rolling boulder trap!  You are hit by a boulder! --"
 "More--"
@@ -2362,56 +2374,56 @@
 "Click! Você disparou uma armadilha de rocha rolante! Você foi atingido por "
 "uma rocha! --Mais--"
 
-#: src/mine/cmine.cc:470
+#: src/mine/cmine.cc:451
 msgid "sleep"
 msgstr "dormir"
 
-#: src/mine/cmine.cc:473
+#: src/mine/cmine.cc:454
 msgid "striking"
 msgstr "golpe"
 
-#: src/mine/cmine.cc:476
+#: src/mine/cmine.cc:457
 msgid "death"
 msgstr "morte"
 
-#: src/mine/cmine.cc:479
+#: src/mine/cmine.cc:460
 msgid "polymorph"
 msgstr "polimorfia"
 
-#: src/mine/cmine.cc:482
+#: src/mine/cmine.cc:463
 msgid "magic missile"
 msgstr "míssil mágico"
 
-#: src/mine/cmine.cc:485
+#: src/mine/cmine.cc:466
 msgid "secret door detection"
 msgstr "detecção de porta secreta"
 
-#: src/mine/cmine.cc:488
+#: src/mine/cmine.cc:469
 msgid "invisibility"
 msgstr "invisibilidade"
 
-#: src/mine/cmine.cc:491
+#: src/mine/cmine.cc:472
 msgid "cold"
 msgstr "frio"
 
-#: src/mine/cmine.cc:497
+#: src/mine/cmine.cc:478
 #, c-format
 msgid "Your wand of %s breaks apart and explodes!  --More--"
 msgstr "Sua varinha de %s separou-se e explodiu!  --Mais--"
 
-#: src/mine/cmine.cc:503
+#: src/mine/cmine.cc:484
 msgid "You are jolted by a surge of electricity!  --More--"
 msgstr "Você está sacudido por uma explosão de eletricidade!  --Mais--"
 
-#: src/mine/cmine.cc:607
+#: src/mine/cmine.cc:588
 msgid "Enter the filename to load: "
 msgstr "Informe o nome do arquivo a ser carregado: "
 
-#: src/mine/cmine.cc:614
+#: src/mine/cmine.cc:595
 msgid "Enter the filename to save: "
 msgstr "Informe o nome do arquivo a ser gravado: "
 
-#: src/mine/cmine.cc:624
+#: src/mine/cmine.cc:605
 msgid "mine-help.txt"
 msgstr "mine-help.txt"
 
@@ -2419,7 +2431,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:1670
+#: src/pkg_columnizer.cc:84 src/ui.cc:1662
 msgid "Package"
 msgstr "Pacote"
 
@@ -3487,52 +3499,52 @@
 "Você tem certeza de que deseja removê-lo?\n"
 "Digite '%s' caso você tenha certeza disso."
 
-#: src/pkg_item.cc:222 src/pkg_ver_item.cc:625
+#: src/pkg_item.cc:220 src/pkg_ver_item.cc:626
 #, c-format
 msgid "Information about %s"
 msgstr "Informação sobre %s"
 
-#: src/pkg_item.cc:224 src/pkg_ver_item.cc:627
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:628
 #, c-format
 msgid "%s info"
 msgstr ""
 
-#: src/pkg_item.cc:310
+#: src/pkg_item.cc:308
 #, fuzzy, c-format
 msgid "Available versions of %s"
 msgstr "Versões disponíveis de "
 
-#: src/pkg_item.cc:313
+#: src/pkg_item.cc:311
 #, fuzzy, c-format
 msgid "%s versions"
 msgstr "Versões"
 
-#: src/pkg_item.cc:325 src/pkg_ver_item.cc:655
+#: src/pkg_item.cc:323 src/pkg_ver_item.cc:656
 #, c-format
 msgid "Dependencies of %s"
 msgstr "Dependências de %s"
 
-#: src/pkg_item.cc:327 src/pkg_ver_item.cc:657
+#: src/pkg_item.cc:325 src/pkg_ver_item.cc:658
 #, c-format
 msgid "%s deps"
 msgstr ""
 
-#: src/pkg_item.cc:338 src/pkg_ver_item.cc:667
+#: src/pkg_item.cc:336 src/pkg_ver_item.cc:668
 #, c-format
 msgid "Packages depending on %s"
 msgstr "Pacotes que dependem de %s"
 
-#: src/pkg_item.cc:340 src/pkg_ver_item.cc:669
+#: src/pkg_item.cc:338 src/pkg_ver_item.cc:670
 #, c-format
 msgid "%s reverse deps"
 msgstr ""
 
-#: src/pkg_item.cc:392 src/pkg_ver_item.cc:707
+#: src/pkg_item.cc:390 src/pkg_ver_item.cc:708
 #, c-format
 msgid "Reporting a bug in %s:\n"
 msgstr "Relatando um bug em %s:\n"
 
-#: src/pkg_item.cc:414
+#: src/pkg_item.cc:412
 #, fuzzy
 msgid ""
 "You are not root and I cannot find any way to become root.  To reconfigure "
@@ -3544,16 +3556,16 @@
 "instale o pacote menu, o pacote login ou execute o \n"
 "aptitude como root."
 
-#: src/pkg_item.cc:422
+#: src/pkg_item.cc:420
 #, c-format
 msgid "Reconfiguring %s\n"
 msgstr "Reconfigurando %s\n"
 
-#: src/pkg_item.cc:447
+#: src/pkg_item.cc:445
 msgid "Hierarchy editor"
 msgstr "Editor de hierarquia"
 
-#: src/pkg_item.cc:447
+#: src/pkg_item.cc:445
 #, fuzzy
 msgid "Hierarchy Editor"
 msgstr "Editor de hierarquia"
@@ -3588,22 +3600,22 @@
 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_view.cc:344
+#: src/pkg_view.cc:359
 msgid "make_package_view: error in arguments -- two main widgets??"
 msgstr "make_package_view: erro nos argumentos -- dois widgets principais??"
 
-#: src/pkg_view.cc:350
+#: src/pkg_view.cc:365
 msgid ""
 "make_package_view: error in arguments -- bad column list for static item"
 msgstr ""
 "make_package_view: erro nos argumentos -- lista de colunas ruim para item "
 "estático"
 
-#: src/pkg_view.cc:443
+#: src/pkg_view.cc:458
 msgid "make_package_view: bad argument!"
 msgstr "make_package_view: argumento ruim!"
 
-#: src/pkg_view.cc:495
+#: src/pkg_view.cc:510
 msgid "make_package_view: no main widget found"
 msgstr "make_package_view: nenhum widget principal encontrado"
 
@@ -3640,12 +3652,12 @@
 msgid " (provided by %F)"
 msgstr " (fornecido por %F)"
 
-#: src/reason_fragment.cc:278
+#: src/reason_fragment.cc:275
 #, c-format
 msgid "%F%s %F %F"
 msgstr "%F%s %F %F"
 
-#: src/reason_fragment.cc:327
+#: src/reason_fragment.cc:324
 msgid ""
 "If you select a package, an explanation of its current state will appear in "
 "this space."
@@ -3653,7 +3665,7 @@
 "Caso você selecione um pacote, uma explicação de seu estado atual aparecerá "
 "neste espaço."
 
-#: src/reason_fragment.cc:361
+#: src/reason_fragment.cc:358
 msgid ""
 "%B%s%b was installed automatically;  it is being removed because all of the "
 "packages which depend upon it are being removed:"
@@ -3661,18 +3673,18 @@
 "%B%s%b foi instalado automaticamente; ele está sendo removido porque todos "
 "os pacotes que dependiam dele estão sendo removidos:"
 
-#: src/reason_fragment.cc:365
+#: src/reason_fragment.cc:362
 msgid "%B%s%b will be automatically removed because of dependency errors:"
 msgstr "%B%s%b será removido automaticamente devido a erros de dependência:"
 
-#: src/reason_fragment.cc:369
+#: src/reason_fragment.cc:366
 msgid ""
 "%B%s%b will be automatically installed to satisfy the following dependencies:"
 msgstr ""
 "%B%s%b será instalado automaticamente para satisfazer as dependências a "
 "seguir:"
 
-#: src/reason_fragment.cc:375 src/reason_fragment.cc:387
+#: src/reason_fragment.cc:372 src/reason_fragment.cc:384
 msgid ""
 "%B%s%b cannot be upgraded now, but if it could be, it would still be held at "
 "version %B%s%b."
@@ -3680,7 +3692,7 @@
 "%B%s%b não pode ser atualizado agora, mas se pudesse, ainda assim seria "
 "mantido na versão %B%s%b."
 
-#: src/reason_fragment.cc:378
+#: src/reason_fragment.cc:375
 msgid ""
 "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the "
 "following dependencies:"
@@ -3688,27 +3700,27 @@
 "%B%s%b não será atualizado para a versão %B%s%b para evitar quebrar as "
 "seguintes dependências:"
 
-#: src/reason_fragment.cc:390
+#: src/reason_fragment.cc:387
 msgid "%B%s%b is currently installed."
 msgstr "%B%s%b está atualmente instalado."
 
-#: src/reason_fragment.cc:396
+#: src/reason_fragment.cc:393
 msgid "%B%s%b is not currently installed."
 msgstr "%B%s%b não está atualmente instalado."
 
-#: src/reason_fragment.cc:404
+#: src/reason_fragment.cc:401
 msgid "Some dependencies of %B%s%b are not satisfied:"
 msgstr "Algumas dependências de %B%s%b não estão satisfeitas:"
 
-#: src/reason_fragment.cc:408
+#: src/reason_fragment.cc:405
 msgid "%B%s%b will be downgraded."
 msgstr "%B%s%b será rebaixado."
 
-#: src/reason_fragment.cc:415
+#: src/reason_fragment.cc:412
 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b."
 msgstr "%B%s%b não será atualizado para a versão proibida %B%s%b."
 
-#: src/reason_fragment.cc:419
+#: src/reason_fragment.cc:416
 msgid ""
 "%B%s%b could be upgraded to version %B%s%b, but it is being held at version %"
 "B%s%b."
@@ -3716,33 +3728,33 @@
 "%B%s%b poderia ser atualizado para a versão %B%s%b, mas está sendo mantido "
 "na versão %B%s%b."
 
-#: src/reason_fragment.cc:426
+#: src/reason_fragment.cc:423
 msgid "%B%s%b will be re-installed."
 msgstr "%B%s%b será reinstalado."
 
-#: src/reason_fragment.cc:430
+#: src/reason_fragment.cc:427
 msgid "%B%s%b will be installed."
 msgstr "%B%s%b será instalado."
 
-#: src/reason_fragment.cc:434
+#: src/reason_fragment.cc:431
 msgid "%B%s%b will be removed."
 msgstr "%B%s%b será removido."
 
-#: src/reason_fragment.cc:439
+#: src/reason_fragment.cc:436
 msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b."
 msgstr "%B%s%b será atualizado da versão %B%s%b para a versão %B%s%b."
 
-#: src/reason_fragment.cc:475
+#: src/reason_fragment.cc:472
 msgid ""
 "The following packages depend on %B%s%b and will be broken by its removal:"
 msgstr ""
 "Os pacotes a seguir dependem de %B%s%b e serão quebrados com sua remoção:"
 
-#: src/reason_fragment.cc:478
+#: src/reason_fragment.cc:475
 msgid "The following packages depend on %B%s%b and are broken:"
 msgstr "Os pacotes a seguir dependem de %B%s%b e estão quebrados:"
 
-#: src/reason_fragment.cc:485
+#: src/reason_fragment.cc:482
 msgid ""
 "The following packages conflict with %B%s%b and will be broken by its "
 "installation:"
@@ -3750,7 +3762,7 @@
 "Os pacotes a seguir conflitam com %B%s%b e serão quebrados devido a sua "
 "instalação:"
 
-#: src/reason_fragment.cc:518
+#: src/reason_fragment.cc:515
 msgid ""
 "The following packages depend on a version of %B%s%b other than the "
 "currently installed version of %B%s%b, or conflict with the currently "
@@ -3760,7 +3772,7 @@
 "atualmente instalada de %B%s%b, ou conflitam com a versão atualmente "
 "instalada:"
 
-#: src/reason_fragment.cc:522
+#: src/reason_fragment.cc:519
 msgid ""
 "The following packages conflict with %B%s%b, or depend on a version of it "
 "which is not going to be installed."
@@ -3768,11 +3780,11 @@
 "Os pacotes a seguir conflitam com %B%s%b ou dependem de uma versão que não "
 "será instalada."
 
-#: src/reason_fragment.cc:526
+#: src/reason_fragment.cc:523
 msgid "The following packages conflict with %B%s%b:"
 msgstr "Os pacotes a seguir conflitam com %B%s%b:"
 
-#: src/reason_fragment.cc:531
+#: src/reason_fragment.cc:528
 msgid ""
 "The following packages depend on a version of %B%s%b other than the "
 "currently installed version of %B%s%b:"
@@ -3780,22 +3792,22 @@
 "Os pacotes a seguir dependem de uma versão de %B%s%b diferente da versão "
 "instalada atualmente de %B%s%b:"
 
-#: src/reason_fragment.cc:535
+#: src/reason_fragment.cc:532
 msgid ""
 "The following packages depend on a version of %B%s%b which is not going to "
 "be installed."
 msgstr ""
 "Os pacotes a seguir dependem de uma versão de %B%s%b que não será instalada."
 
-#: src/reason_fragment.cc:541
+#: src/reason_fragment.cc:538
 msgid "upgraded"
 msgstr "atualizado"
 
-#: src/reason_fragment.cc:541
+#: src/reason_fragment.cc:538
 msgid "downgraded"
 msgstr "rebaixado"
 
-#: src/reason_fragment.cc:547
+#: src/reason_fragment.cc:544
 msgid ""
 "The following packages depend on the currently installed version of %B%s%b (%"
 "B%s%b), or conflict with the version it will be %s to (%B%s%b), and will be "
@@ -3805,7 +3817,7 @@
 "b) ou conflitam com a versão que será %s para (B%s%b) e ficará quebrada caso "
 "a mesma seja %s."
 
-#: src/reason_fragment.cc:554
+#: src/reason_fragment.cc:551
 msgid ""
 "The following packages conflict with version %B%s%b of %B%s%b, and will be "
 "broken if it is %s."
@@ -3813,7 +3825,7 @@
 "Os pacotes a seguir conflitam com a versão %B%s%b de %B%s%b e serão "
 "quebrados caso a mesma seja %s."
 
-#: src/reason_fragment.cc:559
+#: src/reason_fragment.cc:556
 msgid ""
 "The following packages depend on version %B%s%b of %B%s%b, and will be "
 "broken if it is %s."
@@ -3860,38 +3872,43 @@
 msgid "Close"
 msgstr "^C Fechar"
 
-#: src/solution_fragment.cc:125
+#: src/solution_fragment.cc:134
 #, fuzzy
 msgid "%BRemove%b the following packages:%n"
 msgstr "Os pacotes a seguir estão QUEBRADOS :"
 
-#: src/solution_fragment.cc:135
+#: src/solution_fragment.cc:144
 #, fuzzy
 msgid "%BInstall%b the following packages:%n"
 msgstr "Os pacotes a seguir estão QUEBRADOS :"
 
-#: src/solution_fragment.cc:148
+#: src/solution_fragment.cc:157
 msgid "%BKeep%b the following packages at their current version:%n"
 msgstr ""
 
-#: src/solution_fragment.cc:161
+#: src/solution_fragment.cc:164
+#, fuzzy
+msgid "Not Installed"
+msgstr "não instalado"
+
+#: src/solution_fragment.cc:177
 #, fuzzy
 msgid "%BUpgrade%b the following packages:%n"
 msgstr "Os pacotes a seguir estão QUEBRADOS :"
 
-#: src/solution_fragment.cc:176
+#: src/solution_fragment.cc:192
 #, fuzzy
 msgid "%BDowngrade%b the following packages:%n"
 msgstr "Fazendo download de pacotes"
 
-#: src/solution_fragment.cc:190
+#: src/solution_fragment.cc:206
 #, c-format
 msgid "Score is %d"
 msgstr ""
 
 #: src/trust.cc:17 src/trust.cc:19
 msgid "WARNING"
-msgstr ""
+msgstr "AVISO"
 
 #: src/trust.cc:18
 msgid ""
@@ -3899,6 +3916,9 @@
 "package could allow a malicious individual to damage or take control of your "
 "system."
 msgstr ""
+"%F: Esta versão do %s é proveniente de uma %Bfonte não confiável%b! Instalar "
+"esse pacote poderia permitir um individual malicioso causar danos ou obter o "
+"controle de seu sistema."
 
 #: src/ui.cc:165
 msgid "Er, there aren't any errors, this shouldn't have happened.."
@@ -3912,44 +3932,44 @@
 msgid "W:"
 msgstr ""
 
-#: src/ui.cc:194
+#: src/ui.cc:193
 msgid "Search for:"
 msgstr "Procurar por: "
 
-#: src/ui.cc:262
+#: src/ui.cc:258
 msgid "You already are root!"
 msgstr "Você já é root!"
 
-#: src/ui.cc:360
+#: src/ui.cc:356
 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:388
+#: src/ui.cc:384
 msgid "Loading cache"
 msgstr "Carregando cache"
 
-#: src/ui.cc:410
+#: src/ui.cc:406
 msgid "Really quit Aptitude?"
 msgstr "Realmente sair do Aptitude?"
 
-#: src/ui.cc:489
+#: src/ui.cc:485
 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:589 src/ui.cc:591 src/ui.cc:619 src/ui.cc:621
+#: src/ui.cc:585 src/ui.cc:587 src/ui.cc:615 src/ui.cc:617
 msgid "Packages"
 msgstr "Pacotes"
 
-#: src/ui.cc:590 src/ui.cc:620
+#: src/ui.cc:586 src/ui.cc:616
 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:667
+#: src/ui.cc:663
 #, fuzzy
 msgid ""
-"%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
+"Aptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
 "BABSOLUTELY NO WARRANTY%b; for details see 'license' in the Help menu.  This "
 "is free software, and you are welcome to redistribute it under certain "
 "conditions; see 'license' for details."
@@ -3962,61 +3982,69 @@
 "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:688
+#: src/ui.cc:684
 msgid "help.txt"
 msgstr "help.txt"
 
-#: src/ui.cc:704
+#: src/ui.cc:700
 msgid "README"
 msgstr "README"
 
-#: src/ui.cc:786
+#: src/ui.cc:782
 msgid ""
-"%C%BWARNING%b: untrusted versions of the following packages will be "
-"installed!%n%nUntrusted packages could %Bcompromise your system's security%"
-"b.  You should only proceed with the installation if you are certain that "
-"this is what you want to do.%n%n"
+"%BWARNING%b: untrusted versions of the following packages will be installed!%"
+"n%nUntrusted packages could %Bcompromise your system's security%b.  You "
+"should only proceed with the installation if you are certain that this is "
+"what you want to do.%n%n"
 msgstr ""
+"%BAVISO%b : versões não confiáveis dos pacotes a seguir serão instaladas!%n%"
+"nPacotes não confiáveis podem %Bcomprometer a segurança de seu sistema%b. "
+"Você deveria prosseguir com a instalação somente caso esteja certo de que "
+"isso é realmente o que você deseja fazer.%n%n"
 
-#: src/ui.cc:800
+#: src/ui.cc:788
 #, fuzzy
+msgid "  %S*%N %s [version %s]%n"
+msgstr "Versões"
+
+#: src/ui.cc:795
 msgid "Really Continue"
-msgstr "Continuar"
+msgstr "Realmente Continuar"
 
-#: src/ui.cc:802
+#: src/ui.cc:797
 msgid "Abort Installation"
-msgstr ""
+msgstr "Abortar Instalação"
 
-#: src/ui.cc:863
+#: src/ui.cc:858
 msgid "Preview of package installation"
 msgstr "Previsão da instalação de pacotes"
 
-#: src/ui.cc:864
+#: src/ui.cc:859
 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:865
+#: src/ui.cc:860
 #, fuzzy
 msgid "Preview"
 msgstr "^P Anterior"
 
-#: src/ui.cc:901
+#: src/ui.cc:896
 #, fuzzy
 msgid "Some packages were broken and have been fixed:"
 msgstr "Alguns pacotes estavam quebrados e foram consertados"
 
-#: src/ui.cc:907
+#: src/ui.cc:902
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:913
-#, c-format
+#: src/ui.cc:908
+#, fuzzy, c-format
 msgid ""
-"Ran out of time while trying to resolver dependencies (press \"%s\" to try "
+"Ran out of time while trying to resolve dependencies (press \"%s\" to try "
 "harder)"
-msgstr ""
+msgstr "Perca tempo tentando encontrar minas"
 
-#: src/ui.cc:959
+#: src/ui.cc:954
 #, fuzzy
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
@@ -4025,24 +4053,24 @@
 "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:962 src/ui.cc:1078
+#: src/ui.cc:957 src/ui.cc:1072
 msgid "Become root"
 msgstr "Tornar-se root"
 
-#: src/ui.cc:964 src/ui.cc:1080
+#: src/ui.cc:959 src/ui.cc:1074
 msgid "Don't become root"
 msgstr "Não tornar-se root"
 
-#: src/ui.cc:969 src/ui.cc:1085
+#: src/ui.cc:964 src/ui.cc:1079
 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:996
+#: src/ui.cc:991
 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:1002
+#: src/ui.cc:997
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -4055,7 +4083,7 @@
 "los.\n"
 "Digite \"U\" para preparar uma atualização."
 
-#: src/ui.cc:1074
+#: src/ui.cc:1069
 #, fuzzy
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
@@ -4065,114 +4093,114 @@
 "você\n"
 " atualmente não possui. Você gostaria de mudar para a conta de root?\n"
 
-#: src/ui.cc:1090 src/ui.cc:1377
+#: src/ui.cc:1084 src/ui.cc:1371
 msgid "Waste time trying to find mines"
 msgstr "Perca tempo tentando encontrar minas"
 
-#: src/ui.cc:1097 src/ui.cc:1150
+#: src/ui.cc:1091 src/ui.cc:1144
 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:1100
+#: src/ui.cc:1094
 msgid "Deleting downloaded files"
 msgstr "Apagando arquivos baixados"
 
-#: src/ui.cc:1114
+#: src/ui.cc:1108
 msgid "Downloaded package files have been deleted"
 msgstr "Arquivos de pacotes baixados foram apagados"
 
-#: src/ui.cc:1175
+#: src/ui.cc:1169
 #, 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:1247
+#: src/ui.cc:1241
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1252 src/ui.cc:1283
+#: src/ui.cc:1246 src/ui.cc:1277
 #, fuzzy
 msgid "Ran out of time while trying to find a solution."
 msgstr "Perca tempo tentando encontrar minas"
 
-#: src/ui.cc:1277
+#: src/ui.cc:1271
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1307
+#: src/ui.cc:1301
 #, fuzzy, c-format
 msgid "Unable to open %s"
 msgstr "Não foi possível abrir %s para gravação"
 
-#: src/ui.cc:1313
+#: src/ui.cc:1307
 msgid "Error while dumping resolver state"
 msgstr ""
 
-#: src/ui.cc:1323
+#: src/ui.cc:1317
 msgid "File to which the resolver state should be dumped:"
 msgstr ""
 
-#: src/ui.cc:1353
+#: src/ui.cc:1347
 msgid "^Install/remove packages"
 msgstr "^Instalar/remover pacotes"
 
-#: src/ui.cc:1354
+#: src/ui.cc:1348
 msgid "Perform all pending installs and removals"
 msgstr "Executar todas as instalações e remoções pendentes"
 
-#: src/ui.cc:1356
+#: src/ui.cc:1350
 msgid "^Update package list"
 msgstr "^U Atualizar a lista de pacotes"
 
-#: src/ui.cc:1357
+#: src/ui.cc:1351
 msgid "Check for new versions of packages"
 msgstr "Checar por novas versões de pacotes"
 
-#: src/ui.cc:1360
+#: src/ui.cc:1354
 msgid "^Forget new packages"
 msgstr "^F Esquecer novos pacotes"
 
-#: src/ui.cc:1361
+#: src/ui.cc:1355
 msgid "Forget which packages are \"new\""
 msgstr "Esquecer quais pacotes são \"novos\""
 
-#: src/ui.cc:1364
+#: src/ui.cc:1358
 msgid "^Clean package cache"
 msgstr "^C Limpar cache de pacotes"
 
-#: src/ui.cc:1365
+#: src/ui.cc:1359
 msgid "Delete package files which were previously downloaded"
 msgstr "Apagar arquivos de pacotes que foram previamente baixados"
 
-#: src/ui.cc:1368
+#: src/ui.cc:1362
 msgid "Clean ^obsolete files"
 msgstr "Limpar arquivos ^obsoletos"
 
-#: src/ui.cc:1369
+#: src/ui.cc:1363
 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:1372
+#: src/ui.cc:1366
 msgid "Mark ^Upgradable"
 msgstr "^U Marcar Atualizáveis"
 
-#: src/ui.cc:1373
+#: src/ui.cc:1367
 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:1376
+#: src/ui.cc:1370
 msgid "^Play Minesweeper"
 msgstr "^P Jogar Campo Minado"
 
-#: src/ui.cc:1379
+#: src/ui.cc:1373
 msgid "^Become root"
 msgstr "^B Tornar-se root"
 
-#: src/ui.cc:1380
+#: src/ui.cc:1374
 #, fuzzy
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
@@ -4181,70 +4209,70 @@
 "Executar 'su' para tornar-se root. Isto irá reiniciar o programa, mas\n"
 " suas configurações serão preservadas"
 
-#: src/ui.cc:1383
+#: src/ui.cc:1377
 msgid "^Reload package cache"
 msgstr "^Recarregar cache de pacotes"
 
-#: src/ui.cc:1384
+#: src/ui.cc:1378
 msgid "Reload the package cache"
 msgstr "Recarregar o cache de pacotes"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1384
 msgid "^Quit"
 msgstr "^Q Finalizar"
 
-#: src/ui.cc:1391
+#: src/ui.cc:1385
 msgid "Exit the program"
 msgstr "Sair do programa"
 
-#: src/ui.cc:1397 src/ui.cc:1669
+#: src/ui.cc:1391 src/ui.cc:1661
 msgid "Undo"
 msgstr "Desfazer"
 
-#: src/ui.cc:1398
+#: src/ui.cc:1392
 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:1405
+#: src/ui.cc:1399
 msgid "^Install"
 msgstr "^Instalar"
 
-#: src/ui.cc:1406
+#: src/ui.cc:1400
 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:1409
+#: src/ui.cc:1403
 msgid "^Remove"
 msgstr "^Remover"
 
-#: src/ui.cc:1410
+#: src/ui.cc:1404
 msgid "Flag the currently selected package for removal"
 msgstr "Marcar o pacote atualmente selecionado para remoção"
 
-#: src/ui.cc:1413
+#: src/ui.cc:1407
 msgid "^Purge"
 msgstr "Ex^purgar"
 
-#: src/ui.cc:1414
+#: src/ui.cc:1408
 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:1417
+#: src/ui.cc:1411
 msgid "^Keep"
 msgstr "^K Manter"
 
-#: src/ui.cc:1418
+#: src/ui.cc:1412
 msgid "Cancel any action on the selected package"
 msgstr "Cancelar quaisquer ações nos pacotes selecionados"
 
-#: src/ui.cc:1421
+#: src/ui.cc:1415
 msgid "^Hold"
 msgstr "^H Mantido"
 
-#: src/ui.cc:1422
+#: src/ui.cc:1416
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -4252,11 +4280,11 @@
 "Cancelar quaisquer ações nos pacotes selecionados e protegê-los de "
 "atualizações futuras"
 
-#: src/ui.cc:1425
+#: src/ui.cc:1419
 msgid "Mark ^Auto"
 msgstr "Marcar ^Auto"
 
-#: src/ui.cc:1426
+#: src/ui.cc:1420
 #, fuzzy
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
@@ -4265,11 +4293,11 @@
 "Marcar o pacote selecionado como tendo sido automaticamente instalado;\n"
 "ele será automaticamente removido caso nenhum outro pacote dependa dele"
 
-#: src/ui.cc:1429
+#: src/ui.cc:1423
 msgid "Mark ^Manual"
 msgstr "Marcar ^Manual"
 
-#: src/ui.cc:1430
+#: src/ui.cc:1424
 #, fuzzy
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
@@ -4278,11 +4306,11 @@
 "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:1433
+#: src/ui.cc:1427
 msgid "^Forbid Version"
 msgstr "^F Proibir Versão"
 
-#: src/ui.cc:1434
+#: src/ui.cc:1428
 #, fuzzy
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
@@ -4291,205 +4319,205 @@
 "Proibir a versão candidata do pacote selecionado de ser instalada;\n"
 "novas versões do pacotes serão instaladas normalmente"
 
-#: src/ui.cc:1438
+#: src/ui.cc:1432
 msgid "I^nformation"
 msgstr "I^nformação"
 
-#: src/ui.cc:1439
+#: src/ui.cc:1433
 msgid "Display more information about the selected package"
 msgstr "Exibir maiores informações sobre o pacote selecionado"
 
-#: src/ui.cc:1442
+#: src/ui.cc:1436
 msgid "^Changelog"
 msgstr "^C Log de mudanças"
 
-#: src/ui.cc:1443
+#: src/ui.cc:1437
 msgid "Display the Debian changelog of the selected package"
 msgstr "Exibir o log de mudanças Debian do pacote selecionado"
 
-#: src/ui.cc:1450
+#: src/ui.cc:1444
 msgid "^Find"
 msgstr "^F Encontrar"
 
-#: src/ui.cc:1451
+#: src/ui.cc:1445
 msgid "Search for a package"
 msgstr "Procurar por um pacote"
 
-#: src/ui.cc:1454
+#: src/ui.cc:1448
 msgid "Find ^Again"
 msgstr "^A Procurar Novamente"
 
-#: src/ui.cc:1455
+#: src/ui.cc:1449
 msgid "Repeat the last search"
 msgstr "Repetir a última procura"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1453
 msgid "^Limit Display"
 msgstr "^Limitar Exibição"
 
-#: src/ui.cc:1460
+#: src/ui.cc:1454
 msgid "Apply a filter to the package list"
 msgstr "^Aplicar um filtro à lista de pacotes"
 
-#: src/ui.cc:1463
+#: src/ui.cc:1457
 msgid "^Un-Limit Display"
 msgstr "^U Deslimitar Exibição"
 
-#: src/ui.cc:1464
+#: src/ui.cc:1458
 msgid "Remove the filter from the package list"
 msgstr "Remover o filtro da lista de pacotes"
 
-#: src/ui.cc:1468
+#: src/ui.cc:1462
 msgid "Find ^Broken"
 msgstr "^B Encontrar Quebrado"
 
-#: src/ui.cc:1469
+#: src/ui.cc:1463
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Encontra o próximo pacote com dependências não satisfeitas"
 
-#: src/ui.cc:1476
+#: src/ui.cc:1470
 msgid "^UI options"
 msgstr "^U Opções da interface"
 
-#: src/ui.cc:1477
+#: src/ui.cc:1471
 msgid "Change the settings which affect the user interface"
 msgstr "Muda as configurações que afetam a interface do usuário"
 
-#: src/ui.cc:1480
+#: src/ui.cc:1474
 msgid "^Dependency handling"
 msgstr "Gerencimento de ^Dependências"
 
-#: src/ui.cc:1481
+#: src/ui.cc:1475
 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:1484
+#: src/ui.cc:1478
 msgid "^Miscellaneous"
 msgstr "^Miscelânea"
 
-#: src/ui.cc:1485
+#: src/ui.cc:1479
 msgid "Change miscellaneous program settings"
 msgstr "Muda as configurações miscelânicas do programa"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1484
 msgid "^Revert options"
 msgstr "^Reverter as opções"
 
-#: src/ui.cc:1491
+#: src/ui.cc:1485
 msgid "Reset all settings to the system defaults"
 msgstr "Reverte todas as configurações para os padrões do sistema"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1496
 msgid "^Next"
 msgstr "^N Próximo"
 
-#: src/ui.cc:1503
+#: src/ui.cc:1497
 msgid "View next display"
 msgstr "Visualizar próxima tela"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1500
 msgid "^Prev"
 msgstr "^P Anterior"
 
-#: src/ui.cc:1507
+#: src/ui.cc:1501
 msgid "View previous display"
 msgstr "Visualizar tela anterior"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1504
 msgid "^Close"
 msgstr "^C Fechar"
 
-#: src/ui.cc:1511
+#: src/ui.cc:1505
 msgid "Close this display"
 msgstr "Fechar esta tela"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1510
 msgid "New Package ^View"
 msgstr "Nova ^Visão de Pacote"
 
-#: src/ui.cc:1517
+#: src/ui.cc:1511
 msgid "Create a new default package view"
 msgstr "Criar uma nova visão de pacote padrão"
 
-#: src/ui.cc:1520
+#: src/ui.cc:1514
 msgid "New Categorical ^Browser"
 msgstr "^B Novo Navegador de Categorias"
 
-#: src/ui.cc:1522
+#: src/ui.cc:1516
 msgid "Browse packages by category"
 msgstr "Navega pelos pacotes por categoria"
 
-#: src/ui.cc:1530
+#: src/ui.cc:1524
 msgid "^About"
 msgstr "^A Sobre"
 
-#: src/ui.cc:1531
+#: src/ui.cc:1525
 msgid "View information about this program"
 msgstr "Visualiza informações sobre este programa"
 
-#: src/ui.cc:1534
+#: src/ui.cc:1528
 msgid "^Help"
 msgstr "^H Ajuda"
 
-#: src/ui.cc:1535
+#: src/ui.cc:1529
 msgid "View the on-line help"
 msgstr "Visualizar a ajuda on-line"
 
-#: src/ui.cc:1537
+#: src/ui.cc:1531
 msgid "User's ^Manual"
 msgstr "^Manual do Usuário"
 
-#: src/ui.cc:1538
+#: src/ui.cc:1532
 msgid "View the detailed program manual"
 msgstr "Visualizar o manual do programa detalhado"
 
-#: src/ui.cc:1541
+#: src/ui.cc:1535
 msgid "^FAQ"
 msgstr "^FAQ"
 
-#: src/ui.cc:1542
+#: src/ui.cc:1536
 msgid "View a list of frequently asked questions"
 msgstr "Visualizar uma lista de perguntas feitas frequentemente"
 
-#: src/ui.cc:1545
+#: src/ui.cc:1539
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1546
+#: src/ui.cc:1540
 #, 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:1549
+#: src/ui.cc:1543
 msgid "^License"
 msgstr "^Licença"
 
-#: src/ui.cc:1550
+#: src/ui.cc:1544
 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:1668
+#: src/ui.cc:1660
 msgid "Actions"
 msgstr "Ações"
 
-#: src/ui.cc:1671
+#: src/ui.cc:1663
 msgid "Search"
 msgstr "Procurar"
 
-#: src/ui.cc:1672
+#: src/ui.cc:1664
 msgid "Options"
 msgstr "Opções"
 
-#: src/ui.cc:1673
+#: src/ui.cc:1665
 msgid "Views"
 msgstr "Visões"
 
-#: src/ui.cc:1674
+#: src/ui.cc:1666
 msgid "Help"
 msgstr "Ajuda"
 
-#: src/ui.cc:1734
+#: src/ui.cc:1726
 #, c-format
 msgid ""
 "%s: Menu  %s: Help  %s: Quit  %s: Update  %s: Download/Install/Remove Pkgs"
@@ -4497,28 +4525,28 @@
 "%s: Menu %s: Ajuda %s: Finaliza %s: Atualiza %s: Baixar/Instalar/Remover "
 "Pcts."
 
-#: src/ui.cc:2003 src/vscreen/vscreen.cc:281
+#: src/ui.cc:1996 src/vscreen/vscreen.cc:281
 msgid "yes_key"
 msgstr "s"
 
-#: src/ui.cc:2004 src/vscreen/vscreen.cc:282
+#: src/ui.cc:1997 src/vscreen/vscreen.cc:282
 msgid "no_key"
 msgstr "n"
 
-#: src/view_changelog.cc:46
+#: src/view_changelog.cc:61
 msgid "You can only view changelogs of official Debian packages."
 msgstr "Você só pode visualizar logs de mudanças de pacotes Debian oficiais."
 
-#: src/view_changelog.cc:52
+#: src/view_changelog.cc:67
 msgid "Downloading Changelog"
 msgstr "Fazendo download de Logs de Mudanças"
 
-#: src/view_changelog.cc:54
+#: src/view_changelog.cc:69
 #, fuzzy
 msgid "Download Changelog"
 msgstr "Fazendo download de Logs de Mudanças"
 
-#: src/view_changelog.cc:63
+#: src/view_changelog.cc:78
 #, c-format
 msgid "%s changes"
 msgstr ""
@@ -4613,18 +4641,196 @@
 #~ "Por favor, insira o seguinte disco no leitor \"%s\":\n"
 #~ "%s"
 
+#~ msgid "Need exactly two colors in color definition \"%s\""
+#~ msgstr "São necessárias exatamente duas cores na definição de cor \"%s\""
+
+#~ msgid "Can't parse foreground \"%s\"of color \"%s\""
+#~ msgstr "Não foi possível interpretar a frente \"%s\" da cor \"%s\""
+
+#~ msgid "Can't parse background \"%s\" of color \"%s\""
+#~ msgstr "Nao foi possível interpretar o fundo \"%s\" da cor \"%s\""
+
 #~ msgid "Invalid option for interactive mode: -s\n"
 #~ msgstr "Opção inválida para modo interativo: -s\n"
 
+#~ 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."
+#~ 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 "
+#~ "dispositivos de hardware de comunicação. Inclui software para controlar "
+#~ "fax-modems (por exemplo, PPP para conexões internet discadas e programas "
+#~ "originalmente escritos para este propósito (zmodem/kermit), bem como "
+#~ "software para controlar telefones celulares, interfacear com a FidoNet e "
+#~ "gerenciar uma BBS."
+
+#~ 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"
+#~ " .\n"
+#~ " For more information about what Debian considers to be Free Software, "
+#~ "see http://www.debian.org/social_contract#guidelines"
+#~ msgstr ""
+#~ "Programas que não são software livre\n"
+#~ " Pacotes na seção 'non-free' não são parte do Debian.\n"
+#~ " .\n"
+#~ " Estes pacotes não atendem um ou mais requisitos das Linhas Guias Debian "
+#~ "para o Software Livre (veja abaixo). Você deverá ler a licença dos "
+#~ "programas nesta seção para certificar-se de que lhe seja permitido "
+#~ "utilizá-los da maneira que você pretende usá-los.\n"
+#~ ".\n"
+#~ " Para maiores informações sobre o que o Debian considera ser Software "
+#~ "Livre, veja http://www.debian.org/social_contract.pt.html#guidelines"
+
+#~ 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)"
+#~ msgstr ""
+#~ "Novos Pacotes\n"
+#~ " Estes pacotes foram adicionados ao Debian desde a última vez que você "
+#~ "limpou a lista de \"novos\" pacotes. (escolha \"Esquecer novos pacotes\" "
+#~ "a partir do menu Ações para esvaziar esta lista)"
+
+#~ msgid ""
+#~ "%s is an essential package!\n"
+#~ "\n"
+#~ "Are you sure you want to remove it?\n"
+#~ "Type '%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."
+
+#~ msgid "Available versions of "
+#~ msgstr "Versões disponíveis de "
+
+#~ 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."
+#~ 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."
+
 #~ msgid "Information about "
 #~ msgstr "Informação sobre "
 
+#~ msgid ""
+#~ "Aptitude %s\n"
+#~ "\n"
+#~ "Copyright 2000 Daniel Burrows.\n"
+#~ "\n"
+#~ "aptitude comes with ABSOLUTELY NO WARRANTY; for details see 'license' in "
+#~ "the\n"
+#~ "Help menu.  This is free software, and you are welcome to redistribute "
+#~ "it\n"
+#~ "under certain conditions; see 'license' for details."
+#~ msgstr ""
+#~ "Aptitude %s\n"
+#~ "\n"
+#~ "Copyright 2000 Daniel Burrows.\n"
+#~ "\n"
+#~ "O aptitude é fornecido absolutamente SEM GARANTIA NENHUMA; para detalhes\n"
+#~ "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."
+
+#~ msgid "Some packages were broken and have been fixed"
+#~ msgstr "Alguns pacotes estavam quebrados e foram consertados"
+
 #~ msgid "Some broken packages could not be fixed!"
 #~ msgstr "Alguns pacotes quebrados não puderam ser consertados!"
 
+#~ msgid "Some packages are broken.  Try to fix them?"
+#~ msgstr "Alguns pacotes estão quebrados. Deseja tentar consertá-los?"
+
+#~ msgid ""
+#~ "Installing/removing packages requires administrative privileges, which\n"
+#~ "you currently do not have.  Would you like to change to the root "
+#~ "account?\n"
+#~ 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"
+
+#~ msgid ""
+#~ "No packages will be installed, removed or upgraded.\n"
+#~ "\n"
+#~ "Some packages could be upgraded, but you have not chosen to upgrade "
+#~ "them.\n"
+#~ "Type \"U\" to prepare an upgrade."
+#~ msgstr ""
+#~ "Nenhum pacote será instalado, removido ou atualizado.\n"
+#~ "\n"
+#~ "Alguns pacotes poderiam ser atualizados, mas você optou por não atualizá-"
+#~ "los.\n"
+#~ "Digite \"U\" para preparar uma atualização."
+
+#~ 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"
+#~ 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"
+
+#~ msgid "Obsolete downloaded package files have been deleted"
+#~ msgstr "Arquivos de pacotes baixados obsoletos foram apagados"
+
+#~ msgid ""
+#~ "Run 'su' to become root; this will restart the program, but your\n"
+#~ "settings will be preserved"
+#~ msgstr ""
+#~ "Executar 'su' para tornar-se root. Isto irá reiniciar o programa, mas\n"
+#~ " suas configurações serão preservadas"
+
+#~ msgid ""
+#~ "Mark the selected package as having been automatically installed;\n"
+#~ "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"
+
+#~ msgid ""
+#~ "Mark the selected package as having been manually installed;\n"
+#~ "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"
+
+#~ msgid ""
+#~ "Forbid the candidate version of the selected package from being "
+#~ "installed;\n"
+#~ "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"
+
 #~ msgid "^ChangeLog"
 #~ msgstr "^C Log de mudanças"
 
+#~ msgid "View the important changes made in each version of the program"
+#~ msgstr ""
+#~ "Visualizar as mudanças importantes feitas em cada versão do programa"
+
 #~ 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	Sun Jun 12 21:04:47 2005
@@ -1,21 +1,20 @@
-# translation of aptitude_ro.po to Romanian
 # translation of aptitude_po.po to Romanian
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
-# Sorin Batariuc <sorin at bonbon.net>, 2004.
+# Sorin Batariuc <sorin at bonbon.net>, 2004, 2005.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: aptitude_ro\n"
+"Project-Id-Version: ro\n"
 "Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-05-01 14:08-0400\n"
-"PO-Revision-Date: 2004-11-16 15:50+0200\n"
+"POT-Creation-Date: 2005-06-12 22:42+0200\n"
+"PO-Revision-Date: 2005-04-19 03:49+0300\n"
 "Last-Translator: Sorin Batariuc <sorin at bonbon.net>\n"
-"Language-Team: Romanian <romanian>\n"
+"Language-Team: Romanian <debian-l10n-romanian at lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.3.1\n"
+"X-Generator: KBabel 1.9.1\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
 #: src/apt_options.cc:109
@@ -36,7 +35,7 @@
 
 #: src/apt_options.cc:117
 msgid "Closing the last view exits the program"
-msgstr "ÃŽnchiderea ultimului vizualizat ieÅŸit din program"
+msgstr "Închiderea ultimei vizualizări închide programul"
 
 #: src/apt_options.cc:119
 msgid "Prompt for confirmation at exit"
@@ -150,7 +149,7 @@
 
 #: src/apt_options.cc:184
 msgid "Install Recommended packages automatically"
-msgstr "Instalează automat pachetele recomandate"
+msgstr "Instalează automat pachetele Recomandate"
 
 #: src/apt_options.cc:186
 msgid "Remove unused packages automatically"
@@ -160,14 +159,14 @@
 msgid "Automatically remove unused packages matching this filter"
 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:219 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
-#: src/vscreen/vs_util.cc:328
+#: src/apt_options.cc:240 src/mine/cmine.cc:249 src/mine/cmine.cc:312
+#: src/ui.cc:215 src/vscreen/vs_util.cc:77 src/vscreen/vs_util.cc:90
+#: src/vscreen/vs_util.cc:264 src/vscreen/vs_util.cc:298
 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:328
+#: src/apt_options.cc:241 src/download_list.cc:69 src/mine/cmine.cc:250
+#: src/mine/cmine.cc:313 src/vscreen/vs_util.cc:298
 msgid "Cancel"
 msgstr "Anulează"
 
@@ -248,15 +247,15 @@
 msgid "%s: Previous"
 msgstr ""
 
-#: src/broken_indicator.cc:233
+#: src/broken_indicator.cc:232
 #, c-format
-msgid "%CSolution search failed.  %s: try harder"
+msgid "Solution search failed.  %s: try harder"
 msgstr ""
 
-#: src/broken_indicator.cc:239
-#, c-format
-msgid "%CUnable to resolve dependencies."
-msgstr ""
+#: src/broken_indicator.cc:237
+#, fuzzy
+msgid "Unable to resolve dependencies."
+msgstr "Nu pot deschide %s pentru scriere"
 
 #: src/cmdline/cmdline_action.cc:36
 #, c-format
@@ -628,31 +627,39 @@
 "this is what you want to do.\n"
 "\n"
 msgstr ""
+"AVERTISMENT: vor fi instalate versiuni necertificate ale următoarelor "
+"pachete! \n"
+"\n"
+"Pachetele necertificate ar putea compromite securitatea sistemului dvs.\n"
+"Ar trebui să mergeţi mai departe cu instalarea doar dacă sunteţi sigur\n"
+"că vreţi să faceţi astfel.\n"
+"\n"
 
-#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
-#: src/vscreen/vs_util.cc:212
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:165
+#: src/vscreen/vs_util.cc:202
 msgid "Yes"
 msgstr "Da"
 
-#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
-#: src/vscreen/vs_util.cc:212
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:165
+#: src/vscreen/vs_util.cc:202
 msgid "No"
 msgstr "Nu"
 
 #: src/cmdline/cmdline_prompt.cc:388
 #, c-format
 msgid "Do you want to ignore this warning and proceed anyway?\n"
-msgstr ""
+msgstr "Vreţi să ignoraţi acest avertisment şi să continuaţi oricum?\n"
 
 #: src/cmdline/cmdline_prompt.cc:389
-#, fuzzy, c-format
+#, c-format
 msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
-msgstr "Pentru a continua, tastaţi fraza \"%s\":\n"
+msgstr ""
+"Pentru a continua, introduceţi \"%s\"; pentru a renunţa, introduceţi \"%s\": "
 
 #: src/cmdline/cmdline_prompt.cc:400
 #, c-format
 msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
-msgstr ""
+msgstr "Intrare nerecunoscută.  Introduceţi fie \"%s\" fie \"%s\".\n"
 
 #: src/cmdline/cmdline_prompt.cc:499
 #, c-format
@@ -949,7 +956,7 @@
 msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:212
+#: src/cmdline/cmdline_resolver.cc:212 src/cmdline/cmdline_resolver.cc:285
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
@@ -1008,203 +1015,208 @@
 msgid "The following packages have unmet dependencies:\n"
 msgstr "Următoarele pachete n-au îndeplinit dependenţele:\n"
 
-#: src/cmdline/cmdline_show.cc:133
+#: src/cmdline/cmdline_show.cc:119 src/cmdline/cmdline_show.cc:305
+#: src/solution_fragment.cc:65
+msgid "<NULL>"
+msgstr ""
+
+#: src/cmdline/cmdline_show.cc:138
 msgid "not installed"
 msgstr "neinstalat"
 
-#: src/cmdline/cmdline_show.cc:135 src/pkg_columnizer.cc:231
+#: src/cmdline/cmdline_show.cc:140 src/pkg_columnizer.cc:231
 #: src/pkg_ver_item.cc:225
 msgid "unpacked"
 msgstr "nedespachetat"
 
-#: src/cmdline/cmdline_show.cc:137
+#: src/cmdline/cmdline_show.cc:142
 msgid "partially configured"
 msgstr "parţial configurat"
 
-#: src/cmdline/cmdline_show.cc:139
+#: src/cmdline/cmdline_show.cc:144
 msgid "partially installed"
 msgstr "parţial instalat"
 
-#: src/cmdline/cmdline_show.cc:141
+#: src/cmdline/cmdline_show.cc:146
 msgid "not installed (configuration files remain)"
 msgstr "neinstalat (fişierele de configurare rămân)"
 
-#: src/cmdline/cmdline_show.cc:143 src/pkg_columnizer.cc:239
+#: src/cmdline/cmdline_show.cc:148 src/pkg_columnizer.cc:239
 #: src/pkg_ver_item.cc:233
 msgid "installed"
 msgstr "instalat"
 
-#: src/cmdline/cmdline_show.cc:152
+#: src/cmdline/cmdline_show.cc:157
 msgid "not a real package"
 msgstr "pachet ne-real"
 
-#: src/cmdline/cmdline_show.cc:165
+#: src/cmdline/cmdline_show.cc:170
 msgid " [held]"
 msgstr " [reţinut]"
 
-#: src/cmdline/cmdline_show.cc:174
+#: src/cmdline/cmdline_show.cc:179
 #, c-format
 msgid "%s; version %s will be installed"
-msgstr "%s; versiunea %s va fi instalat"
+msgstr "%s; versiunea %s va fi instalată"
 
-#: src/cmdline/cmdline_show.cc:178
+#: src/cmdline/cmdline_show.cc:183
 #, c-format
 msgid "%s; version %s will be installed automatically"
-msgstr "%s; versiunea %s va fi instalat automat"
+msgstr "%s; versiunea %s va fi instalată automat"
 
-#: src/cmdline/cmdline_show.cc:184 src/cmdline/cmdline_show.cc:199
+#: src/cmdline/cmdline_show.cc:189 src/cmdline/cmdline_show.cc:204
 #, c-format
 msgid "%s; will be purged"
 msgstr "%s; va fi curăţat"
 
-#: src/cmdline/cmdline_show.cc:197
+#: src/cmdline/cmdline_show.cc:202
 #, c-format
 msgid "%s; will be purged because nothing depends on it"
 msgstr "%s; va fi curăţat deoarece nimeni nu mai depinde de el"
 
-#: src/cmdline/cmdline_show.cc:204
+#: src/cmdline/cmdline_show.cc:209
 #, c-format
 msgid "%s; will be removed because nothing depends on it"
 msgstr "%s; va fi ÅŸters deoarece nimeni nu depinde de el"
 
-#: src/cmdline/cmdline_show.cc:206
+#: src/cmdline/cmdline_show.cc:211
 #, c-format
 msgid "%s; will be removed"
 msgstr "%s; va fi ÅŸters"
 
-#: src/cmdline/cmdline_show.cc:220
+#: src/cmdline/cmdline_show.cc:225
 #, c-format
 msgid "%s%s; will be downgraded [%s -> %s]"
 msgstr "%s%s; va fi de-gradat [%s -> %s]"
 
-#: src/cmdline/cmdline_show.cc:223
+#: src/cmdline/cmdline_show.cc:228
 #, c-format
 msgid "%s%s; will be upgraded [%s -> %s]"
 msgstr "%s%s; va fi înnoit [%s -> %s]"
 
-#: src/cmdline/cmdline_show.cc:235 src/cmdline/cmdline_show.cc:256
+#: src/cmdline/cmdline_show.cc:240 src/cmdline/cmdline_show.cc:261
 msgid "Package: "
 msgstr "Pachet: "
 
-#: src/cmdline/cmdline_show.cc:236 src/cmdline/cmdline_show.cc:264
+#: src/cmdline/cmdline_show.cc:241 src/cmdline/cmdline_show.cc:269
 #: src/pkg_columnizer.cc:87
 msgid "State"
 msgstr "Stare"
 
-#: src/cmdline/cmdline_show.cc:237 src/cmdline/cmdline_show.cc:318
+#: src/cmdline/cmdline_show.cc:242 src/cmdline/cmdline_show.cc:325
 msgid "Provided by"
 msgstr "Furnizat de"
 
-#: src/cmdline/cmdline_show.cc:258 src/pkg_info_screen.cc:105
+#: src/cmdline/cmdline_show.cc:263 src/pkg_info_screen.cc:105
 msgid "Essential: "
 msgstr "Esenţial: "
 
-#: src/cmdline/cmdline_show.cc:258 src/cmdline/cmdline_show.cc:262
-#: src/cmdline/cmdline_show.cc:273 src/pkg_info_screen.cc:105
+#: src/cmdline/cmdline_show.cc:263 src/cmdline/cmdline_show.cc:267
+#: src/cmdline/cmdline_show.cc:278 src/pkg_info_screen.cc:105
 msgid "yes"
 msgstr "da"
 
-#: src/cmdline/cmdline_show.cc:262
+#: src/cmdline/cmdline_show.cc:267
 msgid "New"
 msgstr "Nou"
 
-#: src/cmdline/cmdline_show.cc:267
+#: src/cmdline/cmdline_show.cc:272
 msgid "Forbidden version"
 msgstr "Versiune interzisă"
 
-#: src/cmdline/cmdline_show.cc:271
+#: src/cmdline/cmdline_show.cc:276
 msgid "Automatically installed"
 msgstr "Instalat automat"
 
-#: src/cmdline/cmdline_show.cc:273
+#: src/cmdline/cmdline_show.cc:278
 msgid "no"
 msgstr "nu"
 
-#: src/cmdline/cmdline_show.cc:275
+#: src/cmdline/cmdline_show.cc:280
 msgid "Version: "
 msgstr "Versiune: "
 
-#: src/cmdline/cmdline_show.cc:276 src/pkg_info_screen.cc:113
+#: src/cmdline/cmdline_show.cc:281 src/pkg_info_screen.cc:113
 msgid "Priority: "
 msgstr "Prioritate: "
 
-#: src/cmdline/cmdline_show.cc:277 src/cmdline/cmdline_show.cc:279
-#: src/cmdline/cmdline_show.cc:288
+#: src/cmdline/cmdline_show.cc:282 src/cmdline/cmdline_show.cc:284
+#: src/cmdline/cmdline_show.cc:293
 msgid "N/A"
-msgstr "necunoscut"
+msgstr "N/A"
 
-#: src/cmdline/cmdline_show.cc:278 src/pkg_info_screen.cc:114
+#: src/cmdline/cmdline_show.cc:283 src/pkg_info_screen.cc:114
 msgid "Section: "
 msgstr "Secţiune: "
 
-#: src/cmdline/cmdline_show.cc:280 src/pkg_info_screen.cc:115
+#: src/cmdline/cmdline_show.cc:285 src/pkg_info_screen.cc:115
 msgid "Maintainer: "
 msgstr "Responsabil: "
 
-#: src/cmdline/cmdline_show.cc:283
+#: src/cmdline/cmdline_show.cc:288
 msgid "Uncompressed Size: "
 msgstr "Dimensiune necomprimat: "
 
-#: src/cmdline/cmdline_show.cc:287
+#: src/cmdline/cmdline_show.cc:292
 msgid "Architecture: "
 msgstr "Arhitectură: "
 
-#: src/cmdline/cmdline_show.cc:289
+#: src/cmdline/cmdline_show.cc:294
 msgid "Compressed Size: "
 msgstr "Dimensiune comprimat: "
 
-#: src/cmdline/cmdline_show.cc:291
+#: src/cmdline/cmdline_show.cc:296
 msgid "Filename: "
 msgstr "Nume fiÅŸier: "
 
-#: src/cmdline/cmdline_show.cc:293
+#: src/cmdline/cmdline_show.cc:298
 msgid "MD5sum: "
 msgstr "MD5sum: "
 
-#: src/cmdline/cmdline_show.cc:297 src/cmdline/cmdline_show.cc:299
+#: src/cmdline/cmdline_show.cc:302 src/cmdline/cmdline_show.cc:305
 msgid "Archive"
 msgstr "Arhivă"
 
-#: src/cmdline/cmdline_show.cc:303
+#: src/cmdline/cmdline_show.cc:310
 msgid "Depends"
 msgstr "Depinde"
 
-#: src/cmdline/cmdline_show.cc:305
+#: src/cmdline/cmdline_show.cc:312
 msgid "PreDepends"
 msgstr "Pre-depinde"
 
-#: src/cmdline/cmdline_show.cc:307
+#: src/cmdline/cmdline_show.cc:314
 msgid "Recommends"
 msgstr "Recomandă"
 
-#: src/cmdline/cmdline_show.cc:309
+#: src/cmdline/cmdline_show.cc:316
 msgid "Suggests"
 msgstr "Sugerează"
 
-#: src/cmdline/cmdline_show.cc:311
+#: src/cmdline/cmdline_show.cc:318
 msgid "Conflicts"
 msgstr "ÃŽn conflict"
 
-#: src/cmdline/cmdline_show.cc:313
+#: src/cmdline/cmdline_show.cc:320
 msgid "Replaces"
 msgstr "ÃŽnlocuieÅŸte"
 
-#: src/cmdline/cmdline_show.cc:315
+#: src/cmdline/cmdline_show.cc:322
 msgid "Obsoletes"
-msgstr "ÃŽnvecheÅŸte(?)"
+msgstr "ÃŽnvecheÅŸte"
 
-#: src/cmdline/cmdline_show.cc:317
+#: src/cmdline/cmdline_show.cc:324
 msgid "Provides"
 msgstr "Furnizează"
 
-#: src/cmdline/cmdline_show.cc:321 src/pkg_info_screen.cc:97
+#: src/cmdline/cmdline_show.cc:328 src/pkg_info_screen.cc:97
 msgid "Description: "
 msgstr "Descriere: "
 
 #: src/cmdline/cmdline_simulate.cc:37
 #, c-format
 msgid "Would download/install/remove packages.\n"
-msgstr "Vrut să descarc/instalez/şterg pachete.\n"
+msgstr "Se doreşte descărcarea/instalarea/ştergerea pachetelor.\n"
 
 #: src/cmdline/cmdline_simulate.cc:48
 msgid "Internal Error, Ordering didn't finish"
@@ -1240,32 +1252,32 @@
 msgid "You cannot specify both an archive and a version for a package\n"
 msgstr "Nu puteţi alege concomitent o arhivă şi o versiune pentru un pachet\n"
 
-#: src/dep_item.cc:137
+#: src/dep_item.cc:139
 msgid "UNSATISFIED"
 msgstr "NESATISFÄ‚CUT"
 
-#: src/dep_item.cc:137 src/reason_fragment.cc:247
+#: src/dep_item.cc:139 src/reason_fragment.cc:244
 msgid "UNAVAILABLE"
 msgstr "INDISPONIBIL"
 
-#: src/download_bar.cc:56 src/download_list.cc:263 src/download_screen.cc:57
+#: src/download_bar.cc:56 src/download_list.cc:266 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_bar.cc:77 src/generic/acqprogress.cc:63
+#: src/download_bar.cc:75 src/generic/acqprogress.cc:63
 msgid "Hit "
 msgstr "Găsit "
 
-#: src/download_bar.cc:90
+#: src/download_bar.cc:88
 msgid "Downloading "
 msgstr "Se descarcă "
 
-#: src/download_bar.cc:103
+#: src/download_bar.cc:101
 msgid "Got "
 msgstr "Luat "
 
-#: src/download_bar.cc:157
+#: src/download_bar.cc:155
 msgid "Downloading..."
 msgstr "Se descarcă..."
 
@@ -1293,14 +1305,14 @@
 msgid "Couldn't clean out list directories"
 msgstr "Nu pot curăţa directoarele listă"
 
-#: src/download.cc:177 src/ui.cc:1153
+#: src/download.cc:177 src/ui.cc:1147
 msgid "Deleting obsolete downloaded files"
-msgstr "Ştergere fişiere învechite descărcate"
+msgstr "Ştergere fişierele învechite descărcate"
 
 #: src/download.cc:182
 #, c-format
 msgid "Deleting obsolete downloaded files\n"
-msgstr "Ştergere fişiere învechite descărcate\n"
+msgstr "Ştergere fişierele învechite descărcate\n"
 
 #: src/download.cc:224
 #, c-format
@@ -1318,7 +1330,7 @@
 "dpkg problems may not be completed.\n"
 "\n"
 msgstr ""
-"IMPORTANT: aceasta înregistrează doar lista cu acţiunile intenţionate, "
+"IMPORTANT: acest jurnal înregistrează doar lista cu acţiunile intenţionate, "
 "acţiunile ce\n"
 "eşuează din pricina unor probleme dpkg ar putea să nu fie completate.\n"
 "\n"
@@ -1432,7 +1444,7 @@
 "Hait!  Ceva rău s-a petrecut în timpul instalării pachetelor.  Încercare de "
 "recuperare:"
 
-#: src/download.cc:477 src/pkg_item.cc:432
+#: src/download.cc:477 src/pkg_item.cc:430
 msgid "Press return to continue.\n"
 msgstr "Apasaţi Enter pentru a continua\n"
 
@@ -1443,17 +1455,17 @@
 "Nu pot recâştiga închiderea sistemului!  (Poate altă instanţă apt sau dpkg "
 "este activă?)"
 
-#: src/download_item.cc:66 src/download_item.cc:70 src/download_item.cc:100
+#: src/download_item.cc:70 src/download_item.cc:74 src/download_item.cc:104
 #: src/generic/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr " [ÃŽn lucru]"
 
-#: src/download_item.cc:104 src/download_list.cc:283
+#: src/download_item.cc:108 src/download_list.cc:284
 msgid "[Hit]"
 msgstr "[Găsit]"
 
-#: src/download_item.cc:104 src/download_list.cc:303
+#: src/download_item.cc:108 src/download_list.cc:304
 msgid "[Downloaded]"
 msgstr "[Descărcat]"
 
@@ -1467,34 +1479,34 @@
 msgid "%n%nSome files were not downloaded successfully."
 msgstr ""
 
-#: src/download_list.cc:68
+#: src/download_list.cc:66
 msgid "Continue"
 msgstr "Continuă"
 
-#: src/download_list.cc:175 src/download_screen.cc:203
+#: src/download_list.cc:178 src/download_screen.cc:203
 msgid "Total Progress: "
 msgstr "Progresul total: "
 
-#: src/download_list.cc:194 src/download_screen.cc:218
+#: src/download_list.cc:197 src/download_screen.cc:218
 #, c-format
 msgid " [ %i%% ] (%sB/s, %s remaining)"
 msgstr " [ %i%% ] (%sB/s, %s rămas)"
 
-#: src/download_list.cc:196
+#: src/download_list.cc:199
 #, c-format
 msgid " [ %i%% ] (stalled)"
 msgstr " [ %i%% ] (împotmolit)"
 
-#: src/download_list.cc:198
+#: src/download_list.cc:201
 #, c-format
 msgid " [ %i%% ]"
 msgstr " [ %i%% ]"
 
-#: src/download_list.cc:323
+#: src/download_list.cc:324
 msgid "[IGNORED]"
 msgstr "[IGNORAT]"
 
-#: src/download_list.cc:329
+#: src/download_list.cc:330
 msgid "[ERROR]"
 msgstr "[EROARE]"
 
@@ -1503,11 +1515,11 @@
 msgid "Downloaded %sB in %ss (%sB/s)."
 msgstr "Descărcat %sB în %ss (%sB/s)."
 
-#: src/edit_pkg_hier.cc:158
+#: src/edit_pkg_hier.cc:176
 msgid "No hierarchy information to edit"
 msgstr "Nici o informaţie de editat despre ierarhie"
 
-#: src/edit_pkg_hier.cc:258
+#: src/edit_pkg_hier.cc:276
 msgid "Couldn't open for writing"
 msgstr "Nu pot deschide pentru scriere"
 
@@ -1608,39 +1620,39 @@
 msgstr ""
 "Avertisment: nu pot încuia fişierul cache.  Deschidere în modul doar-citire"
 
-#: src/generic/matchers.cc:797
+#: src/generic/matchers.cc:798
 msgid "Unmatched '('"
 msgstr "Nepotrivit '('"
 
-#: src/generic/matchers.cc:887 src/generic/matchers.cc:968
+#: src/generic/matchers.cc:888 src/generic/matchers.cc:969
 #, c-format
 msgid "Unknown dependency type: %s"
 msgstr "Tip de dependenţă necunoscut: %s"
 
-#: src/generic/matchers.cc:950
+#: src/generic/matchers.cc:951
 #, c-format
 msgid "Unknown action type: %s"
 msgstr "Tip de acţiune necunoscut: %s"
 
-#: src/generic/matchers.cc:1017
+#: src/generic/matchers.cc:1018
 #, c-format
 msgid "Unknown priority %s"
 msgstr "Prioritate necunoscută: %s"
 
-#: src/generic/matchers.cc:1039
+#: src/generic/matchers.cc:1040
 #, c-format
 msgid "Unknown pattern type: %c"
 msgstr "Tip de model necunoscut: %c"
 
-#: src/generic/matchers.cc:1084
+#: src/generic/matchers.cc:1105
 msgid "Unexpected empty expression"
 msgstr "Expresie goală neaşteptată"
 
-#: src/generic/matchers.cc:1119
+#: src/generic/matchers.cc:1143
 msgid "Badly formed expression"
 msgstr "Expresie formată greşit"
 
-#: src/generic/matchers.cc:1148
+#: src/generic/matchers.cc:1175
 msgid "Unexpected ')'"
 msgstr "NeaÅŸteptat ')'"
 
@@ -1659,14 +1671,14 @@
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
-"Fişierul cu indexarea pachetelor este deteriorat. Fără câmpul 'nume fişier' "
+"Fişierul cu indexarea pachetelor este deteriorat. Fără câmpul 'Nume fişier' "
 "pentru pachetul %s."
 
 #: src/generic/pkg_changelog.cc:105
 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:61
+#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:76
 #, c-format
 msgid "ChangeLog of %s"
 msgstr "Jurnal de modificări al %s"
@@ -1688,17 +1700,17 @@
 #: src/generic/pkg_hier.cc:178
 msgid "Bad record encountered (no Package or Group entry), skipping"
 msgstr ""
-"Înregistrare nevalidă întâlnită (nici o intrare pachet sau grup), sar peste"
+"Înregistrare nevalidă întâlnită (nici o intrare Pachet sau Grup), sar peste"
 
 #: src/generic/pkg_hier.cc:180
 #, c-format
 msgid "Bad record encountered (Package=%s, Group=%s), skipping"
-msgstr "Înregistrare nevalidă întâlnită (pachet=%s, grup=%s), sar peste"
+msgstr "Înregistrare nevalidă întâlnită (Pachet=%s, Grup=%s), sar peste"
 
 #: src/generic/pkg_hier.cc:243
 #, c-format
 msgid "Multiple descriptions found for group %s, ignoring one"
-msgstr "Multiple descrieri găsite pentru grupul %s, una ignorarată"
+msgstr "Multiple descrieri găsite pentru grupul %s, una ignorată"
 
 #: src/generic/tasks.cc:295
 msgid "Unable to open /usr/share/tasksel/debian-tasks.desc"
@@ -1708,38 +1720,38 @@
 msgid "Reading task descriptions"
 msgstr "Citesc descrierile sarcinilor"
 
-#: src/load_config.cc:30
-#, c-format
-msgid "Invalid entry in color definition group: \"%s\""
+#: src/load_config.cc:42
+#, fuzzy, c-format
+msgid "Unrecognized color name \"%s\""
+msgstr "Sarcini nerecunoscute"
+
+#: src/load_config.cc:69
+#, fuzzy, c-format
+msgid "Unrecognized attribute name \"%s\""
+msgstr "Sarcini nerecunoscute"
+
+#: src/load_config.cc:106
+#, fuzzy, c-format
+msgid "Invalid entry in style definition group: \"%s\""
 msgstr "Intrare nevalidă în definiţia de culoare a grupului: \"%s\""
 
-#: src/load_config.cc:32
-#, c-format
-msgid "Invalid tagless entry in color definition group: \"%s\""
+#: src/load_config.cc:108
+#, fuzzy, c-format
+msgid "Invalid tagless entry in style definition group: \"%s\""
 msgstr ""
 "Intrare nevalidă fără etichetă în definiţia de culoare a grupului:\"%s\""
 
-#: src/load_config.cc:34
-#, c-format
-msgid "Need exactly two colors in color definition \"%s\""
-msgstr "Este nevoie de exact două culori în definiţia culorii \"%s\""
-
-#: src/load_config.cc:50
-#, c-format
-msgid "Can't parse foreground \"%s\"of color \"%s\""
-msgstr "Nu pot analiza prim-planul \"%s\" al culorii \"%s\""
-
-#: src/load_config.cc:53
-#, c-format
-msgid "Can't parse background \"%s\" of color \"%s\""
-msgstr "Nu pot analiza fundalul \"%s\" al culorii \"%s\""
+#: src/load_config.cc:130
+#, fuzzy, c-format
+msgid "Unknown style attribute %s"
+msgstr "Tip de acţiune necunoscut: %s"
 
-#: src/load_config.cc:72 src/load_config.cc:74
+#: src/load_config.cc:153 src/load_config.cc:155
 #, c-format
 msgid "Invalid entry in keybinding group: \"%s\""
 msgstr "Intrare nevalidă în keybinding a grupulului: \"%s\""
 
-#: src/load_config.cc:89
+#: src/load_config.cc:170
 #, c-format
 msgid "Ignoring invalid keybinding \"%s\" -> \"%s\""
 msgstr "Se ignoră keybinding nevalid \"%s\" -> \"%s\""
@@ -1769,13 +1781,13 @@
 msgid ""
 "Exactly one filter name must be provided as an argument to a filter policy"
 msgstr ""
-"Exact un singur nume de filtru trebuie furnizat ca argument pentru o "
+"Numai un singur nume de filtru trebuie furnizat ca argument pentru o "
 "politică de filtrare"
 
 #: src/load_grouppolicy.cc:118
 #, c-format
 msgid "Bad filter type '%s' (valid types are: 'missing')"
-msgstr "Tip filtru nevalid '%s' (tipul valid este: 'missing')"
+msgstr "Tip de filtru nevalid '%s' (tipul valid este: 'missing')"
 
 #: src/load_grouppolicy.cc:129
 msgid "By-mode grouping policies take no arguments"
@@ -1792,7 +1804,7 @@
 #: src/load_grouppolicy.cc:165
 msgid "Version-generating grouping policies must be the tail of a chain"
 msgstr ""
-"Politicile de grupare 'generare versiuni' trebuie sa fie coada lanţului"
+"Politicile de grupare 'generare versiuni' trebuie să fie coada lanţului"
 
 #: src/load_grouppolicy.cc:177
 msgid "Dep-generating grouping policies take no arguments"
@@ -1827,24 +1839,25 @@
 #: src/load_pkgview.cc:57
 msgid "Couldn't parse layout: No column format specified for static item"
 msgstr ""
-"Nu pot analiza formatul: format de coloană pentru articol static nespecificat"
+"Nu s-a putut analiza formatul: nu este specificat un format de coloană "
+"pentru articol static"
 
 #: src/load_pkgview.cc:104
 #, c-format
 msgid "Couldn't parse layout: unknown view item type \"%s\""
-msgstr "Nu pot analiza formatul: tip vizualizator necunoscut \"%s\""
+msgstr "Nu s-a putut analiza formatul: tip vizualizator necunoscut \"%s\""
 
 #: src/load_pkgview.cc:111 src/load_pkgview.cc:119
 msgid "Couldn't parse layout: no row number specified"
-msgstr "Nu pot analiza formatul: număr de linie nespecificat"
+msgstr "Nu s-a putut analiza formatul: număr de linie nespecificat"
 
 #: src/load_pkgview.cc:127
 msgid "Couldn't parse layout: no width specified"
-msgstr "Nu pot analiza formatul: lăţime nespecificată"
+msgstr "Nu s-a putut analiza formatul: lăţime nespecificată"
 
 #: src/load_pkgview.cc:135
 msgid "Couldn't parse layout: no height specified"
-msgstr "Nu pot analiza formatul: înălţime nespecificată"
+msgstr "Nu s-a putut analiza formatul: înălţime nespecificată"
 
 #: src/load_pkgview.cc:166 src/load_pkgview.cc:184
 #, c-format
@@ -1932,37 +1945,37 @@
 #: src/main.cc:90
 #, c-format
 msgid " install      - Install/upgrade packages\n"
-msgstr " instalare      - Instalează/înnoieşte pachetele\n"
+msgstr " install      - Instalează/înnoieşte pachetele\n"
 
 #: src/main.cc:91
 #, c-format
 msgid " remove       - Remove packages\n"
-msgstr " ÅŸterge      - Åžterge pachetele\n"
+msgstr " remove      - Åžterge pachetele\n"
 
 #: src/main.cc:92
 #, c-format
 msgid " purge        - Remove packages and their configuration files\n"
-msgstr " curăţă       - Curăţă pachetele şi fişierele lor de configurare\n"
+msgstr " purge       - Curăţă pachetele şi fişierele lor de configurare\n"
 
 #: src/main.cc:93
 #, c-format
 msgid " hold         - Place packages on hold\n"
-msgstr " reţine       - Pune pachetele în aşteptare\n"
+msgstr " hold       - Pune pachetele în aşteptare\n"
 
 #: src/main.cc:94
 #, c-format
 msgid " unhold       - Cancel a hold command for a package\n"
-msgstr " nereţine       - Anulează comanda de reţinere pentru un pachet\n"
+msgstr " unhold       - Anulează comanda de reţinere pentru un pachet\n"
 
 #: src/main.cc:95
 #, c-format
 msgid " markauto     - Mark packages as having been automatically installed\n"
-msgstr " auto-marcare     - Marchează pachetele ca fiind automat instalate\n"
+msgstr " markauto     - Marchează pachetele ca fiind automat instalate\n"
 
 #: src/main.cc:96
 #, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed\n"
-msgstr " ne-auto-marcare   - Marchează pachetele ca fiind instalate manual\n"
+msgstr " unmarkauto   - Marchează pachetele ca fiind instalate manual\n"
 
 #: src/main.cc:101
 #, c-format
@@ -1970,63 +1983,60 @@
 " forbid-version - Forbid aptitude from upgrading to a specific package "
 "version.\n"
 msgstr ""
-" versiune interzisă - Interzice aptitude de a înnoi o anumită versiune de "
+" forbid-version - Interzice aptitude de a înnoi o anumită versiune de "
 "pachet.\n"
 
 #: src/main.cc:102
 #, c-format
 msgid " update       - Download lists of new/upgradable packages\n"
-msgstr ""
-" actualizare       - Descarcă listele de pachete noi/posibil de înnoit\n"
+msgstr " update       - Descarcă listele de pachete noi/posibil de înnoit\n"
 
 #: src/main.cc:103
 #, c-format
 msgid " upgrade      - Perform a safe upgrade\n"
-msgstr " înnoire      - Execută o înnoire sigură\n"
+msgstr " upgrade      - Execută o înnoire sigură\n"
 
 #: src/main.cc:104
 #, c-format
 msgid ""
 " dist-upgrade - Perform an upgrade, possibly installing and removing "
 "packages\n"
-msgstr ""
-" înnoire distribuţie - Execută o înnoire, instalând şi ştergând pachete\n"
+msgstr " dist-upgrade - Execută o înnoire, instalând şi ştergând pachete\n"
 
 #: src/main.cc:105
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\"\n"
-msgstr " uită de noi   - Uită ce pachete sunt \"noi\"\n"
+msgstr " forget-new   - Uită de pachetele ce sunt \"noi\"\n"
 
 #: src/main.cc:106
 #, 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"
+msgstr " search      - Caută un pachet după nume şi/sau expresie\n"
 
 #: src/main.cc:107
 #, c-format
 msgid " show         - Display detailed information about a package\n"
-msgstr " arată       - Afişează informaţii detaliate despre un pachet\n"
+msgstr " show       - Afişează informaţii detaliate despre un pachet\n"
 
 #: src/main.cc:108
 #, c-format
 msgid " clean        - Erase downloaded package files\n"
-msgstr " curăţă      - Şterge fişierele pachetelor descărcate\n"
+msgstr " clean      - Şterge fişierele pachetelor descărcate\n"
 
 #: src/main.cc:109
 #, c-format
 msgid " autoclean    - Erase old downloaded package files\n"
-msgstr " autocurăţare    - Şterge vechile fişiere ale pachetelor descărcate\n"
+msgstr " autoclean    - Şterge vechile fişiere ale pachetelor descărcate\n"
 
 #: src/main.cc:110
 #, c-format
 msgid " changelog    - View a package's changelog\n"
-msgstr ""
-" jurnal de modificări    - Vizualizare jurnal de modificări al unui pachet\n"
+msgstr " changelog    - Vizualizarea jurnalului de modificări al unui pachet\n"
 
 #: src/main.cc:111
 #, c-format
 msgid " download     - Download the .deb file for a package\n"
-msgstr "descărcare     - Descarcă fişierul .deb pentru un pachet\n"
+msgstr "download     - Descarcă fişierul .deb pentru un pachet\n"
 
 #: src/main.cc:113
 #, c-format
@@ -2091,7 +2101,8 @@
 #: src/main.cc:122
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
-msgstr " -f             Încearcă în mod agresiv să repar pachetele.\n"
+msgstr ""
+" -f             Încerc în mod agresiv să repar pachetele deteriorate.\n"
 
 #: src/main.cc:123
 #, c-format
@@ -2107,7 +2118,8 @@
 #: src/main.cc:125
 #, 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"
+msgstr ""
+" -Z\t\t    Arată modificarea în dimensiune a fiecărui pachet instalat.\n"
 
 #: src/main.cc:126
 #, c-format
@@ -2143,7 +2155,9 @@
 #: src/main.cc:130
 #, 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"
+msgstr ""
+" -S fnume: Citeşte informaţiile de stare extinsă aptitude din fişierul "
+"fnume.\n"
 
 #: src/main.cc:131
 #, c-format
@@ -2160,44 +2174,44 @@
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                   Acest aptitude n-are puterile unei Super Vaci.\n"
 
-#: src/main.cc:255
+#: src/main.cc:252
 #, 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:301 src/main.cc:310
+#: src/main.cc:291 src/main.cc:300
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr "CIUDĂŢENIE: primit cod opţiune necunoscut\n"
 
-#: src/main.cc:319
+#: src/main.cc:309
 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:327
+#: src/main.cc:317
 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:348
+#: src/main.cc:338
 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:405
+#: src/main.cc:395
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr "Comandă necunoscută \"%s\"\n"
 
-#: src/main.cc:412 src/main.cc:469
+#: src/main.cc:402 src/main.cc:450
 msgid "Internal error: uncaught 'out of solutions' exception.\n"
 msgstr ""
 
-#: src/main.cc:417 src/main.cc:474
+#: src/main.cc:407 src/main.cc:455
 msgid "Internal error: uncaught 'out of time' exception.\n"
 msgstr ""
 
-#: src/main.cc:424
+#: src/main.cc:414
 #, c-format
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
@@ -2228,19 +2242,19 @@
 msgid "Lost"
 msgstr "Pierdut"
 
-#: src/mine/cmine.cc:119 src/ui.cc:1090
+#: src/mine/cmine.cc:119 src/ui.cc:1084
 msgid "Minesweeper"
 msgstr "Detector de mine"
 
 #: src/mine/cmine.cc:131 src/mine/cmine.cc:168
 #, c-format
 msgid "Could not open file \"%s\""
-msgstr "Nu pot deschide fiÅŸierul \"%s\""
+msgstr "Nu am putut deschide fiÅŸierul \"%s\""
 
 #: src/mine/cmine.cc:145
 #, c-format
 msgid "Could not load game from %s"
-msgstr "Nu pot încărca jocul din %s"
+msgstr "Nu am putut încărca jocul din %s"
 
 #: src/mine/cmine.cc:195
 msgid "The board height must be a number"
@@ -2254,93 +2268,93 @@
 msgid "The number of mines must be a number"
 msgstr "Numărul minelor trebuie să fie un număr"
 
-#: src/mine/cmine.cc:240
+#: src/mine/cmine.cc:238
 msgid "Setup custom game"
 msgstr "Aranjare joc particularizat"
 
-#: src/mine/cmine.cc:243
+#: src/mine/cmine.cc:240
 msgid "Height of board: "
 msgstr "Înălţimea tablei: "
 
-#: src/mine/cmine.cc:247
+#: src/mine/cmine.cc:243
 msgid "Width of board: "
 msgstr "Lăţimea tablei: "
 
-#: src/mine/cmine.cc:251
+#: src/mine/cmine.cc:246
 msgid "Number of mines: "
 msgstr "Numărul de mine: "
 
-#: src/mine/cmine.cc:316
+#: src/mine/cmine.cc:305
 msgid "Choose difficulty level"
 msgstr "Alegeţi nivelul de dificultate"
 
-#: src/mine/cmine.cc:318
+#: src/mine/cmine.cc:307
 msgid "Easy"
 msgstr "UÅŸor"
 
-#: src/mine/cmine.cc:319
+#: src/mine/cmine.cc:308
 msgid "Medium"
 msgstr "Mediu"
 
-#: src/mine/cmine.cc:320
+#: src/mine/cmine.cc:309
 msgid "Hard"
 msgstr "Greu"
 
-#: src/mine/cmine.cc:321
+#: src/mine/cmine.cc:310
 msgid "Custom"
 msgstr "Particularizare"
 
-#: src/mine/cmine.cc:411
+#: src/mine/cmine.cc:392
 msgid "You have won."
 msgstr "Aţi câştigat."
 
-#: src/mine/cmine.cc:414
+#: src/mine/cmine.cc:395
 msgid "You lose!"
 msgstr "AÅ£i pierdut!"
 
-#: src/mine/cmine.cc:419
+#: src/mine/cmine.cc:400
 msgid "You die...  --More--"
 msgstr "Aţi murit...  --Încă odată--"
 
-#: src/mine/cmine.cc:432
+#: src/mine/cmine.cc:413
 msgid "The spikes were poisoned!  The poison was deadly..  --More--"
 msgstr "Spinii au fost otrăviţi!  Otrava a fost mortală..  --Încă odată--"
 
-#: src/mine/cmine.cc:435
+#: src/mine/cmine.cc:416
 msgid "You land on a set of sharp iron spikes!  --More--"
 msgstr "Aţi aterizat pe un răsad de spini de fier ascuţiţi!  --Încă odată--"
 
-#: src/mine/cmine.cc:438
+#: src/mine/cmine.cc:419
 msgid "You fall into a pit!  --More--"
 msgstr "Aţi căzut într-o groapă!  --Încă odată--"
 
-#: src/mine/cmine.cc:441
+#: src/mine/cmine.cc:422
 msgid "KABOOM!  You step on a land mine.  --More--"
 msgstr "ZZBUUUUM!  Aţi călcat pe un câmp minat.  --Încă odată--"
 
-#: src/mine/cmine.cc:446
+#: src/mine/cmine.cc:427
 msgid "The dart was poisoned!  The poison was deadly...  --More--"
 msgstr "Săgeata a fost otrăvită! Otrava a fost mortală...  --Încă odată--"
 
-#: src/mine/cmine.cc:448
+#: src/mine/cmine.cc:429
 msgid ""
 "A little dart shoots out at you!  You are hit by a little dart!  --More--"
 msgstr "O săgeţică v-a străpuns! V-a lovit o biată săgeţică!  --Încă odată--"
 
-#: src/mine/cmine.cc:452
+#: src/mine/cmine.cc:433
 msgid "You turn to stone... --More--"
 msgstr "V-aţi transformat în piatră...  --Încă odată--"
 
-#: src/mine/cmine.cc:454
+#: src/mine/cmine.cc:435
 msgid "Touching the cockatrice corpse was a fatal mistake.  --More--"
 msgstr ""
 "Atingerea cadavrului în putrefacţie a fost o greşeală fatală.  --Încă odată--"
 
-#: src/mine/cmine.cc:456
+#: src/mine/cmine.cc:437
 msgid "You feel here a cockatrice corpse.  --More--"
 msgstr "Sunteţi un cadavru în descompunere.  --Încă odată--"
 
-#: src/mine/cmine.cc:460
+#: src/mine/cmine.cc:441
 msgid ""
 "Click!  You trigger a rolling boulder trap!  You are hit by a boulder! --"
 "More--"
@@ -2348,56 +2362,56 @@
 "Clic!  Aţi tras de o capcană cu un bolovan rostogolitor!  V-a lovit "
 "bolovanul!  --Încă odată--"
 
-#: src/mine/cmine.cc:470
+#: src/mine/cmine.cc:451
 msgid "sleep"
 msgstr "dormind"
 
-#: src/mine/cmine.cc:473
+#: src/mine/cmine.cc:454
 msgid "striking"
 msgstr "lovind"
 
-#: src/mine/cmine.cc:476
+#: src/mine/cmine.cc:457
 msgid "death"
 msgstr "moarte"
 
-#: src/mine/cmine.cc:479
+#: src/mine/cmine.cc:460
 msgid "polymorph"
 msgstr "polimorf"
 
-#: src/mine/cmine.cc:482
+#: src/mine/cmine.cc:463
 msgid "magic missile"
 msgstr "proiectil magic"
 
-#: src/mine/cmine.cc:485
+#: src/mine/cmine.cc:466
 msgid "secret door detection"
 msgstr "descoperirea uÅŸii secrete"
 
-#: src/mine/cmine.cc:488
+#: src/mine/cmine.cc:469
 msgid "invisibility"
 msgstr "invizibilitate"
 
-#: src/mine/cmine.cc:491
+#: src/mine/cmine.cc:472
 msgid "cold"
 msgstr "rece"
 
-#: src/mine/cmine.cc:497
+#: src/mine/cmine.cc:478
 #, c-format
 msgid "Your wand of %s breaks apart and explodes!  --More--"
 msgstr "Bagheta %s se sparge şi explodează!  --Încă odată--"
 
-#: src/mine/cmine.cc:503
+#: src/mine/cmine.cc:484
 msgid "You are jolted by a surge of electricity!  --More--"
 msgstr "Sunteţi zguduit de un val de electricitate!  --Încă odată--"
 
-#: src/mine/cmine.cc:607
+#: src/mine/cmine.cc:588
 msgid "Enter the filename to load: "
 msgstr "Tastaţi numele fişierului pentru a-l încărca: "
 
-#: src/mine/cmine.cc:614
+#: src/mine/cmine.cc:595
 msgid "Enter the filename to save: "
 msgstr "Tastaţi numele fişierului de salvat: "
 
-#: src/mine/cmine.cc:624
+#: src/mine/cmine.cc:605
 msgid "mine-help.txt"
 msgstr "mine-help.txt"
 
@@ -2405,7 +2419,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:1670
+#: src/pkg_columnizer.cc:84 src/ui.cc:1662
 msgid "Package"
 msgstr "Pachet"
 
@@ -2620,7 +2634,7 @@
 msgstr ""
 "Pachete care determină calculatorul să execute o sarcină particulară\n"
 " Pachetele din secţiunea 'Tasks' nu conţin fişiere, ele doar depind de alte "
-"pachete Aceste pachete furnizează o cale simplă pentru alegerea unui set "
+"pachete. Aceste pachete furnizează o cale facilă pentru alegerea unui set "
 "predefinit de pachete pentru o sarcină specializată."
 
 #: src/pkg_grouppolicy.cc:152
@@ -2631,7 +2645,7 @@
 msgstr ""
 "Pachete fără nici o secţiune declarată\n"
 " Nici o secţiune nu este oferită pentru aceste pachete. Poate este o eroare "
-"în fişierul pachetelor?"
+"în fişierul de pachete?"
 
 #: src/pkg_grouppolicy.cc:154
 msgid ""
@@ -2962,8 +2976,7 @@
 "sisteme de operare ÅŸi platforme fizice. (de ex., utilitare pentru citirea "
 "dischetelor DOS, ÅŸi utilitare pentru comunicarea cu Palm Pilots)\n"
 " .\n"
-" N-are nici o relevanţă (??) faptul că programele de scriere CD-uri sunt "
-"incluse ÎN ACEASTĂ secţiune."
+" Programele de inscripţionare CD-uri sunt incluse în ACEASTĂ secţiune."
 
 #: src/pkg_grouppolicy.cc:181
 msgid ""
@@ -3237,7 +3250,7 @@
 "available from any apt source.  They may be obsolete and removed from the "
 "archive, or you may have built a private version of them yourself."
 msgstr ""
-"Pachete învechite şi create local\n"
+"Pachete învechite şi pachete create local\n"
 " Aceste pachete sunt instalate, dar nu sunt disponibile din nici o sursă "
 "apt.  Ar putea fi învechite şi scoase din arhivă, sau poate aţi construit o "
 "versiune particulară pentru dvs."
@@ -3288,7 +3301,7 @@
 " Necesităţile de dependenţe ale acestor pachete nu vor fi împlinite după ce "
 "se va încheia instalarea.\n"
 " .\n"
-" Prezenţa acestei arborescenţe indică faptul că ceva este defect, fie în "
+" Prezenţa acestei arborescenţe indică faptul că ceva este deteriorat, fie în "
 "sistemul dvs., fie în arhiva Debian."
 
 #: src/pkg_grouppolicy.cc:519
@@ -3330,7 +3343,7 @@
 "is no longer available, or because another package conflicts with them."
 msgstr ""
 "Pachete ce sunt şterse datorită dependenţelor nesatisfăcute\n"
-" Aceste pachete sunt şterse deoarece una sau mai multe din dependinţele lor "
+" Aceste pachete sunt şterse deoarece una sau mai multe din dependenţele lor "
 "nu mai sunt disponibile, sau pentru că alt pachet este în conflict cu "
 "acestea."
 
@@ -3475,52 +3488,52 @@
 "Sunteţi sigur că vreţi să-l ştergeţi?\n"
 "Tastaţi '%s' dacă sunteţi."
 
-#: src/pkg_item.cc:222 src/pkg_ver_item.cc:625
+#: src/pkg_item.cc:220 src/pkg_ver_item.cc:626
 #, c-format
 msgid "Information about %s"
 msgstr "Informaţii despre %s"
 
-#: src/pkg_item.cc:224 src/pkg_ver_item.cc:627
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:628
 #, c-format
 msgid "%s info"
 msgstr ""
 
-#: src/pkg_item.cc:310
+#: src/pkg_item.cc:308
 #, fuzzy, c-format
 msgid "Available versions of %s"
 msgstr "Versiuni disponibile ale "
 
-#: src/pkg_item.cc:313
+#: src/pkg_item.cc:311
 #, fuzzy, c-format
 msgid "%s versions"
 msgstr "Versiuni"
 
-#: src/pkg_item.cc:325 src/pkg_ver_item.cc:655
+#: src/pkg_item.cc:323 src/pkg_ver_item.cc:656
 #, c-format
 msgid "Dependencies of %s"
 msgstr "Dependenţele %s"
 
-#: src/pkg_item.cc:327 src/pkg_ver_item.cc:657
+#: src/pkg_item.cc:325 src/pkg_ver_item.cc:658
 #, c-format
 msgid "%s deps"
 msgstr ""
 
-#: src/pkg_item.cc:338 src/pkg_ver_item.cc:667
+#: src/pkg_item.cc:336 src/pkg_ver_item.cc:668
 #, c-format
 msgid "Packages depending on %s"
 msgstr "Pachete ce depind de %s"
 
-#: src/pkg_item.cc:340 src/pkg_ver_item.cc:669
+#: src/pkg_item.cc:338 src/pkg_ver_item.cc:670
 #, c-format
 msgid "%s reverse deps"
 msgstr ""
 
-#: src/pkg_item.cc:392 src/pkg_ver_item.cc:707
+#: src/pkg_item.cc:390 src/pkg_ver_item.cc:708
 #, c-format
 msgid "Reporting a bug in %s:\n"
 msgstr "Raportare eroare în %s:\n"
 
-#: src/pkg_item.cc:414
+#: src/pkg_item.cc:412
 #, fuzzy
 msgid ""
 "You are not root and I cannot find any way to become root.  To reconfigure "
@@ -3532,16 +3545,16 @@
 "instalaţi pachetul menu, pachetul login, sau\n"
 "rulaţi aptitude ca root."
 
-#: src/pkg_item.cc:422
+#: src/pkg_item.cc:420
 #, c-format
 msgid "Reconfiguring %s\n"
 msgstr "Reconfigurare %s\n"
 
-#: src/pkg_item.cc:447
+#: src/pkg_item.cc:445
 msgid "Hierarchy editor"
 msgstr "Editor de ierarhie"
 
-#: src/pkg_item.cc:447
+#: src/pkg_item.cc:445
 #, fuzzy
 msgid "Hierarchy Editor"
 msgstr "Editor de ierarhie"
@@ -3575,22 +3588,22 @@
 msgid "Enter the new package sorting mechanism for this display: "
 msgstr "Introduceţi noul mecanism de sortare pachete pentru acest afişaj: "
 
-#: src/pkg_view.cc:344
+#: src/pkg_view.cc:359
 msgid "make_package_view: error in arguments -- two main widgets??"
 msgstr "make_package_view: eroare în argumente -- două widget-uri principale??"
 
-#: src/pkg_view.cc:350
+#: src/pkg_view.cc:365
 msgid ""
 "make_package_view: error in arguments -- bad column list for static item"
 msgstr ""
 "make_package_view: eroare în argumente -- coloană nevalidă de listă pentru "
 "articol static"
 
-#: src/pkg_view.cc:443
+#: src/pkg_view.cc:458
 msgid "make_package_view: bad argument!"
 msgstr "make_package_view: argument nevalid!"
 
-#: src/pkg_view.cc:495
+#: src/pkg_view.cc:510
 msgid "make_package_view: no main widget found"
 msgstr "make_package_view: nu s-a găsit nici un widget principal"
 
@@ -3627,12 +3640,12 @@
 msgid " (provided by %F)"
 msgstr " (furnizat de %F)"
 
-#: src/reason_fragment.cc:278
+#: src/reason_fragment.cc:275
 #, c-format
 msgid "%F%s %F %F"
 msgstr "%F%s %F %F"
 
-#: src/reason_fragment.cc:327
+#: src/reason_fragment.cc:324
 msgid ""
 "If you select a package, an explanation of its current state will appear in "
 "this space."
@@ -3640,7 +3653,7 @@
 "Dacă alegeţi un pachet, o explicaţie a stării curente va apărea în acest "
 "spaţiu."
 
-#: src/reason_fragment.cc:361
+#: src/reason_fragment.cc:358
 msgid ""
 "%B%s%b was installed automatically;  it is being removed because all of the "
 "packages which depend upon it are being removed:"
@@ -3648,17 +3661,17 @@
 "%B%s%b a fost instalat automat;  este pe cale de a fi ÅŸters deoarece toate "
 "pachetele ce depind de el sunt ÅŸterse:"
 
-#: src/reason_fragment.cc:365
+#: src/reason_fragment.cc:362
 msgid "%B%s%b will be automatically removed because of dependency errors:"
 msgstr "%B%s%b va fi automat şters datorită erorilor de dependenţe:"
 
-#: src/reason_fragment.cc:369
+#: src/reason_fragment.cc:366
 msgid ""
 "%B%s%b will be automatically installed to satisfy the following dependencies:"
 msgstr ""
 "%B%s%b va fi automat instalat pentru a satisface următoarele dependenţe:"
 
-#: src/reason_fragment.cc:375 src/reason_fragment.cc:387
+#: src/reason_fragment.cc:372 src/reason_fragment.cc:384
 msgid ""
 "%B%s%b cannot be upgraded now, but if it could be, it would still be held at "
 "version %B%s%b."
@@ -3666,7 +3679,7 @@
 "%B%s%b nu poate fi înnoit acum, dar dacă ar putea fi, va fi ţinut încă la "
 "versiunea %B%s%b."
 
-#: src/reason_fragment.cc:378
+#: src/reason_fragment.cc:375
 msgid ""
 "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the "
 "following dependencies:"
@@ -3674,27 +3687,27 @@
 "%B%s%b nu va fi înnoit la versiunea %B%s%b, pentru a nu deteriora "
 "următoarele dependenţe:"
 
-#: src/reason_fragment.cc:390
+#: src/reason_fragment.cc:387
 msgid "%B%s%b is currently installed."
 msgstr "%B%s%b este instalat în momentul de faţă."
 
-#: src/reason_fragment.cc:396
+#: src/reason_fragment.cc:393
 msgid "%B%s%b is not currently installed."
 msgstr "%B%s%b nu este instalat în momentul de faţă."
 
-#: src/reason_fragment.cc:404
+#: src/reason_fragment.cc:401
 msgid "Some dependencies of %B%s%b are not satisfied:"
 msgstr "Unele dependenţe ale lui %B%s%b nu sunt satisfăcute:"
 
-#: src/reason_fragment.cc:408
+#: src/reason_fragment.cc:405
 msgid "%B%s%b will be downgraded."
 msgstr "%B%s%b va fi de-gradat."
 
-#: src/reason_fragment.cc:415
+#: src/reason_fragment.cc:412
 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b."
 msgstr "%B%s%b nu va fi înnoit la versiunea interzisă %B%s%b."
 
-#: src/reason_fragment.cc:419
+#: src/reason_fragment.cc:416
 msgid ""
 "%B%s%b could be upgraded to version %B%s%b, but it is being held at version %"
 "B%s%b."
@@ -3702,33 +3715,33 @@
 "%B%s%b ar putea fi înnoit la versiunea %B%s%b, dar va fi ţinut la versiunea %"
 "B%s%b."
 
-#: src/reason_fragment.cc:426
+#: src/reason_fragment.cc:423
 msgid "%B%s%b will be re-installed."
 msgstr "%B%s%b va fi reinstalat."
 
-#: src/reason_fragment.cc:430
+#: src/reason_fragment.cc:427
 msgid "%B%s%b will be installed."
 msgstr "%B%s%b va fi instalat."
 
-#: src/reason_fragment.cc:434
+#: src/reason_fragment.cc:431
 msgid "%B%s%b will be removed."
 msgstr "%B%s%b va fi ÅŸters."
 
-#: src/reason_fragment.cc:439
+#: src/reason_fragment.cc:436
 msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b."
 msgstr "%B%s%b va fi înnoit de la versiunea %B%s%b la versiunea %B%s%b."
 
-#: src/reason_fragment.cc:475
+#: src/reason_fragment.cc:472
 msgid ""
 "The following packages depend on %B%s%b and will be broken by its removal:"
 msgstr ""
 "Următoarele pachete depind de %B%s%b şi vor fi deteriorate prin ştergerea sa:"
 
-#: src/reason_fragment.cc:478
+#: src/reason_fragment.cc:475
 msgid "The following packages depend on %B%s%b and are broken:"
 msgstr "Următoarele pachete depind de %B%s%b şi sunt deteriorate:"
 
-#: src/reason_fragment.cc:485
+#: src/reason_fragment.cc:482
 msgid ""
 "The following packages conflict with %B%s%b and will be broken by its "
 "installation:"
@@ -3736,7 +3749,7 @@
 "Următoarele pachete sunt în conflict cu %B%s%b şi se vor deteriora datorită "
 "instalării sale:"
 
-#: src/reason_fragment.cc:518
+#: src/reason_fragment.cc:515
 msgid ""
 "The following packages depend on a version of %B%s%b other than the "
 "currently installed version of %B%s%b, or conflict with the currently "
@@ -3746,7 +3759,7 @@
 "lui %B%s%b instalată în momentul de faţă, sau este în conflict cu versiunea "
 "curentă:"
 
-#: src/reason_fragment.cc:522
+#: src/reason_fragment.cc:519
 msgid ""
 "The following packages conflict with %B%s%b, or depend on a version of it "
 "which is not going to be installed."
@@ -3754,11 +3767,11 @@
 "Următoarele pachete sunt în conflict cu %B%s%b, sau depind de o versiune ce "
 "nu se va instala."
 
-#: src/reason_fragment.cc:526
+#: src/reason_fragment.cc:523
 msgid "The following packages conflict with %B%s%b:"
 msgstr "Următoarele pachete sunt în conflict cu %B%s%b:"
 
-#: src/reason_fragment.cc:531
+#: src/reason_fragment.cc:528
 msgid ""
 "The following packages depend on a version of %B%s%b other than the "
 "currently installed version of %B%s%b:"
@@ -3766,7 +3779,7 @@
 "Următoarele pachete depind de o versiune a lui %B%s%b alta decât versiunea "
 "curentă a lui %B%s%b:"
 
-#: src/reason_fragment.cc:535
+#: src/reason_fragment.cc:532
 msgid ""
 "The following packages depend on a version of %B%s%b which is not going to "
 "be installed."
@@ -3774,15 +3787,15 @@
 "Următoarele pachete depind de o versiune a lui %B%s%b care nu va fi "
 "instalată:"
 
-#: src/reason_fragment.cc:541
+#: src/reason_fragment.cc:538
 msgid "upgraded"
 msgstr "înnoit"
 
-#: src/reason_fragment.cc:541
+#: src/reason_fragment.cc:538
 msgid "downgraded"
 msgstr "de-gradat"
 
-#: src/reason_fragment.cc:547
+#: src/reason_fragment.cc:544
 msgid ""
 "The following packages depend on the currently installed version of %B%s%b (%"
 "B%s%b), or conflict with the version it will be %s to (%B%s%b), and will be "
@@ -3792,7 +3805,7 @@
 "b), sau sunt în conflict cu versiunea ce va fi %s la (%B%s%b), şi vor fi "
 "deteriorate dacă este %s."
 
-#: src/reason_fragment.cc:554
+#: src/reason_fragment.cc:551
 msgid ""
 "The following packages conflict with version %B%s%b of %B%s%b, and will be "
 "broken if it is %s."
@@ -3800,7 +3813,7 @@
 "Următoarele pachete sunt în conflict cu versiunea %B%s%b a lui %B%s%b şi se "
 "vor deteriora dacă este %s."
 
-#: src/reason_fragment.cc:559
+#: src/reason_fragment.cc:556
 msgid ""
 "The following packages depend on version %B%s%b of %B%s%b, and will be "
 "broken if it is %s."
@@ -3847,38 +3860,43 @@
 msgid "Close"
 msgstr "ÃŽn^chide"
 
-#: src/solution_fragment.cc:125
+#: src/solution_fragment.cc:134
 #, fuzzy
 msgid "%BRemove%b the following packages:%n"
 msgstr "Următoarele pachete sunt DETERIORATE:"
 
-#: src/solution_fragment.cc:135
+#: src/solution_fragment.cc:144
 #, fuzzy
 msgid "%BInstall%b the following packages:%n"
 msgstr "Următoarele pachete sunt DETERIORATE:"
 
-#: src/solution_fragment.cc:148
+#: src/solution_fragment.cc:157
 msgid "%BKeep%b the following packages at their current version:%n"
 msgstr ""
 
-#: src/solution_fragment.cc:161
+#: src/solution_fragment.cc:164
+#, fuzzy
+msgid "Not Installed"
+msgstr "neinstalat"
+
+#: src/solution_fragment.cc:177
 #, fuzzy
 msgid "%BUpgrade%b the following packages:%n"
 msgstr "Următoarele pachete sunt DETERIORATE:"
 
-#: src/solution_fragment.cc:176
+#: src/solution_fragment.cc:192
 #, fuzzy
 msgid "%BDowngrade%b the following packages:%n"
 msgstr "Se descarcă pachetele"
 
-#: src/solution_fragment.cc:190
+#: src/solution_fragment.cc:206
 #, c-format
 msgid "Score is %d"
 msgstr ""
 
 #: src/trust.cc:17 src/trust.cc:19
 msgid "WARNING"
-msgstr ""
+msgstr "AVERTISMENT"
 
 #: src/trust.cc:18
 msgid ""
@@ -3886,6 +3904,9 @@
 "package could allow a malicious individual to damage or take control of your "
 "system."
 msgstr ""
+"%F: Această versiune a lui %s este dintr-o %Bsursă necertificată%b!  "
+"Instalarea acestui pachet ar putea permite unei persoane răuvoitoare să "
+"deterioreze sau să preia controlul sistemului dvs."
 
 #: src/ui.cc:165
 msgid "Er, there aren't any errors, this shouldn't have happened.."
@@ -3899,43 +3920,43 @@
 msgid "W:"
 msgstr ""
 
-#: src/ui.cc:194
+#: src/ui.cc:193
 msgid "Search for:"
 msgstr "Căutare pentru:"
 
-#: src/ui.cc:262
+#: src/ui.cc:258
 msgid "You already are root!"
 msgstr "Sunteţi deja root!"
 
-#: src/ui.cc:360
+#: src/ui.cc:356
 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:388
+#: src/ui.cc:384
 msgid "Loading cache"
 msgstr "Încărcare cache"
 
-#: src/ui.cc:410
+#: src/ui.cc:406
 msgid "Really quit Aptitude?"
 msgstr "Chiar părăsiţi Aptitude?"
 
-#: src/ui.cc:489
+#: src/ui.cc:485
 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:589 src/ui.cc:591 src/ui.cc:619 src/ui.cc:621
+#: src/ui.cc:585 src/ui.cc:587 src/ui.cc:615 src/ui.cc:617
 msgid "Packages"
 msgstr "Pachete"
 
-#: src/ui.cc:590 src/ui.cc:620
+#: src/ui.cc:586 src/ui.cc:616
 msgid "View available packages and choose actions to perform"
 msgstr "Vizualizaţi pachetele disponibile şi alegeţi acţiunile de executat"
 
-#: src/ui.cc:667
+#: src/ui.cc:663
 #, fuzzy
 msgid ""
-"%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
+"Aptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
 "BABSOLUTELY NO WARRANTY%b; for details see 'license' in the Help menu.  This "
 "is free software, and you are welcome to redistribute it under certain "
 "conditions; see 'license' for details."
@@ -3950,61 +3971,69 @@
 "redistribuiţi\n"
 "în anumite condiţii; vedeţi 'licenţa' pentru detalii."
 
-#: src/ui.cc:688
+#: src/ui.cc:684
 msgid "help.txt"
 msgstr "help.txt"
 
-#: src/ui.cc:704
+#: src/ui.cc:700
 msgid "README"
 msgstr "CITEÅžTE-MÄ‚"
 
-#: src/ui.cc:786
+#: src/ui.cc:782
 msgid ""
-"%C%BWARNING%b: untrusted versions of the following packages will be "
-"installed!%n%nUntrusted packages could %Bcompromise your system's security%"
-"b.  You should only proceed with the installation if you are certain that "
-"this is what you want to do.%n%n"
+"%BWARNING%b: untrusted versions of the following packages will be installed!%"
+"n%nUntrusted packages could %Bcompromise your system's security%b.  You "
+"should only proceed with the installation if you are certain that this is "
+"what you want to do.%n%n"
 msgstr ""
+"%BAVERTISMENT%b: versiuni necertificate ale următoarelor pachete vor fi "
+"instalate!%n%nPachetele necertificate ar putea %Bcompromite securitatea "
+"sistemului dvs%b.  Ar trebui să continuaţi cu instalarea numai dacă sunteţi "
+"convins că aşa vreţi să faceţi.%n%n"
 
-#: src/ui.cc:800
+#: src/ui.cc:788
 #, fuzzy
+msgid "  %S*%N %s [version %s]%n"
+msgstr "Versiuni"
+
+#: src/ui.cc:795
 msgid "Really Continue"
-msgstr "Continuă"
+msgstr "Continuă întradevăr"
 
-#: src/ui.cc:802
+#: src/ui.cc:797
 msgid "Abort Installation"
-msgstr ""
+msgstr "Renunţă la instalare"
 
-#: src/ui.cc:863
+#: src/ui.cc:858
 msgid "Preview of package installation"
 msgstr "Previzualizează pachetele instalate"
 
-#: src/ui.cc:864
+#: src/ui.cc:859
 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:865
+#: src/ui.cc:860
 #, fuzzy
 msgid "Preview"
 msgstr "^Precedent"
 
-#: src/ui.cc:901
+#: src/ui.cc:896
 #, fuzzy
 msgid "Some packages were broken and have been fixed:"
 msgstr "Unele pachete au fost deteriorate ÅŸi s-au reparat"
 
-#: src/ui.cc:907
+#: src/ui.cc:902
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:913
-#, c-format
+#: src/ui.cc:908
+#, fuzzy, c-format
 msgid ""
-"Ran out of time while trying to resolver dependencies (press \"%s\" to try "
+"Ran out of time while trying to resolve dependencies (press \"%s\" to try "
 "harder)"
-msgstr ""
+msgstr "Pierdere de timp încercând găsirea minelor"
 
-#: src/ui.cc:959
+#: src/ui.cc:954
 #, fuzzy
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
@@ -4013,25 +4042,25 @@
 "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:962 src/ui.cc:1078
+#: src/ui.cc:957 src/ui.cc:1072
 msgid "Become root"
 msgstr "Devin root"
 
-#: src/ui.cc:964 src/ui.cc:1080
+#: src/ui.cc:959 src/ui.cc:1074
 msgid "Don't become root"
 msgstr "Nu devin root"
 
-#: src/ui.cc:969 src/ui.cc:1085
+#: src/ui.cc:964 src/ui.cc:1079
 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:996
+#: src/ui.cc:991
 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:1002
+#: src/ui.cc:997
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -4043,7 +4072,7 @@
 "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:1074
+#: src/ui.cc:1069
 #, fuzzy
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
@@ -4053,114 +4082,114 @@
 "ce\n"
 "n-aveţi acum.  Vreţi să schimb către contul de root?\n"
 
-#: src/ui.cc:1090 src/ui.cc:1377
+#: src/ui.cc:1084 src/ui.cc:1371
 msgid "Waste time trying to find mines"
 msgstr "Pierdere de timp încercând găsirea minelor"
 
-#: src/ui.cc:1097 src/ui.cc:1150
+#: src/ui.cc:1091 src/ui.cc:1144
 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:1100
+#: src/ui.cc:1094
 msgid "Deleting downloaded files"
 msgstr "Ştergere fişiere descărcate"
 
-#: src/ui.cc:1114
+#: src/ui.cc:1108
 msgid "Downloaded package files have been deleted"
 msgstr "Fişierele pachetelor descărcate au fost şterse"
 
-#: src/ui.cc:1175
+#: src/ui.cc:1169
 #, 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:1247
+#: src/ui.cc:1241
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1252 src/ui.cc:1283
+#: src/ui.cc:1246 src/ui.cc:1277
 #, fuzzy
 msgid "Ran out of time while trying to find a solution."
 msgstr "Pierdere de timp încercând găsirea minelor"
 
-#: src/ui.cc:1277
+#: src/ui.cc:1271
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1307
+#: src/ui.cc:1301
 #, fuzzy, c-format
 msgid "Unable to open %s"
 msgstr "Nu pot deschide %s pentru scriere"
 
-#: src/ui.cc:1313
+#: src/ui.cc:1307
 msgid "Error while dumping resolver state"
 msgstr ""
 
-#: src/ui.cc:1323
+#: src/ui.cc:1317
 msgid "File to which the resolver state should be dumped:"
 msgstr ""
 
-#: src/ui.cc:1353
+#: src/ui.cc:1347
 msgid "^Install/remove packages"
 msgstr "^Instalează/şterge pachete"
 
-#: src/ui.cc:1354
+#: src/ui.cc:1348
 msgid "Perform all pending installs and removals"
 msgstr "Execută toate instalările şi ştergerile nerezolvate"
 
-#: src/ui.cc:1356
+#: src/ui.cc:1350
 msgid "^Update package list"
 msgstr "Act^ualizează lista de pachete"
 
-#: src/ui.cc:1357
+#: src/ui.cc:1351
 msgid "Check for new versions of packages"
 msgstr "Verificare pentru noi versiuni de pachete"
 
-#: src/ui.cc:1360
+#: src/ui.cc:1354
 msgid "^Forget new packages"
 msgstr "Uită de noile pachete"
 
-#: src/ui.cc:1361
+#: src/ui.cc:1355
 msgid "Forget which packages are \"new\""
 msgstr "Uită de pachetele care sunt \"noi\""
 
-#: src/ui.cc:1364
+#: src/ui.cc:1358
 msgid "^Clean package cache"
-msgstr "^Curăţă cache-ul pachetului"
+msgstr "^Curăţă cache-ul pachetelor"
 
-#: src/ui.cc:1365
+#: src/ui.cc:1359
 msgid "Delete package files which were previously downloaded"
 msgstr "Şterge fişierele pachetelor care-au fost anterior descărcate"
 
-#: src/ui.cc:1368
+#: src/ui.cc:1362
 msgid "Clean ^obsolete files"
 msgstr "Curăţă fişierele învechite"
 
-#: src/ui.cc:1369
+#: src/ui.cc:1363
 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:1372
+#: src/ui.cc:1366
 msgid "Mark ^Upgradable"
 msgstr "Marchează ca posibil de înnoit"
 
-#: src/ui.cc:1373
+#: src/ui.cc:1367
 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:1376
+#: src/ui.cc:1370
 msgid "^Play Minesweeper"
 msgstr "Joacă Detectorul de Mine"
 
-#: src/ui.cc:1379
+#: src/ui.cc:1373
 msgid "^Become root"
 msgstr "Devenire root"
 
-#: src/ui.cc:1380
+#: src/ui.cc:1374
 #, fuzzy
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
@@ -4169,70 +4198,70 @@
 "Execută 'su' pentru a deveni root; asta va reporni programul, dar\n"
 "setările dvs. vor fi păstrate"
 
-#: src/ui.cc:1383
+#: src/ui.cc:1377
 msgid "^Reload package cache"
 msgstr "^Reîncarcă cache-ul pachetului"
 
-#: src/ui.cc:1384
+#: src/ui.cc:1378
 msgid "Reload the package cache"
 msgstr "Reîncărcare cache-ul pachetului"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1384
 msgid "^Quit"
 msgstr "IeÅŸire"
 
-#: src/ui.cc:1391
+#: src/ui.cc:1385
 msgid "Exit the program"
 msgstr "IeÅŸire din program"
 
-#: src/ui.cc:1397 src/ui.cc:1669
+#: src/ui.cc:1391 src/ui.cc:1661
 msgid "Undo"
 msgstr "Renunţă"
 
-#: src/ui.cc:1398
+#: src/ui.cc:1392
 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:1405
+#: src/ui.cc:1399
 msgid "^Install"
 msgstr "^Instalează"
 
-#: src/ui.cc:1406
+#: src/ui.cc:1400
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "Semnalizează pachetul curent selectat pentru instalare sau înnoire"
 
-#: src/ui.cc:1409
+#: src/ui.cc:1403
 msgid "^Remove"
 msgstr "Åžte^rge"
 
-#: src/ui.cc:1410
+#: src/ui.cc:1404
 msgid "Flag the currently selected package for removal"
 msgstr "Semnalizează pachetul curent selectat pentru ştergere"
 
-#: src/ui.cc:1413
+#: src/ui.cc:1407
 msgid "^Purge"
 msgstr "Curăţă"
 
-#: src/ui.cc:1414
+#: src/ui.cc:1408
 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:1417
+#: src/ui.cc:1411
 msgid "^Keep"
 msgstr "Å¢ine"
 
-#: src/ui.cc:1418
+#: src/ui.cc:1412
 msgid "Cancel any action on the selected package"
 msgstr "Anulează orice acţiune pentru pachetul selectat"
 
-#: src/ui.cc:1421
+#: src/ui.cc:1415
 msgid "^Hold"
 msgstr "Reţine"
 
-#: src/ui.cc:1422
+#: src/ui.cc:1416
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -4240,11 +4269,11 @@
 "Anulează orice acţiune pentru pachetul selectat, şi protejează-l de viitoare "
 "înnoiri"
 
-#: src/ui.cc:1425
+#: src/ui.cc:1419
 msgid "Mark ^Auto"
 msgstr "Marchează ^automat"
 
-#: src/ui.cc:1426
+#: src/ui.cc:1420
 #, fuzzy
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
@@ -4253,11 +4282,11 @@
 "Marchează pachetul selectat ca fiind instalat automat;\n"
 "va fi şters automat dacă nici un alt pachet nu depinde de el"
 
-#: src/ui.cc:1429
+#: src/ui.cc:1423
 msgid "Mark ^Manual"
 msgstr "Marchează ^manual"
 
-#: src/ui.cc:1430
+#: src/ui.cc:1424
 #, fuzzy
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
@@ -4266,11 +4295,11 @@
 "Marchează pachetul selectat ca fiind instalat manual;\n"
 "nu va fi şters decât dacă îl veţi şterge manual"
 
-#: src/ui.cc:1433
+#: src/ui.cc:1427
 msgid "^Forbid Version"
 msgstr "Interzice versiunea"
 
-#: src/ui.cc:1434
+#: src/ui.cc:1428
 #, fuzzy
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
@@ -4279,205 +4308,205 @@
 "Interzice versiunea candidat pentru pachetul selectat de a fi instalat;\n"
 "noile versiuni ale pachetului vor fi instalate ca de obicei"
 
-#: src/ui.cc:1438
+#: src/ui.cc:1432
 msgid "I^nformation"
 msgstr "I^nformaţii"
 
-#: src/ui.cc:1439
+#: src/ui.cc:1433
 msgid "Display more information about the selected package"
 msgstr "Afişează mai multe informaţii despre pachetul selectat"
 
-#: src/ui.cc:1442
+#: src/ui.cc:1436
 msgid "^Changelog"
 msgstr "Jurnal de modifi^cări"
 
-#: src/ui.cc:1443
+#: src/ui.cc:1437
 msgid "Display the Debian changelog of the selected package"
 msgstr "Afişează jurnalul de modificări Debian pentru pachetul selectat"
 
-#: src/ui.cc:1450
+#: src/ui.cc:1444
 msgid "^Find"
 msgstr "Găseşte"
 
-#: src/ui.cc:1451
+#: src/ui.cc:1445
 msgid "Search for a package"
 msgstr "Căutarea unui pachet"
 
-#: src/ui.cc:1454
+#: src/ui.cc:1448
 msgid "Find ^Again"
 msgstr "Mai găseşte od^ată"
 
-#: src/ui.cc:1455
+#: src/ui.cc:1449
 msgid "Repeat the last search"
 msgstr "Repetă ultima căutare"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1453
 msgid "^Limit Display"
 msgstr "^Limitează afişajul"
 
-#: src/ui.cc:1460
+#: src/ui.cc:1454
 msgid "Apply a filter to the package list"
 msgstr "Aplică un filtru listei de pachete"
 
-#: src/ui.cc:1463
+#: src/ui.cc:1457
 msgid "^Un-Limit Display"
-msgstr "Nelimitează afişajul"
+msgstr "Ne-limitează afişajul"
 
-#: src/ui.cc:1464
+#: src/ui.cc:1458
 msgid "Remove the filter from the package list"
 msgstr "Åžterge filtrul din lista de pachete"
 
-#: src/ui.cc:1468
+#: src/ui.cc:1462
 msgid "Find ^Broken"
 msgstr "Găseşte deteriorat"
 
-#: src/ui.cc:1469
+#: src/ui.cc:1463
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Găseşte următorul pachet cu dependenţe nesatisfăcute"
 
-#: src/ui.cc:1476
+#: src/ui.cc:1470
 msgid "^UI options"
 msgstr "Opţiuni interfaţă ^utilizator"
 
-#: src/ui.cc:1477
+#: src/ui.cc:1471
 msgid "Change the settings which affect the user interface"
 msgstr "Schimbă ajustările ce afectează interfaţa utilizatorului"
 
-#: src/ui.cc:1480
+#: src/ui.cc:1474
 msgid "^Dependency handling"
 msgstr "Manevrarea ^dependenţelor"
 
-#: src/ui.cc:1481
+#: src/ui.cc:1475
 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:1484
+#: src/ui.cc:1478
 msgid "^Miscellaneous"
 msgstr "Diverse"
 
-#: src/ui.cc:1485
+#: src/ui.cc:1479
 msgid "Change miscellaneous program settings"
 msgstr "Schimbă diverse ajustări ale programului"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1484
 msgid "^Revert options"
 msgstr "^Revenire opţiuni"
 
-#: src/ui.cc:1491
+#: src/ui.cc:1485
 msgid "Reset all settings to the system defaults"
 msgstr "Refacere toate ajustările la cele implicite ale sistemului"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1496
 msgid "^Next"
 msgstr "Următorul"
 
-#: src/ui.cc:1503
+#: src/ui.cc:1497
 msgid "View next display"
 msgstr "Vizualizare următorul afişaj"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1500
 msgid "^Prev"
 msgstr "^Precedent"
 
-#: src/ui.cc:1507
+#: src/ui.cc:1501
 msgid "View previous display"
 msgstr "Vizualizare afiÅŸaj precedent"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1504
 msgid "^Close"
 msgstr "ÃŽn^chide"
 
-#: src/ui.cc:1511
+#: src/ui.cc:1505
 msgid "Close this display"
 msgstr "ÃŽnchide acest afiÅŸaj"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1510
 msgid "New Package ^View"
 msgstr "Nouă ^vizualizare pachet"
 
-#: src/ui.cc:1517
+#: src/ui.cc:1511
 msgid "Create a new default package view"
 msgstr "Crearea unei noi vizualizări de pachet implicite"
 
-#: src/ui.cc:1520
+#: src/ui.cc:1514
 msgid "New Categorical ^Browser"
 msgstr "Nouă răsfoire de categorii"
 
-#: src/ui.cc:1522
+#: src/ui.cc:1516
 msgid "Browse packages by category"
 msgstr "Răsfoieşte pachetele după categorie"
 
-#: src/ui.cc:1530
+#: src/ui.cc:1524
 msgid "^About"
 msgstr "Despre"
 
-#: src/ui.cc:1531
+#: src/ui.cc:1525
 msgid "View information about this program"
 msgstr "Vizualizare informaţii despre acest program"
 
-#: src/ui.cc:1534
+#: src/ui.cc:1528
 msgid "^Help"
 msgstr "Ajutor"
 
-#: src/ui.cc:1535
+#: src/ui.cc:1529
 msgid "View the on-line help"
-msgstr "Vizualizare ajutor în direct"
+msgstr "Vizualizare taste de comenzi"
 
-#: src/ui.cc:1537
+#: src/ui.cc:1531
 msgid "User's ^Manual"
 msgstr "^Manual de utilizare"
 
-#: src/ui.cc:1538
+#: src/ui.cc:1532
 msgid "View the detailed program manual"
 msgstr "Vizualizarea manualului detaliat al programului"
 
-#: src/ui.cc:1541
+#: src/ui.cc:1535
 msgid "^FAQ"
 msgstr "Întrebări ^frecvente"
 
-#: src/ui.cc:1542
+#: src/ui.cc:1536
 msgid "View a list of frequently asked questions"
 msgstr "Vizualizare listă de întrebări frecvente"
 
-#: src/ui.cc:1545
+#: src/ui.cc:1539
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1546
+#: src/ui.cc:1540
 #, 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:1549
+#: src/ui.cc:1543
 msgid "^License"
 msgstr "^Licenţă"
 
-#: src/ui.cc:1550
+#: src/ui.cc:1544
 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:1668
+#: src/ui.cc:1660
 msgid "Actions"
 msgstr "Acţiuni"
 
-#: src/ui.cc:1671
+#: src/ui.cc:1663
 msgid "Search"
 msgstr "Căutare"
 
-#: src/ui.cc:1672
+#: src/ui.cc:1664
 msgid "Options"
 msgstr "Opţiuni"
 
-#: src/ui.cc:1673
+#: src/ui.cc:1665
 msgid "Views"
 msgstr "Vizualizări"
 
-#: src/ui.cc:1674
+#: src/ui.cc:1666
 msgid "Help"
 msgstr "Ajutor"
 
-#: src/ui.cc:1734
+#: src/ui.cc:1726
 #, c-format
 msgid ""
 "%s: Menu  %s: Help  %s: Quit  %s: Update  %s: Download/Install/Remove Pkgs"
@@ -4485,30 +4514,29 @@
 "%s: Meniu  %s: Ajutor  %s: Ieşire  %s: Actualizare  %s: Descărcare/Instalare/"
 "Åžtergere pachete"
 
-#: src/ui.cc:2003 src/vscreen/vscreen.cc:281
+#: src/ui.cc:1996 src/vscreen/vscreen.cc:281
 msgid "yes_key"
 msgstr "yes_key"
 
-#: src/ui.cc:2004 src/vscreen/vscreen.cc:282
+#: src/ui.cc:1997 src/vscreen/vscreen.cc:282
 msgid "no_key"
 msgstr "no_key"
 
-#: src/view_changelog.cc:46
+#: src/view_changelog.cc:61
 msgid "You can only view changelogs of official Debian packages."
 msgstr ""
-"Puteţi numai să vedeţi registrele de schimbări ale pachetelor Debian "
-"oficiale."
+"Puteţi doar să vedeţi registrele de schimbări ale pachetelor Debian oficiale."
 
-#: src/view_changelog.cc:52
+#: src/view_changelog.cc:67
 msgid "Downloading Changelog"
 msgstr "Descărcare registru de schimbări"
 
-#: src/view_changelog.cc:54
+#: src/view_changelog.cc:69
 #, fuzzy
 msgid "Download Changelog"
 msgstr "Descărcare registru de schimbări"
 
-#: src/view_changelog.cc:63
+#: src/view_changelog.cc:78
 #, c-format
 msgid "%s changes"
 msgstr ""
@@ -4608,14 +4636,191 @@
 #~ "Vă rog introduceţi următorul disc în unitatea \"%s\":\n"
 #~ "%s"
 
+#~ msgid "Need exactly two colors in color definition \"%s\""
+#~ msgstr "Este nevoie de exact două culori în definiţia culorii \"%s\""
+
+#~ msgid "Can't parse foreground \"%s\"of color \"%s\""
+#~ msgstr "Nu pot analiza prim-planul \"%s\" al culorii \"%s\""
+
+#~ msgid "Can't parse background \"%s\" of color \"%s\""
+#~ msgstr "Nu pot analiza fundalul \"%s\" al culorii \"%s\""
+
 #~ msgid "Invalid option for interactive mode: -s\n"
 #~ msgstr "Opţiune nevalidă pentru modul interactiv: -s\n"
 
+#~ 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."
+#~ msgstr ""
+#~ "Programe pentru faxmodem-uri şi alte dispozitive de comunicaţii\n"
+#~ " Pachetele din secţiunea 'comm' sunt folosite pentru a controla "
+#~ "modemurile şi alte dispozitive fizice de comunicaţii. Acestea includ "
+#~ "program de control al faxmodem-urilor (de ex. PPP pentru conectările la "
+#~ "internet prin telefon fix şi programe scrise iniţial pentru acest scop "
+#~ "zmodem/kermit), ca ÅŸi programe pentru controlul telefoanelor celulare, "
+#~ "interfeţe cu FidoNet, şi lansări de BBS."
+
+#~ 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"
+#~ " .\n"
+#~ " For more information about what Debian considers to be Free Software, "
+#~ "see http://www.debian.org/social_contract#guidelines"
+#~ msgstr ""
+#~ "Programe ce nu sunt Libere\n"
+#~ " Pachetele din secţiunea 'non-free' nu fac parte din Debian.\n"
+#~ " .\n"
+#~ " Aceste pachete n-au îndeplinit una sau mai multe din condiţiile Ghidului "
+#~ "Debian despre Programe Libere (vedeţi mai jos) Ar trebui să citiţi "
+#~ "licenţele programelor din această secţiune ca să fiţi siguri că vă este "
+#~ "permis să le folosiţi în modul în care intenţionaţi.\n"
+#~ " .\n"
+#~ " Pentru mai multe informaţii despre cum anume consideră Debian a fi "
+#~ "Programe Libere, vedeţi http://www.debian.org/social_contract#guidelines"
+
+#~ 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)"
+#~ msgstr ""
+#~ "Pachete noi\n"
+#~ " Aceste pachete au fost adăugate în Debian de când aţi golit ultima dată "
+#~ "lista cu pachete \"noi\". (alegeţi \"Uită de pachetele noi\" din meniul "
+#~ "Acţiuni pentru a goli această listă)"
+
+#~ msgid ""
+#~ "%s is an essential package!\n"
+#~ "\n"
+#~ "Are you sure you want to remove it?\n"
+#~ "Type '%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."
+
+#~ msgid "Available versions of "
+#~ msgstr "Versiuni disponibile ale "
+
+#~ 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."
+#~ 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."
+
 #~ msgid "Information about "
 #~ msgstr "Informaţii despre "
 
+#~ msgid ""
+#~ "Aptitude %s\n"
+#~ "\n"
+#~ "Copyright 2000 Daniel Burrows.\n"
+#~ "\n"
+#~ "aptitude comes with ABSOLUTELY NO WARRANTY; for details see 'license' in "
+#~ "the\n"
+#~ "Help menu.  This is free software, and you are welcome to redistribute "
+#~ "it\n"
+#~ "under certain conditions; see 'license' for details."
+#~ msgstr ""
+#~ "Aptitude %s\n"
+#~ "\n"
+#~ "Copyright 2000 Daniel Burrows.\n"
+#~ "\n"
+#~ "aptitude nu are NICI UN FEL DE GARANŢIE; pentru detalii vedeţi 'licenţa' "
+#~ "în meniul\n"
+#~ "de ajutor.  Acesta este program liber, şi sunteţi binevenit să-l "
+#~ "redistribuiţi\n"
+#~ "în anumite condiţii; vedeţi 'licenţa' pentru detalii."
+
+#~ msgid "Some packages were broken and have been fixed"
+#~ msgstr "Unele pachete au fost deteriorate ÅŸi s-au reparat"
+
 #~ msgid "Some broken packages could not be fixed!"
 #~ msgstr "Unele pachete deteriorate nu pot fi reparate!"
 
+#~ msgid "Some packages are broken.  Try to fix them?"
+#~ msgstr "Unele pachete sunt deteriorate.  Să încerc să le repar?"
+
+#~ msgid ""
+#~ "Installing/removing packages requires administrative privileges, which\n"
+#~ "you currently do not have.  Would you like to change to the root "
+#~ "account?\n"
+#~ msgstr ""
+#~ "Instalarea/ştergerea pachetelor necesită privilegii administrative, care\n"
+#~ "acum nu le aveţi.  Vreţi să schimb către contul de root?\n"
+
+#~ msgid ""
+#~ "No packages will be installed, removed or upgraded.\n"
+#~ "\n"
+#~ "Some packages could be upgraded, but you have not chosen to upgrade "
+#~ "them.\n"
+#~ "Type \"U\" to prepare an upgrade."
+#~ msgstr ""
+#~ "Nici un pachet nu va fi instalat, şters sau înnoit.\n"
+#~ "\n"
+#~ "Unele pachete ar putea fi înnoite, dar n-aţi ales asta.\n"
+#~ "Apăsaţi \"U\" pentru a pregăti o înnoire."
+
+#~ 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"
+#~ 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"
+
+#~ msgid "Obsolete downloaded package files have been deleted"
+#~ msgstr "Fişierele pachetelor învechite şi descărcate au fost şterse"
+
+#~ msgid ""
+#~ "Run 'su' to become root; this will restart the program, but your\n"
+#~ "settings will be preserved"
+#~ msgstr ""
+#~ "Execută 'su' pentru a deveni root; asta va reporni programul, dar\n"
+#~ "setările dvs. vor fi păstrate"
+
+#~ msgid ""
+#~ "Mark the selected package as having been automatically installed;\n"
+#~ "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"
+
+#~ msgid ""
+#~ "Mark the selected package as having been manually installed;\n"
+#~ "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"
+
+#~ msgid ""
+#~ "Forbid the candidate version of the selected package from being "
+#~ "installed;\n"
+#~ "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"
+
 #~ msgid "^ChangeLog"
 #~ msgstr "Jurnal de modifi^cări"
+
+#~ msgid "View the important changes made in each version of the program"
+#~ msgstr ""
+#~ "Vedeţi schimbările importante făcute în fiecare versiune a programului"

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	Sun Jun 12 21:04:47 2005
@@ -1,4 +1,4 @@
-# translation of ru.po to French
+# translation of aptitude_po_ru.po to Russian
 # translation of aptitude_ru.po to Russian
 # translation of aptitude.po to Russian
 # translation of aptitude_ru.po to Русский язык
@@ -6,7 +6,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) 2004 THE PACKAGE'S COPYRIGHT HOLDER.
 # Nikolai Prokoschenko <nikolai at prokoschenko.de>, 2004.
-# Yuri Kozlov <yuray at id.ru>, 2004.
+# Yuri Kozlov <yuray at id.ru>, 2004, 2005.
 # Yuriy Talakan' <yt at amur.elektra.ru>, 2004.
 # Dmitry Beloglazov <dm-guest at alioth.debian.org>, 2004.
 #
@@ -14,14 +14,14 @@
 msgstr ""
 "Project-Id-Version: aptitude_ru\n"
 "Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-05-01 14:08-0400\n"
-"PO-Revision-Date: 2004-09-27 22:47+0200\n"
-"Last-Translator: Yuriy Talakan' <yt at amur.elektra.ru>\n"
+"POT-Creation-Date: 2005-06-12 22:42+0200\n"
+"PO-Revision-Date: 2005-03-31 21:32+0400\n"
+"Last-Translator: Yuri Kozlov <yuray at id.ru>\n"
 "Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: Plural-Forms: nplurals=2; plural=n>1;\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: KBabel 1.3.1\n"
@@ -160,14 +160,14 @@
 msgstr ""
 "Автоматически удалять неиспользуемые пакеты, подходящие под этот фильтр"
 
-#: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:219 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
-#: src/vscreen/vs_util.cc:328
+#: src/apt_options.cc:240 src/mine/cmine.cc:249 src/mine/cmine.cc:312
+#: src/ui.cc:215 src/vscreen/vs_util.cc:77 src/vscreen/vs_util.cc:90
+#: src/vscreen/vs_util.cc:264 src/vscreen/vs_util.cc:298
 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:328
+#: src/apt_options.cc:241 src/download_list.cc:69 src/mine/cmine.cc:250
+#: src/mine/cmine.cc:313 src/vscreen/vs_util.cc:298
 msgid "Cancel"
 msgstr "Отменить"
 
@@ -248,15 +248,15 @@
 msgid "%s: Previous"
 msgstr ""
 
-#: src/broken_indicator.cc:233
+#: src/broken_indicator.cc:232
 #, c-format
-msgid "%CSolution search failed.  %s: try harder"
+msgid "Solution search failed.  %s: try harder"
 msgstr ""
 
-#: src/broken_indicator.cc:239
-#, c-format
-msgid "%CUnable to resolve dependencies."
-msgstr ""
+#: src/broken_indicator.cc:237
+#, fuzzy
+msgid "Unable to resolve dependencies."
+msgstr "Не удаётся открыть %s для записи"
 
 #: src/cmdline/cmdline_action.cc:36
 #, c-format
@@ -625,31 +625,36 @@
 "this is what you want to do.\n"
 "\n"
 msgstr ""
+"ПРЕДУПРЕЖДЕНИЕ: будут установлены версии ненадёжных пакетов!\n"
+"\n"
+"Ненадёжные пакеты могут скомпроментировать безопасность системы.\n"
+"Продолжайте установку, если только вам точно это нужно.\n"
+"\n"
 
-#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
-#: src/vscreen/vs_util.cc:212
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:165
+#: src/vscreen/vs_util.cc:202
 msgid "Yes"
 msgstr "Да"
 
-#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
-#: src/vscreen/vs_util.cc:212
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:165
+#: src/vscreen/vs_util.cc:202
 msgid "No"
 msgstr "Нет"
 
 #: src/cmdline/cmdline_prompt.cc:388
 #, c-format
 msgid "Do you want to ignore this warning and proceed anyway?\n"
-msgstr ""
+msgstr "Хотите игнорировать предупреждение и продолжить?\n"
 
 #: src/cmdline/cmdline_prompt.cc:389
-#, fuzzy, c-format
+#, c-format
 msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
-msgstr "Чтобы продолжить, наберите фразу \"%s\":\n"
+msgstr "Чтобы продолжить, наберите фразу \"%s\"; для отмены введите \"%s\": "
 
 #: src/cmdline/cmdline_prompt.cc:400
 #, c-format
 msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
-msgstr ""
+msgstr "Неверный ввод. Требуется \"%s\" или \"%s\".\n"
 
 #: src/cmdline/cmdline_prompt.cc:499
 #, c-format
@@ -943,7 +948,7 @@
 msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:212
+#: src/cmdline/cmdline_resolver.cc:212 src/cmdline/cmdline_resolver.cc:285
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
@@ -998,196 +1003,201 @@
 msgid "The following packages have unmet dependencies:\n"
 msgstr "Следующие пакеты имеют неудовлетворённые зависимости:\n"
 
-#: src/cmdline/cmdline_show.cc:133
+#: src/cmdline/cmdline_show.cc:119 src/cmdline/cmdline_show.cc:305
+#: src/solution_fragment.cc:65
+msgid "<NULL>"
+msgstr ""
+
+#: src/cmdline/cmdline_show.cc:138
 msgid "not installed"
 msgstr "не установлен"
 
-#: src/cmdline/cmdline_show.cc:135 src/pkg_columnizer.cc:231
+#: src/cmdline/cmdline_show.cc:140 src/pkg_columnizer.cc:231
 #: src/pkg_ver_item.cc:225
 msgid "unpacked"
 msgstr "распакован"
 
-#: src/cmdline/cmdline_show.cc:137
+#: src/cmdline/cmdline_show.cc:142
 msgid "partially configured"
 msgstr "частично настроен"
 
-#: src/cmdline/cmdline_show.cc:139
+#: src/cmdline/cmdline_show.cc:144
 msgid "partially installed"
 msgstr "частично установлен"
 
-#: src/cmdline/cmdline_show.cc:141
+#: src/cmdline/cmdline_show.cc:146
 msgid "not installed (configuration files remain)"
 msgstr "не установлен (файлы настроек сохранены)"
 
-#: src/cmdline/cmdline_show.cc:143 src/pkg_columnizer.cc:239
+#: src/cmdline/cmdline_show.cc:148 src/pkg_columnizer.cc:239
 #: src/pkg_ver_item.cc:233
 msgid "installed"
 msgstr "установлен"
 
-#: src/cmdline/cmdline_show.cc:152
+#: src/cmdline/cmdline_show.cc:157
 msgid "not a real package"
 msgstr "не реальный пакет"
 
-#: src/cmdline/cmdline_show.cc:165
+#: src/cmdline/cmdline_show.cc:170
 msgid " [held]"
 msgstr " [зафиксирован]"
 
-#: src/cmdline/cmdline_show.cc:174
+#: src/cmdline/cmdline_show.cc:179
 #, c-format
 msgid "%s; version %s will be installed"
 msgstr "%s; версия %s будет установлен"
 
-#: src/cmdline/cmdline_show.cc:178
+#: src/cmdline/cmdline_show.cc:183
 #, c-format
 msgid "%s; version %s will be installed automatically"
 msgstr "%s; версия %s будет установлен автоматически"
 
-#: src/cmdline/cmdline_show.cc:184 src/cmdline/cmdline_show.cc:199
+#: src/cmdline/cmdline_show.cc:189 src/cmdline/cmdline_show.cc:204
 #, c-format
 msgid "%s; will be purged"
 msgstr "%s; будет вычищен"
 
-#: src/cmdline/cmdline_show.cc:197
+#: src/cmdline/cmdline_show.cc:202
 #, c-format
 msgid "%s; will be purged because nothing depends on it"
 msgstr "%s; будет вычищен, так как от него ничто не зависит"
 
-#: src/cmdline/cmdline_show.cc:204
+#: src/cmdline/cmdline_show.cc:209
 #, c-format
 msgid "%s; will be removed because nothing depends on it"
 msgstr "%s; будет удалены, так как от него ничто не зависит"
 
-#: src/cmdline/cmdline_show.cc:206
+#: src/cmdline/cmdline_show.cc:211
 #, c-format
 msgid "%s; will be removed"
 msgstr "%s; будет удалён"
 
-#: src/cmdline/cmdline_show.cc:220
+#: src/cmdline/cmdline_show.cc:225
 #, c-format
 msgid "%s%s; will be downgraded [%s -> %s]"
 msgstr "%s%s; будет заменён на более старую версию [%s -> %s]"
 
-#: src/cmdline/cmdline_show.cc:223
+#: src/cmdline/cmdline_show.cc:228
 #, c-format
 msgid "%s%s; will be upgraded [%s -> %s]"
 msgstr "%s%s; будет обновлён [%s -> %s]"
 
-#: src/cmdline/cmdline_show.cc:235 src/cmdline/cmdline_show.cc:256
+#: src/cmdline/cmdline_show.cc:240 src/cmdline/cmdline_show.cc:261
 msgid "Package: "
 msgstr "Пакет: "
 
-#: src/cmdline/cmdline_show.cc:236 src/cmdline/cmdline_show.cc:264
+#: src/cmdline/cmdline_show.cc:241 src/cmdline/cmdline_show.cc:269
 #: src/pkg_columnizer.cc:87
 msgid "State"
 msgstr "Состояние"
 
-#: src/cmdline/cmdline_show.cc:237 src/cmdline/cmdline_show.cc:318
+#: src/cmdline/cmdline_show.cc:242 src/cmdline/cmdline_show.cc:325
 msgid "Provided by"
 msgstr "Предоставляется"
 
-#: src/cmdline/cmdline_show.cc:258 src/pkg_info_screen.cc:105
+#: src/cmdline/cmdline_show.cc:263 src/pkg_info_screen.cc:105
 msgid "Essential: "
 msgstr "Пакеты первой необходимости: "
 
-#: src/cmdline/cmdline_show.cc:258 src/cmdline/cmdline_show.cc:262
-#: src/cmdline/cmdline_show.cc:273 src/pkg_info_screen.cc:105
+#: src/cmdline/cmdline_show.cc:263 src/cmdline/cmdline_show.cc:267
+#: src/cmdline/cmdline_show.cc:278 src/pkg_info_screen.cc:105
 msgid "yes"
 msgstr "да"
 
-#: src/cmdline/cmdline_show.cc:262
+#: src/cmdline/cmdline_show.cc:267
 msgid "New"
 msgstr "Новый"
 
-#: src/cmdline/cmdline_show.cc:267
+#: src/cmdline/cmdline_show.cc:272
 msgid "Forbidden version"
 msgstr "Запрещённая версия"
 
-#: src/cmdline/cmdline_show.cc:271
+#: src/cmdline/cmdline_show.cc:276
 msgid "Automatically installed"
 msgstr "Автоматически установлен"
 
-#: src/cmdline/cmdline_show.cc:273
+#: src/cmdline/cmdline_show.cc:278
 msgid "no"
 msgstr "нет"
 
-#: src/cmdline/cmdline_show.cc:275
+#: src/cmdline/cmdline_show.cc:280
 msgid "Version: "
 msgstr "Версия: "
 
-#: src/cmdline/cmdline_show.cc:276 src/pkg_info_screen.cc:113
+#: src/cmdline/cmdline_show.cc:281 src/pkg_info_screen.cc:113
 msgid "Priority: "
 msgstr "Приоритет: "
 
-#: src/cmdline/cmdline_show.cc:277 src/cmdline/cmdline_show.cc:279
-#: src/cmdline/cmdline_show.cc:288
+#: src/cmdline/cmdline_show.cc:282 src/cmdline/cmdline_show.cc:284
+#: src/cmdline/cmdline_show.cc:293
 msgid "N/A"
 msgstr "Н/Д"
 
-#: src/cmdline/cmdline_show.cc:278 src/pkg_info_screen.cc:114
+#: src/cmdline/cmdline_show.cc:283 src/pkg_info_screen.cc:114
 msgid "Section: "
 msgstr "Раздел: "
 
-#: src/cmdline/cmdline_show.cc:280 src/pkg_info_screen.cc:115
+#: src/cmdline/cmdline_show.cc:285 src/pkg_info_screen.cc:115
 msgid "Maintainer: "
 msgstr "Сопровождающий: "
 
-#: src/cmdline/cmdline_show.cc:283
+#: src/cmdline/cmdline_show.cc:288
 msgid "Uncompressed Size: "
 msgstr "Размер в распакованном виде: "
 
-#: src/cmdline/cmdline_show.cc:287
+#: src/cmdline/cmdline_show.cc:292
 msgid "Architecture: "
 msgstr "Архитектура: "
 
-#: src/cmdline/cmdline_show.cc:289
+#: src/cmdline/cmdline_show.cc:294
 msgid "Compressed Size: "
 msgstr "Размер в сжатом виде: "
 
-#: src/cmdline/cmdline_show.cc:291
+#: src/cmdline/cmdline_show.cc:296
 msgid "Filename: "
 msgstr "Имя файла: "
 
-#: src/cmdline/cmdline_show.cc:293
+#: src/cmdline/cmdline_show.cc:298
 msgid "MD5sum: "
 msgstr "MD5sum: "
 
-#: src/cmdline/cmdline_show.cc:297 src/cmdline/cmdline_show.cc:299
+#: src/cmdline/cmdline_show.cc:302 src/cmdline/cmdline_show.cc:305
 msgid "Archive"
 msgstr "Архив"
 
-#: src/cmdline/cmdline_show.cc:303
+#: src/cmdline/cmdline_show.cc:310
 msgid "Depends"
 msgstr "Зависимости"
 
-#: src/cmdline/cmdline_show.cc:305
+#: src/cmdline/cmdline_show.cc:312
 msgid "PreDepends"
 msgstr "Предварительные зависимости"
 
-#: src/cmdline/cmdline_show.cc:307
+#: src/cmdline/cmdline_show.cc:314
 msgid "Recommends"
 msgstr "Рекомендуются"
 
-#: src/cmdline/cmdline_show.cc:309
+#: src/cmdline/cmdline_show.cc:316
 msgid "Suggests"
 msgstr "Предлагаются"
 
-#: src/cmdline/cmdline_show.cc:311
+#: src/cmdline/cmdline_show.cc:318
 msgid "Conflicts"
 msgstr "Конфликтуют"
 
-#: src/cmdline/cmdline_show.cc:313
+#: src/cmdline/cmdline_show.cc:320
 msgid "Replaces"
 msgstr "Заменяют"
 
-#: src/cmdline/cmdline_show.cc:315
+#: src/cmdline/cmdline_show.cc:322
 msgid "Obsoletes"
 msgstr "Устаревшие"
 
-#: src/cmdline/cmdline_show.cc:317
+#: src/cmdline/cmdline_show.cc:324
 msgid "Provides"
 msgstr "Предоставляют"
 
-#: src/cmdline/cmdline_show.cc:321 src/pkg_info_screen.cc:97
+#: src/cmdline/cmdline_show.cc:328 src/pkg_info_screen.cc:97
 msgid "Description: "
 msgstr "Описание: "
 
@@ -1230,32 +1240,32 @@
 msgid "You cannot specify both an archive and a version for a package\n"
 msgstr "Вы не можете указать архив и версию пакета одновременно\n"
 
-#: src/dep_item.cc:137
+#: src/dep_item.cc:139
 msgid "UNSATISFIED"
 msgstr "НЕУДОВЛЕТВОРЕНО"
 
-#: src/dep_item.cc:137 src/reason_fragment.cc:247
+#: src/dep_item.cc:139 src/reason_fragment.cc:244
 msgid "UNAVAILABLE"
 msgstr "НЕДОСТУПНО"
 
-#: src/download_bar.cc:56 src/download_list.cc:263 src/download_screen.cc:57
+#: src/download_bar.cc:56 src/download_list.cc:266 src/download_screen.cc:57
 #, c-format
 msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
 msgstr "Вставьте диск, помеченный как \"%s\" в привод \"%s\""
 
-#: src/download_bar.cc:77 src/generic/acqprogress.cc:63
+#: src/download_bar.cc:75 src/generic/acqprogress.cc:63
 msgid "Hit "
 msgstr "Попадание"
 
-#: src/download_bar.cc:90
+#: src/download_bar.cc:88
 msgid "Downloading "
 msgstr "Загрузка"
 
-#: src/download_bar.cc:103
+#: src/download_bar.cc:101
 msgid "Got "
 msgstr "Получен "
 
-#: src/download_bar.cc:157
+#: src/download_bar.cc:155
 msgid "Downloading..."
 msgstr "Загрузка..."
 
@@ -1283,7 +1293,7 @@
 msgid "Couldn't clean out list directories"
 msgstr "Не удалось очистить каталог list"
 
-#: src/download.cc:177 src/ui.cc:1153
+#: src/download.cc:177 src/ui.cc:1147
 msgid "Deleting obsolete downloaded files"
 msgstr "Удаление устаревших загруженных файлов"
 
@@ -1422,7 +1432,7 @@
 msgstr ""
 "Что-то плохое случилось во время установки пакетов. Попытка восстановить:"
 
-#: src/download.cc:477 src/pkg_item.cc:432
+#: src/download.cc:477 src/pkg_item.cc:430
 msgid "Press return to continue.\n"
 msgstr "Нажмите Ввод для продолжения.\n"
 
@@ -1433,17 +1443,17 @@
 "Не удалось захватить системную блокировку! (Возможно, запущена другая копия "
 "apt или dpkg?)"
 
-#: src/download_item.cc:66 src/download_item.cc:70 src/download_item.cc:100
+#: src/download_item.cc:70 src/download_item.cc:74 src/download_item.cc:104
 #: src/generic/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr " [Обработка]"
 
-#: src/download_item.cc:104 src/download_list.cc:283
+#: src/download_item.cc:108 src/download_list.cc:284
 msgid "[Hit]"
 msgstr "[Попадание]"
 
-#: src/download_item.cc:104 src/download_list.cc:303
+#: src/download_item.cc:108 src/download_list.cc:304
 msgid "[Downloaded]"
 msgstr "[Загружено]"
 
@@ -1457,34 +1467,34 @@
 msgid "%n%nSome files were not downloaded successfully."
 msgstr ""
 
-#: src/download_list.cc:68
+#: src/download_list.cc:66
 msgid "Continue"
 msgstr "Продолжить"
 
-#: src/download_list.cc:175 src/download_screen.cc:203
+#: src/download_list.cc:178 src/download_screen.cc:203
 msgid "Total Progress: "
 msgstr "Всего: "
 
-#: src/download_list.cc:194 src/download_screen.cc:218
+#: src/download_list.cc:197 src/download_screen.cc:218
 #, c-format
 msgid " [ %i%% ] (%sB/s, %s remaining)"
 msgstr " [ %i%% ] (%sБ/с, %s осталось)"
 
-#: src/download_list.cc:196
+#: src/download_list.cc:199
 #, c-format
 msgid " [ %i%% ] (stalled)"
 msgstr " [ %i%% ] (остановлено)"
 
-#: src/download_list.cc:198
+#: src/download_list.cc:201
 #, c-format
 msgid " [ %i%% ]"
 msgstr " [ %i%% ]"
 
-#: src/download_list.cc:323
+#: src/download_list.cc:324
 msgid "[IGNORED]"
 msgstr "[ИГНОРИРОВАНО]"
 
-#: src/download_list.cc:329
+#: src/download_list.cc:330
 msgid "[ERROR]"
 msgstr "[ОШИБКА]"
 
@@ -1493,11 +1503,11 @@
 msgid "Downloaded %sB in %ss (%sB/s)."
 msgstr "Загружено %sБ в %ss (%sБ/с)."
 
-#: src/edit_pkg_hier.cc:158
+#: src/edit_pkg_hier.cc:176
 msgid "No hierarchy information to edit"
 msgstr "Нет информации об иерархии для редактирования"
 
-#: src/edit_pkg_hier.cc:258
+#: src/edit_pkg_hier.cc:276
 msgid "Couldn't open for writing"
 msgstr "Не удалось открыть для записи"
 
@@ -1600,39 +1610,39 @@
 "Предупреждение: не удалось заблокировать файл кэша. Открытие в режиме только "
 "для чтения"
 
-#: src/generic/matchers.cc:797
+#: src/generic/matchers.cc:798
 msgid "Unmatched '('"
 msgstr "Несовпападющее '('"
 
-#: src/generic/matchers.cc:887 src/generic/matchers.cc:968
+#: src/generic/matchers.cc:888 src/generic/matchers.cc:969
 #, c-format
 msgid "Unknown dependency type: %s"
 msgstr "Неизвестный тип зависимости: %s"
 
-#: src/generic/matchers.cc:950
+#: src/generic/matchers.cc:951
 #, c-format
 msgid "Unknown action type: %s"
 msgstr "Неизвестный тип действия: %s"
 
-#: src/generic/matchers.cc:1017
+#: src/generic/matchers.cc:1018
 #, c-format
 msgid "Unknown priority %s"
 msgstr "Неизвестный приоритет: %s"
 
-#: src/generic/matchers.cc:1039
+#: src/generic/matchers.cc:1040
 #, c-format
 msgid "Unknown pattern type: %c"
 msgstr "Неизвестный тип шаблона: %c"
 
-#: src/generic/matchers.cc:1084
+#: src/generic/matchers.cc:1105
 msgid "Unexpected empty expression"
 msgstr "Неожиданное пустое выражение"
 
-#: src/generic/matchers.cc:1119
+#: src/generic/matchers.cc:1143
 msgid "Badly formed expression"
 msgstr "Неправильно оформленное выражение"
 
-#: src/generic/matchers.cc:1148
+#: src/generic/matchers.cc:1175
 msgid "Unexpected ')'"
 msgstr "Неожиданное ')'"
 
@@ -1655,7 +1665,7 @@
 msgid "Can't get value of $HOME, using TMPDIR (insecure)"
 msgstr "Не удаётся получить значение $HOME, используется TMPDIR (небезопасно)"
 
-#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:61
+#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:76
 #, c-format
 msgid "ChangeLog of %s"
 msgstr "ChangeLog для %s"
@@ -1696,37 +1706,37 @@
 msgid "Reading task descriptions"
 msgstr "Чтение описаний задач"
 
-#: src/load_config.cc:30
-#, c-format
-msgid "Invalid entry in color definition group: \"%s\""
-msgstr "Неправильный элемент в группе определения цвета: \"%s\""
+#: src/load_config.cc:42
+#, fuzzy, c-format
+msgid "Unrecognized color name \"%s\""
+msgstr "Нераспознанные задачи"
 
-#: src/load_config.cc:32
-#, c-format
-msgid "Invalid tagless entry in color definition group: \"%s\""
-msgstr "Неправильный безтеговый элемент в групе определения цвета: \"%s\""
+#: src/load_config.cc:69
+#, fuzzy, c-format
+msgid "Unrecognized attribute name \"%s\""
+msgstr "Нераспознанные задачи"
 
-#: src/load_config.cc:34
-#, c-format
-msgid "Need exactly two colors in color definition \"%s\""
-msgstr "Требуется точно два цвета в определении цвета \"%s\""
+#: src/load_config.cc:106
+#, fuzzy, c-format
+msgid "Invalid entry in style definition group: \"%s\""
+msgstr "Неправильный элемент в группе определения цвета: \"%s\""
 
-#: src/load_config.cc:50
-#, c-format
-msgid "Can't parse foreground \"%s\"of color \"%s\""
-msgstr "Не удаётся разобрать цвет символов (foreground) \"%s\" цвета \"%s\""
+#: src/load_config.cc:108
+#, fuzzy, c-format
+msgid "Invalid tagless entry in style definition group: \"%s\""
+msgstr "Неправильный безтеговый элемент в групе определения цвета: \"%s\""
 
-#: src/load_config.cc:53
-#, c-format
-msgid "Can't parse background \"%s\" of color \"%s\""
-msgstr "Не удаётся разобрать цвет фона (background) \"%s\" цвета \"%s\""
+#: src/load_config.cc:130
+#, fuzzy, c-format
+msgid "Unknown style attribute %s"
+msgstr "Неизвестный тип действия: %s"
 
-#: src/load_config.cc:72 src/load_config.cc:74
+#: src/load_config.cc:153 src/load_config.cc:155
 #, c-format
 msgid "Invalid entry in keybinding group: \"%s\""
 msgstr "Неправильный элемент в группе привязки клавиш: \"%s\""
 
-#: src/load_config.cc:89
+#: src/load_config.cc:170
 #, c-format
 msgid "Ignoring invalid keybinding \"%s\" -> \"%s\""
 msgstr "Игнорирование неверной привязки клавиш \"%s\" -> \"%s\""
@@ -2139,44 +2149,44 @@
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                  Эта версия aptitude не имеет \"Super Cow Powers\".\n"
 
-#: src/main.cc:255
+#: src/main.cc:252
 #, c-format
 msgid "-o requires an argument of the form key=value, got %s"
 msgstr "-o требуется параметр в виде ключ=значение, получен %s"
 
-#: src/main.cc:301 src/main.cc:310
+#: src/main.cc:291 src/main.cc:300
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr "СТРАННОСТЬ: получен неизвестный код параметра\n"
 
-#: src/main.cc:319
+#: src/main.cc:309
 msgid "Only one of -u and -i may be specified\n"
 msgstr "Можно указать только -u или -i\n"
 
-#: src/main.cc:327
+#: src/main.cc:317
 msgid ""
 "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgstr ""
 "-u и -i не могут быть заданы в режиме командной строки (например, с "
 "'install')"
 
-#: src/main.cc:348
+#: src/main.cc:338
 msgid "-u and -i may not be specified with a command"
 msgstr "-u и -i не могут быть заданы с командой"
 
-#: src/main.cc:405
+#: src/main.cc:395
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr "Неизвестная команда \"%s\"\n"
 
-#: src/main.cc:412 src/main.cc:469
+#: src/main.cc:402 src/main.cc:450
 msgid "Internal error: uncaught 'out of solutions' exception.\n"
 msgstr ""
 
-#: src/main.cc:417 src/main.cc:474
+#: src/main.cc:407 src/main.cc:455
 msgid "Internal error: uncaught 'out of time' exception.\n"
 msgstr ""
 
-#: src/main.cc:424
+#: src/main.cc:414
 #, c-format
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
@@ -2207,7 +2217,7 @@
 msgid "Lost"
 msgstr "Проиграл"
 
-#: src/mine/cmine.cc:119 src/ui.cc:1090
+#: src/mine/cmine.cc:119 src/ui.cc:1084
 msgid "Minesweeper"
 msgstr "Сапёр"
 
@@ -2233,92 +2243,92 @@
 msgid "The number of mines must be a number"
 msgstr "Число мин должно задаваться числом"
 
-#: src/mine/cmine.cc:240
+#: src/mine/cmine.cc:238
 msgid "Setup custom game"
 msgstr "Пользовательская настройка игры"
 
-#: src/mine/cmine.cc:243
+#: src/mine/cmine.cc:240
 msgid "Height of board: "
 msgstr "Высота доски:"
 
-#: src/mine/cmine.cc:247
+#: src/mine/cmine.cc:243
 msgid "Width of board: "
 msgstr "Ширина доски:"
 
-#: src/mine/cmine.cc:251
+#: src/mine/cmine.cc:246
 msgid "Number of mines: "
 msgstr "Количество мин: "
 
-#: src/mine/cmine.cc:316
+#: src/mine/cmine.cc:305
 msgid "Choose difficulty level"
 msgstr "Выберите уровень сложности"
 
-#: src/mine/cmine.cc:318
+#: src/mine/cmine.cc:307
 msgid "Easy"
 msgstr "Лёгкий"
 
-#: src/mine/cmine.cc:319
+#: src/mine/cmine.cc:308
 msgid "Medium"
 msgstr "Средний"
 
-#: src/mine/cmine.cc:320
+#: src/mine/cmine.cc:309
 msgid "Hard"
 msgstr "Трудный"
 
-#: src/mine/cmine.cc:321
+#: src/mine/cmine.cc:310
 msgid "Custom"
 msgstr "Пользовательский"
 
-#: src/mine/cmine.cc:411
+#: src/mine/cmine.cc:392
 msgid "You have won."
 msgstr "Вы выиграли."
 
-#: src/mine/cmine.cc:414
+#: src/mine/cmine.cc:395
 msgid "You lose!"
 msgstr "Вы проиграли!"
 
-#: src/mine/cmine.cc:419
+#: src/mine/cmine.cc:400
 msgid "You die...  --More--"
 msgstr "Вы умерли...  --Ещё--"
 
-#: src/mine/cmine.cc:432
+#: src/mine/cmine.cc:413
 msgid "The spikes were poisoned!  The poison was deadly..  --More--"
 msgstr "Пики были отравлены! Яд оказался смертельным..  --Ещё--"
 
-#: src/mine/cmine.cc:435
+#: src/mine/cmine.cc:416
 msgid "You land on a set of sharp iron spikes!  --More--"
 msgstr "Вы попали на острые железные пики!  --Ещё--"
 
-#: src/mine/cmine.cc:438
+#: src/mine/cmine.cc:419
 msgid "You fall into a pit!  --More--"
 msgstr "Вы попали в яму!  --Ещё--"
 
-#: src/mine/cmine.cc:441
+#: src/mine/cmine.cc:422
 msgid "KABOOM!  You step on a land mine.  --More--"
 msgstr "БАБАХ!  Вы наступили на мину.  --Ещё--"
 
-#: src/mine/cmine.cc:446
+#: src/mine/cmine.cc:427
 msgid "The dart was poisoned!  The poison was deadly...  --More--"
 msgstr "Дротик был отравлен!  Яд оказался смертельным...  --Ещё--"
 
-#: src/mine/cmine.cc:448
+#: src/mine/cmine.cc:429
 msgid ""
 "A little dart shoots out at you!  You are hit by a little dart!  --More--"
 msgstr "Маленький дротик попал в вас!  Вы подбиты маленьким дротиком!  --Ещё--"
 
-#: src/mine/cmine.cc:452
+#: src/mine/cmine.cc:433
 msgid "You turn to stone... --More--"
 msgstr "Вы обратились в камень... --Ещё--"
 
-#: src/mine/cmine.cc:454
+#: src/mine/cmine.cc:435
 msgid "Touching the cockatrice corpse was a fatal mistake.  --More--"
 msgstr "Прикосновение к трупу василиска было фатальной ошибкой.  --Ещё--"
 
-#: src/mine/cmine.cc:456
+#: src/mine/cmine.cc:437
 msgid "You feel here a cockatrice corpse.  --More--"
 msgstr "Вы чуствуете здесь труп василиска.  --Ещё--"
 
-#: src/mine/cmine.cc:460
+#: src/mine/cmine.cc:441
 msgid ""
 "Click!  You trigger a rolling boulder trap!  You are hit by a boulder! --"
 "More--"
@@ -2326,56 +2336,56 @@
 "Щёлк!  Вы спустили рычаг, запускающий ловушку с катящейся глыбой!  Вы "
 "раздавлены глыбой! --Ещё--"
 
-#: src/mine/cmine.cc:470
+#: src/mine/cmine.cc:451
 msgid "sleep"
 msgstr "сон"
 
-#: src/mine/cmine.cc:473
+#: src/mine/cmine.cc:454
 msgid "striking"
 msgstr "атакующий"
 
-#: src/mine/cmine.cc:476
+#: src/mine/cmine.cc:457
 msgid "death"
 msgstr "смерть"
 
-#: src/mine/cmine.cc:479
+#: src/mine/cmine.cc:460
 msgid "polymorph"
 msgstr "полиморфный"
 
-#: src/mine/cmine.cc:482
+#: src/mine/cmine.cc:463
 msgid "magic missile"
 msgstr "волшебная ракета"
 
-#: src/mine/cmine.cc:485
+#: src/mine/cmine.cc:466
 msgid "secret door detection"
 msgstr "определение секретной двери"
 
-#: src/mine/cmine.cc:488
+#: src/mine/cmine.cc:469
 msgid "invisibility"
 msgstr "невидимость"
 
-#: src/mine/cmine.cc:491
+#: src/mine/cmine.cc:472
 msgid "cold"
 msgstr "холод"
 
-#: src/mine/cmine.cc:497
+#: src/mine/cmine.cc:478
 #, c-format
 msgid "Your wand of %s breaks apart and explodes!  --More--"
 msgstr "Ваша палочка %s сломалась и взорвалась!  --Ещё--"
 
-#: src/mine/cmine.cc:503
+#: src/mine/cmine.cc:484
 msgid "You are jolted by a surge of electricity!  --More--"
 msgstr "Вас ударило электрической дугой!  --Ещё--"
 
-#: src/mine/cmine.cc:607
+#: src/mine/cmine.cc:588
 msgid "Enter the filename to load: "
 msgstr "Введите имя файла для загрузки: "
 
-#: src/mine/cmine.cc:614
+#: src/mine/cmine.cc:595
 msgid "Enter the filename to save: "
 msgstr "Введите имя файла для сохранения: "
 
-#: src/mine/cmine.cc:624
+#: src/mine/cmine.cc:605
 msgid "mine-help.txt"
 msgstr "mine-help.txt"
 
@@ -2383,7 +2393,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:1670
+#: src/pkg_columnizer.cc:84 src/ui.cc:1662
 msgid "Package"
 msgstr "Пакет"
 
@@ -3445,52 +3455,52 @@
 "Вы точно хотите его удалить?\n"
 "Введите '%s', если это так."
 
-#: src/pkg_item.cc:222 src/pkg_ver_item.cc:625
+#: src/pkg_item.cc:220 src/pkg_ver_item.cc:626
 #, c-format
 msgid "Information about %s"
 msgstr "Информация о %s"
 
-#: src/pkg_item.cc:224 src/pkg_ver_item.cc:627
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:628
 #, c-format
 msgid "%s info"
 msgstr ""
 
-#: src/pkg_item.cc:310
+#: src/pkg_item.cc:308
 #, fuzzy, c-format
 msgid "Available versions of %s"
 msgstr "Доступные версии для "
 
-#: src/pkg_item.cc:313
+#: src/pkg_item.cc:311
 #, fuzzy, c-format
 msgid "%s versions"
 msgstr "Версии"
 
-#: src/pkg_item.cc:325 src/pkg_ver_item.cc:655
+#: src/pkg_item.cc:323 src/pkg_ver_item.cc:656
 #, c-format
 msgid "Dependencies of %s"
 msgstr "Зависимости от %s"
 
-#: src/pkg_item.cc:327 src/pkg_ver_item.cc:657
+#: src/pkg_item.cc:325 src/pkg_ver_item.cc:658
 #, c-format
 msgid "%s deps"
 msgstr ""
 
-#: src/pkg_item.cc:338 src/pkg_ver_item.cc:667
+#: src/pkg_item.cc:336 src/pkg_ver_item.cc:668
 #, c-format
 msgid "Packages depending on %s"
 msgstr "Пакеты, зависящие от %s"
 
-#: src/pkg_item.cc:340 src/pkg_ver_item.cc:669
+#: src/pkg_item.cc:338 src/pkg_ver_item.cc:670
 #, c-format
 msgid "%s reverse deps"
 msgstr ""
 
-#: src/pkg_item.cc:392 src/pkg_ver_item.cc:707
+#: src/pkg_item.cc:390 src/pkg_ver_item.cc:708
 #, c-format
 msgid "Reporting a bug in %s:\n"
 msgstr "Отправка бага в %s:\n"
 
-#: src/pkg_item.cc:414
+#: src/pkg_item.cc:412
 #, fuzzy
 msgid ""
 "You are not root and I cannot find any way to become root.  To reconfigure "
@@ -3502,16 +3512,16 @@
 "установите пакет menu, login,\n"
 "или запустите aptitude когда получите права суперпользователя."
 
-#: src/pkg_item.cc:422
+#: src/pkg_item.cc:420
 #, c-format
 msgid "Reconfiguring %s\n"
 msgstr "Перенастройка %s\n"
 
-#: src/pkg_item.cc:447
+#: src/pkg_item.cc:445
 msgid "Hierarchy editor"
 msgstr "Редактор иерархии"
 
-#: src/pkg_item.cc:447
+#: src/pkg_item.cc:445
 #, fuzzy
 msgid "Hierarchy Editor"
 msgstr "Редактор иерархии"
@@ -3545,22 +3555,22 @@
 msgid "Enter the new package sorting mechanism for this display: "
 msgstr "Введите новый механизм сортировки пакетов для этого вида: "
 
-#: src/pkg_view.cc:344
+#: src/pkg_view.cc:359
 msgid "make_package_view: error in arguments -- two main widgets??"
 msgstr "make_package_view: ошибка в аргументах -- два главных виджета??"
 
-#: src/pkg_view.cc:350
+#: src/pkg_view.cc:365
 msgid ""
 "make_package_view: error in arguments -- bad column list for static item"
 msgstr ""
 "make_package_view: ошибка в аргументах -- неверная колонка списка для "
 "статического элемента??"
 
-#: src/pkg_view.cc:443
+#: src/pkg_view.cc:458
 msgid "make_package_view: bad argument!"
 msgstr "make_package_view: неверный аргумент!"
 
-#: src/pkg_view.cc:495
+#: src/pkg_view.cc:510
 msgid "make_package_view: no main widget found"
 msgstr "make_package_view: не найден главный виджет"
 
@@ -3597,18 +3607,18 @@
 msgid " (provided by %F)"
 msgstr " (предоставлено %F)"
 
-#: src/reason_fragment.cc:278
+#: src/reason_fragment.cc:275
 #, c-format
 msgid "%F%s %F %F"
 msgstr "%F%s %F %F"
 
-#: src/reason_fragment.cc:327
+#: src/reason_fragment.cc:324
 msgid ""
 "If you select a package, an explanation of its current state will appear in "
 "this space."
 msgstr "Если вы выберите пакет, то его текущее состояние появится в здесь."
 
-#: src/reason_fragment.cc:361
+#: src/reason_fragment.cc:358
 msgid ""
 "%B%s%b was installed automatically;  it is being removed because all of the "
 "packages which depend upon it are being removed:"
@@ -3616,18 +3626,18 @@
 "%B%s%b было установлено автоматически; пакеты удаляются, потому что все "
 "пакеты, которые от них зависели тоже удаляются:"
 
-#: src/reason_fragment.cc:365
+#: src/reason_fragment.cc:362
 msgid "%B%s%b will be automatically removed because of dependency errors:"
 msgstr "%B%s%b будут автоматически удалены , из-за ошибок в зависимостях:"
 
-#: src/reason_fragment.cc:369
+#: src/reason_fragment.cc:366
 msgid ""
 "%B%s%b will be automatically installed to satisfy the following dependencies:"
 msgstr ""
 "%B%s%b будут автоматически установлены для удовлетворения следующих "
 "зависимостей:"
 
-#: src/reason_fragment.cc:375 src/reason_fragment.cc:387
+#: src/reason_fragment.cc:372 src/reason_fragment.cc:384
 msgid ""
 "%B%s%b cannot be upgraded now, but if it could be, it would still be held at "
 "version %B%s%b."
@@ -3635,7 +3645,7 @@
 "%B%s%b не могут быть обновлены в данный момент, но если это было бы "
 "возможно, то они всё равно остались бы версии %B%s%b."
 
-#: src/reason_fragment.cc:378
+#: src/reason_fragment.cc:375
 msgid ""
 "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the "
 "following dependencies:"
@@ -3643,27 +3653,27 @@
 "%B%s%b не будет обновлён до версии %B%s%b, чтобы избежать порчи следующих "
 "зависимостей:"
 
-#: src/reason_fragment.cc:390
+#: src/reason_fragment.cc:387
 msgid "%B%s%b is currently installed."
 msgstr "%B%s%b уже установлен."
 
-#: src/reason_fragment.cc:396
+#: src/reason_fragment.cc:393
 msgid "%B%s%b is not currently installed."
 msgstr "%B%s%b ещё не установлен."
 
-#: src/reason_fragment.cc:404
+#: src/reason_fragment.cc:401
 msgid "Some dependencies of %B%s%b are not satisfied:"
 msgstr "Некоторые зависимости от %B%s%b не удовлетворены:"
 
-#: src/reason_fragment.cc:408
+#: src/reason_fragment.cc:405
 msgid "%B%s%b will be downgraded."
 msgstr "%B%s%b будет заменён на более старую версию."
 
-#: src/reason_fragment.cc:415
+#: src/reason_fragment.cc:412
 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b."
 msgstr "%B%s%b не будет обновлён на запрещённую версию %B%s%b."
 
-#: src/reason_fragment.cc:419
+#: src/reason_fragment.cc:416
 msgid ""
 "%B%s%b could be upgraded to version %B%s%b, but it is being held at version %"
 "B%s%b."
@@ -3671,38 +3681,38 @@
 "%B%s%b может быть обновлён до версии %B%s%b, но завиксирован на версии %B%s%"
 "b."
 
-#: src/reason_fragment.cc:426
+#: src/reason_fragment.cc:423
 msgid "%B%s%b will be re-installed."
 msgstr "%B%s%b будет переустановлен."
 
-#: src/reason_fragment.cc:430
+#: src/reason_fragment.cc:427
 msgid "%B%s%b will be installed."
 msgstr "%B%s%b будет установлен."
 
-#: src/reason_fragment.cc:434
+#: src/reason_fragment.cc:431
 msgid "%B%s%b will be removed."
 msgstr "%B%s%b будет удалён."
 
-#: src/reason_fragment.cc:439
+#: src/reason_fragment.cc:436
 msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b."
 msgstr "%B%s%b будет обновлён с версии %B%s%b до версии %B%s%b."
 
-#: src/reason_fragment.cc:475
+#: src/reason_fragment.cc:472
 msgid ""
 "The following packages depend on %B%s%b and will be broken by its removal:"
 msgstr "Следующие пакеты зависят от %B%s%b и будут испорчены удалением:"
 
-#: src/reason_fragment.cc:478
+#: src/reason_fragment.cc:475
 msgid "The following packages depend on %B%s%b and are broken:"
 msgstr "Следующие пакеты зависят от %B%s%b и испорчены:"
 
-#: src/reason_fragment.cc:485
+#: src/reason_fragment.cc:482
 msgid ""
 "The following packages conflict with %B%s%b and will be broken by its "
 "installation:"
 msgstr "Следующие пакеты конфликтуют с %B%s%b и будут испорчены установкой:"
 
-#: src/reason_fragment.cc:518
+#: src/reason_fragment.cc:515
 msgid ""
 "The following packages depend on a version of %B%s%b other than the "
 "currently installed version of %B%s%b, or conflict with the currently "
@@ -3711,7 +3721,7 @@
 "Следующие пакеты зависят от версии %B%s%b, которая отличается от текущей "
 "версии %B%s%b, или конфликтует с текущей версией:"
 
-#: src/reason_fragment.cc:522
+#: src/reason_fragment.cc:519
 msgid ""
 "The following packages conflict with %B%s%b, or depend on a version of it "
 "which is not going to be installed."
@@ -3719,11 +3729,11 @@
 "Следующие пакеты конфликтуют с %B%s%b, или зависят от версии, которая не "
 "установливается."
 
-#: src/reason_fragment.cc:526
+#: src/reason_fragment.cc:523
 msgid "The following packages conflict with %B%s%b:"
 msgstr "Следующие пакеты конфликтуют с %B%s%b:"
 
-#: src/reason_fragment.cc:531
+#: src/reason_fragment.cc:528
 msgid ""
 "The following packages depend on a version of %B%s%b other than the "
 "currently installed version of %B%s%b:"
@@ -3731,21 +3741,21 @@
 "Следующие пакеты зависят от версии %B%s%b которая отличается от текущей "
 "версии %B%s%b:"
 
-#: src/reason_fragment.cc:535
+#: src/reason_fragment.cc:532
 msgid ""
 "The following packages depend on a version of %B%s%b which is not going to "
 "be installed."
 msgstr "Следующие пакеты зависят от версии %B%s%b, которая не устанавливается."
 
-#: src/reason_fragment.cc:541
+#: src/reason_fragment.cc:538
 msgid "upgraded"
 msgstr "обновлено"
 
-#: src/reason_fragment.cc:541
+#: src/reason_fragment.cc:538
 msgid "downgraded"
 msgstr "заменено на более старые"
 
-#: src/reason_fragment.cc:547
+#: src/reason_fragment.cc:544
 msgid ""
 "The following packages depend on the currently installed version of %B%s%b (%"
 "B%s%b), or conflict with the version it will be %s to (%B%s%b), and will be "
@@ -3754,7 +3764,7 @@
 "Следующие пакеты зависят от текущей версии %B%s%b (%B%s%b), или конфликтуют "
 "с версией %s в (%B%s%b), и будут испорчены если %s."
 
-#: src/reason_fragment.cc:554
+#: src/reason_fragment.cc:551
 msgid ""
 "The following packages conflict with version %B%s%b of %B%s%b, and will be "
 "broken if it is %s."
@@ -3762,7 +3772,7 @@
 "Следующие пакеты конфликтуют с версией %B%s%b of %B%s%b, и будут испорчены "
 "если %s."
 
-#: src/reason_fragment.cc:559
+#: src/reason_fragment.cc:556
 msgid ""
 "The following packages depend on version %B%s%b of %B%s%b, and will be "
 "broken if it is %s."
@@ -3809,38 +3819,43 @@
 msgid "Close"
 msgstr "^Закрыть"
 
-#: src/solution_fragment.cc:125
+#: src/solution_fragment.cc:134
 #, fuzzy
 msgid "%BRemove%b the following packages:%n"
 msgstr "Следующие пакеты НЕРАБОТОСПОСОБНЫ:"
 
-#: src/solution_fragment.cc:135
+#: src/solution_fragment.cc:144
 #, fuzzy
 msgid "%BInstall%b the following packages:%n"
 msgstr "Следующие пакеты НЕРАБОТОСПОСОБНЫ:"
 
-#: src/solution_fragment.cc:148
+#: src/solution_fragment.cc:157
 msgid "%BKeep%b the following packages at their current version:%n"
 msgstr ""
 
-#: src/solution_fragment.cc:161
+#: src/solution_fragment.cc:164
+#, fuzzy
+msgid "Not Installed"
+msgstr "не установлен"
+
+#: src/solution_fragment.cc:177
 #, fuzzy
 msgid "%BUpgrade%b the following packages:%n"
 msgstr "Следующие пакеты НЕРАБОТОСПОСОБНЫ:"
 
-#: src/solution_fragment.cc:176
+#: src/solution_fragment.cc:192
 #, fuzzy
 msgid "%BDowngrade%b the following packages:%n"
 msgstr "Загрузка пакетов"
 
-#: src/solution_fragment.cc:190
+#: src/solution_fragment.cc:206
 #, c-format
 msgid "Score is %d"
 msgstr ""
 
 #: src/trust.cc:17 src/trust.cc:19
 msgid "WARNING"
-msgstr ""
+msgstr "ПРЕДУПРЕЖДЕНИЕ"
 
 #: src/trust.cc:18
 msgid ""
@@ -3848,6 +3863,9 @@
 "package could allow a malicious individual to damage or take control of your "
 "system."
 msgstr ""
+"%F: Эта версия %s получена из %Bненадёжного источника%b! Установка этого "
+"пакета может позволить злоумышленнику повредить или взять под контроль вашу "
+"систему."
 
 #: src/ui.cc:165
 msgid "Er, there aren't any errors, this shouldn't have happened.."
@@ -3861,43 +3879,43 @@
 msgid "W:"
 msgstr ""
 
-#: src/ui.cc:194
+#: src/ui.cc:193
 msgid "Search for:"
 msgstr "Поиск:"
 
-#: src/ui.cc:262
+#: src/ui.cc:258
 msgid "You already are root!"
 msgstr "Вы уже суперпользователь!"
 
-#: src/ui.cc:360
+#: src/ui.cc:356
 msgid ""
 "Subprocess exited with an error -- did you type your password correctly?"
 msgstr "Подпроцесс завершился с ошибкой -- вы ввели правильный пароль?"
 
-#: src/ui.cc:388
+#: src/ui.cc:384
 msgid "Loading cache"
 msgstr "Загрузка кэша"
 
-#: src/ui.cc:410
+#: src/ui.cc:406
 msgid "Really quit Aptitude?"
 msgstr "Завершить работу с Aptitude?"
 
-#: src/ui.cc:489
+#: src/ui.cc:485
 msgid "Really discard your personal settings and reload the defaults?"
 msgstr "Стереть все персональные настройки и загрузить значения по умолчанию?"
 
-#: src/ui.cc:589 src/ui.cc:591 src/ui.cc:619 src/ui.cc:621
+#: src/ui.cc:585 src/ui.cc:587 src/ui.cc:615 src/ui.cc:617
 msgid "Packages"
 msgstr "Пакеты"
 
-#: src/ui.cc:590 src/ui.cc:620
+#: src/ui.cc:586 src/ui.cc:616
 msgid "View available packages and choose actions to perform"
 msgstr "Просмотр доступных пакетов и выбор желаемого действия"
 
-#: src/ui.cc:667
+#: src/ui.cc:663
 #, fuzzy
 msgid ""
-"%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
+"Aptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
 "BABSOLUTELY NO WARRANTY%b; for details see 'license' in the Help menu.  This "
 "is free software, and you are welcome to redistribute it under certain "
 "conditions; see 'license' for details."
@@ -3912,61 +3930,68 @@
 "определённых условиях\n"
 "подробней, смотрите 'Лицензия'."
 
-#: src/ui.cc:688
+#: src/ui.cc:684
 msgid "help.txt"
 msgstr "help-ru.txt"
 
-#: src/ui.cc:704
+#: src/ui.cc:700
 msgid "README"
 msgstr "README"
 
-#: src/ui.cc:786
+#: src/ui.cc:782
 msgid ""
-"%C%BWARNING%b: untrusted versions of the following packages will be "
-"installed!%n%nUntrusted packages could %Bcompromise your system's security%"
-"b.  You should only proceed with the installation if you are certain that "
-"this is what you want to do.%n%n"
+"%BWARNING%b: untrusted versions of the following packages will be installed!%"
+"n%nUntrusted packages could %Bcompromise your system's security%b.  You "
+"should only proceed with the installation if you are certain that this is "
+"what you want to do.%n%n"
 msgstr ""
+"%BПРЕДУПРЕЖДЕНИЕ%b: будут установлены версии ненадёжных пакетов!%n%"
+"nНенадёжные пакеты могут %Bскомпроментировать безопасность системы%b. "
+"Продолжайте установку, если только вам точно это нужно.%n%n"
 
-#: src/ui.cc:800
+#: src/ui.cc:788
 #, fuzzy
+msgid "  %S*%N %s [version %s]%n"
+msgstr "Версии"
+
+#: src/ui.cc:795
 msgid "Really Continue"
 msgstr "Продолжить"
 
-#: src/ui.cc:802
+#: src/ui.cc:797
 msgid "Abort Installation"
-msgstr ""
+msgstr "Отменить установку"
 
-#: src/ui.cc:863
+#: src/ui.cc:858
 msgid "Preview of package installation"
 msgstr "Обзор устанавливаемых пакетов"
 
-#: src/ui.cc:864
+#: src/ui.cc:859
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Показать и/или выверить действия, которые будут выполнены"
 
-#: src/ui.cc:865
+#: src/ui.cc:860
 #, fuzzy
 msgid "Preview"
 msgstr "^Предыдущее"
 
-#: src/ui.cc:901
+#: src/ui.cc:896
 #, fuzzy
 msgid "Some packages were broken and have been fixed:"
 msgstr "Некоторые неработоспособные пакеты были исправлены"
 
-#: src/ui.cc:907
+#: src/ui.cc:902
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:913
-#, c-format
+#: src/ui.cc:908
+#, fuzzy, c-format
 msgid ""
-"Ran out of time while trying to resolver dependencies (press \"%s\" to try "
+"Ran out of time while trying to resolve dependencies (press \"%s\" to try "
 "harder)"
-msgstr ""
+msgstr "Убьём время в поисках мин"
 
-#: src/ui.cc:959
+#: src/ui.cc:954
 #, fuzzy
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
@@ -3975,23 +4000,23 @@
 "Для установки/удаления пакетов требуются административные права, которыми\n"
 "вы в данный момент не обладаете. Получить права суперпользователя?\n"
 
-#: src/ui.cc:962 src/ui.cc:1078
+#: src/ui.cc:957 src/ui.cc:1072
 msgid "Become root"
 msgstr "Стать суперпользователем"
 
-#: src/ui.cc:964 src/ui.cc:1080
+#: src/ui.cc:959 src/ui.cc:1074
 msgid "Don't become root"
 msgstr "Не становиться суперпользователем"
 
-#: src/ui.cc:969 src/ui.cc:1085
+#: src/ui.cc:964 src/ui.cc:1079
 msgid "A package-list update or install run is already taking place."
 msgstr "Запуск обновления списка пакетов или установка уже произведены."
 
-#: src/ui.cc:996
+#: src/ui.cc:991
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "Нет пакетов для установки, удаления или обновления."
 
-#: src/ui.cc:1002
+#: src/ui.cc:997
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -4003,7 +4028,7 @@
 "Некоторые пакеты могут быть обновлены, но вы не задали их обновление.\n"
 "Введите \"U\", чтобы пометить их для обновления."
 
-#: src/ui.cc:1074
+#: src/ui.cc:1069
 #, fuzzy
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
@@ -4012,113 +4037,113 @@
 "Для обновления списка пакетов требуются административные права, которыми\n"
 "вы в данный момент не обладаете. Получить права суперпользователя?\n"
 
-#: src/ui.cc:1090 src/ui.cc:1377
+#: src/ui.cc:1084 src/ui.cc:1371
 msgid "Waste time trying to find mines"
 msgstr "Убьём время в поисках мин"
 
-#: src/ui.cc:1097 src/ui.cc:1150
+#: src/ui.cc:1091 src/ui.cc:1144
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "Очистка во время процесса загрузки невозможна"
 
-#: src/ui.cc:1100
+#: src/ui.cc:1094
 msgid "Deleting downloaded files"
 msgstr "Удаление загруженных файлов"
 
-#: src/ui.cc:1114
+#: src/ui.cc:1108
 msgid "Downloaded package files have been deleted"
 msgstr "Загруженные файлы были удалены"
 
-#: src/ui.cc:1175
+#: src/ui.cc:1169
 #, fuzzy, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr "Загруженные файлы с устаревшими пакетами были удалены"
 
-#: src/ui.cc:1247
+#: src/ui.cc:1241
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1252 src/ui.cc:1283
+#: src/ui.cc:1246 src/ui.cc:1277
 #, fuzzy
 msgid "Ran out of time while trying to find a solution."
 msgstr "Убьём время в поисках мин"
 
-#: src/ui.cc:1277
+#: src/ui.cc:1271
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1307
+#: src/ui.cc:1301
 #, fuzzy, c-format
 msgid "Unable to open %s"
 msgstr "Не удаётся открыть %s для записи"
 
-#: src/ui.cc:1313
+#: src/ui.cc:1307
 msgid "Error while dumping resolver state"
 msgstr ""
 
-#: src/ui.cc:1323
+#: src/ui.cc:1317
 msgid "File to which the resolver state should be dumped:"
 msgstr ""
 
-#: src/ui.cc:1353
+#: src/ui.cc:1347
 msgid "^Install/remove packages"
 msgstr "^Установить/удалить пакеты"
 
-#: src/ui.cc:1354
+#: src/ui.cc:1348
 msgid "Perform all pending installs and removals"
 msgstr "Выполнить все незаконченные установки и удаления"
 
-#: src/ui.cc:1356
+#: src/ui.cc:1350
 msgid "^Update package list"
 msgstr "^Обновить список пакетов"
 
-#: src/ui.cc:1357
+#: src/ui.cc:1351
 msgid "Check for new versions of packages"
 msgstr "Проверить, есть ли новые версии пакетов"
 
-#: src/ui.cc:1360
+#: src/ui.cc:1354
 msgid "^Forget new packages"
 msgstr "^Забыть о новых пакетах"
 
-#: src/ui.cc:1361
+#: src/ui.cc:1355
 msgid "Forget which packages are \"new\""
 msgstr "Забыть о \"новых\" пакетах"
 
-#: src/ui.cc:1364
+#: src/ui.cc:1358
 msgid "^Clean package cache"
 msgstr "^Очистить кэш пакетов"
 
-#: src/ui.cc:1365
+#: src/ui.cc:1359
 msgid "Delete package files which were previously downloaded"
 msgstr "Удалить ранее загруженные файлы пакетов"
 
-#: src/ui.cc:1368
+#: src/ui.cc:1362
 msgid "Clean ^obsolete files"
 msgstr "Очистить ^устаревшие файлы"
 
-#: src/ui.cc:1369
+#: src/ui.cc:1363
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Удалить файлы пакетов, которые больше никогда не будут загружены"
 
-#: src/ui.cc:1372
+#: src/ui.cc:1366
 msgid "Mark ^Upgradable"
 msgstr "Пометить ^обновляемые"
 
-#: src/ui.cc:1373
+#: src/ui.cc:1367
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr ""
 "Пометить все обновляемые пакеты, которые не зафиксированы от обновления"
 
-#: src/ui.cc:1376
+#: src/ui.cc:1370
 msgid "^Play Minesweeper"
 msgstr "^Играть в сапёра"
 
-#: src/ui.cc:1379
+#: src/ui.cc:1373
 msgid "^Become root"
 msgstr "^Стать суперпользователем"
 
-#: src/ui.cc:1380
+#: src/ui.cc:1374
 #, fuzzy
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
@@ -4127,68 +4152,68 @@
 "Запуск 'su', чтобы стать суперпользователем. Это приведёт к перезапуску\n"
 "программы, но ваши настройки будут сохранены."
 
-#: src/ui.cc:1383
+#: src/ui.cc:1377
 msgid "^Reload package cache"
 msgstr "^Перезагрузить кэш пакетов"
 
-#: src/ui.cc:1384
+#: src/ui.cc:1378
 msgid "Reload the package cache"
 msgstr "Перезагрузить кэш пакетов."
 
-#: src/ui.cc:1390
+#: src/ui.cc:1384
 msgid "^Quit"
 msgstr "^Выйти"
 
-#: src/ui.cc:1391
+#: src/ui.cc:1385
 msgid "Exit the program"
 msgstr "Завершить работу программы"
 
-#: src/ui.cc:1397 src/ui.cc:1669
+#: src/ui.cc:1391 src/ui.cc:1661
 msgid "Undo"
 msgstr "Откат"
 
-#: src/ui.cc:1398
+#: src/ui.cc:1392
 msgid "Undo the last package operation or group of operations"
 msgstr "Отменить последнюю операцию с пакетом или группу операций"
 
-#: src/ui.cc:1405
+#: src/ui.cc:1399
 msgid "^Install"
 msgstr "^Install"
 
-#: src/ui.cc:1406
+#: src/ui.cc:1400
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "Пометить выделенный пакет для установки или обновления"
 
-#: src/ui.cc:1409
+#: src/ui.cc:1403
 msgid "^Remove"
 msgstr "^Remove"
 
-#: src/ui.cc:1410
+#: src/ui.cc:1404
 msgid "Flag the currently selected package for removal"
 msgstr "Пометить выделенный пакет для удаления"
 
-#: src/ui.cc:1413
+#: src/ui.cc:1407
 msgid "^Purge"
 msgstr "^Purge"
 
-#: src/ui.cc:1414
+#: src/ui.cc:1408
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr "Пометить выделенный пакет для удаления вместе с его файлами настройки"
 
-#: src/ui.cc:1417
+#: src/ui.cc:1411
 msgid "^Keep"
 msgstr "^Keep"
 
-#: src/ui.cc:1418
+#: src/ui.cc:1412
 msgid "Cancel any action on the selected package"
 msgstr "Отменить любое действие над выделенным пакетом"
 
-#: src/ui.cc:1421
+#: src/ui.cc:1415
 msgid "^Hold"
 msgstr "^Hold"
 
-#: src/ui.cc:1422
+#: src/ui.cc:1416
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -4196,11 +4221,11 @@
 "Отменить любое действие над выделенным пакетом и защитить его от дальнейших "
 "обновлений"
 
-#: src/ui.cc:1425
+#: src/ui.cc:1419
 msgid "Mark ^Auto"
 msgstr "Отметить ^Auto"
 
-#: src/ui.cc:1426
+#: src/ui.cc:1420
 #, fuzzy
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
@@ -4209,11 +4234,11 @@
 "Отметить выделенные пакеты, как-будто они были выбраны автоматически;\n"
 "они будут автоматически удалены, если не останется пакетов, от них зависящих"
 
-#: src/ui.cc:1429
+#: src/ui.cc:1423
 msgid "Mark ^Manual"
 msgstr "Отметить ^Manual"
 
-#: src/ui.cc:1430
+#: src/ui.cc:1424
 #, fuzzy
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
@@ -4222,11 +4247,11 @@
 "Отметить выделенные пакеты, как-будто они были выбраны вручную;\n"
 "они не будут удалены, пока вы вручную не сделаете этого"
 
-#: src/ui.cc:1433
+#: src/ui.cc:1427
 msgid "^Forbid Version"
 msgstr "^Forbid версию"
 
-#: src/ui.cc:1434
+#: src/ui.cc:1428
 #, fuzzy
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
@@ -4235,232 +4260,232 @@
 "Запретить установку версии веделенного пакета;\n"
 "новые версии пакета будут устанавливаться как обычно"
 
-#: src/ui.cc:1438
+#: src/ui.cc:1432
 msgid "I^nformation"
 msgstr "I^nformation"
 
-#: src/ui.cc:1439
+#: src/ui.cc:1433
 msgid "Display more information about the selected package"
 msgstr "Показать больше информации о выделенном пакете"
 
-#: src/ui.cc:1442
+#: src/ui.cc:1436
 msgid "^Changelog"
 msgstr "^ChangeLog"
 
-#: src/ui.cc:1443
+#: src/ui.cc:1437
 msgid "Display the Debian changelog of the selected package"
 msgstr "Показать Debian changelog выделенного пакета"
 
-#: src/ui.cc:1450
+#: src/ui.cc:1444
 msgid "^Find"
 msgstr "^Find"
 
-#: src/ui.cc:1451
+#: src/ui.cc:1445
 msgid "Search for a package"
 msgstr "Найти пакет"
 
-#: src/ui.cc:1454
+#: src/ui.cc:1448
 msgid "Find ^Again"
 msgstr "Найти ^Опять"
 
-#: src/ui.cc:1455
+#: src/ui.cc:1449
 msgid "Repeat the last search"
 msgstr "Повторить последний поиск"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1453
 msgid "^Limit Display"
 msgstr "^Limit Display"
 
-#: src/ui.cc:1460
+#: src/ui.cc:1454
 msgid "Apply a filter to the package list"
 msgstr "Применить фильтр к списку пакетов"
 
-#: src/ui.cc:1463
+#: src/ui.cc:1457
 msgid "^Un-Limit Display"
 msgstr "^Un-Limit Display"
 
-#: src/ui.cc:1464
+#: src/ui.cc:1458
 msgid "Remove the filter from the package list"
 msgstr "Снять фильтр со списка пакетов"
 
-#: src/ui.cc:1468
+#: src/ui.cc:1462
 msgid "Find ^Broken"
 msgstr "Найти ^Broken"
 
-#: src/ui.cc:1469
+#: src/ui.cc:1463
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Найти следующий пакет с неудовлетворёнными зависимостями"
 
-#: src/ui.cc:1476
+#: src/ui.cc:1470
 msgid "^UI options"
 msgstr "^Настройки интерфейса"
 
-#: src/ui.cc:1477
+#: src/ui.cc:1471
 msgid "Change the settings which affect the user interface"
 msgstr "Изменить настройки, относящиеся к интерфейсу пользователя"
 
-#: src/ui.cc:1480
+#: src/ui.cc:1474
 msgid "^Dependency handling"
 msgstr "^Работа с зависимостями"
 
-#: src/ui.cc:1481
+#: src/ui.cc:1475
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr "Изменить настройки, относящиеся к тому как обрабатываются зависимости"
 
-#: src/ui.cc:1484
+#: src/ui.cc:1478
 msgid "^Miscellaneous"
 msgstr "^Разное"
 
-#: src/ui.cc:1485
+#: src/ui.cc:1479
 msgid "Change miscellaneous program settings"
 msgstr "Изменить другие настройки программы"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1484
 msgid "^Revert options"
 msgstr "^Отменить настройки"
 
-#: src/ui.cc:1491
+#: src/ui.cc:1485
 msgid "Reset all settings to the system defaults"
 msgstr "Сбросить все настройки в значения по умолчанию"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1496
 msgid "^Next"
 msgstr "^Следующее"
 
-#: src/ui.cc:1503
+#: src/ui.cc:1497
 msgid "View next display"
 msgstr "Перейти к следующему окну"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1500
 msgid "^Prev"
 msgstr "^Предыдущее"
 
-#: src/ui.cc:1507
+#: src/ui.cc:1501
 msgid "View previous display"
 msgstr "Перейти к предыдущему окну"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1504
 msgid "^Close"
 msgstr "^Закрыть"
 
-#: src/ui.cc:1511
+#: src/ui.cc:1505
 msgid "Close this display"
 msgstr "Закрыть это окно"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1510
 msgid "New Package ^View"
 msgstr "Новое ^окно Пакета"
 
-#: src/ui.cc:1517
+#: src/ui.cc:1511
 msgid "Create a new default package view"
 msgstr "Создать новое окно пакета по умолчанию"
 
-#: src/ui.cc:1520
+#: src/ui.cc:1514
 msgid "New Categorical ^Browser"
 msgstr "Новый ^браузер категорий"
 
-#: src/ui.cc:1522
+#: src/ui.cc:1516
 msgid "Browse packages by category"
 msgstr "Показывать пакеты согласно категориям"
 
-#: src/ui.cc:1530
+#: src/ui.cc:1524
 msgid "^About"
 msgstr "^О программе"
 
-#: src/ui.cc:1531
+#: src/ui.cc:1525
 msgid "View information about this program"
 msgstr "Показать информацию об этой программе"
 
-#: src/ui.cc:1534
+#: src/ui.cc:1528
 msgid "^Help"
 msgstr "^Помощь"
 
-#: src/ui.cc:1535
+#: src/ui.cc:1529
 msgid "View the on-line help"
 msgstr "Показать страницу помощи"
 
-#: src/ui.cc:1537
+#: src/ui.cc:1531
 msgid "User's ^Manual"
 msgstr "^Руководство пользователя"
 
-#: src/ui.cc:1538
+#: src/ui.cc:1532
 msgid "View the detailed program manual"
 msgstr "Показать подробное руководство пользователя программы"
 
-#: src/ui.cc:1541
+#: src/ui.cc:1535
 msgid "^FAQ"
 msgstr "^ЧАВО"
 
-#: src/ui.cc:1542
+#: src/ui.cc:1536
 msgid "View a list of frequently asked questions"
 msgstr "Показать список часто задаваемых вопросов"
 
-#: src/ui.cc:1545
+#: src/ui.cc:1539
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1546
+#: src/ui.cc:1540
 #, fuzzy
 msgid "View the important changes made in each version of "
 msgstr "Показать важные изменения, сделанные в каждой версии этой программы"
 
-#: src/ui.cc:1549
+#: src/ui.cc:1543
 msgid "^License"
 msgstr "^Лицензия"
 
-#: src/ui.cc:1550
+#: src/ui.cc:1544
 msgid "View the terms under which you may copy the program"
 msgstr "Показать условия, согласно которым вы можете копировать программу"
 
-#: src/ui.cc:1668
+#: src/ui.cc:1660
 msgid "Actions"
 msgstr "Действия"
 
-#: src/ui.cc:1671
+#: src/ui.cc:1663
 msgid "Search"
 msgstr "Поиск"
 
-#: src/ui.cc:1672
+#: src/ui.cc:1664
 msgid "Options"
 msgstr "Параметры"
 
-#: src/ui.cc:1673
+#: src/ui.cc:1665
 msgid "Views"
 msgstr "Окна"
 
-#: src/ui.cc:1674
+#: src/ui.cc:1666
 msgid "Help"
 msgstr "Помощь"
 
-#: src/ui.cc:1734
+#: src/ui.cc:1726
 #, 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:2003 src/vscreen/vscreen.cc:281
+#: src/ui.cc:1996 src/vscreen/vscreen.cc:281
 msgid "yes_key"
 msgstr "yes_key"
 
-#: src/ui.cc:2004 src/vscreen/vscreen.cc:282
+#: src/ui.cc:1997 src/vscreen/vscreen.cc:282
 msgid "no_key"
 msgstr "no_key"
 
-#: src/view_changelog.cc:46
+#: src/view_changelog.cc:61
 msgid "You can only view changelogs of official Debian packages."
 msgstr "changelog можно посмотреть только у официальных пакетов Debian."
 
-#: src/view_changelog.cc:52
+#: src/view_changelog.cc:67
 msgid "Downloading Changelog"
 msgstr "Загрузка Changelog"
 
-#: src/view_changelog.cc:54
+#: src/view_changelog.cc:69
 #, fuzzy
 msgid "Download Changelog"
 msgstr "Загрузка Changelog"
 
-#: src/view_changelog.cc:63
+#: src/view_changelog.cc:78
 #, c-format
 msgid "%s changes"
 msgstr ""
@@ -4556,18 +4581,195 @@
 #~ "Вставьте следующий диск в привод \"%s\":\n"
 #~ "%s"
 
+#~ msgid "Need exactly two colors in color definition \"%s\""
+#~ msgstr "Требуется точно два цвета в определении цвета \"%s\""
+
+#~ msgid "Can't parse foreground \"%s\"of color \"%s\""
+#~ msgstr "Не удаётся разобрать цвет символов (foreground) \"%s\" цвета \"%s\""
+
+#~ msgid "Can't parse background \"%s\" of color \"%s\""
+#~ msgstr "Не удаётся разобрать цвет фона (background) \"%s\" цвета \"%s\""
+
 #~ msgid "Invalid option for interactive mode: -s\n"
 #~ msgstr "Неверный параметр для диалогового режима: -s\n"
 
+#~ 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."
+#~ msgstr ""
+#~ "Программы для факс-модемов и других устройств связи\n"
+#~ " Пакеты в разделе 'comm' используются для управления модемов и "
+#~ "другойаппаратуры связи. Сюда включены программы для управления факс-"
+#~ "модемами(например, PPP для соединения с Интернет и первые программы "
+#~ "написанные для этой цели (zmodem/kermit), такие как программы для "
+#~ "управления сотовыми телефонами, интерфейс с FidoNet, и для запуска BBS."
+
+#~ 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"
+#~ " .\n"
+#~ " For more information about what Debian considers to be Free Software, "
+#~ "see http://www.debian.org/social_contract#guidelines"
+#~ msgstr ""
+#~ "Программы, не являющиеся Свободным ПО\n"
+#~ " Пакеты в разделе 'non-free' не являются частью Debian.\n"
+#~ " .\n"
+#~ " Эти пакеты не удовлетворяют одному или нескольким критериям Debian по "
+#~ "определению Свободного ПО (смотрите ниже). Вы должны прочитать лицензию "
+#~ "на программы из этого раздела, чтобы убедиться, что вам позволено "
+#~ "использовать их так как вы хотите.\n"
+#~ " .\n"
+#~ " Более подробно о том, как в Debian решают Свободное ПО или нет, смотрите "
+#~ "здесьhttp://www.debian.org/social_contract#guidelines"
+
+#~ 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)"
+#~ msgstr ""
+#~ "Новые пакеты\n"
+#~ " Эти пакеты были добавлены в Debian после последней очистки вашегосписка "
+#~ "\"новых\" пакетов. (выберите \"Забыть новые пакеты\" из меню "
+#~ "Действиячтобы очистить этот список)"
+
+#~ msgid ""
+#~ "%s is an essential package!\n"
+#~ "\n"
+#~ "Are you sure you want to remove it?\n"
+#~ "Type '%s' if you are."
+#~ msgstr ""
+#~ "%s это пакет первой необходимости!\n"
+#~ "\n"
+#~ "Вы точно хотите его удалить?\n"
+#~ "Введите '%s', если это так."
+
+#~ msgid "Available versions of "
+#~ msgstr "Доступные версии для "
+
+#~ 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."
+#~ msgstr ""
+#~ "Вы не являетесь суперпользователем и не удалось\n"
+#~ "повысить привелегии до суперпользователя. Для перенастройки этого "
+#~ "пакета,\n"
+#~ "установите пакет menu, login,\n"
+#~ "или запустите aptitude когда получите права суперпользователя."
+
 #~ msgid "Information about "
 #~ msgstr "Информация о"
 
+#~ msgid ""
+#~ "Aptitude %s\n"
+#~ "\n"
+#~ "Copyright 2000 Daniel Burrows.\n"
+#~ "\n"
+#~ "aptitude comes with ABSOLUTELY NO WARRANTY; for details see 'license' in "
+#~ "the\n"
+#~ "Help menu.  This is free software, and you are welcome to redistribute "
+#~ "it\n"
+#~ "under certain conditions; see 'license' for details."
+#~ msgstr ""
+#~ "Aptitude %s\n"
+#~ "\n"
+#~ "Copyright 2000 Daniel Burrows.\n"
+#~ "\n"
+#~ "aptitude поставляется АБСОЛЮТНО БЕЗ ГАРАНТИЙ; подробней, смотрите "
+#~ "'Лицензия' в \n"
+#~ "меню Помощь. Это свободное ПО, и вы вправе распространять его на "
+#~ "определённых условиях\n"
+#~ "подробней, смотрите 'Лицензия'."
+
+#~ msgid "Some packages were broken and have been fixed"
+#~ msgstr "Некоторые неработоспособные пакеты были исправлены"
+
 #~ msgid "Some broken packages could not be fixed!"
 #~ msgstr "Некоторые неработоспособные пакеты исправить не удалось!"
 
+#~ msgid "Some packages are broken.  Try to fix them?"
+#~ msgstr "Некоторые пакеты неработоспособны. Попытаться исправить?"
+
+#~ msgid ""
+#~ "Installing/removing packages requires administrative privileges, which\n"
+#~ "you currently do not have.  Would you like to change to the root "
+#~ "account?\n"
+#~ msgstr ""
+#~ "Для установки/удаления пакетов требуются административные права, "
+#~ "которыми\n"
+#~ "вы в данный момент не обладаете. Получить права суперпользователя?\n"
+
+#~ msgid ""
+#~ "No packages will be installed, removed or upgraded.\n"
+#~ "\n"
+#~ "Some packages could be upgraded, but you have not chosen to upgrade "
+#~ "them.\n"
+#~ "Type \"U\" to prepare an upgrade."
+#~ msgstr ""
+#~ "Нет пакетов для установки, удаления или обновления.\n"
+#~ "\n"
+#~ "Некоторые пакеты могут быть обновлены, но вы не задали их обновление.\n"
+#~ "Введите \"U\", чтобы пометить их для обновления."
+
+#~ 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"
+#~ msgstr ""
+#~ "Для обновления списка пакетов требуются административные права, которыми\n"
+#~ "вы в данный момент не обладаете. Получить права суперпользователя?\n"
+
+#~ msgid "Obsolete downloaded package files have been deleted"
+#~ msgstr "Загруженные файлы с устаревшими пакетами были удалены"
+
+#~ msgid ""
+#~ "Run 'su' to become root; this will restart the program, but your\n"
+#~ "settings will be preserved"
+#~ msgstr ""
+#~ "Запуск 'su', чтобы стать суперпользователем. Это приведёт к перезапуску\n"
+#~ "программы, но ваши настройки будут сохранены."
+
+#~ msgid ""
+#~ "Mark the selected package as having been automatically installed;\n"
+#~ "it will automatically be removed if no other packages depend on it"
+#~ msgstr ""
+#~ "Отметить выделенные пакеты, как-будто они были выбраны автоматически;\n"
+#~ "они будут автоматически удалены, если не останется пакетов, от них "
+#~ "зависящих"
+
+#~ msgid ""
+#~ "Mark the selected package as having been manually installed;\n"
+#~ "it will not be removed unless you manually remove it"
+#~ msgstr ""
+#~ "Отметить выделенные пакеты, как-будто они были выбраны вручную;\n"
+#~ "они не будут удалены, пока вы вручную не сделаете этого"
+
+#~ msgid ""
+#~ "Forbid the candidate version of the selected package from being "
+#~ "installed;\n"
+#~ "newer versions of the package will be installed as usual"
+#~ msgstr ""
+#~ "Запретить установку версии веделенного пакета;\n"
+#~ "новые версии пакета будут устанавливаться как обычно"
+
 #~ msgid "^ChangeLog"
 #~ msgstr "^ChangeLog"
 
+#~ msgid "View the important changes made in each version of the program"
+#~ 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/sk.po
==============================================================================
--- branches/aptitude-0.3/aptitude/po/sk.po	(original)
+++ branches/aptitude-0.3/aptitude/po/sk.po	Sun Jun 12 21:04:47 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-05-01 14:08-0400\n"
+"POT-Creation-Date: 2005-06-12 22:42+0200\n"
 "PO-Revision-Date: 2005-05-19 22:27+0100\n"
 "Last-Translator: Stanislav Valášek <valasek at fastmail.fm>\n"
 "Language-Team: Slovak <sk-i18n at lists.linux.sk>\n"
@@ -108,16 +108,20 @@
 msgstr "Pred vlastnou akciou zobraziť, čo sa bude vykonávať"
 
 #: src/apt_options.cc:164
-msgid "Forget which packages are \"new\" whenever the package lists are updated"
-msgstr "Zabudnúť zoznam \"nových\" balíkov pri každej aktualizácií zoznamu balíkov"
+msgid ""
+"Forget which packages are \"new\" whenever the package lists are updated"
+msgstr ""
+"Zabudnúť zoznam \"nových\" balíkov pri každej aktualizácií zoznamu balíkov"
 
 #: src/apt_options.cc:167
-msgid "Forget which packages are \"new\" whenever packages are installed or removed"
+msgid ""
+"Forget which packages are \"new\" whenever packages are installed or removed"
 msgstr "Zabudnúť zoznam \"nových\" balíkov pri každej (od)inštalácií balíkov"
 
 #: src/apt_options.cc:170
 msgid "Warn when attempting to perform a privileged action as a non-root user"
-msgstr "Varovať pri pokuse o spustenie privilegovanej akcie ako obyčajný používateľ"
+msgstr ""
+"Varovať pri pokuse o spustenie privilegovanej akcie ako obyčajný používateľ"
 
 #: src/apt_options.cc:173
 msgid "File to log actions into"
@@ -129,7 +133,8 @@
 
 #: src/apt_options.cc:182
 msgid "Automatically fix broken packages before installing or removing"
-msgstr "Pred inštaláciou alebo odstránením automaticky opraviť poškodené balíky"
+msgstr ""
+"Pred inštaláciou alebo odstránením automaticky opraviť poškodené balíky"
 
 #: src/apt_options.cc:184
 msgid "Install Recommended packages automatically"
@@ -143,26 +148,18 @@
 msgid "Automatically remove unused packages matching this filter"
 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:219
-#: src/vscreen/vs_util.cc:83
-#: src/vscreen/vs_util.cc:97
-#: src/vscreen/vs_util.cc:328
+#: src/apt_options.cc:240 src/mine/cmine.cc:249 src/mine/cmine.cc:312
+#: src/ui.cc:215 src/vscreen/vs_util.cc:77 src/vscreen/vs_util.cc:90
+#: src/vscreen/vs_util.cc:264 src/vscreen/vs_util.cc:298
 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:328
+#: src/apt_options.cc:241 src/download_list.cc:69 src/mine/cmine.cc:250
+#: src/mine/cmine.cc:313 src/vscreen/vs_util.cc:298
 msgid "Cancel"
 msgstr "Zrušiť"
 
-#: src/broken_indicator.cc:106
-#: src/solution_dialog.cc:97
+#: src/broken_indicator.cc:106 src/solution_dialog.cc:97
 msgid "Internal error: unexpected null solution."
 msgstr "Interná chyba: neočakávané null riešenie"
 
@@ -235,14 +232,14 @@
 msgid "%s: Previous"
 msgstr "%s: Predchádzajúci"
 
-#: src/broken_indicator.cc:233
-#, c-format
-msgid "%CSolution search failed.  %s: try harder"
+#: src/broken_indicator.cc:232
+#, fuzzy, c-format
+msgid "Solution search failed.  %s: try harder"
 msgstr "%CZlyhalo hľadanie riešenia.  %s: skúsiť dôkladnejšie"
 
-#: src/broken_indicator.cc:239
-#, c-format
-msgid "%CUnable to resolve dependencies."
+#: src/broken_indicator.cc:237
+#, fuzzy
+msgid "Unable to resolve dependencies."
 msgstr "%CNemožnosť zistiť závislosti."
 
 #: src/cmdline/cmdline_action.cc:36
@@ -301,8 +298,7 @@
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr "%s nie je nainštalovaný, preto nebude nainštalovaný.\n"
 
-#: src/cmdline/cmdline_action.cc:106
-#: src/cmdline/cmdline_action.cc:112
+#: src/cmdline/cmdline_action.cc:106 src/cmdline/cmdline_action.cc:112
 #, c-format
 msgid "Package %s is not installed, so it will not be removed\n"
 msgstr "Balík %s nie je nainštalovaný, nebude teda odstránený\n"
@@ -353,7 +349,8 @@
 #: src/cmdline/cmdline_action.cc:305
 #, 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"
+msgstr ""
+"Nemohol som nájsť balík, ktorého názov alebo popis sa zhoduje s \"%s\"\n"
 
 #: src/cmdline/cmdline_action.cc:307
 #, c-format
@@ -417,8 +414,7 @@
 msgid "Invalid operation %s"
 msgstr "Neplatná operácia %s"
 
-#: src/cmdline/cmdline_do_action.cc:207
-#: src/cmdline/cmdline_simulate.cc:31
+#: src/cmdline/cmdline_do_action.cc:207 src/cmdline/cmdline_simulate.cc:31
 #: src/cmdline/cmdline_upgrade.cc:91
 #, c-format
 msgid "Abort.\n"
@@ -429,8 +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:41
-#: src/download.cc:344
+#: src/cmdline/cmdline_download.cc:41 src/download.cc:344
 msgid "Couldn't read source list"
 msgstr "Nemôžem čítať zoznam zdrojov"
 
@@ -441,8 +436,12 @@
 
 #: src/cmdline/cmdline_download.cc:72
 #, c-format
-msgid "No downloadable files for %s version %s; perhaps it is a local or obsolete package?"
-msgstr "Balík %s verzia %s sa nedá stiahnuť. Pravdepodobne sa jedná o lokálny alebo zastaraný balík?"
+msgid ""
+"No downloadable files for %s version %s; perhaps it is a local or obsolete "
+"package?"
+msgstr ""
+"Balík %s verzia %s sa nedá stiahnuť. Pravdepodobne sa jedná o lokálny alebo "
+"zastaraný balík?"
 
 #: src/cmdline/cmdline_forget_new.cc:43
 #, c-format
@@ -461,8 +460,10 @@
 
 #: src/cmdline/cmdline_moo.cc:22
 #, c-format
-msgid "Didn't I already tell you that there are no Easter Eggs in this program?\n"
-msgstr "Nevravel som snáď, že v tomto programe nie sú žiadne veľkonočné vajíčka?\n"
+msgid ""
+"Didn't I already tell you that there are no Easter Eggs in this program?\n"
+msgstr ""
+"Nevravel som snáď, že v tomto programe nie sú žiadne veľkonočné vajíčka?\n"
 
 #: src/cmdline/cmdline_moo.cc:25
 #, c-format
@@ -493,38 +494,32 @@
 msgid "Couldn't read list of sources"
 msgstr "Nemôžem čítať zoznam zdrojov"
 
-#: src/cmdline/cmdline_prompt.cc:221
-#: src/cmdline/cmdline_show_broken.cc:73
+#: src/cmdline/cmdline_prompt.cc:221 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:224
-#: src/cmdline/cmdline_show_broken.cc:76
+#: src/cmdline/cmdline_prompt.cc:224 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:227
-#: src/cmdline/cmdline_show_broken.cc:79
+#: src/cmdline/cmdline_prompt.cc:227 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:231
-#: src/cmdline/cmdline_show_broken.cc:83
+#: src/cmdline/cmdline_prompt.cc:231 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:235
-#: src/cmdline/cmdline_show_broken.cc:87
+#: src/cmdline/cmdline_prompt.cc:235 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:238
-#: src/cmdline/cmdline_show_broken.cc:90
+#: src/cmdline/cmdline_prompt.cc:238 src/cmdline/cmdline_show_broken.cc:90
 #, c-format
 msgid " or"
 msgstr " alebo"
@@ -618,15 +613,13 @@
 "s tým čo chcete urobiť.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:384
-#: src/vscreen/vs_util.cc:175
-#: src/vscreen/vs_util.cc:212
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:165
+#: src/vscreen/vs_util.cc:202
 msgid "Yes"
 msgstr "Áno"
 
-#: src/cmdline/cmdline_prompt.cc:384
-#: src/vscreen/vs_util.cc:175
-#: src/vscreen/vs_util.cc:212
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:165
+#: src/vscreen/vs_util.cc:202
 msgid "No"
 msgstr "Nie"
 
@@ -732,12 +725,20 @@
 msgstr "prerušiť a skončiť"
 
 #: src/cmdline/cmdline_prompt.cc:645
-msgid "show information about one or more packages; the package names should follow the 'i'"
-msgstr "zobraziť informácie o jednom alebo viacerých balíčkoch; mená balíčkov by mali nasledovať za 'i'"
+msgid ""
+"show information about one or more packages; the package names should follow "
+"the 'i'"
+msgstr ""
+"zobraziť informácie o jednom alebo viacerých balíčkoch; mená balíčkov by "
+"mali nasledovať za 'i'"
 
 #: src/cmdline/cmdline_prompt.cc:647
-msgid "show the Debian changelogs of one or more packages; the package names should follow the 'c'"
-msgstr "zobraziť Debian changelogy jedného alebo viacerých balíčkov; mená balíčkov by mali nasledovať za 'c'"
+msgid ""
+"show the Debian changelogs of one or more packages; the package names should "
+"follow the 'c'"
+msgstr ""
+"zobraziť Debian changelogy jedného alebo viacerých balíčkov; mená balíčkov "
+"by mali nasledovať za 'c'"
 
 #: src/cmdline/cmdline_prompt.cc:649
 msgid "toggle the display of dependency information"
@@ -756,46 +757,52 @@
 msgstr "prejsť do plného vizuálneho rozhrania"
 
 #: src/cmdline/cmdline_prompt.cc:656
-msgid "You may also specify modifaction to the actions which will be taken.  To do so, type an action character followed by one or more package names (or patterns).  The action will be applied to all the packages that you list.  The following actions are available:"
-msgstr "Môžete tiež špecifikovat modifikáciu akcií, ktoré budú vykonané. Na dosiahnutie tohto, zadajte znak reprezentujúci akciu, nasledovaný jedným alebo viac názvami balíčkov (alebo vzorov).  Akcia sa vykoná na všetkých balíčkoch, ktoré ste uviedli. Nasledujúce akcie sú dostupné:"
+msgid ""
+"You may also specify modifaction to the actions which will be taken.  To do "
+"so, type an action character followed by one or more package names (or "
+"patterns).  The action will be applied to all the packages that you list.  "
+"The following actions are available:"
+msgstr ""
+"Môžete tiež špecifikovat modifikáciu akcií, ktoré budú vykonané. Na "
+"dosiahnutie tohto, zadajte znak reprezentujúci akciu, nasledovaný jedným "
+"alebo viac názvami balíčkov (alebo vzorov).  Akcia sa vykoná na všetkých "
+"balíčkoch, ktoré ste uviedli. Nasledujúce akcie sú dostupné:"
 
-#: src/cmdline/cmdline_prompt.cc:661
-#: src/cmdline/cmdline_resolver.cc:120
+#: src/cmdline/cmdline_prompt.cc:661 src/cmdline/cmdline_resolver.cc:120
 msgid "'+' to install packages"
 msgstr "'+' na inštaláciu balíčkov"
 
-#: src/cmdline/cmdline_prompt.cc:663
-#: src/cmdline/cmdline_resolver.cc:122
-msgid "'+M' to install packages and immediately flag them as automatically installed"
-msgstr "'+M' na inštaláciu balíčkov a ich okamžité označenie ako automaticky inštalované"
+#: src/cmdline/cmdline_prompt.cc:663 src/cmdline/cmdline_resolver.cc:122
+msgid ""
+"'+M' to install packages and immediately flag them as automatically installed"
+msgstr ""
+"'+M' na inštaláciu balíčkov a ich okamžité označenie ako automaticky "
+"inštalované"
 
-#: src/cmdline/cmdline_prompt.cc:665
-#: src/cmdline/cmdline_resolver.cc:124
+#: src/cmdline/cmdline_prompt.cc:665 src/cmdline/cmdline_resolver.cc:124
 msgid "'-' to remove packages"
 msgstr "'-' na odrstránenie balíčkov"
 
-#: src/cmdline/cmdline_prompt.cc:667
-#: src/cmdline/cmdline_resolver.cc:126
+#: src/cmdline/cmdline_prompt.cc:667 src/cmdline/cmdline_resolver.cc:126
 msgid "'_' to purge packages"
 msgstr "'_' na zabudnutie balíčkov"
 
-#: src/cmdline/cmdline_prompt.cc:669
-#: src/cmdline/cmdline_resolver.cc:128
+#: src/cmdline/cmdline_prompt.cc:669 src/cmdline/cmdline_resolver.cc:128
 msgid "'=' to place packages on hold"
 msgstr "'=' na nastavenie balíka na stav podržať"
 
-#: src/cmdline/cmdline_prompt.cc:671
-#: src/cmdline/cmdline_resolver.cc:130
-msgid "':' to keep packages in their current state without placing them on hold"
-msgstr "':' na uchovanie balíčkov v ich aktuálnom stave bez zmeny ich stavu na Podržať"
+#: src/cmdline/cmdline_prompt.cc:671 src/cmdline/cmdline_resolver.cc:130
+msgid ""
+"':' to keep packages in their current state without placing them on hold"
+msgstr ""
+"':' na uchovanie balíčkov v ich aktuálnom stave bez zmeny ich stavu na "
+"Podržať"
 
-#: src/cmdline/cmdline_prompt.cc:673
-#: src/cmdline/cmdline_resolver.cc:132
+#: src/cmdline/cmdline_prompt.cc:673 src/cmdline/cmdline_resolver.cc:132
 msgid "'&M' to mark packages as automatically installed"
 msgstr "'&M' na označenie balíkov ako automatiky inštalovaných"
 
-#: src/cmdline/cmdline_prompt.cc:675
-#: src/cmdline/cmdline_resolver.cc:134
+#: src/cmdline/cmdline_prompt.cc:675 src/cmdline/cmdline_resolver.cc:134
 msgid "'&m' to mark packages as manually installed"
 msgstr "'&m' na označenie balíky, ako manuálne inštalovaných"
 
@@ -908,8 +915,11 @@
 msgstr "uprav stav uvedených balíčkov tam, kde je AKCIA jedna z:"
 
 #: src/cmdline/cmdline_resolver.cc:136
-msgid "Adjustments will cause the current solution to be discarded and recalculated as necessary."
-msgstr "Úprava spôsobí, že súčasné riešenie bude zahodené a nutná rekalkulácia."
+msgid ""
+"Adjustments will cause the current solution to be discarded and recalculated "
+"as necessary."
+msgstr ""
+"Úprava spôsobí, že súčasné riešenie bude zahodené a nutná rekalkulácia."
 
 #: src/cmdline/cmdline_resolver.cc:169
 msgid "The following actions will resolve these dependencies:"
@@ -919,7 +929,7 @@
 msgid "Accept this solution? [Y/n/q/?] "
 msgstr "Potvrdiť toto riešenie? [Y/n/q/?] "
 
-#: src/cmdline/cmdline_resolver.cc:212
+#: src/cmdline/cmdline_resolver.cc:212 src/cmdline/cmdline_resolver.cc:285
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr "Ukončovanie všetkého úsilia na vyriešenie týchto závislostí."
 
@@ -931,8 +941,7 @@
 msgid "File to write resolver state to: "
 msgstr "Súbor, kde má byť zapísaný stav riešenia:"
 
-#: src/cmdline/cmdline_resolver.cc:240
-#: src/generic/apt.cc:142
+#: src/cmdline/cmdline_resolver.cc:240 src/generic/apt.cc:142
 #, c-format
 msgid "Unable to open %s for writing"
 msgstr "Nemôžem otvoriť %s na zápis"
@@ -948,7 +957,9 @@
 
 #: src/cmdline/cmdline_resolver.cc:260
 msgid "No solution found within the allotted time.  Try harder? [Y/n]"
-msgstr "Počas prideleného času nebolo nájdené žiadne riešenie. Skúsiť dôkladnejšie? [Y/n]"
+msgstr ""
+"Počas prideleného času nebolo nájdené žiadne riešenie. Skúsiť dôkladnejšie? "
+"[Y/n]"
 
 #: src/cmdline/cmdline_resolver.cc:288
 msgid "Invalid response; please enter 'y' or 'n'."
@@ -972,211 +983,201 @@
 msgid "The following packages have unmet dependencies:\n"
 msgstr "Nasledujúce balíky majú nesplnené závislosti:\n"
 
-#: src/cmdline/cmdline_show.cc:133
+#: src/cmdline/cmdline_show.cc:119 src/cmdline/cmdline_show.cc:305
+#: src/solution_fragment.cc:65
+msgid "<NULL>"
+msgstr ""
+
+#: src/cmdline/cmdline_show.cc:138
 msgid "not installed"
 msgstr "nenainštalovaný"
 
-#: src/cmdline/cmdline_show.cc:135
-#: src/pkg_columnizer.cc:231
+#: src/cmdline/cmdline_show.cc:140 src/pkg_columnizer.cc:231
 #: src/pkg_ver_item.cc:225
 msgid "unpacked"
 msgstr "rozbalený"
 
-#: src/cmdline/cmdline_show.cc:137
+#: src/cmdline/cmdline_show.cc:142
 msgid "partially configured"
 msgstr "čiastočne skonfigurovaný"
 
-#: src/cmdline/cmdline_show.cc:139
+#: src/cmdline/cmdline_show.cc:144
 msgid "partially installed"
 msgstr "čiastočne nainštalovaný"
 
-#: src/cmdline/cmdline_show.cc:141
+#: src/cmdline/cmdline_show.cc:146
 msgid "not installed (configuration files remain)"
 msgstr "nenainštalovaný (ponechané konfiguračné súbory)"
 
-#: src/cmdline/cmdline_show.cc:143
-#: src/pkg_columnizer.cc:239
+#: src/cmdline/cmdline_show.cc:148 src/pkg_columnizer.cc:239
 #: src/pkg_ver_item.cc:233
 msgid "installed"
 msgstr "nainštalovaný"
 
-#: src/cmdline/cmdline_show.cc:152
+#: src/cmdline/cmdline_show.cc:157
 msgid "not a real package"
 msgstr "nie je skutočný balík"
 
-#: src/cmdline/cmdline_show.cc:165
+#: src/cmdline/cmdline_show.cc:170
 msgid " [held]"
 msgstr " [podržaný]"
 
-#: src/cmdline/cmdline_show.cc:174
+#: src/cmdline/cmdline_show.cc:179
 #, c-format
 msgid "%s; version %s will be installed"
 msgstr "%s; bude inštalovaná verzia %s"
 
-#: src/cmdline/cmdline_show.cc:178
+#: src/cmdline/cmdline_show.cc:183
 #, c-format
 msgid "%s; version %s will be installed automatically"
 msgstr "%s; automaticky bude inštalovaná verzia %s"
 
-#: src/cmdline/cmdline_show.cc:184
-#: src/cmdline/cmdline_show.cc:199
+#: src/cmdline/cmdline_show.cc:189 src/cmdline/cmdline_show.cc:204
 #, c-format
 msgid "%s; will be purged"
 msgstr "%s; bude vyčistený"
 
-#: src/cmdline/cmdline_show.cc:197
+#: src/cmdline/cmdline_show.cc:202
 #, c-format
 msgid "%s; will be purged because nothing depends on it"
 msgstr "%s; bude vyčistený, pretože na ňom nič nezávisí"
 
-#: src/cmdline/cmdline_show.cc:204
+#: src/cmdline/cmdline_show.cc:209
 #, c-format
 msgid "%s; will be removed because nothing depends on it"
 msgstr "%s; bude odstránený, pretože na ňom nič nezávisí"
 
-#: src/cmdline/cmdline_show.cc:206
+#: src/cmdline/cmdline_show.cc:211
 #, c-format
 msgid "%s; will be removed"
 msgstr "%s; bude odstránený"
 
-#: src/cmdline/cmdline_show.cc:220
+#: src/cmdline/cmdline_show.cc:225
 #, c-format
 msgid "%s%s; will be downgraded [%s -> %s]"
 msgstr "%s%s; bude degradovaný [%s -> %s]"
 
-#: src/cmdline/cmdline_show.cc:223
+#: src/cmdline/cmdline_show.cc:228
 #, c-format
 msgid "%s%s; will be upgraded [%s -> %s]"
 msgstr "%s%s; bude aktualizovaný [%s -> %s]"
 
-#: src/cmdline/cmdline_show.cc:235
-#: src/cmdline/cmdline_show.cc:256
+#: src/cmdline/cmdline_show.cc:240 src/cmdline/cmdline_show.cc:261
 msgid "Package: "
 msgstr "Balík: "
 
-#: src/cmdline/cmdline_show.cc:236
-#: src/cmdline/cmdline_show.cc:264
+#: src/cmdline/cmdline_show.cc:241 src/cmdline/cmdline_show.cc:269
 #: src/pkg_columnizer.cc:87
 msgid "State"
 msgstr "Stav"
 
-#: src/cmdline/cmdline_show.cc:237
-#: src/cmdline/cmdline_show.cc:318
+#: src/cmdline/cmdline_show.cc:242 src/cmdline/cmdline_show.cc:325
 msgid "Provided by"
 msgstr "Poskytovaný"
 
-#: src/cmdline/cmdline_show.cc:258
-#: src/pkg_info_screen.cc:105
+#: src/cmdline/cmdline_show.cc:263 src/pkg_info_screen.cc:105
 msgid "Essential: "
 msgstr "Nutný: "
 
-#: src/cmdline/cmdline_show.cc:258
-#: src/cmdline/cmdline_show.cc:262
-#: src/cmdline/cmdline_show.cc:273
-#: src/pkg_info_screen.cc:105
+#: src/cmdline/cmdline_show.cc:263 src/cmdline/cmdline_show.cc:267
+#: src/cmdline/cmdline_show.cc:278 src/pkg_info_screen.cc:105
 msgid "yes"
 msgstr "ano"
 
-#: src/cmdline/cmdline_show.cc:262
+#: src/cmdline/cmdline_show.cc:267
 msgid "New"
 msgstr "Nový"
 
-#: src/cmdline/cmdline_show.cc:267
+#: src/cmdline/cmdline_show.cc:272
 msgid "Forbidden version"
 msgstr "Zakázaná verzia"
 
-#: src/cmdline/cmdline_show.cc:271
+#: src/cmdline/cmdline_show.cc:276
 msgid "Automatically installed"
 msgstr "Automaticky inštalovaný"
 
-#: src/cmdline/cmdline_show.cc:273
+#: src/cmdline/cmdline_show.cc:278
 msgid "no"
 msgstr "nie"
 
-#: src/cmdline/cmdline_show.cc:275
+#: src/cmdline/cmdline_show.cc:280
 msgid "Version: "
 msgstr "Verzia: "
 
-#: src/cmdline/cmdline_show.cc:276
-#: src/pkg_info_screen.cc:113
+#: src/cmdline/cmdline_show.cc:281 src/pkg_info_screen.cc:113
 msgid "Priority: "
 msgstr "Priorita: "
 
-#: src/cmdline/cmdline_show.cc:277
-#: src/cmdline/cmdline_show.cc:279
-#: src/cmdline/cmdline_show.cc:288
+#: src/cmdline/cmdline_show.cc:282 src/cmdline/cmdline_show.cc:284
+#: src/cmdline/cmdline_show.cc:293
 msgid "N/A"
 msgstr "N/A"
 
-#: src/cmdline/cmdline_show.cc:278
-#: src/pkg_info_screen.cc:114
+#: src/cmdline/cmdline_show.cc:283 src/pkg_info_screen.cc:114
 msgid "Section: "
 msgstr "Sekcia: "
 
-#: src/cmdline/cmdline_show.cc:280
-#: src/pkg_info_screen.cc:115
+#: src/cmdline/cmdline_show.cc:285 src/pkg_info_screen.cc:115
 msgid "Maintainer: "
 msgstr "Správca: "
 
-#: src/cmdline/cmdline_show.cc:283
+#: src/cmdline/cmdline_show.cc:288
 msgid "Uncompressed Size: "
 msgstr "Veľkosť po rozbalení: "
 
-#: src/cmdline/cmdline_show.cc:287
+#: src/cmdline/cmdline_show.cc:292
 msgid "Architecture: "
 msgstr "Architektúra: "
 
-#: src/cmdline/cmdline_show.cc:289
+#: src/cmdline/cmdline_show.cc:294
 msgid "Compressed Size: "
 msgstr "Komprimovaná veľkosť: "
 
-#: src/cmdline/cmdline_show.cc:291
+#: src/cmdline/cmdline_show.cc:296
 msgid "Filename: "
 msgstr "Názov súboru: "
 
-#: src/cmdline/cmdline_show.cc:293
+#: src/cmdline/cmdline_show.cc:298
 msgid "MD5sum: "
 msgstr "MD5 súčet: "
 
-#: src/cmdline/cmdline_show.cc:297
-#: src/cmdline/cmdline_show.cc:299
+#: src/cmdline/cmdline_show.cc:302 src/cmdline/cmdline_show.cc:305
 msgid "Archive"
 msgstr "Archív"
 
-#: src/cmdline/cmdline_show.cc:303
+#: src/cmdline/cmdline_show.cc:310
 msgid "Depends"
 msgstr "Závisí na"
 
-#: src/cmdline/cmdline_show.cc:305
+#: src/cmdline/cmdline_show.cc:312
 msgid "PreDepends"
 msgstr "Predzávisí na"
 
-#: src/cmdline/cmdline_show.cc:307
+#: src/cmdline/cmdline_show.cc:314
 msgid "Recommends"
 msgstr "Doporučuje"
 
-#: src/cmdline/cmdline_show.cc:309
+#: src/cmdline/cmdline_show.cc:316
 msgid "Suggests"
 msgstr "Navrhuje"
 
-#: src/cmdline/cmdline_show.cc:311
+#: src/cmdline/cmdline_show.cc:318
 msgid "Conflicts"
 msgstr "Koliduje s"
 
-#: src/cmdline/cmdline_show.cc:313
+#: src/cmdline/cmdline_show.cc:320
 msgid "Replaces"
 msgstr "Nahrádza"
 
-#: src/cmdline/cmdline_show.cc:315
+#: src/cmdline/cmdline_show.cc:322
 msgid "Obsoletes"
 msgstr "Zastaráva"
 
-#: src/cmdline/cmdline_show.cc:317
+#: src/cmdline/cmdline_show.cc:324
 msgid "Provides"
 msgstr "Poskytuje"
 
-#: src/cmdline/cmdline_show.cc:321
-#: src/pkg_info_screen.cc:97
+#: src/cmdline/cmdline_show.cc:328 src/pkg_info_screen.cc:97
 msgid "Description: "
 msgstr "Popis: "
 
@@ -1219,36 +1220,32 @@
 msgid "You cannot specify both an archive and a version for a package\n"
 msgstr "Nemôžete naraz zadať archív a verzií balíku\n"
 
-#: src/dep_item.cc:137
+#: src/dep_item.cc:139
 msgid "UNSATISFIED"
 msgstr "NESPLNENÝ"
 
-#: src/dep_item.cc:137
-#: src/reason_fragment.cc:247
+#: src/dep_item.cc:139 src/reason_fragment.cc:244
 msgid "UNAVAILABLE"
 msgstr "NEDOSTUPNÝ"
 
-#: src/download_bar.cc:56
-#: src/download_list.cc:263
-#: src/download_screen.cc:57
+#: src/download_bar.cc:56 src/download_list.cc:266 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_bar.cc:77
-#: src/generic/acqprogress.cc:63
+#: src/download_bar.cc:75 src/generic/acqprogress.cc:63
 msgid "Hit "
 msgstr "Cieľ "
 
-#: src/download_bar.cc:90
+#: src/download_bar.cc:88
 msgid "Downloading "
 msgstr "SÅ¥ahujem "
 
-#: src/download_bar.cc:103
+#: src/download_bar.cc:101
 msgid "Got "
 msgstr "Mám "
 
-#: src/download_bar.cc:157
+#: src/download_bar.cc:155
 msgid "Downloading..."
 msgstr "SÅ¥ahujem ..."
 
@@ -1256,8 +1253,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:322
+#: 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?"
 
@@ -1277,8 +1273,7 @@
 msgid "Couldn't clean out list directories"
 msgstr "Nemôžem vyčistiť adresáre zoznamu"
 
-#: src/download.cc:177
-#: src/ui.cc:1153
+#: src/download.cc:177 src/ui.cc:1147
 msgid "Deleting obsolete downloaded files"
 msgstr "Vymazávam staré stiahnuté súbory"
 
@@ -1409,33 +1404,30 @@
 msgstr "Nemôžem opraviť kvôli nedostupným balíkom"
 
 #: src/download.cc:467
-msgid "Ack!  Something bad happened while installing packages.  Trying to recover:"
+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:477
-#: src/pkg_item.cc:432
+#: src/download.cc:477 src/pkg_item.cc:430
 msgid "Press return to continue.\n"
 msgstr "Na pokračovanie stlačte enter.\n"
 
 #: src/download.cc:508
-msgid "Could not regain the system lock!  (Perhaps another apt or dpkg is running?)"
+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?)"
 
-#: src/download_item.cc:66
-#: src/download_item.cc:70
-#: src/download_item.cc:100
+#: src/download_item.cc:70 src/download_item.cc:74 src/download_item.cc:104
 #: src/generic/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr " [Pracujem]"
 
-#: src/download_item.cc:104
-#: src/download_list.cc:283
+#: src/download_item.cc:108 src/download_list.cc:284
 msgid "[Hit]"
 msgstr "[Zásah]"
 
-#: src/download_item.cc:104
-#: src/download_list.cc:303
+#: src/download_item.cc:108 src/download_list.cc:304
 msgid "[Downloaded]"
 msgstr "[Stiahnuté]"
 
@@ -1449,36 +1441,34 @@
 msgid "%n%nSome files were not downloaded successfully."
 msgstr "%n%nNiektoré súbory neboli stiahnuté úspešne."
 
-#: src/download_list.cc:68
+#: src/download_list.cc:66
 msgid "Continue"
 msgstr "Pokračovať"
 
-#: src/download_list.cc:175
-#: src/download_screen.cc:203
+#: src/download_list.cc:178 src/download_screen.cc:203
 msgid "Total Progress: "
 msgstr "Celkový postup:"
 
-#: src/download_list.cc:194
-#: src/download_screen.cc:218
+#: src/download_list.cc:197 src/download_screen.cc:218
 #, c-format
 msgid " [ %i%% ] (%sB/s, %s remaining)"
 msgstr " [ %i%% ] (%sB/s, %s ostáva)"
 
-#: src/download_list.cc:196
+#: src/download_list.cc:199
 #, c-format
 msgid " [ %i%% ] (stalled)"
 msgstr " [ %i%% ] (stagnuje)"
 
-#: src/download_list.cc:198
+#: src/download_list.cc:201
 #, c-format
 msgid " [ %i%% ]"
 msgstr " [ %i%% ]"
 
-#: src/download_list.cc:323
+#: src/download_list.cc:324
 msgid "[IGNORED]"
 msgstr "[IGNOROVANÝ]"
 
-#: src/download_list.cc:329
+#: src/download_list.cc:330
 msgid "[ERROR]"
 msgstr "[CHYBA]"
 
@@ -1487,11 +1477,11 @@
 msgid "Downloaded %sB in %ss (%sB/s)."
 msgstr "Stiahnuté %sB za %ss (%sB/s)."
 
-#: src/edit_pkg_hier.cc:158
+#: src/edit_pkg_hier.cc:176
 msgid "No hierarchy information to edit"
 msgstr "Neexistujú žiadne informácie o hierarchii"
 
-#: src/edit_pkg_hier.cc:258
+#: src/edit_pkg_hier.cc:276
 msgid "Couldn't open for writing"
 msgstr "Nemôžem otvoriť na zápis"
 
@@ -1514,21 +1504,22 @@
 
 #: src/generic/acqprogress.cc:282
 #, c-format
-msgid "Media Change: Please insert the disc labeled '%s' in the drive '%s' and press enter\n"
-msgstr "Výmena média: Do mechaniky '%s' vložte disk nazvaný '%s' a stlačte enter\n"
+msgid ""
+"Media Change: Please insert the disc labeled '%s' in the drive '%s' and "
+"press enter\n"
+msgstr ""
+"Výmena média: Do mechaniky '%s' vložte disk nazvaný '%s' a stlačte enter\n"
 
 #: 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:260
-#: src/generic/aptcache.cc:313
+#: 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:321
-#: src/generic/aptcache.cc:395
+#: src/generic/aptcache.cc:321 src/generic/aptcache.cc:395
 #: src/generic/aptcache.cc:398
 msgid "Initializing package states"
 msgstr "Inicializujem stavy balíkov"
@@ -1537,8 +1528,7 @@
 msgid "Cannot open Aptitude state file"
 msgstr "Nemôžem otvoriť stavový súbor programu Aptitude"
 
-#: src/generic/aptcache.cc:513
-#: src/generic/aptcache.cc:568
+#: 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"
@@ -1583,67 +1573,71 @@
 
 #: 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"
+msgstr ""
+"Varovanie: nemožno zamknúť cache súbor. Otváram v režime iba na čítanie"
 
-#: src/generic/matchers.cc:797
+#: src/generic/matchers.cc:798
 msgid "Unmatched '('"
 msgstr "Nepárová '('"
 
-#: src/generic/matchers.cc:887
-#: src/generic/matchers.cc:968
+#: src/generic/matchers.cc:888 src/generic/matchers.cc:969
 #, c-format
 msgid "Unknown dependency type: %s"
 msgstr "Neznáma závislosť: %s"
 
-#: src/generic/matchers.cc:950
+#: src/generic/matchers.cc:951
 #, c-format
 msgid "Unknown action type: %s"
 msgstr "Neznáma akcia: %s"
 
-#: src/generic/matchers.cc:1017
+#: src/generic/matchers.cc:1018
 #, c-format
 msgid "Unknown priority %s"
 msgstr "Neznáma priorita: %s"
 
-#: src/generic/matchers.cc:1039
+#: src/generic/matchers.cc:1040
 #, c-format
 msgid "Unknown pattern type: %c"
 msgstr "Neznámy vzor: %c"
 
-#: src/generic/matchers.cc:1084
+#: src/generic/matchers.cc:1105
 msgid "Unexpected empty expression"
 msgstr "Neočakávaný prázdny výraz"
 
-#: src/generic/matchers.cc:1119
+#: src/generic/matchers.cc:1143
 msgid "Badly formed expression"
 msgstr "Zle zformulovaný výraz"
 
-#: src/generic/matchers.cc:1148
+#: src/generic/matchers.cc:1175
 msgid "Unexpected ')'"
 msgstr "Neočakávaná ')'"
 
 #: src/generic/pkg_acqfile.cc:86
 #, c-format
-msgid "I wasn't able to locate a file for the %s package. This might mean you need to manually fix this package. (due to missing arch)"
-msgstr "Nemôžem nájsť súbor príslušný balíku %s. To môže znamenať, že budete musieť balík opraviť ručne (kvôli chýbajúcej architektúre)"
+msgid ""
+"I wasn't able to locate a file for the %s package. This might mean you need "
+"to manually fix this package. (due to missing arch)"
+msgstr ""
+"Nemôžem nájsť súbor príslušný balíku %s. To môže znamenať, že budete musieť "
+"balík opraviť ručne (kvôli chýbajúcej architektúre)"
 
 #: src/generic/pkg_acqfile.cc:134
 #, c-format
-msgid "The package index files are corrupted. No Filename: field for package %s."
-msgstr "Súbory s indexmi balíkov sú poškodené. Chýba pole Filename: na balík %s."
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
+msgstr ""
+"Súbory s indexmi balíkov sú poškodené. Chýba pole Filename: na balík %s."
 
 #: src/generic/pkg_changelog.cc:105
 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:61
+#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:76
 #, c-format
 msgid "ChangeLog of %s"
 msgstr "Súbor zmien %s"
 
-#: src/generic/pkg_hier.cc:29
-#: src/generic/pkg_hier.cc:50
+#: src/generic/pkg_hier.cc:29 src/generic/pkg_hier.cc:50
 #, c-format
 msgid "Warning: group %s is involved in a cycle"
 msgstr "Varovanie: skupina %s je časťou kruhu"
@@ -1675,44 +1669,41 @@
 msgid "Unable to open /usr/share/tasksel/debian-tasks.desc"
 msgstr "Nemôžem otvoriť /usr/share/tasksel/debian-tasks.desc"
 
-#: src/generic/tasks.cc:302
-#: src/generic/tasks.cc:344
-#: src/generic/tasks.cc:346
+#: src/generic/tasks.cc:302 src/generic/tasks.cc:344 src/generic/tasks.cc:346
 msgid "Reading task descriptions"
 msgstr "Načítavam popisy úloh"
 
-#: src/load_config.cc:30
-#, c-format
-msgid "Invalid entry in color definition group: \"%s\""
-msgstr "Chybný záznam v definíciách farieb: \"%s\""
+#: src/load_config.cc:42
+#, fuzzy, c-format
+msgid "Unrecognized color name \"%s\""
+msgstr "Nezaradené úlohy"
 
-#: src/load_config.cc:32
-#, c-format
-msgid "Invalid tagless entry in color definition group: \"%s\""
-msgstr "Chybný neoznačený záznam v definíciách farieb: \"%s\""
+#: src/load_config.cc:69
+#, fuzzy, c-format
+msgid "Unrecognized attribute name \"%s\""
+msgstr "Nezaradené úlohy"
 
-#: src/load_config.cc:34
-#, c-format
-msgid "Need exactly two colors in color definition \"%s\""
-msgstr "Na definíciu farby potrebujem presne dve hodnoty \"%s\""
+#: src/load_config.cc:106
+#, fuzzy, c-format
+msgid "Invalid entry in style definition group: \"%s\""
+msgstr "Chybný záznam v definíciách farieb: \"%s\""
 
-#: src/load_config.cc:50
-#, c-format
-msgid "Can't parse foreground \"%s\"of color \"%s\""
-msgstr "Nemôžem spracovať farbu popredia \"%s\" (\"%s\")"
+#: src/load_config.cc:108
+#, fuzzy, c-format
+msgid "Invalid tagless entry in style definition group: \"%s\""
+msgstr "Chybný neoznačený záznam v definíciách farieb: \"%s\""
 
-#: src/load_config.cc:53
-#, c-format
-msgid "Can't parse background \"%s\" of color \"%s\""
-msgstr "Nemôžem spracovať farbu pozadia \"%s\" (\"%s\")"
+#: src/load_config.cc:130
+#, fuzzy, c-format
+msgid "Unknown style attribute %s"
+msgstr "Neznáma akcia: %s"
 
-#: src/load_config.cc:72
-#: src/load_config.cc:74
+#: src/load_config.cc:153 src/load_config.cc:155
 #, c-format
 msgid "Invalid entry in keybinding group: \"%s\""
 msgstr "Chybný záznam v definíciách kláves: \"%s\""
 
-#: src/load_config.cc:89
+#: src/load_config.cc:170
 #, c-format
 msgid "Ignoring invalid keybinding \"%s\" -> \"%s\""
 msgstr "Ignorujem neplatné viazanie klávesy \"%s\" -> \"%s\""
@@ -1725,7 +1716,9 @@
 #: src/load_grouppolicy.cc:67
 #, c-format
 msgid "Bad passthrough setting '%s' (use 'passthrough' or 'nopassthrough')"
-msgstr "Chybné nastavenie passthrough '%s' (použite 'passthrough' alebo 'nopassthrough')"
+msgstr ""
+"Chybné nastavenie passthrough '%s' (použite 'passthrough' alebo "
+"'nopassthrough')"
 
 #: src/load_grouppolicy.cc:75
 msgid "Too many arguments to by-section grouping policy"
@@ -1736,7 +1729,8 @@
 msgstr "Zoskupovanie podľa statusu nepoužíva žiadne argumenty"
 
 #: src/load_grouppolicy.cc:105
-msgid "Exactly one filter name must be provided as an argument to a filter policy"
+msgid ""
+"Exactly one filter name must be provided as an argument to a filter policy"
 msgstr "Zoskupovanie podľa filtra vyžaduje práve jeden názov filtru."
 
 #: src/load_grouppolicy.cc:118
@@ -1791,15 +1785,15 @@
 
 #: src/load_pkgview.cc:57
 msgid "Couldn't parse layout: No column format specified for static item"
-msgstr "Nemôžem spracovať rozloženie: Statická položka nemá zadaný formát stĺpca"
+msgstr ""
+"Nemôžem spracovať rozloženie: Statická položka nemá zadaný formát stĺpca"
 
 #: src/load_pkgview.cc:104
 #, c-format
 msgid "Couldn't parse layout: unknown view item type \"%s\""
 msgstr "Nemôžem spracovať rozloženie: neznámy typ položky pohľadu \"%s\""
 
-#: src/load_pkgview.cc:111
-#: src/load_pkgview.cc:119
+#: src/load_pkgview.cc:111 src/load_pkgview.cc:119
 msgid "Couldn't parse layout: no row number specified"
 msgstr "Nemôžem spracovať rozloženie: nie je zadané číslo stĺpca"
 
@@ -1811,8 +1805,7 @@
 msgid "Couldn't parse layout: no height specified"
 msgstr "Nemôžem spracovať rozloženie: nie je zadaná výška"
 
-#: src/load_pkgview.cc:166
-#: src/load_pkgview.cc:184
+#: src/load_pkgview.cc:166 src/load_pkgview.cc:184
 #, c-format
 msgid "Unknown alignment type '%s'"
 msgstr "Neznámy typ zarovnania '%s'"
@@ -1931,8 +1924,11 @@
 
 #: src/main.cc:101
 #, c-format
-msgid " forbid-version - Forbid aptitude from upgrading to a specific package version.\n"
-msgstr " forbid-version - Zakáže aptitude aktualizáciu na konkrétnu verziu balíku.\n"
+msgid ""
+" forbid-version - Forbid aptitude from upgrading to a specific package "
+"version.\n"
+msgstr ""
+" forbid-version - Zakáže aptitude aktualizáciu na konkrétnu verziu balíku.\n"
 
 #: src/main.cc:102
 #, c-format
@@ -1946,8 +1942,12 @@
 
 #: src/main.cc:104
 #, c-format
-msgid " dist-upgrade - Perform an upgrade, possibly installing and removing packages\n"
-msgstr " dist-upgrade - Vykoná aktualizáciu, pri ktoré možno (na|od)inštaluje balíky\n"
+msgid ""
+" dist-upgrade - Perform an upgrade, possibly installing and removing "
+"packages\n"
+msgstr ""
+" dist-upgrade - Vykoná aktualizáciu, pri ktoré možno (na|od)inštaluje "
+"balíky\n"
 
 #: src/main.cc:105
 #, c-format
@@ -2001,8 +2001,10 @@
 
 #: src/main.cc:116
 #, 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"
+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:117
 #, c-format
@@ -2011,22 +2013,30 @@
 
 #: src/main.cc:118
 #, 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"
+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:119
 #, c-format
-msgid " -F format      Specify a format for displaying search results; see the manual\n"
-msgstr " -F formát      Zadajte formát na zobrazenie výsledkov hľadania; viď manuál\n"
+msgid ""
+" -F format      Specify a format for displaying search results; see the "
+"manual\n"
+msgstr ""
+" -F formát      Zadajte formát na zobrazenie výsledkov hľadania; viď manuál\n"
 
 #: src/main.cc:120
 #, 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"
+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:121
 #, c-format
-msgid " -w width       Specify the display width for formatting search results\n"
+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:122
@@ -2041,7 +2051,8 @@
 
 #: src/main.cc:124
 #, c-format
-msgid " -D             Show the dependencies of automatically changed packages.\n"
+msgid ""
+" -D             Show the dependencies of automatically changed packages.\n"
 msgstr " -D             Zobrazí závislosti automaticky zmenených balíkov.\n"
 
 #: src/main.cc:125
@@ -2051,13 +2062,17 @@
 
 #: src/main.cc:126
 #, 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"
+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:127
 #, 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"
+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:128
 #, c-format
@@ -2076,7 +2091,8 @@
 #: src/main.cc:130
 #, 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"
+msgstr ""
+" -S  menosub: Načítať rozšírené stavové informácie zo súboru menosub.\n"
 
 #: src/main.cc:131
 #, c-format
@@ -2093,44 +2109,42 @@
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                  Táto aptitude nemá schopnosti svätej kravy.\n"
 
-#: src/main.cc:255
+#: src/main.cc:252
 #, 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:301
-#: src/main.cc:310
+#: src/main.cc:291 src/main.cc:300
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr "ZVLÁŠTNE: obdržaný kód neznámej voľby\n"
 
-#: src/main.cc:319
+#: src/main.cc:309
 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:327
-msgid "-u and -i may not be specified in command-line mode (eg, with 'install')"
+#: src/main.cc:317
+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:348
+#: src/main.cc:338
 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:405
+#: src/main.cc:395
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr "Neznámy príkaz \"%s\"\n"
 
-#: src/main.cc:412
-#: src/main.cc:469
+#: src/main.cc:402 src/main.cc:450
 msgid "Internal error: uncaught 'out of solutions' exception.\n"
 msgstr "Interná chyba: neošetrená výnimka 'mimo riešenia'.\n"
 
-#: src/main.cc:417
-#: src/main.cc:474
+#: src/main.cc:407 src/main.cc:455
 msgid "Internal error: uncaught 'out of time' exception.\n"
 msgstr "Interná chyba: neošetrená chyba 'mimo času'.\n"
 
-#: src/main.cc:424
+#: src/main.cc:414
 #, c-format
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr "Varovanie: vizuálne rozhranie bude ignorovať -s/Cmdline::Simulate\n"
@@ -2140,13 +2154,11 @@
 msgid "%i/%i mines  %d %s"
 msgstr "%i/%i mín  %d %s"
 
-#: src/mine/cmine.cc:97
-#: src/mine/cmine.cc:104
+#: src/mine/cmine.cc:97 src/mine/cmine.cc:104
 msgid "second"
 msgstr "sekundu"
 
-#: src/mine/cmine.cc:97
-#: src/mine/cmine.cc:104
+#: src/mine/cmine.cc:97 src/mine/cmine.cc:104
 msgid "seconds"
 msgstr "sekúnd"
 
@@ -2163,13 +2175,11 @@
 msgid "Lost"
 msgstr "Prehral"
 
-#: src/mine/cmine.cc:119
-#: src/ui.cc:1090
+#: src/mine/cmine.cc:119 src/ui.cc:1084
 msgid "Minesweeper"
 msgstr "Hľadanie mín"
 
-#: src/mine/cmine.cc:131
-#: src/mine/cmine.cc:168
+#: src/mine/cmine.cc:131 src/mine/cmine.cc:168
 #, c-format
 msgid "Could not open file \"%s\""
 msgstr "Nemôžem otvoriť súbor \"%s\""
@@ -2191,144 +2201,149 @@
 msgid "The number of mines must be a number"
 msgstr "Počet mín musí byť číslo"
 
-#: src/mine/cmine.cc:240
+#: src/mine/cmine.cc:238
 msgid "Setup custom game"
 msgstr "Nastaviť vlastnú hru"
 
-#: src/mine/cmine.cc:243
+#: src/mine/cmine.cc:240
 msgid "Height of board: "
 msgstr "Výška dosky:"
 
-#: src/mine/cmine.cc:247
+#: src/mine/cmine.cc:243
 msgid "Width of board: "
 msgstr "Šírka dosky:"
 
-#: src/mine/cmine.cc:251
+#: src/mine/cmine.cc:246
 msgid "Number of mines: "
 msgstr "Počet mín:"
 
-#: src/mine/cmine.cc:316
+#: src/mine/cmine.cc:305
 msgid "Choose difficulty level"
 msgstr "Zvoľte obtiažnosť"
 
-#: src/mine/cmine.cc:318
+#: src/mine/cmine.cc:307
 msgid "Easy"
 msgstr "Jednoduchá"
 
-#: src/mine/cmine.cc:319
+#: src/mine/cmine.cc:308
 msgid "Medium"
 msgstr "Normálna"
 
-#: src/mine/cmine.cc:320
+#: src/mine/cmine.cc:309
 msgid "Hard"
 msgstr "Ťažká"
 
-#: src/mine/cmine.cc:321
+#: src/mine/cmine.cc:310
 msgid "Custom"
 msgstr "Vlastná"
 
-#: src/mine/cmine.cc:411
+#: src/mine/cmine.cc:392
 msgid "You have won."
 msgstr "Vyhrali ste."
 
-#: src/mine/cmine.cc:414
+#: src/mine/cmine.cc:395
 msgid "You lose!"
 msgstr "Prehrali ste!"
 
-#: src/mine/cmine.cc:419
+#: src/mine/cmine.cc:400
 msgid "You die...  --More--"
 msgstr "Umieraš...  --Viac--"
 
-#: src/mine/cmine.cc:432
+#: src/mine/cmine.cc:413
 msgid "The spikes were poisoned!  The poison was deadly..  --More--"
 msgstr "Bodce sú otrávené! Otrava je smrteľná...  --Viac--"
 
-#: src/mine/cmine.cc:435
+#: src/mine/cmine.cc:416
 msgid "You land on a set of sharp iron spikes!  --More--"
 msgstr "Spadol si na ostré železné bodce!  --Viac--"
 
-#: src/mine/cmine.cc:438
+#: src/mine/cmine.cc:419
 msgid "You fall into a pit!  --More--"
 msgstr "Spadol si do jamy!  --Viac--"
 
-#: src/mine/cmine.cc:441
+#: src/mine/cmine.cc:422
 msgid "KABOOM!  You step on a land mine.  --More--"
 msgstr "PRÁSK! Šliapol si na mínu.  --Viac--"
 
-#: src/mine/cmine.cc:446
+#: src/mine/cmine.cc:427
 msgid "The dart was poisoned!  The poison was deadly...  --More--"
 msgstr "Šipka je otrávená! Otrava je smrteľná... --Viac--"
 
-#: src/mine/cmine.cc:448
-msgid "A little dart shoots out at you!  You are hit by a little dart!  --More--"
+#: src/mine/cmine.cc:429
+msgid ""
+"A little dart shoots out at you!  You are hit by a little dart!  --More--"
 msgstr "Odniekiaľ na teba vyletela malá šípka! Šípka ťa zasiahla!  --Viac--"
 
-#: src/mine/cmine.cc:452
+#: src/mine/cmine.cc:433
 msgid "You turn to stone... --More--"
 msgstr "Meníš sa na kameň...  --Viac--"
 
-#: src/mine/cmine.cc:454
+#: src/mine/cmine.cc:435
 msgid "Touching the cockatrice corpse was a fatal mistake.  --More--"
 msgstr "Dotknúť sa mýtického zvieraťa bola fatálna chyba.  --Viac--"
 
-#: src/mine/cmine.cc:456
+#: src/mine/cmine.cc:437
 msgid "You feel here a cockatrice corpse.  --More--"
 msgstr "Cítiš prítomnosť mýtického zvieraťa.  --Viac--"
 
-#: src/mine/cmine.cc:460
-msgid "Click!  You trigger a rolling boulder trap!  You are hit by a boulder! --More--"
-msgstr "Cvak! Spustil si nejaký mechanizmus! Si zasiahnutý valiacim sa kameňom! --Viac--"
+#: src/mine/cmine.cc:441
+msgid ""
+"Click!  You trigger a rolling boulder trap!  You are hit by a boulder! --"
+"More--"
+msgstr ""
+"Cvak! Spustil si nejaký mechanizmus! Si zasiahnutý valiacim sa kameňom! --"
+"Viac--"
 
-#: src/mine/cmine.cc:470
+#: src/mine/cmine.cc:451
 msgid "sleep"
 msgstr "spánku"
 
-#: src/mine/cmine.cc:473
+#: src/mine/cmine.cc:454
 msgid "striking"
 msgstr "úderu"
 
-#: src/mine/cmine.cc:476
+#: src/mine/cmine.cc:457
 msgid "death"
 msgstr "smrti"
 
-#: src/mine/cmine.cc:479
+#: src/mine/cmine.cc:460
 msgid "polymorph"
 msgstr "polymorfizmu"
 
-#: src/mine/cmine.cc:482
+#: src/mine/cmine.cc:463
 msgid "magic missile"
 msgstr "magických striel"
 
-#: src/mine/cmine.cc:485
+#: src/mine/cmine.cc:466
 msgid "secret door detection"
 msgstr "na detekciu tajných dvier"
 
-#: src/mine/cmine.cc:488
+#: src/mine/cmine.cc:469
 msgid "invisibility"
 msgstr "neviditeľnosti"
 
-#: src/mine/cmine.cc:491
+#: src/mine/cmine.cc:472
 msgid "cold"
 msgstr "chladu"
 
-#: src/mine/cmine.cc:497
+#: src/mine/cmine.cc:478
 #, c-format
 msgid "Your wand of %s breaks apart and explodes!  --More--"
 msgstr "Tvoja barla %s sa rozpadne a exploduje!  --Viac--"
 
-#: src/mine/cmine.cc:503
+#: src/mine/cmine.cc:484
 msgid "You are jolted by a surge of electricity!  --More--"
 msgstr "Si otrasený vlnou elektriny!  --Viac--"
 
-#: src/mine/cmine.cc:607
+#: src/mine/cmine.cc:588
 msgid "Enter the filename to load: "
 msgstr "Zadajte meno súboru na načítanie:"
 
-#: src/mine/cmine.cc:614
+#: src/mine/cmine.cc:595
 msgid "Enter the filename to save: "
 msgstr "Zadajte meno súboru na uloženie:"
 
-#: src/mine/cmine.cc:624
+#: src/mine/cmine.cc:605
 msgid "mine-help.txt"
 msgstr "mine-help-cs.txt"
 
@@ -2336,8 +2351,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:1670
+#: src/pkg_columnizer.cc:84 src/ui.cc:1662
 msgid "Package"
 msgstr "Balík"
 
@@ -2417,52 +2431,40 @@
 msgid "DownloadSize"
 msgstr "VeľkStiahnutia"
 
-#: src/pkg_columnizer.cc:126
-#: src/pkg_columnizer.cc:138
-#: src/pkg_ver_item.cc:103
+#: src/pkg_columnizer.cc:126 src/pkg_columnizer.cc:138 src/pkg_ver_item.cc:103
 #: src/pkg_ver_item.cc:168
 msgid "<N/A>"
 msgstr "<N/A>"
 
-#: src/pkg_columnizer.cc:168
-#: src/pkg_columnizer.cc:179
+#: src/pkg_columnizer.cc:168 src/pkg_columnizer.cc:179
 msgid "<none>"
 msgstr "<žiadne>"
 
-#: src/pkg_columnizer.cc:219
-#: src/pkg_grouppolicy.cc:222
+#: src/pkg_columnizer.cc:219 src/pkg_grouppolicy.cc:222
 msgid "virtual"
 msgstr "virtuálny"
 
-#: src/pkg_columnizer.cc:226
-#: src/pkg_ver_item.cc:212
-#: src/pkg_ver_item.cc:220
+#: src/pkg_columnizer.cc:226 src/pkg_ver_item.cc:212 src/pkg_ver_item.cc:220
 msgid "purged"
 msgstr "vyčistený"
 
-#: src/pkg_columnizer.cc:233
-#: src/pkg_ver_item.cc:227
+#: src/pkg_columnizer.cc:233 src/pkg_ver_item.cc:227
 msgid "half-config"
 msgstr "napoly skonfigurovaný"
 
-#: src/pkg_columnizer.cc:235
-#: src/pkg_ver_item.cc:229
+#: src/pkg_columnizer.cc:235 src/pkg_ver_item.cc:229
 msgid "half-install"
 msgstr "napoly inštalovaný"
 
-#: src/pkg_columnizer.cc:237
-#: src/pkg_ver_item.cc:231
+#: src/pkg_columnizer.cc:237 src/pkg_ver_item.cc:231
 msgid "config-files"
 msgstr "konfiguračné súbory"
 
-#: src/pkg_columnizer.cc:241
-#: src/pkg_columnizer.cc:525
-#: src/pkg_ver_item.cc:235
+#: src/pkg_columnizer.cc:241 src/pkg_columnizer.cc:525 src/pkg_ver_item.cc:235
 msgid "ERROR"
 msgstr "CHYBA"
 
-#: src/pkg_columnizer.cc:288
-#: src/pkg_ver_item.cc:293
+#: src/pkg_columnizer.cc:288 src/pkg_ver_item.cc:293
 msgid "hold"
 msgstr "pridržať"
 
@@ -2470,20 +2472,15 @@
 msgid "purge"
 msgstr "vyčistiť"
 
-#: src/pkg_columnizer.cc:293
-#: src/pkg_ver_item.cc:317
+#: src/pkg_columnizer.cc:293 src/pkg_ver_item.cc:317
 msgid "delete"
 msgstr "vymazať"
 
-#: src/pkg_columnizer.cc:295
-#: src/pkg_ver_item.cc:215
-#: src/pkg_ver_item.cc:299
+#: src/pkg_columnizer.cc:295 src/pkg_ver_item.cc:215 src/pkg_ver_item.cc:299
 msgid "broken"
 msgstr "porušený"
 
-#: src/pkg_columnizer.cc:297
-#: src/pkg_ver_item.cc:303
-#: src/pkg_ver_item.cc:310
+#: src/pkg_columnizer.cc:297 src/pkg_ver_item.cc:303 src/pkg_ver_item.cc:310
 #: src/pkg_ver_item.cc:319
 msgid "install"
 msgstr "inštalovať"
@@ -2496,53 +2493,39 @@
 msgid "upgrade"
 msgstr "aktualizovať"
 
-#: src/pkg_columnizer.cc:303
-#: src/pkg_columnizer.cc:305
-#: src/pkg_ver_item.cc:305
-#: src/pkg_ver_item.cc:312
-#: src/pkg_ver_item.cc:321
-#: src/pkg_ver_item.cc:324
+#: src/pkg_columnizer.cc:303 src/pkg_columnizer.cc:305 src/pkg_ver_item.cc:305
+#: src/pkg_ver_item.cc:312 src/pkg_ver_item.cc:321 src/pkg_ver_item.cc:324
 msgid "none"
 msgstr "nič"
 
-#: src/pkg_columnizer.cc:333
-#: src/pkg_columnizer.cc:354
-#: src/pkg_columnizer.cc:361
-#: src/pkg_grouppolicy.cc:216
-#: src/pkg_info_screen.cc:113
-#: src/pkg_info_screen.cc:114
-#: src/pkg_ver_item.cc:345
-#: src/pkg_ver_item.cc:374
+#: src/pkg_columnizer.cc:333 src/pkg_columnizer.cc:354
+#: src/pkg_columnizer.cc:361 src/pkg_grouppolicy.cc:216
+#: src/pkg_info_screen.cc:113 src/pkg_info_screen.cc:114
+#: src/pkg_ver_item.cc:345 src/pkg_ver_item.cc:374
 msgid "Unknown"
 msgstr "Neznáma"
 
-#: src/pkg_columnizer.cc:341
-#: src/pkg_ver_item.cc:353
+#: src/pkg_columnizer.cc:341 src/pkg_ver_item.cc:353
 msgid "Imp"
 msgstr "Imp"
 
-#: src/pkg_columnizer.cc:343
-#: src/pkg_ver_item.cc:355
+#: src/pkg_columnizer.cc:343 src/pkg_ver_item.cc:355
 msgid "Req"
 msgstr "Req"
 
-#: src/pkg_columnizer.cc:345
-#: src/pkg_ver_item.cc:357
+#: src/pkg_columnizer.cc:345 src/pkg_ver_item.cc:357
 msgid "Std"
 msgstr "Std"
 
-#: src/pkg_columnizer.cc:347
-#: src/pkg_ver_item.cc:359
+#: src/pkg_columnizer.cc:347 src/pkg_ver_item.cc:359
 msgid "Opt"
 msgstr "Vol"
 
-#: src/pkg_columnizer.cc:349
-#: src/pkg_ver_item.cc:361
+#: src/pkg_columnizer.cc:349 src/pkg_ver_item.cc:361
 msgid "Xtr"
 msgstr "Xtr"
 
-#: src/pkg_columnizer.cc:351
-#: src/pkg_ver_item.cc:363
+#: src/pkg_columnizer.cc:351 src/pkg_ver_item.cc:363
 msgid "ERR"
 msgstr "ERR"
 
@@ -2577,34 +2560,46 @@
 #: src/pkg_grouppolicy.cc:150
 msgid ""
 "Packages which set up your computer to perform a particular task\n"
-" Packages in the 'Tasks' section contain no files; they merely depend upon other packages. These packages provide an easy way to select a predefined set of packages for a specialized task."
+" Packages in the 'Tasks' section contain no files; they merely depend upon "
+"other packages. These packages provide an easy way to select a predefined "
+"set of packages for a specialized task."
 msgstr ""
 "Balíky, ktoré nastavia počítač na vykonávanie určitých úloh\n"
-" Balíky v sekcii 'Úlohy' neobsahujú žiadne súbory, iba závisia na ostatných balíkoch. Tieto balíky ponúkajú jednoduchú cestu k inštalácii všetkých balíkov potrebných na vykonávanie určitej úlohy."
+" Balíky v sekcii 'Úlohy' neobsahujú žiadne súbory, iba závisia na ostatných "
+"balíkoch. Tieto balíky ponúkajú jednoduchú cestu k inštalácii všetkých "
+"balíkov potrebných na vykonávanie určitej úlohy."
 
 #: src/pkg_grouppolicy.cc:152
 msgid ""
 "Packages with no declared section\n"
-" No section is given for these packages. Perhaps there is an error in the Packages file?"
+" No section is given for these packages. Perhaps there is an error in the "
+"Packages file?"
 msgstr ""
 "Balíky bez sekcie\n"
-" Týmto balíkom nebola priradená žiadna sekcia. Možno je chyba v súbore Packages?"
+" Týmto balíkom nebola priradená žiadna sekcia. Možno je chyba v súbore "
+"Packages?"
 
 #: src/pkg_grouppolicy.cc:154
 msgid ""
 "Administrative utilities (install software, manage users, etc)\n"
-" Packages in the 'admin' section allow you to perform administrative tasks such as installing software, managing users, configuring and monitoring your system, examining network traffic, and so on."
+" Packages in the 'admin' section allow you to perform administrative tasks "
+"such as installing software, managing users, configuring and monitoring your "
+"system, examining network traffic, and so on."
 msgstr ""
 "Nástroje na správu (inštaláciu softvéri, správa užívateľov, atď.)\n"
-" Balíky v sekcii 'admin' umožňujú vykonávať správu systému, ako inštaláciu softvéri, správu užívateľov, nastavenie a sledovanie systému, skúmanie sieťovej prevádzky, a tak podobne."
+" Balíky v sekcii 'admin' umožňujú vykonávať správu systému, ako inštaláciu "
+"softvéri, správu užívateľov, nastavenie a sledovanie systému, skúmanie "
+"sieťovej prevádzky, a tak podobne."
 
 #: src/pkg_grouppolicy.cc:156
 msgid ""
 "Packages converted from foreign formats (rpm, tgz, etc)\n"
-" Packages in the 'alien' section were created by the 'alien' program from a non-Debian package format such as RPM"
+" Packages in the 'alien' section were created by the 'alien' program from a "
+"non-Debian package format such as RPM"
 msgstr ""
 "Balíky konvertované z cudzích formátov (rpm, tgz, atd.)\n"
-" Balíky zo sekcii 'alien' boli vytvorené programom 'alien' z cudzích formátov balíkov, ako napríklad RPM"
+" Balíky zo sekcii 'alien' boli vytvorené programom 'alien' z cudzích "
+"formátov balíkov, ako napríklad RPM"
 
 #: src/pkg_grouppolicy.cc:157
 msgid ""
@@ -2617,62 +2612,93 @@
 #: src/pkg_grouppolicy.cc:158
 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, such as zmodem/kermit), as well as software to control cellular phones, interface with FidoNet, and run a BBS."
+" 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, 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 komunikačných zariadení. To zahŕňa softvér na ovládanie faxmodemov (napríkad, PPP na vytáčané pripojenie k Internetu a programy pôvodne napísané pre ten účel, ako napr. zmodem/kermit), taktiž ako programy na ovládanie mobilných telefónov, rozhranie k FidoNetu, alebo prevádzkovanie BBS."
+" Balíčky zo sekcie 'comm' sa používajú k ovládaniu modemov a ďalších "
+"komunikačných zariadení. To zahŕňa softvér na ovládanie faxmodemov "
+"(napríkad, PPP na vytáčané pripojenie k Internetu a programy pôvodne "
+"napísané pre ten účel, ako napr. zmodem/kermit), taktiž ako programy na "
+"ovládanie mobilných telefónov, rozhranie k FidoNetu, alebo prevádzkovanie "
+"BBS."
 
 #: src/pkg_grouppolicy.cc:159
 msgid ""
 "Utilities and programs for software development\n"
-" Packages in the 'devel' section are used to write new software and work on existing software. Non-programmers who do not compile their own software probably do not need much software from this section.\n"
+" Packages in the 'devel' section are used to write new software and work on "
+"existing software. Non-programmers who do not compile their own software "
+"probably do not need much software from this section.\n"
 " .\n"
-" It includes compilers, debugging tools, programmer's editors, source processing tools, and other things related to software development."
+" It includes compilers, debugging tools, programmer's editors, source "
+"processing tools, and other things related to software development."
 msgstr ""
 "Nástroje na vývoj softvéri\n"
-" Balíky zo sekcie 'devel' sú používané k písaniu nových programov a upravovaniu programov existujúcich. Neprogramátori, ktorí si sami nekompilujú programy, z tejto sekcie asi mnoho nepotrebujú.\n"
+" Balíky zo sekcie 'devel' sú používané k písaniu nových programov a "
+"upravovaniu programov existujúcich. Neprogramátori, ktorí si sami "
+"nekompilujú programy, z tejto sekcie asi mnoho nepotrebujú.\n"
 " .\n"
-" Zahrnuté sú kompilátory, debugovacie nástroje, programátorské editory, nástroje na spracovanie zdrojových textov a ďalšie veci s programovaním spojené."
+" Zahrnuté sú kompilátory, debugovacie nástroje, programátorské editory, "
+"nástroje na spracovanie zdrojových textov a ďalšie veci s programovaním "
+"spojené."
 
 #: src/pkg_grouppolicy.cc:160
 msgid ""
 "Documentation and specialized programs for viewing documentation\n"
-" Packages in the 'doc' section document parts of the Debian system, or are viewers for documentation formats."
+" Packages in the 'doc' section document parts of the Debian system, or are "
+"viewers for documentation formats."
 msgstr ""
 "Dokumentácia a programy na jej prehliadanie\n"
-" Balíky zo sekcie 'doc' dokumentujú rôzne časti Debianu, alebo slúžia k prehliadanie tejto dokumentácie."
+" Balíky zo sekcie 'doc' dokumentujú rôzne časti Debianu, alebo slúžia k "
+"prehliadanie tejto dokumentácie."
 
 #: src/pkg_grouppolicy.cc:161
 msgid ""
 "Text editors and word processors\n"
-" Packages in the 'editors' section allow you to edit plain ASCII text. These are not necessarily word processors, although some word processors may be found in this section."
+" Packages in the 'editors' section allow you to edit plain ASCII text. These "
+"are not necessarily word processors, although some word processors may be "
+"found in this section."
 msgstr ""
 "Textové editory a procesory\n"
-" Balíky zo sekcie 'editors' umožňujú editovať čistý ASCII text. Tieto nástroje nie sú textovými procesormi, hoci i tie môžete v tejto sekcii nájsť."
+" Balíky zo sekcie 'editors' umožňujú editovať čistý ASCII text. Tieto "
+"nástroje nie sú textovými procesormi, hoci i tie môžete v tejto sekcii nájsť."
 
 #: src/pkg_grouppolicy.cc:162
 msgid ""
 "Programs for working with circuits and electronics\n"
-" Packages in the 'electronics' section include circuit design tools, simulators and assemblers for microcontrollers, and other related software."
+" Packages in the 'electronics' section include circuit design tools, "
+"simulators and assemblers for microcontrollers, and other related software."
 msgstr ""
 "Programy na prácu s el. obvodmi a elektronikou\n"
-" Balíky zo sekcie 'electronics' obsahujú nástroje na návrh elektrických obvodov, simulátory a assemblery mikrokontolerov a podobný  softvér."
+" Balíky zo sekcie 'electronics' obsahujú nástroje na návrh elektrických "
+"obvodov, simulátory a assemblery mikrokontolerov a podobný  softvér."
 
 #: src/pkg_grouppolicy.cc:163
 msgid ""
 "Programs for embedded systems\n"
-" Packages in the 'embedded' section are meant to run on embedded devices. Embedded devices are specialized hardware devices with much less power than a typical desktop system: for instance, a PDA, a cell phone, or a Tivo."
+" Packages in the 'embedded' section are meant to run on embedded devices. "
+"Embedded devices are specialized hardware devices with much less power than "
+"a typical desktop system: for instance, a PDA, a cell phone, or a Tivo."
 msgstr ""
 "Programy na vložené (embeded) systémy\n"
-" Balíky zo sekcie 'embedded' slúžia k behu na vložených zariadení. Vložené zariadenia sú špecializované hardwarové zariadenia s minimálnym príkonom, ako napríklad PDA, mobilné telefóny, alebo Tivo."
+" Balíky zo sekcie 'embedded' slúžia k behu na vložených zariadení. Vložené "
+"zariadenia sú špecializované hardwarové zariadenia s minimálnym príkonom, "
+"ako napríklad PDA, mobilné telefóny, alebo Tivo."
 
 #: src/pkg_grouppolicy.cc:164
 msgid ""
 "The GNOME Desktop System\n"
-" GNOME is a collection of software which provides an easy-to-use desktop environment for Linux.  Packages in the 'gnome' section are part of the GNOME environment or closely integrated into it."
+" GNOME is a collection of software which provides an easy-to-use desktop "
+"environment for Linux.  Packages in the 'gnome' section are part of the "
+"GNOME environment or closely integrated into it."
 msgstr ""
 "Desktopové prostredie GNOME\n"
-" GNOME je kolekcia programov, ktoré spoločne ponúkajú jednoduché a príjemné desktopové prostredie. Balíky v sekcii 'gnome' sú priamo súčasťou prostredia GNOME, alebo s ním úzko súvisia."
+" GNOME je kolekcia programov, ktoré spoločne ponúkajú jednoduché a príjemné "
+"desktopové prostredie. Balíky v sekcii 'gnome' sú priamo súčasťou prostredia "
+"GNOME, alebo s ním úzko súvisia."
 
 #: src/pkg_grouppolicy.cc:165
 msgid ""
@@ -2685,15 +2711,22 @@
 #: src/pkg_grouppolicy.cc:166
 msgid ""
 "Utilities to create, view, and edit graphics files\n"
-" Packages in the 'graphics' section include viewers for image files, image processing and manipulation software, software to interact with graphics hardware (such as video cards, scanners, and digital cameras), and programming tools for handling graphics."
+" Packages in the 'graphics' section include viewers for image files, image "
+"processing and manipulation software, software to interact with graphics "
+"hardware (such as video cards, scanners, and digital cameras), and "
+"programming tools for handling graphics."
 msgstr ""
 "Nástroje na vytváranie, prehliadanie a úpravu grafických súborov\n"
-" Balíky v sekcii 'graphics' zahrňujú prehliadače obrázkov, softvér na úpravu obrázkov, softvér na komunikáciu s grafickým hardwarom (ako sú grafické karty, scannery a digitálne kamery) a tiež programovacie nástroje na riešenie grafických úloh"
+" Balíky v sekcii 'graphics' zahrňujú prehliadače obrázkov, softvér na úpravu "
+"obrázkov, softvér na komunikáciu s grafickým hardwarom (ako sú grafické "
+"karty, scannery a digitálne kamery) a tiež programovacie nástroje na "
+"riešenie grafických úloh"
 
 #: src/pkg_grouppolicy.cc:167
 msgid ""
 "Software for ham radio operators\n"
-" Packages in the 'hamradio' section are meant primarily for ham radio operators."
+" Packages in the 'hamradio' section are meant primarily for ham radio "
+"operators."
 msgstr ""
 "Softvér pre rádioamatérov\n"
 " Balíky v sekcii 'hamradio' sú primárne cielené na rádioamatérov."
@@ -2701,66 +2734,101 @@
 #: src/pkg_grouppolicy.cc:168
 msgid ""
 "Interpreters for interpreted languages\n"
-" Packages in the 'interpreters' section include interpreters for languages like Python, Perl, and Ruby, and libraries for these same languages."
+" Packages in the 'interpreters' section include interpreters for languages "
+"like Python, Perl, and Ruby, and libraries for these same languages."
 msgstr ""
 "Interpretre pre interpretované jazyky\n"
-" Balíky v sekcii 'interpreters' obsahujú interpretre na jazyky ako Python, Perl alebo Ruby a tiež ich rozširujúce knižnice."
+" Balíky v sekcii 'interpreters' obsahujú interpretre na jazyky ako Python, "
+"Perl alebo Ruby a tiež ich rozširujúce knižnice."
 
 #: src/pkg_grouppolicy.cc:169
 msgid ""
 "The KDE Desktop System\n"
-" KDE is a collection of software which provides an easy-to-use desktop environment for Linux.  Packages in the 'kde' section are part of the KDE environment or closely integrated into it."
+" KDE is a collection of software which provides an easy-to-use desktop "
+"environment for Linux.  Packages in the 'kde' section are part of the KDE "
+"environment or closely integrated into it."
 msgstr ""
 "Desktopové prostredie KDE\n"
-" KDE je kolekcia programov, ktoré spoločne ponúkajú jednoduché a príjemné desktopové prostredie. Balíky v sekcii 'kde' sú priamo súčasťou prostredia KDE, alebo s ním úzko súvisia."
+" KDE je kolekcia programov, ktoré spoločne ponúkajú jednoduché a príjemné "
+"desktopové prostredie. Balíky v sekcii 'kde' sú priamo súčasťou prostredia "
+"KDE, alebo s ním úzko súvisia."
 
 #: src/pkg_grouppolicy.cc:170
 msgid ""
 "Development files for libraries\n"
-" Packages in the 'libdevel' section contain files required for building programs that use libraries in the 'libs' section.  You don't need packages from this section unless you want to compile software yourself."
+" Packages in the 'libdevel' section contain files required for building "
+"programs that use libraries in the 'libs' section.  You don't need packages "
+"from this section unless you want to compile software yourself."
 msgstr ""
 "Vývojové súbory na knižnice\n"
-" Balíky zo sekcie 'libdevel' obsahujú súbory vyžadované na zostavenie programov, ktoré využívajú knižnice zo sekcie 'libs'. Bežný užívateľ tieto balíky nepotrebuje. (Ak si však nechcete zostaviť systém sami.)"
+" Balíky zo sekcie 'libdevel' obsahujú súbory vyžadované na zostavenie "
+"programov, ktoré využívajú knižnice zo sekcie 'libs'. Bežný užívateľ tieto "
+"balíky nepotrebuje. (Ak si však nechcete zostaviť systém sami.)"
 
 #: src/pkg_grouppolicy.cc:171
 msgid ""
 "Collections of software routines\n"
-" Packages in the 'libs' section provide necessary functionality for other software on the computer. With very few exceptions, you should not need to explicitly install a package from this section; the package system will install them as required to fulfill dependencies."
+" Packages in the 'libs' section provide necessary functionality for other "
+"software on the computer. With very few exceptions, you should not need to "
+"explicitly install a package from this section; the package system will "
+"install them as required to fulfill dependencies."
 msgstr ""
 "Kolekcia softverových knižníc\n"
-" Balíky zo sekcie 'libs' poskytujú nutnú funkcionalitu počítačovým programom. Okrem niekoľkých výnimiek nemusíte v tejto sekcii nič vyberať; balíčkovací systém si vďaka závislostiam nainštaluje všetko potrebné."
+" Balíky zo sekcie 'libs' poskytujú nutnú funkcionalitu počítačovým "
+"programom. Okrem niekoľkých výnimiek nemusíte v tejto sekcii nič vyberať; "
+"balíčkovací systém si vďaka závislostiam nainštaluje všetko potrebné."
 
 #: src/pkg_grouppolicy.cc:172
 msgid ""
 "Perl interpreter and libraries\n"
-" Packages in the 'perl' section provide the Perl programming language and many third-party libraries for it. Unless you are a Perl programmer, you don't need to install packages from this section explicitly; the package system will install them if they are required."
+" Packages in the 'perl' section provide the Perl programming language and "
+"many third-party libraries for it. Unless you are a Perl programmer, you "
+"don't need to install packages from this section explicitly; the package "
+"system will install them if they are required."
 msgstr ""
 "Interpret Perlu a rozširujúce knižnice\n"
-" Balíky zo sekcie 'perl' poskytujú programovací jazyk Perl a mnoho rozširujúcich knižníc z ďalších zdrojov. Ak nie ste perlový programátor, nemusíte tu nič vyberať; ak budú nejaké balíky potreba, balíčkovací systém si vďaka závislostiam nainštaluje všetko potrebné."
+" Balíky zo sekcie 'perl' poskytujú programovací jazyk Perl a mnoho "
+"rozširujúcich knižníc z ďalších zdrojov. Ak nie ste perlový programátor, "
+"nemusíte tu nič vyberať; ak budú nejaké balíky potreba, balíčkovací systém "
+"si vďaka závislostiam nainštaluje všetko potrebné."
 
 #: src/pkg_grouppolicy.cc:173
 msgid ""
 "Python interpreter and libraries\n"
-" Packages in the 'python' section provide the Python programming language and many third-party libraries for it. Unless you are a Python programmer, you don't need to install packages from this section explicitly; the package system will install them if they are required."
+" Packages in the 'python' section provide the Python programming language "
+"and many third-party libraries for it. Unless you are a Python programmer, "
+"you don't need to install packages from this section explicitly; the package "
+"system will install them if they are required."
 msgstr ""
 "Interpret Pythonu a rozširujúce knižnice\n"
-" Balíky zo sekcie 'python' poskytujú programovací jazyk Python a veľa rozširujúcich knižníc z ďalších zdrojov. Ak nie ste programátor v pythone, nemusíte tu nič vyberať; ak budú nejaké balíky potreba, balíčkovací systém si vďaka závislostiam nainštaluje všetko potrebné."
+" Balíky zo sekcie 'python' poskytujú programovací jazyk Python a veľa "
+"rozširujúcich knižníc z ďalších zdrojov. Ak nie ste programátor v pythone, "
+"nemusíte tu nič vyberať; ak budú nejaké balíky potreba, balíčkovací systém "
+"si vďaka závislostiam nainštaluje všetko potrebné."
 
 #: src/pkg_grouppolicy.cc:174
 msgid ""
 "Programs to write, send, and route email messages\n"
-" Packages in the 'mail' section include mail readers, mail transport daemons, mailing list software, and spam filters, as well as various other software related to electronic mail."
+" Packages in the 'mail' section include mail readers, mail transport "
+"daemons, mailing list software, and spam filters, as well as various other "
+"software related to electronic mail."
 msgstr ""
 "Programy na čítanie, písaniu, posielanie a smerovanie pošty\n"
-" Balíky zo sekcie 'mail' obsahujú programy na čítanie pošty, poštovné démony, softvér na poštové konferencie, spamové filtre a podobné nástroje na prácu s elektronickou poštou."
+" Balíky zo sekcie 'mail' obsahujú programy na čítanie pošty, poštovné "
+"démony, softvér na poštové konferencie, spamové filtre a podobné nástroje na "
+"prácu s elektronickou poštou."
 
 #: src/pkg_grouppolicy.cc:175
 msgid ""
 "Numeric analysis and other mathematics-related software\n"
-" Packages in the 'math' section include calculators, languages for mathematical computation (similar to Mathematica), symbolic algebra packages, and programs to visualize mathematical objects."
+" Packages in the 'math' section include calculators, languages for "
+"mathematical computation (similar to Mathematica), symbolic algebra "
+"packages, and programs to visualize mathematical objects."
 msgstr ""
 "Numerická analýza a iný matematický softvér\n"
-" Balíky zo sekcie 'math' zahŕňajú kalkulačky, jazyky na matematické výpočty (podobné s programom Mathematica), balíky na symbolickú algebru a nástroje na vizualizáciu matematických objektov."
+" Balíky zo sekcie 'math' zahŕňajú kalkulačky, jazyky na matematické výpočty "
+"(podobné s programom Mathematica), balíky na symbolickú algebru a nástroje "
+"na vizualizáciu matematických objektov."
 
 #: src/pkg_grouppolicy.cc:176
 msgid ""
@@ -2773,55 +2841,76 @@
 #: src/pkg_grouppolicy.cc:177
 msgid ""
 "Programs to connect to and provide various services\n"
-" Packages in the 'net' section include clients and servers for many protocols, tools to manipulate and debug low-level network protocols, IM systems, and other network-related software."
+" Packages in the 'net' section include clients and servers for many "
+"protocols, tools to manipulate and debug low-level network protocols, IM "
+"systems, and other network-related software."
 msgstr ""
 "Programy na sieťovanie a poskytovanie sieťových služieb\n"
-" Balíky zo sekcie 'net' obsahujú klientov a servery pre mnoho protokolov, nástroje na manipuláciu a ladenie nízko-úrovňových sieťových protokolov, IM systémy a mnoho ďalších sieťových programov."
+" Balíky zo sekcie 'net' obsahujú klientov a servery pre mnoho protokolov, "
+"nástroje na manipuláciu a ladenie nízko-úrovňových sieťových protokolov, IM "
+"systémy a mnoho ďalších sieťových programov."
 
 #: src/pkg_grouppolicy.cc:178
 msgid ""
 "Usenet clients and servers\n"
-" Packages in the 'news' section are related to the Usenet distributed news system.  They include news readers and news servers."
+" Packages in the 'news' section are related to the Usenet distributed news "
+"system.  They include news readers and news servers."
 msgstr ""
 "Klienti a servery pre Usenet\n"
-" Balíky zo sekcie 'news' sú spojené s distribuovaným systémom Usenet news. Zahŕňajú news prehliadače, ako aj news servery."
+" Balíky zo sekcie 'news' sú spojené s distribuovaným systémom Usenet news. "
+"Zahŕňajú news prehliadače, ako aj news servery."
 
 #: src/pkg_grouppolicy.cc:179
 msgid ""
 "Obsolete libraries\n"
-" Packages in the 'oldlibs' section are obsolete and should not be used by new software.  They are provided for compatibility reasons, or because software distributed by Debian still requires them.\n"
+" Packages in the 'oldlibs' section are obsolete and should not be used by "
+"new software.  They are provided for compatibility reasons, or because "
+"software distributed by Debian still requires them.\n"
 " .\n"
-" With very few exceptions, you should not need to explicitly install a package from this section; the package system will install them as required to fulfill dependencies."
+" With very few exceptions, you should not need to explicitly install a "
+"package from this section; the package system will install them as required "
+"to fulfill dependencies."
 msgstr ""
 "Zastarané knižnice\n"
-" Balíky zo sekcie 'oldlibs' sú staré a v nových programoch by sa nemali používať. Poskytujeme ich z dôvodov kompatibility, pretože niektorý softvér ich stále môže vyžadovať.\n"
+" Balíky zo sekcie 'oldlibs' sú staré a v nových programoch by sa nemali "
+"používať. Poskytujeme ich z dôvodov kompatibility, pretože niektorý softvér "
+"ich stále môže vyžadovať.\n"
 " .\n"
-" Okrem niekoľkých výnimiek nemusíte v tejto sekcii nič vyberať; balíčkovací systém si vďaka závislostiam nainštaluje všetko potrebné."
+" Okrem niekoľkých výnimiek nemusíte v tejto sekcii nič vyberať; balíčkovací "
+"systém si vďaka závislostiam nainštaluje všetko potrebné."
 
 #: src/pkg_grouppolicy.cc:180
 msgid ""
 "Emulators and software to read foreign filesystems\n"
-" Packages in the 'otherosfs' section emulate hardware and operating systems and provide tools for transferring data between different operating systems and hardware platforms. (for instance, utilities to read DOS floppies, and utilities to communicate with Palm Pilots)\n"
+" Packages in the 'otherosfs' section emulate hardware and operating systems "
+"and provide tools for transferring data between different operating systems "
+"and hardware platforms. (for instance, utilities to read DOS floppies, and "
+"utilities to communicate with Palm Pilots)\n"
 " .\n"
 " It is worth noting that CD burning software is included in THIS section."
 msgstr ""
 "Emulátory a nástroje na prístup k cudzím súborovým systémom\n"
-" Balíky zo sekcie 'otherosfs' emulujú rôzny hardware a operačné systémy a poskytujú nástroje na prenos dát medzi rôznymi operačnými systémami a hardwarovými platformami. (Napríklad komunikácia s Palm Pilot.)\n"
+" Balíky zo sekcie 'otherosfs' emulujú rôzny hardware a operačné systémy a "
+"poskytujú nástroje na prenos dát medzi rôznymi operačnými systémami a "
+"hardwarovými platformami. (Napríklad komunikácia s Palm Pilot.)\n"
 " .\n"
 " Je vhodné spomenúť, že v TEJTO sekcií je i softvér na vypaľovanie CD."
 
 #: src/pkg_grouppolicy.cc:181
 msgid ""
 "Software for scientific work\n"
-" Packages in the 'science' section include tools for astronomy, biology, and chemistry, as well as other science-related software."
+" Packages in the 'science' section include tools for astronomy, biology, and "
+"chemistry, as well as other science-related software."
 msgstr ""
 "Softvér na vedeckú prácu\n"
-" Balíky zo sekcie 'science' zahŕňajú nástroje na astronómiu, biológiu, chémiu a softvér na podobné obory."
+" Balíky zo sekcie 'science' zahŕňajú nástroje na astronómiu, biológiu, "
+"chémiu a softvér na podobné obory."
 
 #: src/pkg_grouppolicy.cc:182
 msgid ""
 "Command shells and alternative console environments\n"
-" Packages in the 'shells' section include programs providing a command-line interface."
+" Packages in the 'shells' section include programs providing a command-line "
+"interface."
 msgstr ""
 "Shelly a alternatívne konzolové prostredia\n"
 " Balíky zo sekcie 'shells' obsahujú programy s riadkovým rozhraním."
@@ -2829,121 +2918,181 @@
 #: src/pkg_grouppolicy.cc:183
 msgid ""
 "Utilities to play and record sound\n"
-" Packages in the 'sound' section include sound players, recorders, and encoders for many formats, mixers and volume controls, MIDI sequencers and programs to generate musical notation, drivers for sound hardware, and sound processing software."
+" Packages in the 'sound' section include sound players, recorders, and "
+"encoders for many formats, mixers and volume controls, MIDI sequencers and "
+"programs to generate musical notation, drivers for sound hardware, and sound "
+"processing software."
 msgstr ""
 "Nástroje na prehrávanie a nahrávanie zvukov\n"
-" Balíky zo sekcie 'sound' zahŕňajú prehrávače, rekordéry a enkodéry mnohých formátov, mixážne pulty a ovládače hlasitosti, MIDI sekvencéry, programy na zápis nôt, ovládače zvukových zariadení a softvér na spracovanie zvuku."
+" Balíky zo sekcie 'sound' zahŕňajú prehrávače, rekordéry a enkodéry mnohých "
+"formátov, mixážne pulty a ovládače hlasitosti, MIDI sekvencéry, programy na "
+"zápis nôt, ovládače zvukových zariadení a softvér na spracovanie zvuku."
 
 #: src/pkg_grouppolicy.cc:184
 msgid ""
 "The TeX typesetting system\n"
-" Packages in the 'tex' section are related to TeX, a system for producing high-quality typeset output.  They include TeX itself, TeX packages, editors designed for TeX, utilities to convert TeX and TeX output files to various formats, TeX fonts, and other software related to TeX."
+" Packages in the 'tex' section are related to TeX, a system for producing "
+"high-quality typeset output.  They include TeX itself, TeX packages, editors "
+"designed for TeX, utilities to convert TeX and TeX output files to various "
+"formats, TeX fonts, and other software related to TeX."
 msgstr ""
 "Typografický systém TeX\n"
-" Balíky zo sekcie 'tex' sú spriaznené s TeXom, systémom na vytváranie vysoko kvalitných výstupov. Zahŕňajú samotný TeX, editory špeciálne navrhnuté na TeX, nástroje na prevod TeXových súborov do mnohých formátov, TeXové fonty a ďalší podobný softvér."
+" Balíky zo sekcie 'tex' sú spriaznené s TeXom, systémom na vytváranie vysoko "
+"kvalitných výstupov. Zahŕňajú samotný TeX, editory špeciálne navrhnuté na "
+"TeX, nástroje na prevod TeXových súborov do mnohých formátov, TeXové fonty a "
+"ďalší podobný softvér."
 
 #: src/pkg_grouppolicy.cc:185
 msgid ""
 "Text processing utilities\n"
-" Packages in the 'text' section include text filters and processors, spelling checkers, dictionary programs, utilities to convert between character encodings and text file formats (eg, Unix and DOS), text formatters and pretty-printers, and other software which operates on plain text."
+" Packages in the 'text' section include text filters and processors, "
+"spelling checkers, dictionary programs, utilities to convert between "
+"character encodings and text file formats (eg, Unix and DOS), text "
+"formatters and pretty-printers, and other software which operates on plain "
+"text."
 msgstr ""
 "Nástroje na spracovanie textu\n"
-" Balíky zo sekcie 'text' obsahujú textové filtre, procesory, slovníky, sledovače preklepov, konverzné programy na prevod medzi rôznymi formátmi a najrôznejšími kódovaniami, formátovače textu a ďalší softvér, ktorý pracuje s čistým textom."
+" Balíky zo sekcie 'text' obsahujú textové filtre, procesory, slovníky, "
+"sledovače preklepov, konverzné programy na prevod medzi rôznymi formátmi a "
+"najrôznejšími kódovaniami, formátovače textu a ďalší softvér, ktorý pracuje "
+"s čistým textom."
 
 #: src/pkg_grouppolicy.cc:186
 msgid ""
 "Various system utilities\n"
-" Packages in the 'utils' section are utilities whose purpose is too unique to be classified."
+" Packages in the 'utils' section are utilities whose purpose is too unique "
+"to be classified."
 msgstr ""
 "Rôzne systémové nástroje\n"
-" Balíky v sekcii 'utils' sú nástroje, ktorých účel je príliš špecifický na zarazení do konkrétnej skupiny."
+" Balíky v sekcii 'utils' sú nástroje, ktorých účel je príliš špecifický na "
+"zarazení do konkrétnej skupiny."
 
 #: src/pkg_grouppolicy.cc:187
 msgid ""
 "Web browsers, servers, proxies, and other tools\n"
-" Packages in the 'web' section include Web browsers, Web servers and proxies, software to write CGI scripts or Web-based programs, pre-written Web-based programs, and other software related to the World Wide Web."
+" Packages in the 'web' section include Web browsers, Web servers and "
+"proxies, software to write CGI scripts or Web-based programs, pre-written "
+"Web-based programs, and other software related to the World Wide Web."
 msgstr ""
 "Webové prehliadače, servery a iné programy\n"
-" Balíky zo sekcie 'web' ponúka webové prehliadače, webové servery a proxy, softvér na písanie CGI skriptov alebo webových služieb, a vôbec všetko, čo sa týka World Wide Webu."
+" Balíky zo sekcie 'web' ponúka webové prehliadače, webové servery a proxy, "
+"softvér na písanie CGI skriptov alebo webových služieb, a vôbec všetko, čo "
+"sa týka World Wide Webu."
 
 #: src/pkg_grouppolicy.cc:188
 msgid ""
 "The X window system and related software\n"
-" Packages in the 'x11' section include the core packages for the X window system, window managers, utility programs for X, and miscellaneous programs with an X GUI which were placed here because they didn't fit anywhere else."
+" Packages in the 'x11' section include the core packages for the X window "
+"system, window managers, utility programs for X, and miscellaneous programs "
+"with an X GUI which were placed here because they didn't fit anywhere else."
 msgstr ""
 "X Window System a príbuzný softvér\n"
-" Balíky v sekcii 'x11' zahŕňajú jadro X Window Systému, správcu okien, nástroje na X a rôzne programy s grafickým X rozhraním, ktoré sa nehodili do žiadnej inej kategórie."
+" Balíky v sekcii 'x11' zahŕňajú jadro X Window Systému, správcu okien, "
+"nástroje na X a rôzne programy s grafickým X rozhraním, ktoré sa nehodili do "
+"žiadnej inej kategórie."
 
 #: src/pkg_grouppolicy.cc:190
 msgid ""
 "Programs which depend on software not in Debian\n"
 " Packages in the 'contrib' section are not part of Debian.\n"
 " .\n"
-" These packages are Free Software, but they depend on software which is not part of Debian.  This may be because it is not Free Software, but is packaged in the non-free section of the archive, because Debian cannot distribute it at all, or (in rare cases) because no-one has packaged it yet.\n"
+" These packages are Free Software, but they depend on software which is not "
+"part of Debian.  This may be because it is not Free Software, but is "
+"packaged in the non-free section of the archive, because Debian cannot "
+"distribute it at all, or (in rare cases) because no-one has packaged it "
+"yet.\n"
 " .\n"
-" For more information about what Debian considers to be Free Software, see http://www.debian.org/social_contract#guidelines"
+" For more information about what Debian considers to be Free Software, see "
+"http://www.debian.org/social_contract#guidelines"
 msgstr ""
 "Programy závisiace na softvéri, ktorý nie je v Debiane\n"
 " Balíky v sekcii 'contrib' nie sú súčasťou Debianu.\n"
 " .\n"
-" Tieto balíky sú slobodným softvérom, ale závisia na softvéri, ktorý nie je súčasťou Debianu. To môže mať dve príčiny. Buď je tento softvér neslobodný, alebo (zriedka) ho ešte nikto nezabalil.\n"
+" Tieto balíky sú slobodným softvérom, ale závisia na softvéri, ktorý nie je "
+"súčasťou Debianu. To môže mať dve príčiny. Buď je tento softvér neslobodný, "
+"alebo (zriedka) ho ešte nikto nezabalil.\n"
 " .\n"
-" Viac informácií o tom, čo Debian považuje za slobodný softvér, nájdete v http://www.debian.org/social_contract#guidelines, alebo česky na http://www.debian.cz/info/social_contract.php#guidelines."
+" Viac informácií o tom, čo Debian považuje za slobodný softvér, nájdete v "
+"http://www.debian.org/social_contract#guidelines, alebo česky na http://www."
+"debian.cz/info/social_contract.php#guidelines."
 
 #: src/pkg_grouppolicy.cc:191
 msgid ""
 "The main Debian archive\n"
-" The Debian distribution consists of packages from the 'main' section. Every package in 'main' is Free Software.\n"
+" The Debian distribution consists of packages from the 'main' section. Every "
+"package in 'main' is Free Software.\n"
 " .\n"
-" For more information about what Debian considers to be Free Software, see http://www.debian.org/social_contract#guidelines"
+" For more information about what Debian considers to be Free Software, see "
+"http://www.debian.org/social_contract#guidelines"
 msgstr ""
 "Hlavný archív Debianu\n"
-" Debian sa skladá z balíkov zo sekcie 'main'. Každý balík v tejto sekcii je slobodným softvérom.\n"
+" Debian sa skladá z balíkov zo sekcie 'main'. Každý balík v tejto sekcii je "
+"slobodným softvérom.\n"
 " .\n"
-" Viac informácií o tom, čo Debian považuje za slobodný softvér, nájdete v http://www.debian.org/social_contract#guidelines, alebo česky na http://www.debian.cz/info/social_contract.php#guidelines."
+" Viac informácií o tom, čo Debian považuje za slobodný softvér, nájdete v "
+"http://www.debian.org/social_contract#guidelines, alebo česky na http://www."
+"debian.cz/info/social_contract.php#guidelines."
 
 #: src/pkg_grouppolicy.cc:192
 msgid ""
 "Programs stored outside the US due to export controls\n"
-" Packages in 'non-US' likely contain cryptography; a few implement patented algorithms. Because of this, they cannot be exported from the United States, and hence are stored on a server in the \"free world\".\n"
+" Packages in 'non-US' likely contain cryptography; a few implement patented "
+"algorithms. Because of this, they cannot be exported from the United States, "
+"and hence are stored on a server in the \"free world\".\n"
 " .\n"
-" Note: the Debian Project is currently merging cryptographic software into the US-based archives after consulting with legal experts about recent changes in export policies. Most packages which were formerly found in this section, therefore, are now in 'main'."
+" Note: the Debian Project is currently merging cryptographic software into "
+"the US-based archives after consulting with legal experts about recent "
+"changes in export policies. Most packages which were formerly found in this "
+"section, therefore, are now in 'main'."
 msgstr ""
 "Programy uložené mimo USA kvôli exportným obmedzeniam\n"
-" Balíky zo sekcie 'non-US' najčastejšie obsahujú kryptografiu a niekoľko patentovaných algoritmov. Vďaka tomu nemôžu byť vyvážané zo Spojených štátov a preto sú uložené na serveroch v \"slobodnom\" svete.\n"
+" Balíky zo sekcie 'non-US' najčastejšie obsahujú kryptografiu a niekoľko "
+"patentovaných algoritmov. Vďaka tomu nemôžu byť vyvážané zo Spojených štátov "
+"a preto sú uložené na serveroch v \"slobodnom\" svete.\n"
 " .\n"
-" Poznámka: Po nedávnych zmenách v exportnej politike USA sú teraz tieto balíky presúvané do hlavného archívu v sekcii 'main'."
+" Poznámka: Po nedávnych zmenách v exportnej politike USA sú teraz tieto "
+"balíky presúvané do hlavného archívu v sekcii 'main'."
 
 #: src/pkg_grouppolicy.cc:193
 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"
+" 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"
 " .\n"
-" For more information about what Debian considers to be Free Software, see http://www.debian.org/social_contract#guidelines"
+" For more information about what Debian considers to be Free Software, see "
+"http://www.debian.org/social_contract#guidelines"
 msgstr ""
 "Programy, ktoré nie sú slobodným softvérom\n"
 " Balíky v sekcii 'non-free' nie sú súčasťou Debianu.\n"
 " .\n"
-" Tieto balíky nespĺňajú jednu alebo viac požiadavkiek z Debian Free Software Guidelines (pozrite nižšie). V tejto sekcií by ste si mali prečítať licenčné podmienky programov, na uistenie sa, či ich môžete používať spôsobom, akým zamýšľate.\n"
+" Tieto balíky nespĺňajú jednu alebo viac požiadavkiek z Debian Free Software "
+"Guidelines (pozrite nižšie). V tejto sekcií by ste si mali prečítať licenčné "
+"podmienky programov, na uistenie sa, či ich môžete používať spôsobom, akým "
+"zamýšľate.\n"
 " .\n"
-" Viac informácií o tom, čo Debian považuje za slobodný softvér, nájdete na http://www.debian.org/social_contract#guidelines, alebo česky na http://www.debian.cz/info/social_contract.php#guidelines"
+" Viac informácií o tom, čo Debian považuje za slobodný softvér, nájdete na "
+"http://www.debian.org/social_contract#guidelines, alebo česky na http://www."
+"debian.cz/info/social_contract.php#guidelines"
 
 #: src/pkg_grouppolicy.cc:195
 msgid ""
 "Virtual packages\n"
-" These packages do not exist; they are names other packages use to require or provide some functionality."
+" These packages do not exist; they are names other packages use to require "
+"or provide some functionality."
 msgstr ""
 "Virtuálne balíky\n"
-" Tieto balíky fyzicky neexistujú; sú to iba mená, ktoré využívajú ostatné balíky vyžadujúce konkrétnu funkčnosť."
+" Tieto balíky fyzicky neexistujú; sú to iba mená, ktoré využívajú ostatné "
+"balíky vyžadujúce konkrétnu funkčnosť."
 
 #: src/pkg_grouppolicy.cc:210
 msgid "Tasks/Tasks"
 msgstr "Úlohy/Úlohy"
 
-#: src/pkg_grouppolicy.cc:210
-#: src/pkg_grouppolicy.cc:937
+#: src/pkg_grouppolicy.cc:210 src/pkg_grouppolicy.cc:937
 msgid "Tasks"
 msgstr "Úlohy"
 
@@ -2965,7 +3114,8 @@
 " Security updates for these packages are available from security.debian.org."
 msgstr ""
 "Bezpečnostné aktualizácie\n"
-" Bezpečnostné aktualizácie týchto balíkov sú k dispozícií na security.debian.org.org."
+" Bezpečnostné aktualizácie týchto balíkov sú k dispozícií na security.debian."
+"org.org."
 
 #: src/pkg_grouppolicy.cc:319
 msgid ""
@@ -2978,10 +3128,14 @@
 #: src/pkg_grouppolicy.cc:320
 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)."
+" 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)."
 msgstr ""
 "Nové balíky\n"
-" Tieto balíky boli pridané do Debianu odvtedy, ako ste naposledy vymazali zoznam \"nových\" balíkov. (Na vymazanie tohto zoznamu vyberte z menu Akcie položku \"Zabudnúť nové balíky\".)"
+" Tieto balíky boli pridané do Debianu odvtedy, ako ste naposledy vymazali "
+"zoznam \"nových\" balíkov. (Na vymazanie tohto zoznamu vyberte z menu Akcie "
+"položku \"Zabudnúť nové balíky\".)"
 
 #: src/pkg_grouppolicy.cc:321
 msgid ""
@@ -3002,83 +3156,108 @@
 #: src/pkg_grouppolicy.cc:323
 msgid ""
 "Obsolete and Locally Created Packages\n"
-" These packages are currently installed on your computer, but they are not available from any apt source.  They may be obsolete and removed from the archive, or you may have built a private version of them yourself."
+" These packages are currently installed on your computer, but they are not "
+"available from any apt source.  They may be obsolete and removed from the "
+"archive, or you may have built a private version of them yourself."
 msgstr ""
 "Zastarané a lokálne vytvorené balíky\n"
-" Tieto balíky máte momentálne nainštalované, ale nie sú dostupné v žiadnom zo zdrojov na apt. Buď už boli zastarané a boli odstránené z archívu, alebo ste si je ich vytvorili sami."
+" Tieto balíky máte momentálne nainštalované, ale nie sú dostupné v žiadnom "
+"zo zdrojov na apt. Buď už boli zastarané a boli odstránené z archívu, alebo "
+"ste si je ich vytvorili sami."
 
 #: src/pkg_grouppolicy.cc:324
 msgid ""
 "Virtual Packages\n"
-" These packages do not exist; they are names other packages use to require or provide some functionality."
+" These packages do not exist; they are names other packages use to require "
+"or provide some functionality."
 msgstr ""
 "Virtuálne balíky\n"
-" Tieto balíky fyzicky neexistujú; sú to iba mená, ktoré využívajú ostatné balíky vyžadujúce konkrétnu funkčnosť."
+" Tieto balíky fyzicky neexistujú; sú to iba mená, ktoré využívajú ostatné "
+"balíky vyžadujúce konkrétnu funkčnosť."
 
 #: src/pkg_grouppolicy.cc:471
 msgid ""
 "Packages which are recommended by other packages\n"
-" These packages are not strictly required, but they may be necessary to provide full functionality in some other programs that you are installing or upgrading."
+" These packages are not strictly required, but they may be necessary to "
+"provide full functionality in some other programs that you are installing or "
+"upgrading."
 msgstr ""
 "Balíky doporučované inými balíkmi\n"
-" Tieto balíky nie sú nutne vyžadované, ale môžu byť nutné na plnú funkčnosť práve inštalovaných alebo aktualizovaných balíkov."
+" Tieto balíky nie sú nutne vyžadované, ale môžu byť nutné na plnú funkčnosť "
+"práve inštalovaných alebo aktualizovaných balíkov."
 
 #: src/pkg_grouppolicy.cc:491
 msgid ""
 "Packages which are suggested by other packages\n"
-" These packages are not required in order to make your system function properly, but they may provide enhanced functionality for some programs that you are currently installing."
+" These packages are not required in order to make your system function "
+"properly, but they may provide enhanced functionality for some programs that "
+"you are currently installing."
 msgstr ""
 "Balíky navrhované inými balíkmi\n"
-" Tieto balíky nie sú vyžadované na správnu funkčnosť systému, ale môžu rozšíriť možnosti niektorých programov, ktoré práve inštalujete."
+" Tieto balíky nie sú vyžadované na správnu funkčnosť systému, ale môžu "
+"rozšíriť možnosti niektorých programov, ktoré práve inštalujete."
 
 #: src/pkg_grouppolicy.cc:518
 msgid ""
 "Packages with unsatisfied dependencies\n"
-" The dependency requirements of these packages will be unmet after the install is complete.\n"
+" The dependency requirements of these packages will be unmet after the "
+"install is complete.\n"
 " .\n"
-" The presence of this tree probably indicates that something is broken, either on your system or in the Debian archive."
+" The presence of this tree probably indicates that something is broken, "
+"either on your system or in the Debian archive."
 msgstr ""
 "Balíky s nesplnenými závislosťami\n"
 " Závislosti týchto balíkov nebudú po dokončení inštalácie splnené.\n"
 " .\n"
-" Prítomnosť tohto stromu naznačuje, že je niečo divného vo vašom systéme alebo v archíve Debianu."
+" Prítomnosť tohto stromu naznačuje, že je niečo divného vo vašom systéme "
+"alebo v archíve Debianu."
 
 #: src/pkg_grouppolicy.cc:519
 msgid ""
 "Packages being removed because they are no longer used\n"
-" These packages are being deleted because they were automatically installed to fulfill dependencies, and the planned action will result in no installed package declaring an 'important' dependency on them.\n"
+" These packages are being deleted because they were automatically installed "
+"to fulfill dependencies, and the planned action will result in no installed "
+"package declaring an 'important' dependency on them.\n"
 msgstr ""
 "Balíky, ktoré sa už nepoužívajú a budú odstránené\n"
-" Tieto balíky sú označené na výmaz, pretože boli nainštalované automaticky kvôli závislostiam, ktoré už nie sú potrebné.\n"
+" Tieto balíky sú označené na výmaz, pretože boli nainštalované automaticky "
+"kvôli závislostiam, ktoré už nie sú potrebné.\n"
 
 #: src/pkg_grouppolicy.cc:520
 msgid ""
 "Packages being automatically held in their current state\n"
-" These packages could be upgraded, but they have been kept in their current state to avoid breaking dependencies."
+" These packages could be upgraded, but they have been kept in their current "
+"state to avoid breaking dependencies."
 msgstr ""
 "Balíky automaticky podržané v aktuálnom stave\n"
-" Tieto balíky môžu byť aktualizované na novšiu verziu, ale sú podržané vo svojej pôvodnej verzií, aby sa neporušili závislosti."
+" Tieto balíky môžu byť aktualizované na novšiu verziu, ale sú podržané vo "
+"svojej pôvodnej verzií, aby sa neporušili závislosti."
 
 #: src/pkg_grouppolicy.cc:521
 msgid ""
 "Packages being automatically installed to satisfy dependencies\n"
-" These packages are being installed because they are required by another package you have chosen for installation."
+" These packages are being installed because they are required by another "
+"package you have chosen for installation."
 msgstr ""
 "Balíky automaticky inštalované na splnenie závislostí\n"
-" Tieto balíky budú automaticky nainštalované, pretože sú vyžadované inými balíkmi, ktoré ste vybrali na inštaláciu."
+" Tieto balíky budú automaticky nainštalované, pretože sú vyžadované inými "
+"balíkmi, ktoré ste vybrali na inštaláciu."
 
 #: src/pkg_grouppolicy.cc:522
 msgid ""
 "Packages being deleted due to unsatisfied dependencies\n"
-" These packages are being deleted because one or more of their dependencies is no longer available, or because another package conflicts with them."
+" These packages are being deleted because one or more of their dependencies "
+"is no longer available, or because another package conflicts with them."
 msgstr ""
 "Balíky automaticky odstránené kvôli nesplneným závislostiam\n"
-" Tieto balíky budú odstránené, pretože jedna alebo viac ich závislostí už nie je splnená, alebo pretože je s nimi iný balík v konflikte."
+" Tieto balíky budú odstránené, pretože jedna alebo viac ich závislostí už "
+"nie je splnená, alebo pretože je s nimi iný balík v konflikte."
 
 #: src/pkg_grouppolicy.cc:523
 msgid ""
 "Packages to be downgraded\n"
-" An older version of these packages than is currently installed will be installed."
+" An older version of these packages than is currently installed will be "
+"installed."
 msgstr ""
 "Balíky k degradácii\n"
 " Tieto balíky budú nahradené svojou staršou verziou."
@@ -3086,10 +3265,12 @@
 #: src/pkg_grouppolicy.cc:524
 msgid ""
 "Packages being held back\n"
-" These packages could be upgraded, but you have asked for them to be held at their current version."
+" These packages could be upgraded, but you have asked for them to be held at "
+"their current version."
 msgstr ""
 "Balíky podržané v aktuálnom stave\n"
-" Tieto balíky môžu byť aktualizované na novšiu verziu, ale vy ste požiadali o ich podržanie v pôvodnej verzii."
+" Tieto balíky môžu byť aktualizované na novšiu verziu, ale vy ste požiadali "
+"o ich podržanie v pôvodnej verzii."
 
 #: src/pkg_grouppolicy.cc:525
 msgid ""
@@ -3102,7 +3283,8 @@
 #: src/pkg_grouppolicy.cc:526
 msgid ""
 "Packages to be installed\n"
-" These packages have been manually selected for installation on your computer."
+" These packages have been manually selected for installation on your "
+"computer."
 msgstr ""
 "Balíky na inštaláciu\n"
 " Tieto balíky ste vybrali na inštaláciu na svoj počítač."
@@ -3163,10 +3345,12 @@
 #: src/pkg_grouppolicy.cc:937
 msgid ""
 "\n"
-" Tasks are groups of packages which provide an easy way to select a predefined set of packages for a particular purpose."
+" Tasks are groups of packages which provide an easy way to select a "
+"predefined set of packages for a particular purpose."
 msgstr ""
 "\n"
-" Úlohy sú skupiny balíkov, ktoré ponúkajú jednoduchú cestu na výber všetkých potrebných balíkov na splnenie konkrétnej úlohy."
+" Úlohy sú skupiny balíkov, ktoré ponúkajú jednoduchú cestu na výber všetkých "
+"potrebných balíkov na splnenie konkrétnej úlohy."
 
 #: src/pkg_info_screen.cc:116
 msgid "Compressed size: "
@@ -3200,75 +3384,77 @@
 
 #: src/pkg_item.cc:80
 #, c-format
-msgid "%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%nSte si istý, že ho chcete odstrániť?%nAk ste, napíšte '%s'."
+msgid ""
+"%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%nSte si istý, že ho chcete odstrániť?%nAk ste, napíšte "
+"'%s'."
 
-#: src/pkg_item.cc:222
-#: src/pkg_ver_item.cc:625
+#: src/pkg_item.cc:220 src/pkg_ver_item.cc:626
 #, c-format
 msgid "Information about %s"
 msgstr "Informácie o %s"
 
-#: src/pkg_item.cc:224
-#: src/pkg_ver_item.cc:627
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:628
 #, c-format
 msgid "%s info"
 msgstr "%s info"
 
-#: src/pkg_item.cc:310
+#: src/pkg_item.cc:308
 #, c-format
 msgid "Available versions of %s"
 msgstr "Dostupné verzie %s"
 
-#: src/pkg_item.cc:313
+#: src/pkg_item.cc:311
 #, c-format
 msgid "%s versions"
 msgstr "%s verzie"
 
-#: src/pkg_item.cc:325
-#: src/pkg_ver_item.cc:655
+#: src/pkg_item.cc:323 src/pkg_ver_item.cc:656
 #, c-format
 msgid "Dependencies of %s"
 msgstr "Závislosti %s"
 
-#: src/pkg_item.cc:327
-#: src/pkg_ver_item.cc:657
+#: src/pkg_item.cc:325 src/pkg_ver_item.cc:658
 #, c-format
 msgid "%s deps"
 msgstr "%s závis"
 
-#: src/pkg_item.cc:338
-#: src/pkg_ver_item.cc:667
+#: src/pkg_item.cc:336 src/pkg_ver_item.cc:668
 #, c-format
 msgid "Packages depending on %s"
 msgstr "Balíky závisiace na %s"
 
-#: src/pkg_item.cc:340
-#: src/pkg_ver_item.cc:669
+#: src/pkg_item.cc:338 src/pkg_ver_item.cc:670
 #, c-format
 msgid "%s reverse deps"
 msgstr "%s reverzných závis"
 
-#: src/pkg_item.cc:392
-#: src/pkg_ver_item.cc:707
+#: src/pkg_item.cc:390 src/pkg_ver_item.cc:708
 #, c-format
 msgid "Reporting a bug in %s:\n"
 msgstr "Hlásim chybu v %s:\n"
 
-#: src/pkg_item.cc:414
-msgid "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 stať.  Na rekonfiguráciu tohto balíku nainštalujte balíky menu a login, alebo spusťte aptitude ako root."
+#: src/pkg_item.cc:412
+msgid ""
+"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 stať.  Na rekonfiguráciu tohto "
+"balíku nainštalujte balíky menu a login, alebo spusťte aptitude ako root."
 
-#: src/pkg_item.cc:422
+#: src/pkg_item.cc:420
 #, c-format
 msgid "Reconfiguring %s\n"
 msgstr "Prekonfigurovávám %s\n"
 
-#: src/pkg_item.cc:447
+#: src/pkg_item.cc:445
 msgid "Hierarchy editor"
 msgstr "Editor hierarchie"
 
-#: src/pkg_item.cc:447
+#: src/pkg_item.cc:445
 msgid "Hierarchy Editor"
 msgstr "Editor Hierarchie"
 
@@ -3280,8 +3466,7 @@
 msgid "All Packages"
 msgstr "Všetky balíky"
 
-#: src/pkg_tree.cc:581
-#: src/pkg_tree.cc:590
+#: src/pkg_tree.cc:581 src/pkg_tree.cc:590
 msgid "Building view"
 msgstr "Zostavujem pohľad"
 
@@ -3302,19 +3487,20 @@
 msgid "Enter the new package sorting mechanism for this display: "
 msgstr "Triediaci mechanizmus: "
 
-#: src/pkg_view.cc:344
+#: src/pkg_view.cc:359
 msgid "make_package_view: error in arguments -- two main widgets??"
 msgstr "make_package_view: chyba v argumentoch -- dva hlavné widgety??"
 
-#: src/pkg_view.cc:350
-msgid "make_package_view: error in arguments -- bad column list for static item"
+#: src/pkg_view.cc:365
+msgid ""
+"make_package_view: error in arguments -- bad column list for static item"
 msgstr "make_package_view: chyba v argumentoch -- chybný zoznam stĺpcov"
 
-#: src/pkg_view.cc:443
+#: src/pkg_view.cc:458
 msgid "make_package_view: bad argument!"
 msgstr "make_package_view: chybný argument!"
 
-#: src/pkg_view.cc:495
+#: src/pkg_view.cc:510
 msgid "make_package_view: no main widget found"
 msgstr "make_package_view: nebol nájdený hlavný widget"
 
@@ -3351,127 +3537,181 @@
 msgid " (provided by %F)"
 msgstr " (poskytovaný %F)"
 
-#: src/reason_fragment.cc:278
+#: src/reason_fragment.cc:275
 #, c-format
 msgid "%F%s %F %F"
 msgstr "%F%s %F %F"
 
-#: src/reason_fragment.cc:327
-msgid "If you select a package, an explanation of its current state will appear in this space."
+#: src/reason_fragment.cc:324
+msgid ""
+"If you select a package, an explanation of its current state will appear in "
+"this space."
 msgstr "Ak vyberiete balík, objaví sa tu popis jeho aktuálneho stavu."
 
-#: src/reason_fragment.cc:361
-msgid "%B%s%b was installed automatically;  it is being removed because all of the packages which depend upon it are being removed:"
-msgstr "%B%s%b bol inštalovaný automaticky; teraz bude odstránený, pretože všetky balíky, ktoré na ňom záviseli, budú odstránené:"
+#: src/reason_fragment.cc:358
+msgid ""
+"%B%s%b was installed automatically;  it is being removed because all of the "
+"packages which depend upon it are being removed:"
+msgstr ""
+"%B%s%b bol inštalovaný automaticky; teraz bude odstránený, pretože všetky "
+"balíky, ktoré na ňom záviseli, budú odstránené:"
 
-#: src/reason_fragment.cc:365
+#: src/reason_fragment.cc:362
 msgid "%B%s%b will be automatically removed because of dependency errors:"
 msgstr "%B%s%b bude automaticky odstránený kvôli chybám v závislostiach:"
 
-#: src/reason_fragment.cc:369
-msgid "%B%s%b will be automatically installed to satisfy the following dependencies:"
-msgstr "%B%s%b bude inštalovaný automaticky na splnenie nasledujúcich závislostí:"
+#: src/reason_fragment.cc:366
+msgid ""
+"%B%s%b will be automatically installed to satisfy the following dependencies:"
+msgstr ""
+"%B%s%b bude inštalovaný automaticky na splnenie nasledujúcich závislostí:"
 
-#: src/reason_fragment.cc:375
-#: src/reason_fragment.cc:387
-msgid "%B%s%b cannot be upgraded now, but if it could be, it would still be held at version %B%s%b."
-msgstr "%B%s%b nemôže byť aktualizovaný, a i keby mohol, bol by podržaný vo verzií %B%s%b."
+#: src/reason_fragment.cc:372 src/reason_fragment.cc:384
+msgid ""
+"%B%s%b cannot be upgraded now, but if it could be, it would still be held at "
+"version %B%s%b."
+msgstr ""
+"%B%s%b nemôže byť aktualizovaný, a i keby mohol, bol by podržaný vo verzií %B"
+"%s%b."
 
-#: src/reason_fragment.cc:378
-msgid "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the following dependencies:"
-msgstr "%B%s%b nebude aktualizovaný na verziu %B%s%b, aby neporušil nasledujúce závislosti:"
+#: src/reason_fragment.cc:375
+msgid ""
+"%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the "
+"following dependencies:"
+msgstr ""
+"%B%s%b nebude aktualizovaný na verziu %B%s%b, aby neporušil nasledujúce "
+"závislosti:"
 
-#: src/reason_fragment.cc:390
+#: src/reason_fragment.cc:387
 msgid "%B%s%b is currently installed."
 msgstr "%B%s%b je nainštalovaný."
 
-#: src/reason_fragment.cc:396
+#: src/reason_fragment.cc:393
 msgid "%B%s%b is not currently installed."
 msgstr "%B%s%b nie je nainštalovaný."
 
-#: src/reason_fragment.cc:404
+#: src/reason_fragment.cc:401
 msgid "Some dependencies of %B%s%b are not satisfied:"
 msgstr "Niektoré závislosti %B%s%b nie sú splnené:"
 
-#: src/reason_fragment.cc:408
+#: src/reason_fragment.cc:405
 msgid "%B%s%b will be downgraded."
 msgstr "%B%s%b bude degradovaný."
 
-#: src/reason_fragment.cc:415
+#: src/reason_fragment.cc:412
 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b."
 msgstr "%B%s%b nebude aktualizovaný na zakázanú verziu %B%s%b."
 
-#: src/reason_fragment.cc:419
-msgid "%B%s%b could be upgraded to version %B%s%b, but it is being held at version %B%s%b."
-msgstr "%B%s%b by mohol byť aktualizovaný na verziu %B%s%b, ale je podržaný vo verzii %B%s%b."
+#: src/reason_fragment.cc:416
+msgid ""
+"%B%s%b could be upgraded to version %B%s%b, but it is being held at version %"
+"B%s%b."
+msgstr ""
+"%B%s%b by mohol byť aktualizovaný na verziu %B%s%b, ale je podržaný vo "
+"verzii %B%s%b."
 
-#: src/reason_fragment.cc:426
+#: src/reason_fragment.cc:423
 msgid "%B%s%b will be re-installed."
 msgstr "%B%s%b bude nainštalovaný."
 
-#: src/reason_fragment.cc:430
+#: src/reason_fragment.cc:427
 msgid "%B%s%b will be installed."
 msgstr "%B%s%b bude inštalovaný."
 
-#: src/reason_fragment.cc:434
+#: src/reason_fragment.cc:431
 msgid "%B%s%b will be removed."
 msgstr "%B%s%b bude odstránený."
 
-#: src/reason_fragment.cc:439
+#: src/reason_fragment.cc:436
 msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b."
 msgstr "%B%s%b bude aktualizovaný z verzie %B%s%b na verziu %B%s%b."
 
-#: src/reason_fragment.cc:475
-msgid "The following packages depend on %B%s%b and will be broken by its removal:"
+#: src/reason_fragment.cc:472
+msgid ""
+"The following packages depend on %B%s%b and will be broken by its removal:"
 msgstr "Nasledujúce balíky závisia na %B%s%b a budú jeho odstránením porušené:"
 
-#: src/reason_fragment.cc:478
+#: src/reason_fragment.cc:475
 msgid "The following packages depend on %B%s%b and are broken:"
 msgstr "Nasledujúce balíky závisia na %B%s%b a sú porušené:"
 
-#: src/reason_fragment.cc:485
-msgid "The following packages conflict with %B%s%b and will be broken by its installation:"
-msgstr "Nasledujúce balíky sú v konflikte s %B%s%b a budú jeho inštaláciou porušené:"
-
-#: src/reason_fragment.cc:518
-msgid "The following packages depend on a version of %B%s%b other than the currently installed version of %B%s%b, or conflict with the currently installed version:"
-msgstr "Nasledujúce balíky závisia na balíku %B%s%b v inej verzií, než je aktuálne inštalovaná %B%s%b, alebo sú s ňou v konflikte:"
-
-#: src/reason_fragment.cc:522
-msgid "The following packages conflict with %B%s%b, or depend on a version of it which is not going to be installed."
-msgstr "Nasledujúce balíky sú v konflikte s %B%s%b, alebo závisia na jeho verzii, ktorá nebude inštalovaná."
+#: src/reason_fragment.cc:482
+msgid ""
+"The following packages conflict with %B%s%b and will be broken by its "
+"installation:"
+msgstr ""
+"Nasledujúce balíky sú v konflikte s %B%s%b a budú jeho inštaláciou porušené:"
+
+#: src/reason_fragment.cc:515
+msgid ""
+"The following packages depend on a version of %B%s%b other than the "
+"currently installed version of %B%s%b, or conflict with the currently "
+"installed version:"
+msgstr ""
+"Nasledujúce balíky závisia na balíku %B%s%b v inej verzií, než je aktuálne "
+"inštalovaná %B%s%b, alebo sú s ňou v konflikte:"
+
+#: src/reason_fragment.cc:519
+msgid ""
+"The following packages conflict with %B%s%b, or depend on a version of it "
+"which is not going to be installed."
+msgstr ""
+"Nasledujúce balíky sú v konflikte s %B%s%b, alebo závisia na jeho verzii, "
+"ktorá nebude inštalovaná."
 
-#: src/reason_fragment.cc:526
+#: src/reason_fragment.cc:523
 msgid "The following packages conflict with %B%s%b:"
 msgstr "Nasledujúce balíky sú v konflikte s %B%s%b:"
 
-#: src/reason_fragment.cc:531
-msgid "The following packages depend on a version of %B%s%b other than the currently installed version of %B%s%b:"
-msgstr "Nasledujúce balíky závisia na balíku %B%s%b v inej verzii, než je aktuálne inštalovaná %B%s%b:"
-
-#: src/reason_fragment.cc:535
-msgid "The following packages depend on a version of %B%s%b which is not going to be installed."
-msgstr "Nasledujúce balíky závisia na verzii balíku %B%s%b, ktorá sa nebude inštalovať."
+#: src/reason_fragment.cc:528
+msgid ""
+"The following packages depend on a version of %B%s%b other than the "
+"currently installed version of %B%s%b:"
+msgstr ""
+"Nasledujúce balíky závisia na balíku %B%s%b v inej verzii, než je aktuálne "
+"inštalovaná %B%s%b:"
 
-#: src/reason_fragment.cc:541
+#: src/reason_fragment.cc:532
+msgid ""
+"The following packages depend on a version of %B%s%b which is not going to "
+"be installed."
+msgstr ""
+"Nasledujúce balíky závisia na verzii balíku %B%s%b, ktorá sa nebude "
+"inštalovať."
+
+#: src/reason_fragment.cc:538
 msgid "upgraded"
 msgstr "aktualizovaný"
 
-#: src/reason_fragment.cc:541
+#: src/reason_fragment.cc:538
 msgid "downgraded"
 msgstr "degradovaný"
 
-#: src/reason_fragment.cc:547
-msgid "The following packages depend on the currently installed version of %B%s%b (%B%s%b), or conflict with the version it will be %s to (%B%s%b), and will be broken if it is %s."
-msgstr "Nasledujúce balíky závisia na aktuálne inštalovanej verzii balíku %B%s%b (%B%s%b), alebo sú v konflikte s verziou, na ktorú bude balík %s (%B%s%b). Ak bude balík %s, budú tieto balíky porušené."
-
-#: src/reason_fragment.cc:554
-msgid "The following packages conflict with version %B%s%b of %B%s%b, and will be broken if it is %s."
-msgstr "Nasledujúce balíky sú v konflikte s verziou %B%s%b balíku %B%s%b. Ak bude balík %s, budú tieto balíky porušené."
-
-#: src/reason_fragment.cc:559
-msgid "The following packages depend on version %B%s%b of %B%s%b, and will be broken if it is %s."
-msgstr "Nasledujúce balíky sú závisia na verzii %B%s%b balíku %B%s%b. Ak bude balík %s, budú tieto balíky porušené."
+#: src/reason_fragment.cc:544
+msgid ""
+"The following packages depend on the currently installed version of %B%s%b (%"
+"B%s%b), or conflict with the version it will be %s to (%B%s%b), and will be "
+"broken if it is %s."
+msgstr ""
+"Nasledujúce balíky závisia na aktuálne inštalovanej verzii balíku %B%s%b (%B%"
+"s%b), alebo sú v konflikte s verziou, na ktorú bude balík %s (%B%s%b). Ak "
+"bude balík %s, budú tieto balíky porušené."
+
+#: src/reason_fragment.cc:551
+msgid ""
+"The following packages conflict with version %B%s%b of %B%s%b, and will be "
+"broken if it is %s."
+msgstr ""
+"Nasledujúce balíky sú v konflikte s verziou %B%s%b balíku %B%s%b. Ak bude "
+"balík %s, budú tieto balíky porušené."
+
+#: src/reason_fragment.cc:556
+msgid ""
+"The following packages depend on version %B%s%b of %B%s%b, and will be "
+"broken if it is %s."
+msgstr ""
+"Nasledujúce balíky sú závisia na verzii %B%s%b balíku %B%s%b. Ak bude balík %"
+"s, budú tieto balíky porušené."
 
 #: src/solution_dialog.cc:74
 msgid "The package cache is not available."
@@ -3487,8 +3727,12 @@
 
 #: 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 "Vyčerpal sa čas vyhradený na hľadanie riešenia (môžete vybrať \"Ďalšie riešenie\" alebo stlačiť %s na dôkladnejšie hľadanie)."
+msgid ""
+"Time exhausted while searching for a solution (you can select \"Next Solution"
+"\" or press %s to try harder)."
+msgstr ""
+"Vyčerpal sa čas vyhradený na hľadanie riešenia (môžete vybrať \"Ďalšie "
+"riešenie\" alebo stlačiť %s na dôkladnejšie hľadanie)."
 
 #: src/solution_dialog.cc:146
 msgid "Previous"
@@ -3506,39 +3750,48 @@
 msgid "Close"
 msgstr "Zavrieť"
 
-#: src/solution_fragment.cc:125
+#: src/solution_fragment.cc:134
 msgid "%BRemove%b the following packages:%n"
 msgstr "%BOdstrániť%b nasledujúce balíky:%n"
 
-#: src/solution_fragment.cc:135
+#: src/solution_fragment.cc:144
 msgid "%BInstall%b the following packages:%n"
 msgstr "%BNainštalovať%b nasledujúce balíky:%n"
 
-#: src/solution_fragment.cc:148
+#: src/solution_fragment.cc:157
 msgid "%BKeep%b the following packages at their current version:%n"
 msgstr "%BPodrž%b nasledujúcich balíčkov v ich aktuánych verziách:%n"
 
-#: src/solution_fragment.cc:161
+#: src/solution_fragment.cc:164
+#, fuzzy
+msgid "Not Installed"
+msgstr "nenainštalovaný"
+
+#: src/solution_fragment.cc:177
 msgid "%BUpgrade%b the following packages:%n"
 msgstr "%BAktualizovať%b nasledujúce balíky:%n"
 
-#: src/solution_fragment.cc:176
+#: src/solution_fragment.cc:192
 msgid "%BDowngrade%b the following packages:%n"
 msgstr "%BDegradovať%b nasledujúce balíky:%n"
 
-#: src/solution_fragment.cc:190
+#: src/solution_fragment.cc:206
 #, c-format
 msgid "Score is %d"
 msgstr "Skóre je %d"
 
-#: src/trust.cc:17
-#: src/trust.cc:19
+#: src/trust.cc:17 src/trust.cc:19
 msgid "WARNING"
 msgstr "VAROVANIE"
 
 #: src/trust.cc:18
-msgid "%F: This version of %s is from an %Buntrusted source%b!  Installing this package could allow a malicious individual to damage or take control of your system."
-msgstr "%F: Táto verzia %s je z %Bnedôverihodného zdroja%b!  Inštaláciou tohto balíčka môžete dovoliť zákernému jedincovi poškodiť alebo riadiť Váš systém."
+msgid ""
+"%F: This version of %s is from an %Buntrusted source%b!  Installing this "
+"package could allow a malicious individual to damage or take control of your "
+"system."
+msgstr ""
+"%F: Táto verzia %s je z %Bnedôverihodného zdroja%b!  Inštaláciou tohto "
+"balíčka môžete dovoliť zákernému jedincovi poškodiť alebo riadiť Váš systém."
 
 #: src/ui.cc:165
 msgid "Er, there aren't any errors, this shouldn't have happened.."
@@ -3554,544 +3807,595 @@
 msgid "W:"
 msgstr "W:"
 
-#: src/ui.cc:194
+#: src/ui.cc:193
 msgid "Search for:"
 msgstr "Hľadať:"
 
-#: src/ui.cc:262
+#: src/ui.cc:258
 msgid "You already are root!"
 msgstr "Už ste root!"
 
-#: src/ui.cc:360
-msgid "Subprocess exited with an error -- did you type your password correctly?"
+#: src/ui.cc:356
+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:388
+#: src/ui.cc:384
 msgid "Loading cache"
 msgstr "Nahrávam cache"
 
-#: src/ui.cc:410
+#: src/ui.cc:406
 msgid "Really quit Aptitude?"
 msgstr "Skutočne ukončiť Aptitude?"
 
-#: src/ui.cc:489
+#: src/ui.cc:485
 msgid "Really discard your personal settings and reload the defaults?"
 msgstr "Skutočne zahodiť osobné nastavenie a načítať štandardné hodnoty?"
 
-#: src/ui.cc:589
-#: src/ui.cc:591
-#: src/ui.cc:619
-#: src/ui.cc:621
+#: src/ui.cc:585 src/ui.cc:587 src/ui.cc:615 src/ui.cc:617
 msgid "Packages"
 msgstr "Balíky"
 
-#: src/ui.cc:590
-#: src/ui.cc:620
+#: src/ui.cc:586 src/ui.cc:616
 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:667
-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 is free software, and you are welcome to redistribute it under certain conditions; see 'license' for details."
-msgstr "%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%nna aptitude sa nevzťahuje %BABSOLÚTNE ŽIADNA ZÁRUKA%b; podrobnosti nájdete v menu Pomoc, 'licencia'. Toto je slobodný softvér a budeme radi, ak ho budete pod určitými podmienkami šíriť ďalej; podrobnosti viď 'licencia'."
+#: src/ui.cc:663
+#, fuzzy
+msgid ""
+"Aptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
+"BABSOLUTELY NO WARRANTY%b; for details see 'license' in the Help menu.  This "
+"is free software, and you are welcome to redistribute it under certain "
+"conditions; see 'license' for details."
+msgstr ""
+"%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%nna aptitude sa "
+"nevzťahuje %BABSOLÚTNE ŽIADNA ZÁRUKA%b; podrobnosti nájdete v menu Pomoc, "
+"'licencia'. Toto je slobodný softvér a budeme radi, ak ho budete pod "
+"určitými podmienkami šíriť ďalej; podrobnosti viď 'licencia'."
 
-#: src/ui.cc:688
+#: src/ui.cc:684
 msgid "help.txt"
 msgstr "help-sk.txt"
 
-#: src/ui.cc:704
+#: src/ui.cc:700
 msgid "README"
 msgstr "README.sk"
 
-#: src/ui.cc:786
-msgid "%C%BWARNING%b: untrusted versions of the following packages will be installed!%n%nUntrusted packages could %Bcompromise your system's security%b.  You should only proceed with the installation if you are certain that this is what you want to do.%n%n"
-msgstr "%C%BVAROVANIE%b: budú nainštalované nedôverihodné verzie nasledujúcich balíčkov!%n%nNedôverihodné balíčky môžu %Bohroziť bezpečnosť Vášho systému%b.  V inšztalácií by ste mali pokračovať iba vtedy, ak ste si istý čo chcete spraviť.%n%n"
+#: src/ui.cc:782
+msgid ""
+"%BWARNING%b: untrusted versions of the following packages will be installed!%"
+"n%nUntrusted packages could %Bcompromise your system's security%b.  You "
+"should only proceed with the installation if you are certain that this is "
+"what you want to do.%n%n"
+msgstr ""
+
+#: src/ui.cc:788
+#, fuzzy
+msgid "  %S*%N %s [version %s]%n"
+msgstr "%s verzie"
 
-#: src/ui.cc:800
+#: src/ui.cc:795
 msgid "Really Continue"
 msgstr "Skutočne Pokračovať"
 
-#: src/ui.cc:802
+#: src/ui.cc:797
 msgid "Abort Installation"
 msgstr "Zrušiť Inštaláciu"
 
-#: src/ui.cc:863
+#: src/ui.cc:858
 msgid "Preview of package installation"
 msgstr "Náhľad inštalácie balíkov"
 
-#: src/ui.cc:864
+#: src/ui.cc:859
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Zobrazí a/alebo upraví akcie, ktoré sa majú vykonať"
 
-#: src/ui.cc:865
+#: src/ui.cc:860
 msgid "Preview"
 msgstr "Náhľad"
 
-#: src/ui.cc:901
+#: src/ui.cc:896
 msgid "Some packages were broken and have been fixed:"
 msgstr "Niektoré balíky boli poškodené a podarilo sa ich opraviť:"
 
-#: src/ui.cc:907
+#: src/ui.cc:902
 msgid "No solution to these dependency problems exists!"
 msgstr "Na tieto problémy so závislosťami neexistuje žiadne riešenie!"
 
-#: src/ui.cc:913
-#, c-format
-msgid "Ran out of time while trying to resolver dependencies (press \"%s\" to try harder)"
-msgstr "Počas pokusov o vyriešenie závislostí som presiahol čas (stlačte \"%s\" na dôkladnejšie hľadanie)"
+#: src/ui.cc:908
+#, fuzzy, c-format
+msgid ""
+"Ran out of time while trying to resolve dependencies (press \"%s\" to try "
+"harder)"
+msgstr ""
+"Počas pokusov o vyriešenie závislostí som presiahol čas (stlačte \"%s\" na "
+"dôkladnejšie hľadanie)"
 
-#: src/ui.cc:959
-msgid "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é momentálne nemáte. Chcete sa prepnúť na účet root?"
+#: src/ui.cc:954
+msgid ""
+"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é "
+"momentálne nemáte. Chcete sa prepnúť na účet root?"
 
-#: src/ui.cc:962
-#: src/ui.cc:1078
+#: src/ui.cc:957 src/ui.cc:1072
 msgid "Become root"
 msgstr "Stať sa rootom"
 
-#: src/ui.cc:964
-#: src/ui.cc:1080
+#: src/ui.cc:959 src/ui.cc:1074
 msgid "Don't become root"
 msgstr "Nestať sa rootom"
 
-#: src/ui.cc:969
-#: src/ui.cc:1085
+#: src/ui.cc:964 src/ui.cc:1079
 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:996
+#: src/ui.cc:991
 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."
+msgstr ""
+"Žiadne balíky nie sú označené na inštaláciu, aktualizáciu alebo odstránenie."
 
-#: src/ui.cc:1002
-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 "Žiadne balíky nebudú inštalované, odstránené alebo aktualizované.  Niektoré balíky síce môžu byť aktualizované, ale vybrali ste, že sa nemajú aktualizovať.  Aktualizáciu môžete pripraviť klávesou \"U\"."
+#: src/ui.cc:997
+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 ""
+"Žiadne balíky nebudú inštalované, odstránené alebo aktualizované.  Niektoré "
+"balíky síce môžu byť aktualizované, ale vybrali ste, že sa nemajú "
+"aktualizovať.  Aktualizáciu môžete pripraviť klávesou \"U\"."
 
-#: src/ui.cc:1074
-msgid "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é momentálne nemáte. Chcete sa prepnúť na účet root?"
+#: src/ui.cc:1069
+msgid ""
+"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é "
+"momentálne nemáte. Chcete sa prepnúť na účet root?"
 
-#: src/ui.cc:1090
-#: src/ui.cc:1377
+#: src/ui.cc:1084 src/ui.cc:1371
 msgid "Waste time trying to find mines"
 msgstr "Zabiť čas hľadaním mín."
 
-#: src/ui.cc:1097
-#: src/ui.cc:1150
+#: src/ui.cc:1091 src/ui.cc:1144
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "Čistenie počas sťahovania nie je dovolené"
 
-#: src/ui.cc:1100
+#: src/ui.cc:1094
 msgid "Deleting downloaded files"
 msgstr "Vymazávam stiahnuté súbory"
 
-#: src/ui.cc:1114
+#: src/ui.cc:1108
 msgid "Downloaded package files have been deleted"
 msgstr "Stiahnuté balíky boli vymazané"
 
-#: src/ui.cc:1175
+#: src/ui.cc:1169
 #, c-format
-msgid "Obsolete downloaded package files have been deleted, freeing %sB of disk space."
+msgid ""
+"Obsolete downloaded package files have been deleted, freeing %sB of disk "
+"space."
 msgstr "Staré stiahnuté balíky boli vymazané, uvoľnilo sa %sB miesta na disku."
 
-#: src/ui.cc:1247
+#: src/ui.cc:1241
 msgid "All solutions exhausted."
 msgstr "Všetky riešenia boli vyčerpané."
 
-#: src/ui.cc:1252
-#: src/ui.cc:1283
+#: src/ui.cc:1246 src/ui.cc:1277
 msgid "Ran out of time while trying to find a solution."
 msgstr "Vypšal čas počas hľadania riešenia."
 
-#: src/ui.cc:1277
+#: src/ui.cc:1271
 msgid "Unable to find a solution to apply."
 msgstr "Nemôžem nájsť potvrdené riešenie"
 
-#: src/ui.cc:1307
+#: src/ui.cc:1301
 #, c-format
 msgid "Unable to open %s"
 msgstr "Nemôžem otvoriť %s"
 
-#: src/ui.cc:1313
+#: src/ui.cc:1307
 msgid "Error while dumping resolver state"
 msgstr "Nastala chyba pri ukladaní stavu riešenia"
 
-#: src/ui.cc:1323
+#: src/ui.cc:1317
 msgid "File to which the resolver state should be dumped:"
 msgstr "Súbor, do ktorého má byť stav riešenia uložený:"
 
-#: src/ui.cc:1353
+#: src/ui.cc:1347
 msgid "^Install/remove packages"
 msgstr "^Inštalovať/odstrániť balíky"
 
-#: src/ui.cc:1354
+#: src/ui.cc:1348
 msgid "Perform all pending installs and removals"
 msgstr "Vykoná všetky nevykonané inštalácie a odstraňovania"
 
-#: src/ui.cc:1356
+#: src/ui.cc:1350
 msgid "^Update package list"
 msgstr "^Aktualizovať zoznam balíkov"
 
-#: src/ui.cc:1357
+#: src/ui.cc:1351
 msgid "Check for new versions of packages"
 msgstr "Zistí, či nie sú k dispozícii novšie verzie balíkov"
 
-#: src/ui.cc:1360
+#: src/ui.cc:1354
 msgid "^Forget new packages"
 msgstr "^Zabudnúť nové balíky"
 
-#: src/ui.cc:1361
+#: src/ui.cc:1355
 msgid "Forget which packages are \"new\""
 msgstr "Zabudne, ktoré balíky sú \"nové\""
 
-#: src/ui.cc:1364
+#: src/ui.cc:1358
 msgid "^Clean package cache"
 msgstr "Vyčistiť ^cache s balíkmi"
 
-#: src/ui.cc:1365
+#: src/ui.cc:1359
 msgid "Delete package files which were previously downloaded"
 msgstr "Vymaže stiahnuté súbory (balíky) z /var/cache/apt"
 
-#: src/ui.cc:1368
+#: src/ui.cc:1362
 msgid "Clean ^obsolete files"
 msgstr "Vyčistiť staré súb^ory"
 
-#: src/ui.cc:1369
+#: src/ui.cc:1363
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Vymaže súbory, ktoré sa už nedajú stiahnuť"
 
-#: src/ui.cc:1372
+#: src/ui.cc:1366
 msgid "Mark ^Upgradable"
 msgstr "Označiť aktualizovateľné"
 
-#: src/ui.cc:1373
+#: src/ui.cc:1367
 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:1376
+#: src/ui.cc:1370
 msgid "^Play Minesweeper"
 msgstr "Zahrať si mínové ^pole"
 
-#: src/ui.cc:1379
+#: src/ui.cc:1373
 msgid "^Become root"
 msgstr "Stať sa rootom"
 
-#: src/ui.cc:1380
-msgid "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'; toto  reštartuje program, ale Vaše nastavenia budú zachované"
+#: src/ui.cc:1374
+msgid ""
+"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'; toto  reštartuje program, ale "
+"Vaše nastavenia budú zachované"
 
-#: src/ui.cc:1383
+#: src/ui.cc:1377
 msgid "^Reload package cache"
 msgstr "Znovu načítať cache"
 
-#: src/ui.cc:1384
+#: src/ui.cc:1378
 msgid "Reload the package cache"
 msgstr "Znovu načítať obsah cache"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1384
 msgid "^Quit"
 msgstr "Koniec"
 
-#: src/ui.cc:1391
+#: src/ui.cc:1385
 msgid "Exit the program"
 msgstr "Ukončí program"
 
-#: src/ui.cc:1397
-#: src/ui.cc:1669
+#: src/ui.cc:1391 src/ui.cc:1661
 msgid "Undo"
 msgstr "Späť"
 
-#: src/ui.cc:1398
+#: src/ui.cc:1392
 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:1405
+#: src/ui.cc:1399
 msgid "^Install"
 msgstr "^Inštalovať"
 
-#: src/ui.cc:1406
+#: src/ui.cc:1400
 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:1409
+#: src/ui.cc:1403
 msgid "^Remove"
 msgstr "Odst^rániť"
 
-#: src/ui.cc:1410
+#: src/ui.cc:1404
 msgid "Flag the currently selected package for removal"
 msgstr "Označí aktuálny vybraný balík na odstránenie"
 
-#: src/ui.cc:1413
+#: src/ui.cc:1407
 msgid "^Purge"
 msgstr "Vyčistiť"
 
-#: src/ui.cc:1414
-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:1408
+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:1417
+#: src/ui.cc:1411
 msgid "^Keep"
 msgstr "Ponechať"
 
-#: src/ui.cc:1418
+#: src/ui.cc:1412
 msgid "Cancel any action on the selected package"
 msgstr "Na vybranom balíku zruší všetky akcie"
 
-#: src/ui.cc:1421
+#: src/ui.cc:1415
 msgid "^Hold"
 msgstr "Podržať"
 
-#: src/ui.cc:1422
-msgid "Cancel any action on the selected package, and protect it from future upgrades"
-msgstr "Na vybranom balíku zruší všetky akcie a ochráni ho pred budúcimi aktualizáciami."
+#: src/ui.cc:1416
+msgid ""
+"Cancel any action on the selected package, and protect it from future "
+"upgrades"
+msgstr ""
+"Na vybranom balíku zruší všetky akcie a ochráni ho pred budúcimi "
+"aktualizáciami."
 
-#: src/ui.cc:1425
+#: src/ui.cc:1419
 msgid "Mark ^Auto"
 msgstr "Označiť ^automaticky"
 
-#: src/ui.cc:1426
-msgid "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; ak na ňom nebudú závisieť iné balíky, bude automaticky odstránený"
+#: src/ui.cc:1420
+msgid ""
+"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; ak na ňom nebudú závisieť "
+"iné balíky, bude automaticky odstránený"
 
-#: src/ui.cc:1429
+#: src/ui.cc:1423
 msgid "Mark ^Manual"
 msgstr "Označiť ručne"
 
-#: src/ui.cc:1430
-msgid "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; nebude odstránený, pokiaľ ho neodstránite sami"
+#: src/ui.cc:1424
+msgid ""
+"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; nebude odstránený, "
+"pokiaľ ho neodstránite sami"
 
-#: src/ui.cc:1433
+#: src/ui.cc:1427
 msgid "^Forbid Version"
 msgstr "Zakázať ^verziu"
 
-#: src/ui.cc:1434
-msgid "Forbid the candidate version of the selected package from being installed; newer versions of the package will be installed as usual"
-msgstr "Zakázať, aby sa kandidátska verzia balíku nainštalovala; novšie verzie balíku sa budú inštalovať ako zvyčajne"
+#: src/ui.cc:1428
+msgid ""
+"Forbid the candidate version of the selected package from being installed; "
+"newer versions of the package will be installed as usual"
+msgstr ""
+"Zakázať, aby sa kandidátska verzia balíku nainštalovala; novšie verzie "
+"balíku sa budú inštalovať ako zvyčajne"
 
-#: src/ui.cc:1438
+#: src/ui.cc:1432
 msgid "I^nformation"
 msgstr "I^nformácie"
 
-#: src/ui.cc:1439
+#: src/ui.cc:1433
 msgid "Display more information about the selected package"
 msgstr "Na vybraný balík zobrazí ďalšie informácie"
 
-#: src/ui.cc:1442
+#: src/ui.cc:1436
 msgid "^Changelog"
 msgstr "^Changelog"
 
-#: src/ui.cc:1443
+#: src/ui.cc:1437
 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:1450
+#: src/ui.cc:1444
 msgid "^Find"
 msgstr "Hľadať"
 
-#: src/ui.cc:1451
+#: src/ui.cc:1445
 msgid "Search for a package"
 msgstr "Hľadá balík"
 
-#: src/ui.cc:1454
+#: src/ui.cc:1448
 msgid "Find ^Again"
 msgstr "Hľadať znova"
 
-#: src/ui.cc:1455
+#: src/ui.cc:1449
 msgid "Repeat the last search"
 msgstr "Zopakuje posledné hľadanie"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1453
 msgid "^Limit Display"
 msgstr "Obmedziť zobrazenie"
 
-#: src/ui.cc:1460
+#: src/ui.cc:1454
 msgid "Apply a filter to the package list"
 msgstr "Na zoznam balíkov aplikuje výberový filter"
 
-#: src/ui.cc:1463
+#: src/ui.cc:1457
 msgid "^Un-Limit Display"
 msgstr "Zrušiť obmedzenie"
 
-#: src/ui.cc:1464
+#: src/ui.cc:1458
 msgid "Remove the filter from the package list"
 msgstr "Odstráni filter aplikovaný na zoznam balíkov"
 
-#: src/ui.cc:1468
+#: src/ui.cc:1462
 msgid "Find ^Broken"
 msgstr "Hľadať porušené"
 
-#: src/ui.cc:1469
+#: src/ui.cc:1463
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Hľadá ďalší balík s nesplnenými závislosťami"
 
-#: src/ui.cc:1476
+#: src/ui.cc:1470
 msgid "^UI options"
 msgstr "Nastavenie zobrazenia"
 
-#: src/ui.cc:1477
+#: src/ui.cc:1471
 msgid "Change the settings which affect the user interface"
 msgstr "Zmení nastavenia, ktoré ovplyvňujú užívateľské rozhranie"
 
-#: src/ui.cc:1480
+#: src/ui.cc:1474
 msgid "^Dependency handling"
 msgstr "Správa závislostí"
 
-#: src/ui.cc:1481
+#: src/ui.cc:1475
 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:1484
+#: src/ui.cc:1478
 msgid "^Miscellaneous"
 msgstr "Rôzne"
 
-#: src/ui.cc:1485
+#: src/ui.cc:1479
 msgid "Change miscellaneous program settings"
 msgstr "Zmení rôzne nastavenia programu"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1484
 msgid "^Revert options"
 msgstr "Pôvodné nastavenia"
 
-#: src/ui.cc:1491
+#: src/ui.cc:1485
 msgid "Reset all settings to the system defaults"
 msgstr "Vráti všetky nastavenia do pôvodného stavu"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1496
 msgid "^Next"
 msgstr "Ďalší"
 
-#: src/ui.cc:1503
+#: src/ui.cc:1497
 msgid "View next display"
 msgstr "Zobrazí ďalší pohľad"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1500
 msgid "^Prev"
 msgstr "^Predchádzajúce"
 
-#: src/ui.cc:1507
+#: src/ui.cc:1501
 msgid "View previous display"
 msgstr "Zobrazí predchádzajúci pohľad"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1504
 msgid "^Close"
 msgstr "Zavrieť"
 
-#: src/ui.cc:1511
+#: src/ui.cc:1505
 msgid "Close this display"
 msgstr "Zavrie tento pohľad"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1510
 msgid "New Package ^View"
 msgstr "No^vý pohľad na balíky"
 
-#: src/ui.cc:1517
+#: src/ui.cc:1511
 msgid "Create a new default package view"
 msgstr "Vytvorí nový štandardný pohľad na balíky"
 
-#: src/ui.cc:1520
+#: src/ui.cc:1514
 msgid "New Categorical ^Browser"
 msgstr "Nový prehliadač kategorií"
 
-#: src/ui.cc:1522
+#: src/ui.cc:1516
 msgid "Browse packages by category"
 msgstr "Prehliada balíky podľa kategorií"
 
-#: src/ui.cc:1530
+#: src/ui.cc:1524
 msgid "^About"
 msgstr "O progr^ame"
 
-#: src/ui.cc:1531
+#: src/ui.cc:1525
 msgid "View information about this program"
 msgstr "Zobrazí informácie o programe"
 
-#: src/ui.cc:1534
+#: src/ui.cc:1528
 msgid "^Help"
 msgstr "Pomoc"
 
-#: src/ui.cc:1535
+#: src/ui.cc:1529
 msgid "View the on-line help"
 msgstr "Zobrazí on-line pomoc"
 
-#: src/ui.cc:1537
+#: src/ui.cc:1531
 msgid "User's ^Manual"
 msgstr "Užívatelský ^manuál"
 
-#: src/ui.cc:1538
+#: src/ui.cc:1532
 msgid "View the detailed program manual"
 msgstr "Zobrazí podrobný manuál tohto programu"
 
-#: src/ui.cc:1541
+#: src/ui.cc:1535
 msgid "^FAQ"
 msgstr "^FAQ"
 
-#: src/ui.cc:1542
+#: src/ui.cc:1536
 msgid "View a list of frequently asked questions"
 msgstr "Zobrazí zoznam často kladených otázok"
 
-#: src/ui.cc:1545
+#: src/ui.cc:1539
 msgid "^NEWS"
 msgstr "^NOVINKY"
 
-#: src/ui.cc:1546
+#: src/ui.cc:1540
 msgid "View the important changes made in each version of "
 msgstr "Zobraziť dôležité zmeny v každej verzií programu"
 
-#: src/ui.cc:1549
+#: src/ui.cc:1543
 msgid "^License"
 msgstr "^Licencia"
 
-#: src/ui.cc:1550
+#: src/ui.cc:1544
 msgid "View the terms under which you may copy the program"
 msgstr "Zobrazí podmienky, za ktorých môžete program šíriť"
 
-#: src/ui.cc:1668
+#: src/ui.cc:1660
 msgid "Actions"
 msgstr "Akcie"
 
-#: src/ui.cc:1671
+#: src/ui.cc:1663
 msgid "Search"
 msgstr "Hľadat"
 
-#: src/ui.cc:1672
+#: src/ui.cc:1664
 msgid "Options"
 msgstr "Voľby"
 
-#: src/ui.cc:1673
+#: src/ui.cc:1665
 msgid "Views"
 msgstr "Pohľady"
 
-#: src/ui.cc:1674
+#: src/ui.cc:1666
 msgid "Help"
 msgstr "Pomoc"
 
-#: src/ui.cc:1734
+#: src/ui.cc:1726
 #, 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"
+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:2003
-#: src/vscreen/vscreen.cc:281
+#: src/ui.cc:1996 src/vscreen/vscreen.cc:281
 msgid "yes_key"
 msgstr "ano_key"
 
-#: src/ui.cc:2004
-#: src/vscreen/vscreen.cc:282
+#: src/ui.cc:1997 src/vscreen/vscreen.cc:282
 msgid "no_key"
 msgstr "ne_key"
 
-#: src/view_changelog.cc:46
+#: src/view_changelog.cc:61
 msgid "You can only view changelogs of official Debian packages."
 msgstr "Môžete prehliadať zoznamy zmien iba u oficiálnych debianích balíkov."
 
-#: src/view_changelog.cc:52
+#: src/view_changelog.cc:67
 msgid "Downloading Changelog"
 msgstr "SÅ¥ahujem Changelog"
 
-#: src/view_changelog.cc:54
+#: src/view_changelog.cc:69
 msgid "Download Changelog"
 msgstr "Stiahnuť Changelog"
 
-#: src/view_changelog.cc:63
+#: src/view_changelog.cc:78
 #, c-format
 msgid "%s changes"
 msgstr "%s zmien"
@@ -4116,3 +4420,325 @@
 msgid "Ouch!  Got SIGQUIT, dying..\n"
 msgstr "Au! Dostal ma SIGQUIT, umieram..\n"
 
+#~ msgid ""
+#~ "Commands:\n"
+#~ "  y: continue with the installation\n"
+#~ "  n: abort and quit\n"
+#~ "  i: show information about one or more packages;\n"
+#~ "     the package names should follow 'i'\n"
+#~ "  c: show the Debian changelogs of one or more packages;\n"
+#~ "     the package names should follow 'c'\n"
+#~ "  d: toggle display of dependency information\n"
+#~ "  s: toggle display of changes in package sizes\n"
+#~ "  v: toggle display of versions\n"
+#~ "  e: enter the full visual interface\n"
+#~ "\n"
+#~ "  You may also specify modifications to the set of package actions.\n"
+#~ "  To do so, type an action character followed by one or more package "
+#~ "names\n"
+#~ "or patterns.  The action will be applied to all packages. (you may "
+#~ "specify\n"
+#~ "additional actions; each will be applied to all packages that follow it)\n"
+#~ "\n"
+#~ "Actions:\n"
+#~ "  + : Install\n"
+#~ "  - : Remove\n"
+#~ "  _ : Purge\n"
+#~ "  = : Hold\n"
+#~ msgstr ""
+#~ "Príkazy:\n"
+#~ "  y: pokračovať v inštalácii\n"
+#~ "  n: prerušiť a skončiť\n"
+#~ "  i: zobrazí informácie o balíkoch, ktorých názvy\n"
+#~ "     nasledujú za 'i'.\n"
+#~ "  c: zobrazí zoznamy zmien, ktoré vykonali správcovia balíkov;\n"
+#~ "     názvy balíkov uveďte za 'c'\n"
+#~ "  d: zapne/vypne zobrazenie informácií o závislostiach\n"
+#~ "  s: zapne/vypne zobrazenie zmien vo veľkostiach balíkov\n"
+#~ "  v: zapne/vypne zobrazenie verzii\n"
+#~ "  e: vstúpiť do plne vizuálneho rozhrania\n"
+#~ "\n"
+#~ "  Tiež môžete zadať dodatočné akcie nad balíkmi:\n"
+#~ "  Napíšte znak akcie nasledovaný jedným alebo viac názvami balíkov alebo "
+#~ "vzorov.\n"
+#~ "Akcia sa vykoná na všetkých zadaných balíkoch. (Môžete zadať i viac "
+#~ "akcii,\n"
+#~ "každá sa vzťahuje na balíky, ktoré ju nasledujú.)\n"
+#~ "\n"
+#~ "Akce:\n"
+#~ "  + : Inštalácia\n"
+#~ "  - : Odstránenie\n"
+#~ "  _ :  Odstránenie aj s konfiguráciou\n"
+#~ "  = : Podržanie v aktuálnom stave\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 ""
+#~ "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 "Need exactly two colors in color definition \"%s\""
+#~ msgstr "Na definíciu farby potrebujem presne dve hodnoty \"%s\""
+
+#~ msgid "Can't parse foreground \"%s\"of color \"%s\""
+#~ msgstr "Nemôžem spracovať farbu popredia \"%s\" (\"%s\")"
+
+#~ msgid "Can't parse background \"%s\" of color \"%s\""
+#~ msgstr "Nemôžem spracovať farbu pozadia \"%s\" (\"%s\")"
+
+#~ msgid "Invalid option for interactive mode: -s\n"
+#~ msgstr "Neplatná voľba na interaktívny režim: -s\n"
+
+#~ 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."
+#~ 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 "
+#~ "komunikačných zariadení. To zahŕňa softvér na faxmodemy (PPP na vytáčané "
+#~ "pripojenie k Internetu a pôvodný  softvér ako zmodem/kermit), mobilné "
+#~ "telefóny, rozhranie k FidoNetu, alebo vlastný BBS server."
+
+#~ 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"
+#~ " .\n"
+#~ " For more information about what Debian considers to be Free Software, "
+#~ "see http://www.debian.org/social_contract#guidelines"
+#~ msgstr ""
+#~ "Neslobodný softvér\n"
+#~ " Balíky v sekcii 'non-free' nie sú súčasťou Debianu.\n"
+#~ " .\n"
+#~ " Tieto balíky nespĺňajú niektoré požiadavky z Debian Free Software "
+#~ "Guidelines. Pred použitím týchto balíkov si prečítajte ich licenčné "
+#~ "podmienky, či môžete softvér používať na zamýšľané účely.\n"
+#~ " .\n"
+#~ " Viac informácií o tom, čo Debian považuje za slobodný softvér, nájdete v "
+#~ "http://www.debian.org/social_contract#guidelines, alebo česky na http://"
+#~ "www.debian.cz/info/social_contract.php#guidelines."
+
+#~ 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)"
+#~ msgstr ""
+#~ "Nové balíky\n"
+#~ " Tieto balíky boli pridané do Debianu od posledného čistenia \"nových\" "
+#~ "balíkov. (Na vyprázdnenie tohto zoznamu vyberte z menu Akcie položku "
+#~ "\"Zabudnúť nové balíky\".)"
+
+#~ msgid ""
+#~ "%s is an essential package!\n"
+#~ "\n"
+#~ "Are you sure you want to remove it?\n"
+#~ "Type '%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'."
+
+#~ msgid "Available versions of "
+#~ msgstr "Dostupné verzie"
+
+#~ 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."
+#~ 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."
+
+#~ msgid "Information about "
+#~ msgstr "Informácie o "
+
+#~ msgid ""
+#~ "Aptitude %s\n"
+#~ "\n"
+#~ "Copyright 2000 Daniel Burrows.\n"
+#~ "\n"
+#~ "aptitude comes with ABSOLUTELY NO WARRANTY; for details see 'license' in "
+#~ "the\n"
+#~ "Help menu.  This is free software, and you are welcome to redistribute "
+#~ "it\n"
+#~ "under certain conditions; see 'license' for details."
+#~ msgstr ""
+#~ "Aptitude %s\n"
+#~ "\n"
+#~ "Copyright 2000 Daniel Burrows.\n"
+#~ "\n"
+#~ "na aptitude sa nevzťahuje ŽIADNA ZÁRUKA; podrobnosti nájdete v menu \n"
+#~ "Pomoc, 'licencia'. Toto je slobodný softvér a budeme radi, ak ho\n"
+#~ "budete ďalej šíriť; podrobnosti viď 'licencia'."
+
+#~ msgid "Some packages were broken and have been fixed"
+#~ msgstr "Niektoré balíky boli poškodené, ale podarilo sa ich opraviť"
+
+#~ msgid "Some broken packages could not be fixed!"
+#~ msgstr "Niektoré poškodené balíky nemohli byť opravené!"
+
+#~ msgid "Some packages are broken.  Try to fix them?"
+#~ msgstr "Niektoré balíky sú poškodené. Skúsiť ich opraviť?"
+
+#~ msgid ""
+#~ "Installing/removing packages requires administrative privileges, which\n"
+#~ "you currently do not have.  Would you like to change to the root "
+#~ "account?\n"
+#~ 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"
+
+#~ msgid ""
+#~ "No packages will be installed, removed or upgraded.\n"
+#~ "\n"
+#~ "Some packages could be upgraded, but you have not chosen to upgrade "
+#~ "them.\n"
+#~ "Type \"U\" to prepare an upgrade."
+#~ msgstr ""
+#~ "Žiadne balíky nebudú inštalované, odstránené alebo aktualizované.\n"
+#~ "\n"
+#~ "Niektoré balíky sice môžu byť aktualizované, ale vybrali ste, že sa "
+#~ "nemajú aktualizovať.\n"
+#~ "Aktualizáciu môžete pripraviť klávesou \"U\"."
+
+#~ 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"
+#~ 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"
+
+#~ msgid "Obsolete downloaded package files have been deleted"
+#~ msgstr "Staré stiahnuté balíky boli vymazané"
+
+#~ msgid ""
+#~ "Run 'su' to become root; this will restart the program, but your\n"
+#~ "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é"
+
+#~ msgid ""
+#~ "Mark the selected package as having been automatically installed;\n"
+#~ "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ý."
+
+#~ msgid ""
+#~ "Mark the selected package as having been manually installed;\n"
+#~ "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"
+
+#~ msgid ""
+#~ "Forbid the candidate version of the selected package from being "
+#~ "installed;\n"
+#~ "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"
+
+#~ msgid "^ChangeLog"
+#~ msgstr "^ChangeLog"
+
+#~ msgid "View the important changes made in each version of the program"
+#~ msgstr "Zobrazí dôležité zmeny medzi jednotlivými verziami programu"
+
+#~ msgid ""
+#~ "%C%BWARNING%b: untrusted versions of the following packages will be "
+#~ "installed!%n%nUntrusted packages could %Bcompromise your system's security"
+#~ "%b.  You should only proceed with the installation if you are certain "
+#~ "that this is what you want to do.%n%n"
+#~ msgstr ""
+#~ "%C%BVAROVANIE%b: budú nainštalované nedôverihodné verzie nasledujúcich "
+#~ "balíčkov!%n%nNedôverihodné balíčky môžu %Bohroziť bezpečnosť Vášho systému"
+#~ "%b.  V inšztalácií by ste mali pokračovať iba vtedy, ak ste si istý čo "
+#~ "chcete spraviť.%n%n"
+
+#~ msgid "Go away, I'm trying to think.\n"
+#~ msgstr "Bež preč, skúšam premýšľať.\n"
+
+#~ msgid "  This will use %sB of disk space."
+#~ msgstr "Toto na disku použije %sB."
+
+#~ msgid "  This will free %sB of disk space."
+#~ msgstr "Toto na disku uvolní %sB."
+
+#~ msgid "Essential:"
+#~ msgstr "Nutný:"
+
+#~ msgid "Use new (idempotent) package command behavior"
+#~ msgstr "Použiť nové (idempotent) správanie sa príkazu balíka"
+
+#~ msgid "Install Suggested packages automatically"
+#~ msgstr "Automaticky inštalovať Navrhované balíky"
+
+#, fuzzy
+#~ msgid ""
+#~ "Packages with unsatisfied dependencies\n"
+#~ " The dependency requirements of these packages will be after the install "
+#~ "is complete.\n"
+#~ " .\n"
+#~ " The presence of this tree probably indicates that something is broken, "
+#~ "either on your system or in the Debian archive."
+#~ msgstr ""
+#~ "Balíky s nesplnenými závislosťami\n"
+#~ " Závislosti týchto balíkov nebudú po dokončení inštalácie splnené.\n"
+#~ " .\n"
+#~ " Prítomnosť tohto stromu naznačuje, že je niečo divného vo vašom systéme "
+#~ "alebo v archíve Debianu."
+
+#, fuzzy
+#~ msgid "Description of %s"
+#~ msgstr "Popis: "
+
+#, fuzzy
+#~ msgid "Description of "
+#~ msgstr "Popis: "
+
+#, fuzzy
+#~ 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"
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not regain the system lock!  (Perhaps another apt or dpkg is "
+#~ "running?"
+#~ msgstr "Nemôžem získať systémový zámok! (Možno beží ďalší apt alebo dpkg?)"
+
+#, fuzzy
+#~ msgid "Bad section name '%s' (use 'none', 'topdir', or 'subdir'"
+#~ msgstr "Chybný názov sekcie '%s' (použite 'none', 'topdir' alebo 'subdir')"

Modified: branches/aptitude-0.3/aptitude/po/tl.po
==============================================================================
--- branches/aptitude-0.3/aptitude/po/tl.po	(original)
+++ branches/aptitude-0.3/aptitude/po/tl.po	Sun Jun 12 21:04:47 2005
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: aptitude\n"
 "Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-05-01 14:08-0400\n"
+"POT-Creation-Date: 2005-06-12 22:42+0200\n"
 "PO-Revision-Date: 2005-03-30 16:02+0800\n"
 "Last-Translator: Ryan Escarez <rescarez at gmail.com>\n"
 "Language-Team: Tagalog <debian-tl at banwa.upm.edu.ph>\n"
@@ -161,14 +161,14 @@
 msgstr ""
 "Tanggalin ng awtomatiko ang di ginagamit na pakete na tumbas nitong filter"
 
-#: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:219 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
-#: src/vscreen/vs_util.cc:328
+#: src/apt_options.cc:240 src/mine/cmine.cc:249 src/mine/cmine.cc:312
+#: src/ui.cc:215 src/vscreen/vs_util.cc:77 src/vscreen/vs_util.cc:90
+#: src/vscreen/vs_util.cc:264 src/vscreen/vs_util.cc:298
 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:328
+#: src/apt_options.cc:241 src/download_list.cc:69 src/mine/cmine.cc:250
+#: src/mine/cmine.cc:313 src/vscreen/vs_util.cc:298
 msgid "Cancel"
 msgstr "Kanselahin"
 
@@ -249,15 +249,15 @@
 msgid "%s: Previous"
 msgstr ""
 
-#: src/broken_indicator.cc:233
+#: src/broken_indicator.cc:232
 #, c-format
-msgid "%CSolution search failed.  %s: try harder"
+msgid "Solution search failed.  %s: try harder"
 msgstr ""
 
-#: src/broken_indicator.cc:239
-#, c-format
-msgid "%CUnable to resolve dependencies."
-msgstr ""
+#: src/broken_indicator.cc:237
+#, fuzzy
+msgid "Unable to resolve dependencies."
+msgstr "Hindi ma-buksan ang %s para sulatan"
 
 #: src/cmdline/cmdline_action.cc:36
 #, c-format
@@ -637,13 +637,13 @@
 "ito.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
-#: src/vscreen/vs_util.cc:212
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:165
+#: src/vscreen/vs_util.cc:202
 msgid "Yes"
 msgstr "Oo"
 
-#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
-#: src/vscreen/vs_util.cc:212
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:165
+#: src/vscreen/vs_util.cc:202
 msgid "No"
 msgstr "Hindi"
 
@@ -956,7 +956,7 @@
 msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:212
+#: src/cmdline/cmdline_resolver.cc:212 src/cmdline/cmdline_resolver.cc:285
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
@@ -1014,196 +1014,201 @@
 msgid "The following packages have unmet dependencies:\n"
 msgstr "Ang mga sumusunod na pakete ay may kulang na dependensiya:\n"
 
-#: src/cmdline/cmdline_show.cc:133
+#: src/cmdline/cmdline_show.cc:119 src/cmdline/cmdline_show.cc:305
+#: src/solution_fragment.cc:65
+msgid "<NULL>"
+msgstr ""
+
+#: src/cmdline/cmdline_show.cc:138
 msgid "not installed"
 msgstr "hindi naka-instol"
 
-#: src/cmdline/cmdline_show.cc:135 src/pkg_columnizer.cc:231
+#: src/cmdline/cmdline_show.cc:140 src/pkg_columnizer.cc:231
 #: src/pkg_ver_item.cc:225
 msgid "unpacked"
 msgstr "binuklat"
 
-#: src/cmdline/cmdline_show.cc:137
+#: src/cmdline/cmdline_show.cc:142
 msgid "partially configured"
 msgstr "nakaayos ng bitin"
 
-#: src/cmdline/cmdline_show.cc:139
+#: src/cmdline/cmdline_show.cc:144
 msgid "partially installed"
 msgstr "naka-instol na bitin"
 
-#: src/cmdline/cmdline_show.cc:141
+#: src/cmdline/cmdline_show.cc:146
 msgid "not installed (configuration files remain)"
 msgstr "hindi naka-instol (may mga tipunang pagkaayos na naiwan)"
 
-#: src/cmdline/cmdline_show.cc:143 src/pkg_columnizer.cc:239
+#: src/cmdline/cmdline_show.cc:148 src/pkg_columnizer.cc:239
 #: src/pkg_ver_item.cc:233
 msgid "installed"
 msgstr "naka-instol"
 
-#: src/cmdline/cmdline_show.cc:152
+#: src/cmdline/cmdline_show.cc:157
 msgid "not a real package"
 msgstr "hindi totoong pakete"
 
-#: src/cmdline/cmdline_show.cc:165
+#: src/cmdline/cmdline_show.cc:170
 msgid " [held]"
 msgstr " [held]"
 
-#: src/cmdline/cmdline_show.cc:174
+#: src/cmdline/cmdline_show.cc:179
 #, c-format
 msgid "%s; version %s will be installed"
 msgstr "%s; iinstolahin ang bersyon %s"
 
-#: src/cmdline/cmdline_show.cc:178
+#: src/cmdline/cmdline_show.cc:183
 #, c-format
 msgid "%s; version %s will be installed automatically"
 msgstr "%s; iinstolahin ang bersyon %s ng kusa"
 
-#: src/cmdline/cmdline_show.cc:184 src/cmdline/cmdline_show.cc:199
+#: src/cmdline/cmdline_show.cc:189 src/cmdline/cmdline_show.cc:204
 #, c-format
 msgid "%s; will be purged"
 msgstr "%s; ay ma-purged"
 
-#: src/cmdline/cmdline_show.cc:197
+#: src/cmdline/cmdline_show.cc:202
 #, c-format
 msgid "%s; will be purged because nothing depends on it"
 msgstr "%s; ay ma-purged dahil walang naka depende dito"
 
-#: src/cmdline/cmdline_show.cc:204
+#: src/cmdline/cmdline_show.cc:209
 #, c-format
 msgid "%s; will be removed because nothing depends on it"
 msgstr "%s; ay maaalis dahil walang naka-depende dito"
 
-#: src/cmdline/cmdline_show.cc:206
+#: src/cmdline/cmdline_show.cc:211
 #, c-format
 msgid "%s; will be removed"
 msgstr "%s; ay matatanggal"
 
-#: src/cmdline/cmdline_show.cc:220
+#: src/cmdline/cmdline_show.cc:225
 #, c-format
 msgid "%s%s; will be downgraded [%s -> %s]"
 msgstr "%s%s; ay ma-downgraded [%s -> %s]"
 
-#: src/cmdline/cmdline_show.cc:223
+#: src/cmdline/cmdline_show.cc:228
 #, c-format
 msgid "%s%s; will be upgraded [%s -> %s]"
 msgstr "%s%s; ay ma-upgraded [%s -> %s]"
 
-#: src/cmdline/cmdline_show.cc:235 src/cmdline/cmdline_show.cc:256
+#: src/cmdline/cmdline_show.cc:240 src/cmdline/cmdline_show.cc:261
 msgid "Package: "
 msgstr "Pakete: "
 
-#: src/cmdline/cmdline_show.cc:236 src/cmdline/cmdline_show.cc:264
+#: src/cmdline/cmdline_show.cc:241 src/cmdline/cmdline_show.cc:269
 #: src/pkg_columnizer.cc:87
 msgid "State"
 msgstr "Katayuan"
 
-#: src/cmdline/cmdline_show.cc:237 src/cmdline/cmdline_show.cc:318
+#: src/cmdline/cmdline_show.cc:242 src/cmdline/cmdline_show.cc:325
 msgid "Provided by"
 msgstr "Inihanda ni"
 
-#: src/cmdline/cmdline_show.cc:258 src/pkg_info_screen.cc:105
+#: src/cmdline/cmdline_show.cc:263 src/pkg_info_screen.cc:105
 msgid "Essential: "
 msgstr "Pangunahin: "
 
-#: src/cmdline/cmdline_show.cc:258 src/cmdline/cmdline_show.cc:262
-#: src/cmdline/cmdline_show.cc:273 src/pkg_info_screen.cc:105
+#: src/cmdline/cmdline_show.cc:263 src/cmdline/cmdline_show.cc:267
+#: src/cmdline/cmdline_show.cc:278 src/pkg_info_screen.cc:105
 msgid "yes"
 msgstr "oo"
 
-#: src/cmdline/cmdline_show.cc:262
+#: src/cmdline/cmdline_show.cc:267
 msgid "New"
 msgstr "Bago"
 
-#: src/cmdline/cmdline_show.cc:267
+#: src/cmdline/cmdline_show.cc:272
 msgid "Forbidden version"
 msgstr "Bawal na version"
 
-#: src/cmdline/cmdline_show.cc:271
+#: src/cmdline/cmdline_show.cc:276
 msgid "Automatically installed"
 msgstr "Kusang insalled"
 
-#: src/cmdline/cmdline_show.cc:273
+#: src/cmdline/cmdline_show.cc:278
 msgid "no"
 msgstr "hindi"
 
-#: src/cmdline/cmdline_show.cc:275
+#: src/cmdline/cmdline_show.cc:280
 msgid "Version: "
 msgstr "Bersyon: "
 
-#: src/cmdline/cmdline_show.cc:276 src/pkg_info_screen.cc:113
+#: src/cmdline/cmdline_show.cc:281 src/pkg_info_screen.cc:113
 msgid "Priority: "
 msgstr "Prioridad: "
 
-#: src/cmdline/cmdline_show.cc:277 src/cmdline/cmdline_show.cc:279
-#: src/cmdline/cmdline_show.cc:288
+#: src/cmdline/cmdline_show.cc:282 src/cmdline/cmdline_show.cc:284
+#: src/cmdline/cmdline_show.cc:293
 msgid "N/A"
 msgstr "N/A"
 
-#: src/cmdline/cmdline_show.cc:278 src/pkg_info_screen.cc:114
+#: src/cmdline/cmdline_show.cc:283 src/pkg_info_screen.cc:114
 msgid "Section: "
 msgstr "Hanay: "
 
-#: src/cmdline/cmdline_show.cc:280 src/pkg_info_screen.cc:115
+#: src/cmdline/cmdline_show.cc:285 src/pkg_info_screen.cc:115
 msgid "Maintainer: "
 msgstr "Tagapamahala: "
 
-#: src/cmdline/cmdline_show.cc:283
+#: src/cmdline/cmdline_show.cc:288
 msgid "Uncompressed Size: "
 msgstr "Uncompressed na sukat: "
 
-#: src/cmdline/cmdline_show.cc:287
+#: src/cmdline/cmdline_show.cc:292
 msgid "Architecture: "
 msgstr "Arketektura: "
 
-#: src/cmdline/cmdline_show.cc:289
+#: src/cmdline/cmdline_show.cc:294
 msgid "Compressed Size: "
 msgstr "Compressed na sukat: "
 
-#: src/cmdline/cmdline_show.cc:291
+#: src/cmdline/cmdline_show.cc:296
 msgid "Filename: "
 msgstr "Filename: "
 
-#: src/cmdline/cmdline_show.cc:293
+#: src/cmdline/cmdline_show.cc:298
 msgid "MD5sum: "
 msgstr "MD5sum: "
 
-#: src/cmdline/cmdline_show.cc:297 src/cmdline/cmdline_show.cc:299
+#: src/cmdline/cmdline_show.cc:302 src/cmdline/cmdline_show.cc:305
 msgid "Archive"
 msgstr "Arkibo"
 
-#: src/cmdline/cmdline_show.cc:303
+#: src/cmdline/cmdline_show.cc:310
 msgid "Depends"
 msgstr "Depends"
 
-#: src/cmdline/cmdline_show.cc:305
+#: src/cmdline/cmdline_show.cc:312
 msgid "PreDepends"
 msgstr "PreDepends"
 
-#: src/cmdline/cmdline_show.cc:307
+#: src/cmdline/cmdline_show.cc:314
 msgid "Recommends"
 msgstr "Rekomendasyon"
 
-#: src/cmdline/cmdline_show.cc:309
+#: src/cmdline/cmdline_show.cc:316
 msgid "Suggests"
 msgstr "Suhesyon"
 
-#: src/cmdline/cmdline_show.cc:311
+#: src/cmdline/cmdline_show.cc:318
 msgid "Conflicts"
 msgstr "Conflicts"
 
-#: src/cmdline/cmdline_show.cc:313
+#: src/cmdline/cmdline_show.cc:320
 msgid "Replaces"
 msgstr "Palitan"
 
-#: src/cmdline/cmdline_show.cc:315
+#: src/cmdline/cmdline_show.cc:322
 msgid "Obsoletes"
 msgstr "Obsoletes"
 
-#: src/cmdline/cmdline_show.cc:317
+#: src/cmdline/cmdline_show.cc:324
 msgid "Provides"
 msgstr "Provides"
 
-#: src/cmdline/cmdline_show.cc:321 src/pkg_info_screen.cc:97
+#: src/cmdline/cmdline_show.cc:328 src/pkg_info_screen.cc:97
 msgid "Description: "
 msgstr "Diskripyson: "
 
@@ -1247,32 +1252,32 @@
 msgstr ""
 "Hindi mo pwedeng specify ang dalawang arkibo at ang version para sa pakete\n"
 
-#: src/dep_item.cc:137
+#: src/dep_item.cc:139
 msgid "UNSATISFIED"
 msgstr "HINDI KUNTENTO"
 
-#: src/dep_item.cc:137 src/reason_fragment.cc:247
+#: src/dep_item.cc:139 src/reason_fragment.cc:244
 msgid "UNAVAILABLE"
 msgstr "HINDI AVAILABLE"
 
-#: src/download_bar.cc:56 src/download_list.cc:263 src/download_screen.cc:57
+#: src/download_bar.cc:56 src/download_list.cc:266 src/download_screen.cc:57
 #, c-format
 msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
 msgstr "Paki insert ang disc na may label \"%s\" sa loob ng drive \"%s\""
 
-#: src/download_bar.cc:77 src/generic/acqprogress.cc:63
+#: src/download_bar.cc:75 src/generic/acqprogress.cc:63
 msgid "Hit "
 msgstr "Tumama "
 
-#: src/download_bar.cc:90
+#: src/download_bar.cc:88
 msgid "Downloading "
 msgstr "Kinukuha "
 
-#: src/download_bar.cc:103
+#: src/download_bar.cc:101
 msgid "Got "
 msgstr "Nakuha "
 
-#: src/download_bar.cc:157
+#: src/download_bar.cc:155
 msgid "Downloading..."
 msgstr "Kinukuha..."
 
@@ -1300,7 +1305,7 @@
 msgid "Couldn't clean out list directories"
 msgstr "Hindi malinis ng maayos ang listahan ng directories"
 
-#: src/download.cc:177 src/ui.cc:1153
+#: src/download.cc:177 src/ui.cc:1147
 msgid "Deleting obsolete downloaded files"
 msgstr "Binubura ang matagal ng nakuhang mga files"
 
@@ -1439,7 +1444,7 @@
 "Ayyyk!!!  Mayhindi magandang nanyari habang ini-install ang mga pakete.  "
 "Sinusubukang ma-recover:"
 
-#: src/download.cc:477 src/pkg_item.cc:432
+#: src/download.cc:477 src/pkg_item.cc:430
 msgid "Press return to continue.\n"
 msgstr "Pindutin ang pabalik upang magpatuloy.\n"
 
@@ -1450,17 +1455,17 @@
 "Hindi ma-regain ang system lock!  (Siguro may ibang apt or dpg ang "
 "tumatakbo?)"
 
-#: src/download_item.cc:66 src/download_item.cc:70 src/download_item.cc:100
+#: src/download_item.cc:70 src/download_item.cc:74 src/download_item.cc:104
 #: src/generic/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr " [Nagtatrabaho]"
 
-#: src/download_item.cc:104 src/download_list.cc:283
+#: src/download_item.cc:108 src/download_list.cc:284
 msgid "[Hit]"
 msgstr "[Pindut]"
 
-#: src/download_item.cc:104 src/download_list.cc:303
+#: src/download_item.cc:108 src/download_list.cc:304
 msgid "[Downloaded]"
 msgstr "[Nakuha]"
 
@@ -1474,34 +1479,34 @@
 msgid "%n%nSome files were not downloaded successfully."
 msgstr ""
 
-#: src/download_list.cc:68
+#: src/download_list.cc:66
 msgid "Continue"
 msgstr "Magpatuloy"
 
-#: src/download_list.cc:175 src/download_screen.cc:203
+#: src/download_list.cc:178 src/download_screen.cc:203
 msgid "Total Progress: "
 msgstr "Pangkalahatan progreso: "
 
-#: src/download_list.cc:194 src/download_screen.cc:218
+#: src/download_list.cc:197 src/download_screen.cc:218
 #, c-format
 msgid " [ %i%% ] (%sB/s, %s remaining)"
 msgstr " [ %i%% ] (%sB/s, %s natitira)"
 
-#: src/download_list.cc:196
+#: src/download_list.cc:199
 #, c-format
 msgid " [ %i%% ] (stalled)"
 msgstr " [ %i%% ] (stalled)"
 
-#: src/download_list.cc:198
+#: src/download_list.cc:201
 #, c-format
 msgid " [ %i%% ]"
 msgstr " [ %i%% ]"
 
-#: src/download_list.cc:323
+#: src/download_list.cc:324
 msgid "[IGNORED]"
 msgstr "[HAYAAN]"
 
-#: src/download_list.cc:329
+#: src/download_list.cc:330
 msgid "[ERROR]"
 msgstr "[ERROR]"
 
@@ -1510,11 +1515,11 @@
 msgid "Downloaded %sB in %ss (%sB/s)."
 msgstr "Nakuha %sB sa %ss (%sB/s)."
 
-#: src/edit_pkg_hier.cc:158
+#: src/edit_pkg_hier.cc:176
 msgid "No hierarchy information to edit"
 msgstr "Walang impormasyon hierarchy para ma-edit"
 
-#: src/edit_pkg_hier.cc:258
+#: src/edit_pkg_hier.cc:276
 msgid "Couldn't open for writing"
 msgstr "Hindi mabuksan para masulatan"
 
@@ -1613,39 +1618,39 @@
 msgid "Warning: could not lock the cache file.  Opening in read-only mode"
 msgstr "Babala: hindi ma-lock ang cache file.  Bubuksan ng read-only mode"
 
-#: src/generic/matchers.cc:797
+#: src/generic/matchers.cc:798
 msgid "Unmatched '('"
 msgstr "Hindi magkatulad '('"
 
-#: src/generic/matchers.cc:887 src/generic/matchers.cc:968
+#: src/generic/matchers.cc:888 src/generic/matchers.cc:969
 #, c-format
 msgid "Unknown dependency type: %s"
 msgstr "Di-kilalang anyo ng dependency: %s"
 
-#: src/generic/matchers.cc:950
+#: src/generic/matchers.cc:951
 #, c-format
 msgid "Unknown action type: %s"
 msgstr "Di-kilalang anyo ng aksyon: %s"
 
-#: src/generic/matchers.cc:1017
+#: src/generic/matchers.cc:1018
 #, c-format
 msgid "Unknown priority %s"
 msgstr "Hindi kilalang prayoridad %s"
 
-#: src/generic/matchers.cc:1039
+#: src/generic/matchers.cc:1040
 #, c-format
 msgid "Unknown pattern type: %c"
 msgstr "Di-kilalang anyo ng pattern: %c"
 
-#: src/generic/matchers.cc:1084
+#: src/generic/matchers.cc:1105
 msgid "Unexpected empty expression"
 msgstr "Hindi inaasahang blangko na expression"
 
-#: src/generic/matchers.cc:1119
+#: src/generic/matchers.cc:1143
 msgid "Badly formed expression"
 msgstr "Badly formed expression"
 
-#: src/generic/matchers.cc:1148
+#: src/generic/matchers.cc:1175
 msgid "Unexpected ')'"
 msgstr "Hindi inaasahan ')'"
 
@@ -1669,7 +1674,7 @@
 msgid "Can't get value of $HOME, using TMPDIR (insecure)"
 msgstr "Hindi makuha ang value ng $HOME, gamit ang TMPDIR (insecure)"
 
-#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:61
+#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:76
 #, c-format
 msgid "ChangeLog of %s"
 msgstr "ChangeLog ng %s"
@@ -1711,37 +1716,37 @@
 msgid "Reading task descriptions"
 msgstr "Binabasa ang deskripsyon na gagawin"
 
-#: src/load_config.cc:30
-#, c-format
-msgid "Invalid entry in color definition group: \"%s\""
-msgstr "Invalid na entry sa grupo ng color definition: \"%s\""
+#: src/load_config.cc:42
+#, fuzzy, c-format
+msgid "Unrecognized color name \"%s\""
+msgstr "Hindi matandaang gawain"
 
-#: src/load_config.cc:32
-#, c-format
-msgid "Invalid tagless entry in color definition group: \"%s\""
-msgstr "Invalid tagless entry sa grupo ng depinisyon ng kulay: \"%s\""
+#: src/load_config.cc:69
+#, fuzzy, c-format
+msgid "Unrecognized attribute name \"%s\""
+msgstr "Hindi matandaang gawain"
 
-#: src/load_config.cc:34
-#, c-format
-msgid "Need exactly two colors in color definition \"%s\""
-msgstr "Kailangan ng saktong dalawang kulay sa depinisyon ng kulay \"%s\""
+#: src/load_config.cc:106
+#, fuzzy, c-format
+msgid "Invalid entry in style definition group: \"%s\""
+msgstr "Invalid na entry sa grupo ng color definition: \"%s\""
 
-#: src/load_config.cc:50
-#, c-format
-msgid "Can't parse foreground \"%s\"of color \"%s\""
-msgstr "Hindi ma-parse na foreground \"%s\"ng kulay \"%s\""
+#: src/load_config.cc:108
+#, fuzzy, c-format
+msgid "Invalid tagless entry in style definition group: \"%s\""
+msgstr "Invalid tagless entry sa grupo ng depinisyon ng kulay: \"%s\""
 
-#: src/load_config.cc:53
-#, c-format
-msgid "Can't parse background \"%s\" of color \"%s\""
-msgstr "Hindi ma-parse na background \"%s\" ng kulay \"%s\""
+#: src/load_config.cc:130
+#, fuzzy, c-format
+msgid "Unknown style attribute %s"
+msgstr "Di-kilalang anyo ng aksyon: %s"
 
-#: src/load_config.cc:72 src/load_config.cc:74
+#: src/load_config.cc:153 src/load_config.cc:155
 #, c-format
 msgid "Invalid entry in keybinding group: \"%s\""
 msgstr "Hindi-valid entry sa grupo ng keybinding: \"%s\""
 
-#: src/load_config.cc:89
+#: src/load_config.cc:170
 #, c-format
 msgid "Ignoring invalid keybinding \"%s\" -> \"%s\""
 msgstr "Hinayaan ang hindi-valid keybinding \"%s\" -> \"%s\""
@@ -2173,44 +2178,44 @@
 "                  Ang aptitude na ito ay walang kapanyarihang Super "
 "Kalabaw.\n"
 
-#: src/main.cc:255
+#: src/main.cc:252
 #, c-format
 msgid "-o requires an argument of the form key=value, got %s"
 msgstr "-o kailangan ng argumento sa hubog na key=value, nakuha %s"
 
-#: src/main.cc:301 src/main.cc:310
+#: src/main.cc:291 src/main.cc:300
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr "KAKAIBA: di-kilala na option code natanggap\n"
 
-#: src/main.cc:319
+#: src/main.cc:309
 msgid "Only one of -u and -i may be specified\n"
 msgstr "Tanging isa sa -u at -i ang maaaring specified\n"
 
-#: src/main.cc:327
+#: src/main.cc:317
 msgid ""
 "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgstr ""
 "-u at -i ay maaring hindi specified sa command-line na pamamaraan (eg, with "
 "'install')"
 
-#: src/main.cc:348
+#: src/main.cc:338
 msgid "-u and -i may not be specified with a command"
 msgstr "-u at -i hindi siguro na specified na merong command"
 
-#: src/main.cc:405
+#: src/main.cc:395
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr "Hindi kilalang command \"%s\"\n"
 
-#: src/main.cc:412 src/main.cc:469
+#: src/main.cc:402 src/main.cc:450
 msgid "Internal error: uncaught 'out of solutions' exception.\n"
 msgstr ""
 
-#: src/main.cc:417 src/main.cc:474
+#: src/main.cc:407 src/main.cc:455
 msgid "Internal error: uncaught 'out of time' exception.\n"
 msgstr ""
 
-#: src/main.cc:424
+#: src/main.cc:414
 #, c-format
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
@@ -2241,7 +2246,7 @@
 msgid "Lost"
 msgstr "Natalo"
 
-#: src/mine/cmine.cc:119 src/ui.cc:1090
+#: src/mine/cmine.cc:119 src/ui.cc:1084
 msgid "Minesweeper"
 msgstr "Taga-walis ng ginto"
 
@@ -2267,94 +2272,94 @@
 msgid "The number of mines must be a number"
 msgstr "Ang numero ng ginto ay kailangan numero"
 
-#: src/mine/cmine.cc:240
+#: src/mine/cmine.cc:238
 msgid "Setup custom game"
 msgstr "Mag-setup ng custom na laro"
 
-#: src/mine/cmine.cc:243
+#: src/mine/cmine.cc:240
 msgid "Height of board: "
 msgstr "Taas ng board: "
 
-#: src/mine/cmine.cc:247
+#: src/mine/cmine.cc:243
 msgid "Width of board: "
 msgstr "Lapad ng board: "
 
-#: src/mine/cmine.cc:251
+#: src/mine/cmine.cc:246
 msgid "Number of mines: "
 msgstr "Bilang ng mines: "
 
-#: src/mine/cmine.cc:316
+#: src/mine/cmine.cc:305
 msgid "Choose difficulty level"
 msgstr "Pumili sa level ng hirap"
 
-#: src/mine/cmine.cc:318
+#: src/mine/cmine.cc:307
 msgid "Easy"
 msgstr "Padali"
 
-#: src/mine/cmine.cc:319
+#: src/mine/cmine.cc:308
 msgid "Medium"
 msgstr "Katamtaman"
 
-#: src/mine/cmine.cc:320
+#: src/mine/cmine.cc:309
 msgid "Hard"
 msgstr "Mahirap"
 
-#: src/mine/cmine.cc:321
+#: src/mine/cmine.cc:310
 msgid "Custom"
 msgstr "Custom"
 
-#: src/mine/cmine.cc:411
+#: src/mine/cmine.cc:392
 msgid "You have won."
 msgstr "Nanalo ka"
 
-#: src/mine/cmine.cc:414
+#: src/mine/cmine.cc:395
 msgid "You lose!"
 msgstr "Natalo ka!"
 
-#: src/mine/cmine.cc:419
+#: src/mine/cmine.cc:400
 msgid "You die...  --More--"
 msgstr "Namatay ka...  --Marami--"
 
-#: src/mine/cmine.cc:432
+#: src/mine/cmine.cc:413
 msgid "The spikes were poisoned!  The poison was deadly..  --More--"
 msgstr "Ang spikes ay nalason!  Ang lason ay nakamamatay..  --Higit--"
 
-#: src/mine/cmine.cc:435
+#: src/mine/cmine.cc:416
 msgid "You land on a set of sharp iron spikes!  --More--"
 msgstr "Ikaw ay nalapag sa lipon ng matalas na bakal na spikes!  --Higit--"
 
-#: src/mine/cmine.cc:438
+#: src/mine/cmine.cc:419
 msgid "You fall into a pit!  --More--"
 msgstr "Ikaw ay bumagsak sa hukay!  --Higit--"
 
-#: src/mine/cmine.cc:441
+#: src/mine/cmine.cc:422
 msgid "KABOOM!  You step on a land mine.  --More--"
 msgstr "BLAGA!  Ikaw ay naka tapak sa paputok.  --Marami--"
 
-#: src/mine/cmine.cc:446
+#: src/mine/cmine.cc:427
 msgid "The dart was poisoned!  The poison was deadly...  --More--"
 msgstr "Ang dart ay nalason!  Ang lason ay nakamamatay...  --Higit--"
 
-#: src/mine/cmine.cc:448
+#: src/mine/cmine.cc:429
 msgid ""
 "A little dart shoots out at you!  You are hit by a little dart!  --More--"
 msgstr ""
 "Isang maliit na dart ang bumaril sa 'yo!  Ikaw ay tinamaan ng maliit na "
 "dart!  --Higit--"
 
-#: src/mine/cmine.cc:452
+#: src/mine/cmine.cc:433
 msgid "You turn to stone... --More--"
 msgstr "Ikaw ay naging bato... --Marami--"
 
-#: src/mine/cmine.cc:454
+#: src/mine/cmine.cc:435
 msgid "Touching the cockatrice corpse was a fatal mistake.  --More--"
 msgstr "Paghipo sa bangkay na cockatrice ay mali at nakamamatay.  --Higit--"
 
-#: src/mine/cmine.cc:456
+#: src/mine/cmine.cc:437
 msgid "You feel here a cockatrice corpse.  --More--"
 msgstr "Ikaw ay nakadama ng bangkay na cockatrice.  --Higit--"
 
-#: src/mine/cmine.cc:460
+#: src/mine/cmine.cc:441
 msgid ""
 "Click!  You trigger a rolling boulder trap!  You are hit by a boulder! --"
 "More--"
@@ -2362,56 +2367,56 @@
 "Click! Nakalabit mo ang umiikot na boulder na bitag! Ikaw at natinamaan ng "
 "boulder! --Higit--"
 
-#: src/mine/cmine.cc:470
+#: src/mine/cmine.cc:451
 msgid "sleep"
 msgstr "tulog"
 
-#: src/mine/cmine.cc:473
+#: src/mine/cmine.cc:454
 msgid "striking"
 msgstr "hinahampas"
 
-#: src/mine/cmine.cc:476
+#: src/mine/cmine.cc:457
 msgid "death"
 msgstr "kamatayan"
 
-#: src/mine/cmine.cc:479
+#: src/mine/cmine.cc:460
 msgid "polymorph"
 msgstr "polymorph"
 
-#: src/mine/cmine.cc:482
+#: src/mine/cmine.cc:463
 msgid "magic missile"
 msgstr "salamangkang missile"
 
-#: src/mine/cmine.cc:485
+#: src/mine/cmine.cc:466
 msgid "secret door detection"
 msgstr "sekretong pintong detection"
 
-#: src/mine/cmine.cc:488
+#: src/mine/cmine.cc:469
 msgid "invisibility"
 msgstr "di-maaaring makita"
 
-#: src/mine/cmine.cc:491
+#: src/mine/cmine.cc:472
 msgid "cold"
 msgstr "lamig"
 
-#: src/mine/cmine.cc:497
+#: src/mine/cmine.cc:478
 #, c-format
 msgid "Your wand of %s breaks apart and explodes!  --More--"
 msgstr "Ang iyong wand ng %s nabasag pirapiraso at sumabog!  --Higit--"
 
-#: src/mine/cmine.cc:503
+#: src/mine/cmine.cc:484
 msgid "You are jolted by a surge of electricity!  --More--"
 msgstr "Ikaw ay jolted na surge ng elektrisidad!  --Higit--"
 
-#: src/mine/cmine.cc:607
+#: src/mine/cmine.cc:588
 msgid "Enter the filename to load: "
 msgstr "ilagay ang filename para i-load: "
 
-#: src/mine/cmine.cc:614
+#: src/mine/cmine.cc:595
 msgid "Enter the filename to save: "
 msgstr "ilagay ang filename para ma-save:"
 
-#: src/mine/cmine.cc:624
+#: src/mine/cmine.cc:605
 msgid "mine-help.txt"
 msgstr "mine-help.txt"
 
@@ -2419,7 +2424,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:1670
+#: src/pkg_columnizer.cc:84 src/ui.cc:1662
 msgid "Package"
 msgstr "Pakete"
 
@@ -3496,52 +3501,52 @@
 "Ikaw ba'y sigurado na aalisin ito?\n"
 "Makinilyahin '%s' kung ukaw ay sigurado."
 
-#: src/pkg_item.cc:222 src/pkg_ver_item.cc:625
+#: src/pkg_item.cc:220 src/pkg_ver_item.cc:626
 #, c-format
 msgid "Information about %s"
 msgstr "Impormasyon tungkol sa %s"
 
-#: src/pkg_item.cc:224 src/pkg_ver_item.cc:627
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:628
 #, c-format
 msgid "%s info"
 msgstr ""
 
-#: src/pkg_item.cc:310
+#: src/pkg_item.cc:308
 #, fuzzy, c-format
 msgid "Available versions of %s"
 msgstr "Available na salin ng "
 
-#: src/pkg_item.cc:313
+#: src/pkg_item.cc:311
 #, fuzzy, c-format
 msgid "%s versions"
 msgstr "Bersyon"
 
-#: src/pkg_item.cc:325 src/pkg_ver_item.cc:655
+#: src/pkg_item.cc:323 src/pkg_ver_item.cc:656
 #, c-format
 msgid "Dependencies of %s"
 msgstr "Dependensiya ng %s"
 
-#: src/pkg_item.cc:327 src/pkg_ver_item.cc:657
+#: src/pkg_item.cc:325 src/pkg_ver_item.cc:658
 #, c-format
 msgid "%s deps"
 msgstr ""
 
-#: src/pkg_item.cc:338 src/pkg_ver_item.cc:667
+#: src/pkg_item.cc:336 src/pkg_ver_item.cc:668
 #, c-format
 msgid "Packages depending on %s"
 msgstr "Pakete na umaasa sa %s"
 
-#: src/pkg_item.cc:340 src/pkg_ver_item.cc:669
+#: src/pkg_item.cc:338 src/pkg_ver_item.cc:670
 #, c-format
 msgid "%s reverse deps"
 msgstr ""
 
-#: src/pkg_item.cc:392 src/pkg_ver_item.cc:707
+#: src/pkg_item.cc:390 src/pkg_ver_item.cc:708
 #, c-format
 msgid "Reporting a bug in %s:\n"
 msgstr "Mag-ulat ng bug sa %s:\n"
 
-#: src/pkg_item.cc:414
+#: src/pkg_item.cc:412
 #, fuzzy
 msgid ""
 "You are not root and I cannot find any way to become root.  To reconfigure "
@@ -3553,16 +3558,16 @@
 "instal ang menu pakete, ang login na pakete,\n"
 "o patakbuhin ang aptitude bilang root."
 
-#: src/pkg_item.cc:422
+#: src/pkg_item.cc:420
 #, c-format
 msgid "Reconfiguring %s\n"
 msgstr "Reconfiguring %s\n"
 
-#: src/pkg_item.cc:447
+#: src/pkg_item.cc:445
 msgid "Hierarchy editor"
 msgstr "Hierarchy editor"
 
-#: src/pkg_item.cc:447
+#: src/pkg_item.cc:445
 #, fuzzy
 msgid "Hierarchy Editor"
 msgstr "Hierarchy editor"
@@ -3597,22 +3602,22 @@
 msgstr ""
 "Ipasok ang bagong pakete na pag-uri-uriin na mekanismo para sa display: "
 
-#: src/pkg_view.cc:344
+#: src/pkg_view.cc:359
 msgid "make_package_view: error in arguments -- two main widgets??"
 msgstr "make_package_view: error sa argumento -- dalawang main widgets??"
 
-#: src/pkg_view.cc:350
+#: src/pkg_view.cc:365
 msgid ""
 "make_package_view: error in arguments -- bad column list for static item"
 msgstr ""
 "make_package_view: error sa argumento -- masama na hanay na listahan para sa "
 "static na gamit"
 
-#: src/pkg_view.cc:443
+#: src/pkg_view.cc:458
 msgid "make_package_view: bad argument!"
 msgstr "make_package_view: masamang argumento!"
 
-#: src/pkg_view.cc:495
+#: src/pkg_view.cc:510
 msgid "make_package_view: no main widget found"
 msgstr "make_package_view: walang main widget na-nakita"
 
@@ -3649,12 +3654,12 @@
 msgid " (provided by %F)"
 msgstr " (inihanda ni %F)"
 
-#: src/reason_fragment.cc:278
+#: src/reason_fragment.cc:275
 #, c-format
 msgid "%F%s %F %F"
 msgstr "%F%s %F %F"
 
-#: src/reason_fragment.cc:327
+#: src/reason_fragment.cc:324
 msgid ""
 "If you select a package, an explanation of its current state will appear in "
 "this space."
@@ -3662,7 +3667,7 @@
 "Kapag pumili ka ng pakete, ang explanation nang kanyang kasalukuyang "
 "katayuan ay makikita sa lugar na ito."
 
-#: src/reason_fragment.cc:361
+#: src/reason_fragment.cc:358
 msgid ""
 "%B%s%b was installed automatically;  it is being removed because all of the "
 "packages which depend upon it are being removed:"
@@ -3670,19 +3675,19 @@
 "%B%s%b ay ma-instal ng otomatik;  itoy tinanggal dahil ang lahat ng mga "
 "pakete na naka-depende dito ay tinatanggal:"
 
-#: src/reason_fragment.cc:365
+#: src/reason_fragment.cc:362
 msgid "%B%s%b will be automatically removed because of dependency errors:"
 msgstr ""
 "%B%s%b ay mag-otomatik na ma-tatanggal sa kadahilanan ng dependency errors:"
 
-#: src/reason_fragment.cc:369
+#: src/reason_fragment.cc:366
 msgid ""
 "%B%s%b will be automatically installed to satisfy the following dependencies:"
 msgstr ""
 "%B%s%b ay ma-otomatik na ma-instal para ma to satisfy the following "
 "dependencies:"
 
-#: src/reason_fragment.cc:375 src/reason_fragment.cc:387
+#: src/reason_fragment.cc:372 src/reason_fragment.cc:384
 msgid ""
 "%B%s%b cannot be upgraded now, but if it could be, it would still be held at "
 "version %B%s%b."
@@ -3690,7 +3695,7 @@
 "%B%s%b hindi maaaring i-upgraded ngayon, pero kung sakali, ito ay nasa salin "
 "%B%s%b."
 
-#: src/reason_fragment.cc:378
+#: src/reason_fragment.cc:375
 msgid ""
 "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the "
 "following dependencies:"
@@ -3698,27 +3703,27 @@
 "%B%s%b hindi maaring i-upgraded sa salin na %B%s%b, upang maiwasan ang basag "
 "na mga sumusunod na dependencies:"
 
-#: src/reason_fragment.cc:390
+#: src/reason_fragment.cc:387
 msgid "%B%s%b is currently installed."
 msgstr "%B%s%b ay kasalukuyang naka-instal."
 
-#: src/reason_fragment.cc:396
+#: src/reason_fragment.cc:393
 msgid "%B%s%b is not currently installed."
 msgstr "%B%s%b ay hindi-kasalukuyang naka-instal."
 
-#: src/reason_fragment.cc:404
+#: src/reason_fragment.cc:401
 msgid "Some dependencies of %B%s%b are not satisfied:"
 msgstr "May mga dependecies ng %B%s%b ay hindi kuntento:"
 
-#: src/reason_fragment.cc:408
+#: src/reason_fragment.cc:405
 msgid "%B%s%b will be downgraded."
 msgstr "%B%s%b ay ma da-downgraded."
 
-#: src/reason_fragment.cc:415
+#: src/reason_fragment.cc:412
 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b."
 msgstr "%B%s%b ay hindi ma a-upgraded sa bawal na salin %B%s%b."
 
-#: src/reason_fragment.cc:419
+#: src/reason_fragment.cc:416
 msgid ""
 "%B%s%b could be upgraded to version %B%s%b, but it is being held at version %"
 "B%s%b."
@@ -3726,41 +3731,41 @@
 "%B%s%b maaring ma-upgraded sa saling %B%s%b, pero itoy inilagay sa saling %B%"
 "s%b."
 
-#: src/reason_fragment.cc:426
+#: src/reason_fragment.cc:423
 msgid "%B%s%b will be re-installed."
 msgstr "%B%s%ay ma re-installed."
 
-#: src/reason_fragment.cc:430
+#: src/reason_fragment.cc:427
 msgid "%B%s%b will be installed."
 msgstr "%B%s%b ay ma installed."
 
-#: src/reason_fragment.cc:434
+#: src/reason_fragment.cc:431
 msgid "%B%s%b will be removed."
 msgstr "%B%s%b ay tatanggalin."
 
-#: src/reason_fragment.cc:439
+#: src/reason_fragment.cc:436
 msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b."
 msgstr "%B%s%b ay ma-upgraded mula sa salin %B%s%b patungo sa salin %B%s%b."
 
-#: src/reason_fragment.cc:475
+#: src/reason_fragment.cc:472
 msgid ""
 "The following packages depend on %B%s%b and will be broken by its removal:"
 msgstr ""
 "Ang mga sumusunod pakete ay naka depende sa %B%s%b at mababasag sa pag-"
 "tanggal:"
 
-#: src/reason_fragment.cc:478
+#: src/reason_fragment.cc:475
 msgid "The following packages depend on %B%s%b and are broken:"
 msgstr "Ang mga sumusunod pakete ay naka depende sa %B%s%b at mga mababasag:"
 
-#: src/reason_fragment.cc:485
+#: src/reason_fragment.cc:482
 msgid ""
 "The following packages conflict with %B%s%b and will be broken by its "
 "installation:"
 msgstr ""
 "Ang mga sumusunod pakete ay komplikado sa %B%s%b at mababasag sa pag-instal:"
 
-#: src/reason_fragment.cc:518
+#: src/reason_fragment.cc:515
 msgid ""
 "The following packages depend on a version of %B%s%b other than the "
 "currently installed version of %B%s%b, or conflict with the currently "
@@ -3770,7 +3775,7 @@
 "kasalukuyan installed na salin ng %B%s%b, o conflict sa currently installed "
 "bersyon:"
 
-#: src/reason_fragment.cc:522
+#: src/reason_fragment.cc:519
 msgid ""
 "The following packages conflict with %B%s%b, or depend on a version of it "
 "which is not going to be installed."
@@ -3778,11 +3783,11 @@
 "Ang mga sumusunod na pakete ay conflict sa %B%s%b, o naka-depende sa bersyon "
 "nito na hindi i-instal."
 
-#: src/reason_fragment.cc:526
+#: src/reason_fragment.cc:523
 msgid "The following packages conflict with %B%s%b:"
 msgstr "Ang mga sumusunod na pakete ay conflict sa %B%s%b:"
 
-#: src/reason_fragment.cc:531
+#: src/reason_fragment.cc:528
 msgid ""
 "The following packages depend on a version of %B%s%b other than the "
 "currently installed version of %B%s%b:"
@@ -3790,7 +3795,7 @@
 "Ang mga sumusunod na pakete ay naka-depende sa versyon ng %B%s%b bukod sa "
 "kasalukuyan na naka-instal na bersyon ng %B%s%b:"
 
-#: src/reason_fragment.cc:535
+#: src/reason_fragment.cc:532
 msgid ""
 "The following packages depend on a version of %B%s%b which is not going to "
 "be installed."
@@ -3798,15 +3803,15 @@
 "Ang mga sumusunod na pakete ay naka-depende sa bersyon ng %B%s%b na hindi i-"
 "instal."
 
-#: src/reason_fragment.cc:541
+#: src/reason_fragment.cc:538
 msgid "upgraded"
 msgstr "upgrade"
 
-#: src/reason_fragment.cc:541
+#: src/reason_fragment.cc:538
 msgid "downgraded"
 msgstr "downgrade"
 
-#: src/reason_fragment.cc:547
+#: src/reason_fragment.cc:544
 msgid ""
 "The following packages depend on the currently installed version of %B%s%b (%"
 "B%s%b), or conflict with the version it will be %s to (%B%s%b), and will be "
@@ -3816,7 +3821,7 @@
 "ng  %B%s%b (%B%s%b), o conflict sa bersyon na %s sa (%B%s%b), at itoy "
 "mababasag kapag %s."
 
-#: src/reason_fragment.cc:554
+#: src/reason_fragment.cc:551
 msgid ""
 "The following packages conflict with version %B%s%b of %B%s%b, and will be "
 "broken if it is %s."
@@ -3824,7 +3829,7 @@
 "Ang mga sumusunod na pakete ay conflict sa bersyon %B%s%b ng %B%s%b, at itoy "
 "mababasag kapag na %s."
 
-#: src/reason_fragment.cc:559
+#: src/reason_fragment.cc:556
 msgid ""
 "The following packages depend on version %B%s%b of %B%s%b, and will be "
 "broken if it is %s."
@@ -3871,31 +3876,36 @@
 msgid "Close"
 msgstr "^Isara"
 
-#: src/solution_fragment.cc:125
+#: src/solution_fragment.cc:134
 #, fuzzy
 msgid "%BRemove%b the following packages:%n"
 msgstr "Ang mga sumusunod na pakete ay SIRA:"
 
-#: src/solution_fragment.cc:135
+#: src/solution_fragment.cc:144
 #, fuzzy
 msgid "%BInstall%b the following packages:%n"
 msgstr "Ang mga sumusunod na pakete ay SIRA:"
 
-#: src/solution_fragment.cc:148
+#: src/solution_fragment.cc:157
 msgid "%BKeep%b the following packages at their current version:%n"
 msgstr ""
 
-#: src/solution_fragment.cc:161
+#: src/solution_fragment.cc:164
+#, fuzzy
+msgid "Not Installed"
+msgstr "hindi naka-instol"
+
+#: src/solution_fragment.cc:177
 #, fuzzy
 msgid "%BUpgrade%b the following packages:%n"
 msgstr "Ang mga sumusunod na pakete ay SIRA:"
 
-#: src/solution_fragment.cc:176
+#: src/solution_fragment.cc:192
 #, fuzzy
 msgid "%BDowngrade%b the following packages:%n"
 msgstr "Kinukuha ang mga pakete"
 
-#: src/solution_fragment.cc:190
+#: src/solution_fragment.cc:206
 #, c-format
 msgid "Score is %d"
 msgstr ""
@@ -3926,44 +3936,44 @@
 msgid "W:"
 msgstr ""
 
-#: src/ui.cc:194
+#: src/ui.cc:193
 msgid "Search for:"
 msgstr "Maghanap ng:"
 
-#: src/ui.cc:262
+#: src/ui.cc:258
 msgid "You already are root!"
 msgstr "Ikaw ay nasa katayuang root"
 
-#: src/ui.cc:360
+#: src/ui.cc:356
 msgid ""
 "Subprocess exited with an error -- did you type your password correctly?"
 msgstr "Subprocess lumabas ng may error -- na type mo ba ang password ng tama?"
 
-#: src/ui.cc:388
+#: src/ui.cc:384
 msgid "Loading cache"
 msgstr "Kinakarga ang cache"
 
-#: src/ui.cc:410
+#: src/ui.cc:406
 msgid "Really quit Aptitude?"
 msgstr "Sigurado ka sa pag alis sa Aptitude?"
 
-#: src/ui.cc:489
+#: src/ui.cc:485
 msgid "Really discard your personal settings and reload the defaults?"
 msgstr ""
 "Sigurado kang hayaan ang iyong personal settings at reload ang defaults?"
 
-#: src/ui.cc:589 src/ui.cc:591 src/ui.cc:619 src/ui.cc:621
+#: src/ui.cc:585 src/ui.cc:587 src/ui.cc:615 src/ui.cc:617
 msgid "Packages"
 msgstr "Mga Pakete"
 
-#: src/ui.cc:590 src/ui.cc:620
+#: src/ui.cc:586 src/ui.cc:616
 msgid "View available packages and choose actions to perform"
 msgstr "Tingnan ang available na pakete at pumili ng aksyon para magsagawa"
 
-#: src/ui.cc:667
+#: src/ui.cc:663
 #, fuzzy
 msgid ""
-"%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
+"Aptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
 "BABSOLUTELY NO WARRANTY%b; for details see 'license' in the Help menu.  This "
 "is free software, and you are welcome to redistribute it under certain "
 "conditions; see 'license' for details."
@@ -3978,65 +3988,69 @@
 "sa ilalim ng mga tiyak na kalagayan; tingnan ang 'lisensya' para sa mga "
 "detalye."
 
-#: src/ui.cc:688
+#: src/ui.cc:684
 msgid "help.txt"
 msgstr "tulong.txt"
 
-#: src/ui.cc:704
+#: src/ui.cc:700
 msgid "README"
 msgstr "BASAHINAKO"
 
-#: src/ui.cc:786
-#, fuzzy
+#: src/ui.cc:782
 msgid ""
-"%C%BWARNING%b: untrusted versions of the following packages will be "
-"installed!%n%nUntrusted packages could %Bcompromise your system's security%"
-"b.  You should only proceed with the installation if you are certain that "
-"this is what you want to do.%n%n"
+"%BWARNING%b: untrusted versions of the following packages will be installed!%"
+"n%nUntrusted packages could %Bcompromise your system's security%b.  You "
+"should only proceed with the installation if you are certain that this is "
+"what you want to do.%n%n"
 msgstr ""
 "%BBABALA%b: may iluluklok na di katiwalang bersyon ng sumusunod na mga "
 "pakete!%n%nMga di katiwalang mga pakete ay maaaring %Bmag-kompromiso ng "
 "seguridad ng inyong sistema%b. Dapat lamang na ipagpatuloy ang pagluklok "
 "kung tiyak kayong gawin ito.%n%n"
 
-#: src/ui.cc:800
+#: src/ui.cc:788
+#, fuzzy
+msgid "  %S*%N %s [version %s]%n"
+msgstr "Bersyon"
+
+#: src/ui.cc:795
 msgid "Really Continue"
 msgstr "Talagang magpatuloy"
 
-#: src/ui.cc:802
+#: src/ui.cc:797
 msgid "Abort Installation"
 msgstr "Hintuin ang pagluklok"
 
-#: src/ui.cc:863
+#: src/ui.cc:858
 msgid "Preview of package installation"
 msgstr "Preview ng pagluklok ng mga pakete"
 
-#: src/ui.cc:864
+#: src/ui.cc:859
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Tignan at/o ibagay ang aksyon na isasagawa"
 
-#: src/ui.cc:865
+#: src/ui.cc:860
 #, fuzzy
 msgid "Preview"
 msgstr "^Nakaraan"
 
-#: src/ui.cc:901
+#: src/ui.cc:896
 #, fuzzy
 msgid "Some packages were broken and have been fixed:"
 msgstr "Ang ibang pakete ay basag at iniayos"
 
-#: src/ui.cc:907
+#: src/ui.cc:902
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:913
-#, c-format
+#: src/ui.cc:908
+#, fuzzy, c-format
 msgid ""
-"Ran out of time while trying to resolver dependencies (press \"%s\" to try "
+"Ran out of time while trying to resolve dependencies (press \"%s\" to try "
 "harder)"
-msgstr ""
+msgstr "Magsayang ng oras sa pag-hahanap ng mga mina"
 
-#: src/ui.cc:959
+#: src/ui.cc:954
 #, fuzzy
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
@@ -4046,23 +4060,23 @@
 "pribilhiyo, na\n"
 "sa iyo kasalukuyan ay wala.  Gusto mo bang magbago sa root account?\n"
 
-#: src/ui.cc:962 src/ui.cc:1078
+#: src/ui.cc:957 src/ui.cc:1072
 msgid "Become root"
 msgstr "Maging root"
 
-#: src/ui.cc:964 src/ui.cc:1080
+#: src/ui.cc:959 src/ui.cc:1074
 msgid "Don't become root"
 msgstr "Huwag maging root"
 
-#: src/ui.cc:969 src/ui.cc:1085
+#: src/ui.cc:964 src/ui.cc:1079
 msgid "A package-list update or install run is already taking place."
 msgstr "Ang package-list update o install run ay kasalukuyan nasa pwesto."
 
-#: src/ui.cc:996
+#: src/ui.cc:991
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "Walang pakete ang nakatakda na iluklok, tanggalin, o i-upgrade."
 
-#: src/ui.cc:1002
+#: src/ui.cc:997
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -4075,7 +4089,7 @@
 "iapgreyd\n"
 "ang mga ito. Pindutin ang \"U\" upang maghanda ng pag-apgreyd."
 
-#: src/ui.cc:1074
+#: src/ui.cc:1069
 #, fuzzy
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
@@ -4085,114 +4099,114 @@
 "na\n"
 "sa iyo kasalukuyan ay wala.  Gusto mo bang magbago sa root account?\n"
 
-#: src/ui.cc:1090 src/ui.cc:1377
+#: src/ui.cc:1084 src/ui.cc:1371
 msgid "Waste time trying to find mines"
 msgstr "Magsayang ng oras sa pag-hahanap ng mga mina"
 
-#: src/ui.cc:1097 src/ui.cc:1150
+#: src/ui.cc:1091 src/ui.cc:1144
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr ""
 "Paglilinis habang ang pagkuha ay nasa progreso ay hindi pina hi-hintulutan"
 
-#: src/ui.cc:1100
+#: src/ui.cc:1094
 msgid "Deleting downloaded files"
 msgstr "Binubura ang mga na-download na files"
 
-#: src/ui.cc:1114
+#: src/ui.cc:1108
 msgid "Downloaded package files have been deleted"
 msgstr "Nakuhang pakete files ay nabura na"
 
-#: src/ui.cc:1175
+#: src/ui.cc:1169
 #, fuzzy, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr "Laos na talaksang pakete ay nabura na"
 
-#: src/ui.cc:1247
+#: src/ui.cc:1241
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1252 src/ui.cc:1283
+#: src/ui.cc:1246 src/ui.cc:1277
 #, fuzzy
 msgid "Ran out of time while trying to find a solution."
 msgstr "Magsayang ng oras sa pag-hahanap ng mga mina"
 
-#: src/ui.cc:1277
+#: src/ui.cc:1271
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1307
+#: src/ui.cc:1301
 #, fuzzy, c-format
 msgid "Unable to open %s"
 msgstr "Hindi ma-buksan ang %s para sulatan"
 
-#: src/ui.cc:1313
+#: src/ui.cc:1307
 msgid "Error while dumping resolver state"
 msgstr ""
 
-#: src/ui.cc:1323
+#: src/ui.cc:1317
 msgid "File to which the resolver state should be dumped:"
 msgstr ""
 
-#: src/ui.cc:1353
+#: src/ui.cc:1347
 msgid "^Install/remove packages"
 msgstr "^Iluklok/tanggalin ang mga pakete"
 
-#: src/ui.cc:1354
+#: src/ui.cc:1348
 msgid "Perform all pending installs and removals"
 msgstr "Gawin ang lahat ng naka-binbin na instal at mga tatanggalin"
 
-#: src/ui.cc:1356
+#: src/ui.cc:1350
 msgid "^Update package list"
 msgstr "^Update ang pakete list"
 
-#: src/ui.cc:1357
+#: src/ui.cc:1351
 msgid "Check for new versions of packages"
 msgstr "Suriin para sa mga bagong bersyon ng mga pakete"
 
-#: src/ui.cc:1360
+#: src/ui.cc:1354
 msgid "^Forget new packages"
 msgstr "^Kalimutan ang mga bagong pakete"
 
-#: src/ui.cc:1361
+#: src/ui.cc:1355
 msgid "Forget which packages are \"new\""
 msgstr "Kalimutan kung ano amg mga pakete na \"bago\""
 
-#: src/ui.cc:1364
+#: src/ui.cc:1358
 msgid "^Clean package cache"
 msgstr "^Linisin ang mga cache ng pakete"
 
-#: src/ui.cc:1365
+#: src/ui.cc:1359
 msgid "Delete package files which were previously downloaded"
 msgstr "Burahin ang pakete files na na-download ng nakaraan"
 
-#: src/ui.cc:1368
+#: src/ui.cc:1362
 msgid "Clean ^obsolete files"
 msgstr "Linisin ang  ^obsolete files"
 
-#: src/ui.cc:1369
+#: src/ui.cc:1363
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Alisin ang pakete files na hindi na ma-download"
 
-#: src/ui.cc:1372
+#: src/ui.cc:1366
 msgid "Mark ^Upgradable"
 msgstr "Markahan ng ^Upgradable"
 
-#: src/ui.cc:1373
+#: src/ui.cc:1367
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr ""
 "Markahan ang lahat ng hindi upgradable na pakete na hindi kasama sa upgrade"
 
-#: src/ui.cc:1376
+#: src/ui.cc:1370
 msgid "^Play Minesweeper"
 msgstr "^Maglaro ng Minesweeper"
 
-#: src/ui.cc:1379
+#: src/ui.cc:1373
 msgid "^Become root"
 msgstr "^Maging root"
 
-#: src/ui.cc:1380
+#: src/ui.cc:1374
 #, fuzzy
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
@@ -4202,71 +4216,71 @@
 "iyong\n"
 "settings ay hindi magagalaw"
 
-#: src/ui.cc:1383
+#: src/ui.cc:1377
 msgid "^Reload package cache"
 msgstr "^Reload ang pakete cache"
 
-#: src/ui.cc:1384
+#: src/ui.cc:1378
 msgid "Reload the package cache"
 msgstr "Reload ang pakete cache"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1384
 msgid "^Quit"
 msgstr "^Umalis"
 
-#: src/ui.cc:1391
+#: src/ui.cc:1385
 msgid "Exit the program"
 msgstr "Lumabas sa programa"
 
-#: src/ui.cc:1397 src/ui.cc:1669
+#: src/ui.cc:1391 src/ui.cc:1661
 msgid "Undo"
 msgstr "Ibalik"
 
-#: src/ui.cc:1398
+#: src/ui.cc:1392
 msgid "Undo the last package operation or group of operations"
 msgstr "Ulitin ang huling pakete operation o grupo ng operations"
 
-#: src/ui.cc:1405
+#: src/ui.cc:1399
 msgid "^Install"
 msgstr "^Instal"
 
-#: src/ui.cc:1406
+#: src/ui.cc:1400
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr ""
 "Bandilaan ang kasalukuyan ay napiling pakete para sa installation o upgrade"
 
-#: src/ui.cc:1409
+#: src/ui.cc:1403
 msgid "^Remove"
 msgstr "^Tanggalin"
 
-#: src/ui.cc:1410
+#: src/ui.cc:1404
 msgid "Flag the currently selected package for removal"
 msgstr "Bandilaan ang kasalukuyan ay napiling pakete para sa pagalis"
 
-#: src/ui.cc:1413
+#: src/ui.cc:1407
 msgid "^Purge"
 msgstr "^Purge"
 
-#: src/ui.cc:1414
+#: src/ui.cc:1408
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr ""
 "Bandilaan ang kasalukuyan ay napiling pakete at ang configuration files para "
 "sa pagtanggal"
 
-#: src/ui.cc:1417
+#: src/ui.cc:1411
 msgid "^Keep"
 msgstr "^Itago"
 
-#: src/ui.cc:1418
+#: src/ui.cc:1412
 msgid "Cancel any action on the selected package"
 msgstr "Kansel ang anumang aksyon sa napiling pakete"
 
-#: src/ui.cc:1421
+#: src/ui.cc:1415
 msgid "^Hold"
 msgstr "^Pigilin"
 
-#: src/ui.cc:1422
+#: src/ui.cc:1416
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -4274,11 +4288,11 @@
 "Kansel ang anumang aksyon sa napiling pakete, at protektahan sa balang araw "
 "na upgrades"
 
-#: src/ui.cc:1425
+#: src/ui.cc:1419
 msgid "Mark ^Auto"
 msgstr "Markahang ^Auto"
 
-#: src/ui.cc:1426
+#: src/ui.cc:1420
 #, fuzzy
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
@@ -4287,11 +4301,11 @@
 "Markahan ang napiling pakete bilang otomatikong na instal;\n"
 "itoy otomatikong ma-tatanggal pag walang anomang paketeng naka-depende dito"
 
-#: src/ui.cc:1429
+#: src/ui.cc:1423
 msgid "Mark ^Manual"
 msgstr "Markahang ^Manual"
 
-#: src/ui.cc:1430
+#: src/ui.cc:1424
 #, fuzzy
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
@@ -4300,11 +4314,11 @@
 "Markahan ang napiling pakete bilang manually na na-instal;\n"
 "itoy hindi ma-tatanggal ngunit kung itoy iyong manually na tatanggalin"
 
-#: src/ui.cc:1433
+#: src/ui.cc:1427
 msgid "^Forbid Version"
 msgstr "^Forbid Na Salin"
 
-#: src/ui.cc:1434
+#: src/ui.cc:1428
 #, fuzzy
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
@@ -4313,234 +4327,234 @@
 "Ipagbawal ang kandidato na salin ng piniling pakete na ma-installed;\n"
 "bagong salin ng pakete ay ma-installed syempre"
 
-#: src/ui.cc:1438
+#: src/ui.cc:1432
 msgid "I^nformation"
 msgstr "I^mpormasyon"
 
-#: src/ui.cc:1439
+#: src/ui.cc:1433
 msgid "Display more information about the selected package"
 msgstr "Pakita ang higit na impormasyon tungkol sa piniling pakete"
 
-#: src/ui.cc:1442
+#: src/ui.cc:1436
 msgid "^Changelog"
 msgstr "^Changelog"
 
-#: src/ui.cc:1443
+#: src/ui.cc:1437
 msgid "Display the Debian changelog of the selected package"
 msgstr "Ipakita ang Debian changelog ng napiling pakete"
 
-#: src/ui.cc:1450
+#: src/ui.cc:1444
 msgid "^Find"
 msgstr "^Hanap"
 
-#: src/ui.cc:1451
+#: src/ui.cc:1445
 msgid "Search for a package"
 msgstr "Humanap ng pakete"
 
-#: src/ui.cc:1454
+#: src/ui.cc:1448
 msgid "Find ^Again"
 msgstr "Humanap ^Ulit"
 
-#: src/ui.cc:1455
+#: src/ui.cc:1449
 msgid "Repeat the last search"
 msgstr "Ulitin ang huling pag-hahanap"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1453
 msgid "^Limit Display"
 msgstr "^Limitahan ang pag-papakita"
 
-#: src/ui.cc:1460
+#: src/ui.cc:1454
 msgid "Apply a filter to the package list"
 msgstr "Apply ang filter sa listahan ng mga pakete"
 
-#: src/ui.cc:1463
+#: src/ui.cc:1457
 msgid "^Un-Limit Display"
 msgstr "^Un-Limit Display"
 
-#: src/ui.cc:1464
+#: src/ui.cc:1458
 msgid "Remove the filter from the package list"
 msgstr "Alisin ang filter sa mga listahan ng pakete"
 
-#: src/ui.cc:1468
+#: src/ui.cc:1462
 msgid "Find ^Broken"
 msgstr "Hanapin ang ^Basag"
 
-#: src/ui.cc:1469
+#: src/ui.cc:1463
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Hanapin ang sumunod na pakete na may hindi masiya na dependencies"
 
-#: src/ui.cc:1476
+#: src/ui.cc:1470
 msgid "^UI options"
 msgstr "^UI options"
 
-#: src/ui.cc:1477
+#: src/ui.cc:1471
 msgid "Change the settings which affect the user interface"
 msgstr "Baguhin ang settings na maapektuhan ang user interface"
 
-#: src/ui.cc:1480
+#: src/ui.cc:1474
 msgid "^Dependency handling"
 msgstr "^Dependency na pag-tagan"
 
-#: src/ui.cc:1481
+#: src/ui.cc:1475
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr ""
 "Palitan ang settings na makaka apekto kung paano ang pakete dependencies ay "
 "hawakan"
 
-#: src/ui.cc:1484
+#: src/ui.cc:1478
 msgid "^Miscellaneous"
 msgstr "^Miscellaneous"
 
-#: src/ui.cc:1485
+#: src/ui.cc:1479
 msgid "Change miscellaneous program settings"
 msgstr "Palitan ang samut-samot na programa settings"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1484
 msgid "^Revert options"
 msgstr "^Mabalik ang options"
 
-#: src/ui.cc:1491
+#: src/ui.cc:1485
 msgid "Reset all settings to the system defaults"
 msgstr "Ibalik ang lahat ng settings sa system default"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1496
 msgid "^Next"
 msgstr "^Susunod"
 
-#: src/ui.cc:1503
+#: src/ui.cc:1497
 msgid "View next display"
 msgstr "Pakita ang susunod na display"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1500
 msgid "^Prev"
 msgstr "^Nakaraan"
 
-#: src/ui.cc:1507
+#: src/ui.cc:1501
 msgid "View previous display"
 msgstr "Pakita ang nakaraang display"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1504
 msgid "^Close"
 msgstr "^Isara"
 
-#: src/ui.cc:1511
+#: src/ui.cc:1505
 msgid "Close this display"
 msgstr "Isara ang display"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1510
 msgid "New Package ^View"
 msgstr "^Tanaw ng Bagong mga Pakete"
 
-#: src/ui.cc:1517
+#: src/ui.cc:1511
 msgid "Create a new default package view"
 msgstr "Gumawa ng bagong default pakete view"
 
-#: src/ui.cc:1520
+#: src/ui.cc:1514
 msgid "New Categorical ^Browser"
 msgstr "Bagong Kategoryang ^Browser"
 
-#: src/ui.cc:1522
+#: src/ui.cc:1516
 msgid "Browse packages by category"
 msgstr "Silipin ang pakete ayon sa kategorya"
 
-#: src/ui.cc:1530
+#: src/ui.cc:1524
 msgid "^About"
 msgstr "^Tungkol"
 
-#: src/ui.cc:1531
+#: src/ui.cc:1525
 msgid "View information about this program"
 msgstr "Basahin ang impormasyon tungkol sa programang ito"
 
-#: src/ui.cc:1534
+#: src/ui.cc:1528
 msgid "^Help"
 msgstr "^Tulong"
 
-#: src/ui.cc:1535
+#: src/ui.cc:1529
 msgid "View the on-line help"
 msgstr "Basahin ang tulong na on-line"
 
-#: src/ui.cc:1537
+#: src/ui.cc:1531
 msgid "User's ^Manual"
 msgstr "^Manwal ng Pag-gamit"
 
-#: src/ui.cc:1538
+#: src/ui.cc:1532
 msgid "View the detailed program manual"
 msgstr "Basahin ang detalyadong manwal ng programa"
 
-#: src/ui.cc:1541
+#: src/ui.cc:1535
 msgid "^FAQ"
 msgstr "^FAQ"
 
-#: src/ui.cc:1542
+#: src/ui.cc:1536
 msgid "View a list of frequently asked questions"
 msgstr "Basahin ang talaan ng madalas na tanungin"
 
-#: src/ui.cc:1545
+#: src/ui.cc:1539
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1546
+#: src/ui.cc:1540
 #, fuzzy
 msgid "View the important changes made in each version of "
 msgstr "Tignan ang mga mahalagang pagbabago sa bawat bersyon ng programa"
 
-#: src/ui.cc:1549
+#: src/ui.cc:1543
 msgid "^License"
 msgstr "^Lisensiya"
 
-#: src/ui.cc:1550
+#: src/ui.cc:1544
 msgid "View the terms under which you may copy the program"
 msgstr "Basahin ang mga tadhana kung paano makokopya ang programa"
 
-#: src/ui.cc:1668
+#: src/ui.cc:1660
 msgid "Actions"
 msgstr "Mga Gagawin"
 
-#: src/ui.cc:1671
+#: src/ui.cc:1663
 msgid "Search"
 msgstr "Paghahanap"
 
-#: src/ui.cc:1672
+#: src/ui.cc:1664
 msgid "Options"
 msgstr "Mga Pagpipilian"
 
-#: src/ui.cc:1673
+#: src/ui.cc:1665
 msgid "Views"
 msgstr "Mga Pananaw"
 
-#: src/ui.cc:1674
+#: src/ui.cc:1666
 msgid "Help"
 msgstr "Tulong"
 
-#: src/ui.cc:1734
+#: src/ui.cc:1726
 #, c-format
 msgid ""
 "%s: Menu  %s: Help  %s: Quit  %s: Update  %s: Download/Install/Remove Pkgs"
 msgstr ""
 "%s: Menu  %s: Tulong %s: Quit %s: Apdeyt  %s: Kumuha/Instol/Tanggal ng Pkt"
 
-#: src/ui.cc:2003 src/vscreen/vscreen.cc:281
+#: src/ui.cc:1996 src/vscreen/vscreen.cc:281
 msgid "yes_key"
 msgstr "o"
 
-#: src/ui.cc:2004 src/vscreen/vscreen.cc:282
+#: src/ui.cc:1997 src/vscreen/vscreen.cc:282
 msgid "no_key"
 msgstr "h"
 
-#: src/view_changelog.cc:46
+#: src/view_changelog.cc:61
 msgid "You can only view changelogs of official Debian packages."
 msgstr "Maari lang tignan ang mga changelog ng mga opisyal na paketeng Debian."
 
-#: src/view_changelog.cc:52
+#: src/view_changelog.cc:67
 msgid "Downloading Changelog"
 msgstr "Kinukuha ang Changelog"
 
-#: src/view_changelog.cc:54
+#: src/view_changelog.cc:69
 #, fuzzy
 msgid "Download Changelog"
 msgstr "Kinukuha ang Changelog"
 
-#: src/view_changelog.cc:63
+#: src/view_changelog.cc:78
 #, c-format
 msgid "%s changes"
 msgstr ""
@@ -4638,14 +4652,207 @@
 #~ "Paki insert ang mga sumusunod na disc sa drive \"%s\":\n"
 #~ "%s"
 
+#~ msgid "Need exactly two colors in color definition \"%s\""
+#~ msgstr "Kailangan ng saktong dalawang kulay sa depinisyon ng kulay \"%s\""
+
+#~ msgid "Can't parse foreground \"%s\"of color \"%s\""
+#~ msgstr "Hindi ma-parse na foreground \"%s\"ng kulay \"%s\""
+
+#~ msgid "Can't parse background \"%s\" of color \"%s\""
+#~ msgstr "Hindi ma-parse na background \"%s\" ng kulay \"%s\""
+
 #~ msgid "Invalid option for interactive mode: -s\n"
 #~ msgstr "Hindi valid na option para sa interactive mode: -s\n"
 
+#~ 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."
+#~ msgstr ""
+#~ "Programa para sa faxmodems at iba pang mga kumunikasyong kagamitan\n"
+#~ " Pakete sa seksyon ng 'comm' mga mamit para ma-control ang modems at iba "
+#~ "pang hardware na kumunikasyong kagamitan. Kasama dito ang software para "
+#~ "ma-control ang faxmodems (halimbawa, PPP para sa dial-up internet "
+#~ "connections at programa orihinal na sinulat para sa layunin nito (zmodem/"
+#~ "kermit), patirin ang software para ma-control ang  cellular phones, "
+#~ "interface sa FidoNet, an tumakbo bilang BBS."
+
+#~ 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"
+#~ " .\n"
+#~ " For more information about what Debian considers to be Free Software, "
+#~ "see http://www.debian.org/social_contract#guidelines"
+#~ msgstr ""
+#~ "Programa na hindi malayang software\n"
+#~ " Pakete sa seksyon ng 'non-free' ay hindi parte ng Debian.\n"
+#~ " .\n"
+#~ " Ang mga pakete na ito ay hindi na-abot ang isa o maraming kinakailangan "
+#~ "ng Debian Malayang Software Patnubay (tingnan sa ibaba) Nararapat basahin "
+#~ "ang lisensiya ng programa sa seksyon na ito para makasiguro na "
+#~ "pahintulutan  na gumamit sa gusto mong pamamaraan.\n"
+#~ " .\n"
+#~ " Para sa higit na impormasyon tungkol sa kung ano ang ayunan ng Debian "
+#~ "para maging Malayang Software, tingnan http://www.debian.org/"
+#~ "social_contract#guidelines"
+
+#~ 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)"
+#~ msgstr ""
+#~ "Bagong Pakete\n"
+#~ " Ang mga pakete ay naidagdag sa Debian nang huling linisni mo ang "
+#~ "listahan ng \"bago\" na pakete. (pumili \"Kalimutan ang mga bagong pakete"
+#~ "\" mula sa aksyon menu para mawalang laman ang listahang)"
+
+#~ msgid ""
+#~ "%s is an essential package!\n"
+#~ "\n"
+#~ "Are you sure you want to remove it?\n"
+#~ "Type '%s' if you are."
+#~ msgstr ""
+#~ "%s ay pangunahing pakete!\n"
+#~ "\n"
+#~ "Ikaw ba'y sigurado na aalisin ito?\n"
+#~ "Makinilyahin '%s' kung ukaw ay sigurado."
+
+#~ msgid "Available versions of "
+#~ msgstr "Available na salin ng "
+
+#~ 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."
+#~ msgstr ""
+#~ "Ikaw ay hindi root at hindi ko makita\n"
+#~ "para maging root.  Para reconfigure ang pakete na ito,\n"
+#~ "instal ang menu pakete, ang login na pakete,\n"
+#~ "o patakbuhin ang aptitude bilang root."
+
 #~ msgid "Information about "
 #~ msgstr "Impormasyon tungkol"
 
+#~ msgid ""
+#~ "Aptitude %s\n"
+#~ "\n"
+#~ "Copyright 2000 Daniel Burrows.\n"
+#~ "\n"
+#~ "aptitude comes with ABSOLUTELY NO WARRANTY; for details see 'license' in "
+#~ "the\n"
+#~ "Help menu.  This is free software, and you are welcome to redistribute "
+#~ "it\n"
+#~ "under certain conditions; see 'license' for details."
+#~ msgstr ""
+#~ "Aptitude %s\n"
+#~ "\n"
+#~ "Copyright 2000 Daniel Burrows.\n"
+#~ "\n"
+#~ "aptitude ay dumating ng may GANAP NA WALANG WARRANTY; para sa detailye "
+#~ "tingnan ang 'lisensiya' sa\n"
+#~ "Help menu.  Ito ay malayang software, at ikaw ay magiliw na ipamigay ito\n"
+#~ "sa ilalim ng mga tiyak na kalagayan; tingnan ang 'lisensya' para sa mga "
+#~ "detalye."
+
+#~ msgid "Some packages were broken and have been fixed"
+#~ msgstr "Ang ibang pakete ay basag at iniayos"
+
 #~ msgid "Some broken packages could not be fixed!"
 #~ msgstr "May mga basag na pakete na hindi maiayos!"
 
+#~ msgid "Some packages are broken.  Try to fix them?"
+#~ msgstr "May mga pakete na basag.  Subukin na ayusin sila?"
+
+#~ msgid ""
+#~ "Installing/removing packages requires administrative privileges, which\n"
+#~ "you currently do not have.  Would you like to change to the root "
+#~ "account?\n"
+#~ msgstr ""
+#~ "Installing/removing ng mga pakete ay kailangan ng administrative na "
+#~ "pribilhiyo, na\n"
+#~ "sa iyo kasalukuyan ay wala.  Gusto mo bang magbago sa root account?\n"
+
+#~ msgid ""
+#~ "No packages will be installed, removed or upgraded.\n"
+#~ "\n"
+#~ "Some packages could be upgraded, but you have not chosen to upgrade "
+#~ "them.\n"
+#~ "Type \"U\" to prepare an upgrade."
+#~ msgstr ""
+#~ "Walang pakete ang mai-instal, ma-tatagal o ma-upgrade.\n"
+#~ "\n"
+#~ "May mga ilang pakete na maaaring i-apgreyd, ngunit hindi niyo piniling "
+#~ "iapgreyd\n"
+#~ "ang mga ito. Pindutin ang \"U\" upang maghanda ng pag-apgreyd."
+
+#~ 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"
+#~ msgstr ""
+#~ "Updating ng mga pakete list ay kailangan ng administrative na pribilhiyo, "
+#~ "na\n"
+#~ "sa iyo kasalukuyan ay wala.  Gusto mo bang magbago sa root account?\n"
+
+#~ msgid "Obsolete downloaded package files have been deleted"
+#~ msgstr "Laos na talaksang pakete ay nabura na"
+
+#~ msgid ""
+#~ "Run 'su' to become root; this will restart the program, but your\n"
+#~ "settings will be preserved"
+#~ msgstr ""
+#~ "Tumakbong 'su' para maging root; amg program ay mag re-restart, pero ang "
+#~ "iyong\n"
+#~ "settings ay hindi magagalaw"
+
+#~ msgid ""
+#~ "Mark the selected package as having been automatically installed;\n"
+#~ "it will automatically be removed if no other packages depend on it"
+#~ msgstr ""
+#~ "Markahan ang napiling pakete bilang otomatikong na instal;\n"
+#~ "itoy otomatikong ma-tatanggal pag walang anomang paketeng naka-depende "
+#~ "dito"
+
+#~ msgid ""
+#~ "Mark the selected package as having been manually installed;\n"
+#~ "it will not be removed unless you manually remove it"
+#~ msgstr ""
+#~ "Markahan ang napiling pakete bilang manually na na-instal;\n"
+#~ "itoy hindi ma-tatanggal ngunit kung itoy iyong manually na tatanggalin"
+
+#~ msgid ""
+#~ "Forbid the candidate version of the selected package from being "
+#~ "installed;\n"
+#~ "newer versions of the package will be installed as usual"
+#~ msgstr ""
+#~ "Ipagbawal ang kandidato na salin ng piniling pakete na ma-installed;\n"
+#~ "bagong salin ng pakete ay ma-installed syempre"
+
 #~ msgid "^ChangeLog"
 #~ msgstr "Talaan ng ^Pagbabago"
+
+#~ msgid "View the important changes made in each version of the program"
+#~ msgstr "Tignan ang mga mahalagang pagbabago sa bawat bersyon ng programa"
+
+#, fuzzy
+#~ msgid ""
+#~ "%C%BWARNING%b: untrusted versions of the following packages will be "
+#~ "installed!%n%nUntrusted packages could %Bcompromise your system's security"
+#~ "%b.  You should only proceed with the installation if you are certain "
+#~ "that this is what you want to do.%n%n"
+#~ msgstr ""
+#~ "%BBABALA%b: may iluluklok na di katiwalang bersyon ng sumusunod na mga "
+#~ "pakete!%n%nMga di katiwalang mga pakete ay maaaring %Bmag-kompromiso ng "
+#~ "seguridad ng inyong sistema%b. Dapat lamang na ipagpatuloy ang pagluklok "
+#~ "kung tiyak kayong gawin ito.%n%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	Sun Jun 12 21:04:47 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-05-01 14:08-0400\n"
+"POT-Creation-Date: 2005-06-12 22:42+0200\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"
@@ -154,14 +154,14 @@
 msgid "Automatically remove unused packages matching this filter"
 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:219 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
-#: src/vscreen/vs_util.cc:328
+#: src/apt_options.cc:240 src/mine/cmine.cc:249 src/mine/cmine.cc:312
+#: src/ui.cc:215 src/vscreen/vs_util.cc:77 src/vscreen/vs_util.cc:90
+#: src/vscreen/vs_util.cc:264 src/vscreen/vs_util.cc:298
 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:328
+#: src/apt_options.cc:241 src/download_list.cc:69 src/mine/cmine.cc:250
+#: src/mine/cmine.cc:313 src/vscreen/vs_util.cc:298
 msgid "Cancel"
 msgstr "Ä°ptal"
 
@@ -242,15 +242,15 @@
 msgid "%s: Previous"
 msgstr ""
 
-#: src/broken_indicator.cc:233
+#: src/broken_indicator.cc:232
 #, c-format
-msgid "%CSolution search failed.  %s: try harder"
+msgid "Solution search failed.  %s: try harder"
 msgstr ""
 
-#: src/broken_indicator.cc:239
-#, c-format
-msgid "%CUnable to resolve dependencies."
-msgstr ""
+#: src/broken_indicator.cc:237
+#, fuzzy
+msgid "Unable to resolve dependencies."
+msgstr "%s yazmak için açılamıyor"
 
 #: src/cmdline/cmdline_action.cc:36
 #, c-format
@@ -615,13 +615,13 @@
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
-#: src/vscreen/vs_util.cc:212
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:165
+#: src/vscreen/vs_util.cc:202
 msgid "Yes"
 msgstr "Evet"
 
-#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
-#: src/vscreen/vs_util.cc:212
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:165
+#: src/vscreen/vs_util.cc:202
 msgid "No"
 msgstr "Hayır"
 
@@ -935,7 +935,7 @@
 msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:212
+#: src/cmdline/cmdline_resolver.cc:212 src/cmdline/cmdline_resolver.cc:285
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
@@ -990,197 +990,202 @@
 msgid "The following packages have unmet dependencies:\n"
 msgstr "Aşağıdaki paketler bağımlılıkları karşılamıyor:\n"
 
-#: src/cmdline/cmdline_show.cc:133
+#: src/cmdline/cmdline_show.cc:119 src/cmdline/cmdline_show.cc:305
+#: src/solution_fragment.cc:65
+msgid "<NULL>"
+msgstr ""
+
+#: src/cmdline/cmdline_show.cc:138
 msgid "not installed"
 msgstr "kurulmadı"
 
-#: src/cmdline/cmdline_show.cc:135 src/pkg_columnizer.cc:231
+#: src/cmdline/cmdline_show.cc:140 src/pkg_columnizer.cc:231
 #: src/pkg_ver_item.cc:225
 msgid "unpacked"
 msgstr "paketlenmemiÅŸ"
 
-#: src/cmdline/cmdline_show.cc:137
+#: src/cmdline/cmdline_show.cc:142
 msgid "partially configured"
 msgstr "tam yapılandırılmamış"
 
-#: src/cmdline/cmdline_show.cc:139
+#: src/cmdline/cmdline_show.cc:144
 msgid "partially installed"
 msgstr "kısmen kuruldu"
 
-#: src/cmdline/cmdline_show.cc:141
+#: src/cmdline/cmdline_show.cc:146
 msgid "not installed (configuration files remain)"
 msgstr "kurulu değil (yapılandırma dosyaları kalmış)"
 
-#: src/cmdline/cmdline_show.cc:143 src/pkg_columnizer.cc:239
+#: src/cmdline/cmdline_show.cc:148 src/pkg_columnizer.cc:239
 #: src/pkg_ver_item.cc:233
 msgid "installed"
 msgstr "kuruldu"
 
-#: src/cmdline/cmdline_show.cc:152
+#: src/cmdline/cmdline_show.cc:157
 msgid "not a real package"
 msgstr "gerçek bir paket değil"
 
-#: src/cmdline/cmdline_show.cc:165
+#: src/cmdline/cmdline_show.cc:170
 msgid " [held]"
 msgstr " [tut]"
 
-#: src/cmdline/cmdline_show.cc:174
+#: src/cmdline/cmdline_show.cc:179
 #, c-format
 msgid "%s; version %s will be installed"
 msgstr "%s; %s sürümü kurulacak."
 
-#: src/cmdline/cmdline_show.cc:178
+#: src/cmdline/cmdline_show.cc:183
 #, c-format
 msgid "%s; version %s will be installed automatically"
 msgstr "%s; %s sürümü otomatik olarak kurulacak"
 
-#: src/cmdline/cmdline_show.cc:184 src/cmdline/cmdline_show.cc:199
+#: src/cmdline/cmdline_show.cc:189 src/cmdline/cmdline_show.cc:204
 #, c-format
 msgid "%s; will be purged"
 msgstr "%s; temizlenecek"
 
-#: src/cmdline/cmdline_show.cc:197
+#: src/cmdline/cmdline_show.cc:202
 #, c-format
 msgid "%s; will be purged because nothing depends on it"
 msgstr ""
 "%s; paketi ihtiyaç duyulmadığından yapılandırması ile beraber silinecek"
 
-#: src/cmdline/cmdline_show.cc:204
+#: src/cmdline/cmdline_show.cc:209
 #, c-format
 msgid "%s; will be removed because nothing depends on it"
 msgstr "%s; paketi başka paketlerce ihtiyaç duyulmadığından kaldırılacak"
 
-#: src/cmdline/cmdline_show.cc:206
+#: src/cmdline/cmdline_show.cc:211
 #, c-format
 msgid "%s; will be removed"
 msgstr "%s; kaldırılacak"
 
-#: src/cmdline/cmdline_show.cc:220
+#: src/cmdline/cmdline_show.cc:225
 #, c-format
 msgid "%s%s; will be downgraded [%s -> %s]"
 msgstr "%s%s; daha eski sürümü kurulacak [%s -> %s]"
 
-#: src/cmdline/cmdline_show.cc:223
+#: src/cmdline/cmdline_show.cc:228
 #, c-format
 msgid "%s%s; will be upgraded [%s -> %s]"
 msgstr "%s%s; yükseltilecek [%s -> %s]"
 
-#: src/cmdline/cmdline_show.cc:235 src/cmdline/cmdline_show.cc:256
+#: src/cmdline/cmdline_show.cc:240 src/cmdline/cmdline_show.cc:261
 msgid "Package: "
 msgstr "Paket:"
 
-#: src/cmdline/cmdline_show.cc:236 src/cmdline/cmdline_show.cc:264
+#: src/cmdline/cmdline_show.cc:241 src/cmdline/cmdline_show.cc:269
 #: src/pkg_columnizer.cc:87
 msgid "State"
 msgstr "Durum"
 
-#: src/cmdline/cmdline_show.cc:237 src/cmdline/cmdline_show.cc:318
+#: src/cmdline/cmdline_show.cc:242 src/cmdline/cmdline_show.cc:325
 msgid "Provided by"
 msgstr "Sağlayıcı"
 
-#: src/cmdline/cmdline_show.cc:258 src/pkg_info_screen.cc:105
+#: src/cmdline/cmdline_show.cc:263 src/pkg_info_screen.cc:105
 msgid "Essential: "
 msgstr "Önemli: "
 
-#: src/cmdline/cmdline_show.cc:258 src/cmdline/cmdline_show.cc:262
-#: src/cmdline/cmdline_show.cc:273 src/pkg_info_screen.cc:105
+#: src/cmdline/cmdline_show.cc:263 src/cmdline/cmdline_show.cc:267
+#: src/cmdline/cmdline_show.cc:278 src/pkg_info_screen.cc:105
 msgid "yes"
 msgstr "evet"
 
-#: src/cmdline/cmdline_show.cc:262
+#: src/cmdline/cmdline_show.cc:267
 msgid "New"
 msgstr "Yeni"
 
-#: src/cmdline/cmdline_show.cc:267
+#: src/cmdline/cmdline_show.cc:272
 msgid "Forbidden version"
 msgstr "Engellenen sürüm"
 
-#: src/cmdline/cmdline_show.cc:271
+#: src/cmdline/cmdline_show.cc:276
 msgid "Automatically installed"
 msgstr "Otomatik olarak kuruldu"
 
-#: src/cmdline/cmdline_show.cc:273
+#: src/cmdline/cmdline_show.cc:278
 msgid "no"
 msgstr "hayır"
 
-#: src/cmdline/cmdline_show.cc:275
+#: src/cmdline/cmdline_show.cc:280
 msgid "Version: "
 msgstr "Sürüm:"
 
-#: src/cmdline/cmdline_show.cc:276 src/pkg_info_screen.cc:113
+#: src/cmdline/cmdline_show.cc:281 src/pkg_info_screen.cc:113
 msgid "Priority: "
 msgstr "Öncelik: "
 
-#: src/cmdline/cmdline_show.cc:277 src/cmdline/cmdline_show.cc:279
-#: src/cmdline/cmdline_show.cc:288
+#: src/cmdline/cmdline_show.cc:282 src/cmdline/cmdline_show.cc:284
+#: src/cmdline/cmdline_show.cc:293
 msgid "N/A"
 msgstr "N/A"
 
-#: src/cmdline/cmdline_show.cc:278 src/pkg_info_screen.cc:114
+#: src/cmdline/cmdline_show.cc:283 src/pkg_info_screen.cc:114
 msgid "Section: "
 msgstr "Bölüm: "
 
-#: src/cmdline/cmdline_show.cc:280 src/pkg_info_screen.cc:115
+#: src/cmdline/cmdline_show.cc:285 src/pkg_info_screen.cc:115
 msgid "Maintainer: "
 msgstr "Sağlayıcı: "
 
-#: src/cmdline/cmdline_show.cc:283
+#: src/cmdline/cmdline_show.cc:288
 msgid "Uncompressed Size: "
 msgstr "Açılmış boyutu: "
 
-#: src/cmdline/cmdline_show.cc:287
+#: src/cmdline/cmdline_show.cc:292
 msgid "Architecture: "
 msgstr "Mimari: "
 
-#: src/cmdline/cmdline_show.cc:289
+#: src/cmdline/cmdline_show.cc:294
 msgid "Compressed Size: "
 msgstr "Sıkıştırılmış boyutu: "
 
-#: src/cmdline/cmdline_show.cc:291
+#: src/cmdline/cmdline_show.cc:296
 msgid "Filename: "
 msgstr "Dosyaadı: "
 
-#: src/cmdline/cmdline_show.cc:293
+#: src/cmdline/cmdline_show.cc:298
 msgid "MD5sum: "
 msgstr "MD5sum: "
 
-#: src/cmdline/cmdline_show.cc:297 src/cmdline/cmdline_show.cc:299
+#: src/cmdline/cmdline_show.cc:302 src/cmdline/cmdline_show.cc:305
 msgid "Archive"
 msgstr "ArÅŸiv"
 
-#: src/cmdline/cmdline_show.cc:303
+#: src/cmdline/cmdline_show.cc:310
 msgid "Depends"
 msgstr "bağımlılıklar"
 
-#: src/cmdline/cmdline_show.cc:305
+#: src/cmdline/cmdline_show.cc:312
 msgid "PreDepends"
 msgstr "ÖnBağımlılıklar"
 
-#: src/cmdline/cmdline_show.cc:307
+#: src/cmdline/cmdline_show.cc:314
 msgid "Recommends"
 msgstr "Önerilenler"
 
-#: src/cmdline/cmdline_show.cc:309
+#: src/cmdline/cmdline_show.cc:316
 msgid "Suggests"
 msgstr "Teklif edilenler"
 
-#: src/cmdline/cmdline_show.cc:311
+#: src/cmdline/cmdline_show.cc:318
 msgid "Conflicts"
 msgstr "Çakışmalar"
 
-#: src/cmdline/cmdline_show.cc:313
+#: src/cmdline/cmdline_show.cc:320
 msgid "Replaces"
 msgstr "DeÄŸiÅŸtirilenler"
 
-#: src/cmdline/cmdline_show.cc:315
+#: src/cmdline/cmdline_show.cc:322
 msgid "Obsoletes"
 msgstr "Eskiyenler"
 
-#: src/cmdline/cmdline_show.cc:317
+#: src/cmdline/cmdline_show.cc:324
 msgid "Provides"
 msgstr "Sağladığı"
 
-#: src/cmdline/cmdline_show.cc:321 src/pkg_info_screen.cc:97
+#: src/cmdline/cmdline_show.cc:328 src/pkg_info_screen.cc:97
 msgid "Description: "
 msgstr "Tanım: "
 
@@ -1223,32 +1228,32 @@
 msgid "You cannot specify both an archive and a version for a package\n"
 msgstr "Bir paket için bir arşiv ve bir sürümü birlikte belirtemezsiniz\n"
 
-#: src/dep_item.cc:137
+#: src/dep_item.cc:139
 msgid "UNSATISFIED"
 msgstr " KARÅžILANAMAZ"
 
-#: src/dep_item.cc:137 src/reason_fragment.cc:247
+#: src/dep_item.cc:139 src/reason_fragment.cc:244
 msgid "UNAVAILABLE"
 msgstr "MEVCUT DEĞİL"
 
-#: src/download_bar.cc:56 src/download_list.cc:263 src/download_screen.cc:57
+#: src/download_bar.cc:56 src/download_list.cc:266 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_bar.cc:77 src/generic/acqprogress.cc:63
+#: src/download_bar.cc:75 src/generic/acqprogress.cc:63
 msgid "Hit "
 msgstr "Ä°sabet "
 
-#: src/download_bar.cc:90
+#: src/download_bar.cc:88
 msgid "Downloading "
 msgstr "Ä°ndiriliyor "
 
-#: src/download_bar.cc:103
+#: src/download_bar.cc:101
 msgid "Got "
 msgstr "Alındı "
 
-#: src/download_bar.cc:157
+#: src/download_bar.cc:155
 msgid "Downloading..."
 msgstr "Indiriliyor..."
 
@@ -1276,7 +1281,7 @@
 msgid "Couldn't clean out list directories"
 msgstr "Liste klasörü temizlenemiyor"
 
-#: src/download.cc:177 src/ui.cc:1153
+#: src/download.cc:177 src/ui.cc:1147
 msgid "Deleting obsolete downloaded files"
 msgstr "EskimiÅŸ indirilmiÅŸ dosyalar siliniyor"
 
@@ -1413,7 +1418,7 @@
 "Bilgi! ..Paketler kurulurken bazı şeyler yolunda gitmedi.  Geri almaya "
 "çalışılıyor:"
 
-#: src/download.cc:477 src/pkg_item.cc:432
+#: src/download.cc:477 src/pkg_item.cc:430
 msgid "Press return to continue.\n"
 msgstr "Devam etmek için enter tuşuna basın.\n"
 
@@ -1423,17 +1428,17 @@
 msgstr ""
 "Sistem kilidi ele geçirilemiyor!  (Belki başka bir apt ya da dpkg çalışıyor?)"
 
-#: src/download_item.cc:66 src/download_item.cc:70 src/download_item.cc:100
+#: src/download_item.cc:70 src/download_item.cc:74 src/download_item.cc:104
 #: src/generic/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr "[Çalışılıyor]"
 
-#: src/download_item.cc:104 src/download_list.cc:283
+#: src/download_item.cc:108 src/download_list.cc:284
 msgid "[Hit]"
 msgstr "[Ä°sabet]"
 
-#: src/download_item.cc:104 src/download_list.cc:303
+#: src/download_item.cc:108 src/download_list.cc:304
 msgid "[Downloaded]"
 msgstr "[Ä°ndirilmiÅŸ]"
 
@@ -1447,34 +1452,34 @@
 msgid "%n%nSome files were not downloaded successfully."
 msgstr ""
 
-#: src/download_list.cc:68
+#: src/download_list.cc:66
 msgid "Continue"
 msgstr "Devam"
 
-#: src/download_list.cc:175 src/download_screen.cc:203
+#: src/download_list.cc:178 src/download_screen.cc:203
 msgid "Total Progress: "
 msgstr "Toplam Ä°lerleme: "
 
-#: src/download_list.cc:194 src/download_screen.cc:218
+#: src/download_list.cc:197 src/download_screen.cc:218
 #, c-format
 msgid " [ %i%% ] (%sB/s, %s remaining)"
 msgstr " [ %i%% ] (%sB/s, %s kaldı)"
 
-#: src/download_list.cc:196
+#: src/download_list.cc:199
 #, c-format
 msgid " [ %i%% ] (stalled)"
 msgstr " [ %i%% ] (askıda)"
 
-#: src/download_list.cc:198
+#: src/download_list.cc:201
 #, c-format
 msgid " [ %i%% ]"
 msgstr " [ %i%% ]"
 
-#: src/download_list.cc:323
+#: src/download_list.cc:324
 msgid "[IGNORED]"
 msgstr "[GÖZARDI EDILDI]"
 
-#: src/download_list.cc:329
+#: src/download_list.cc:330
 msgid "[ERROR]"
 msgstr "[HATA]"
 
@@ -1483,11 +1488,11 @@
 msgid "Downloaded %sB in %ss (%sB/s)."
 msgstr "Ä°ndirildi: %2$ss'de %1$sB (%3$sB/s)."
 
-#: src/edit_pkg_hier.cc:158
+#: src/edit_pkg_hier.cc:176
 msgid "No hierarchy information to edit"
 msgstr "Düzenlemek için hiyerarşi bilgisi bulunamadı"
 
-#: src/edit_pkg_hier.cc:258
+#: src/edit_pkg_hier.cc:276
 msgid "Couldn't open for writing"
 msgstr "Yazmak için açılamıyor"
 
@@ -1582,39 +1587,39 @@
 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:797
+#: src/generic/matchers.cc:798
 msgid "Unmatched '('"
 msgstr "EÅŸleÅŸtirilemeyen '('"
 
-#: src/generic/matchers.cc:887 src/generic/matchers.cc:968
+#: src/generic/matchers.cc:888 src/generic/matchers.cc:969
 #, c-format
 msgid "Unknown dependency type: %s"
 msgstr "Bilinmeye bağımlılık tipi: %s"
 
-#: src/generic/matchers.cc:950
+#: src/generic/matchers.cc:951
 #, c-format
 msgid "Unknown action type: %s"
 msgstr "Bilinmeye eylem tipi: %s"
 
-#: src/generic/matchers.cc:1017
+#: src/generic/matchers.cc:1018
 #, c-format
 msgid "Unknown priority %s"
 msgstr "Bilinmeyen öncelik: %s"
 
-#: src/generic/matchers.cc:1039
+#: src/generic/matchers.cc:1040
 #, c-format
 msgid "Unknown pattern type: %c"
 msgstr "Bilinmeye desen tipi: %c"
 
-#: src/generic/matchers.cc:1084
+#: src/generic/matchers.cc:1105
 msgid "Unexpected empty expression"
 msgstr "Beklenmeye boÅŸ ifade"
 
-#: src/generic/matchers.cc:1119
+#: src/generic/matchers.cc:1143
 msgid "Badly formed expression"
 msgstr "Kötü biçimli ifade"
 
-#: src/generic/matchers.cc:1148
+#: src/generic/matchers.cc:1175
 msgid "Unexpected ')'"
 msgstr "Beklenmeyen ')'"
 
@@ -1639,7 +1644,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:61
+#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:76
 #, c-format
 msgid "ChangeLog of %s"
 msgstr "%s için Değişim Günlüğü"
@@ -1680,37 +1685,37 @@
 msgid "Reading task descriptions"
 msgstr "Görev açıklamaları okunuyor"
 
-#: src/load_config.cc:30
-#, c-format
-msgid "Invalid entry in color definition group: \"%s\""
-msgstr "Renk tanımında geçersiz girdi: \"%s\""
+#: src/load_config.cc:42
+#, fuzzy, c-format
+msgid "Unrecognized color name \"%s\""
+msgstr "Tanınmayan Görevler"
 
-#: src/load_config.cc:32
-#, c-format
-msgid "Invalid tagless entry in color definition group: \"%s\""
-msgstr "Renk tanım grubunda hatalı etiketsiz giriş: \"%s\""
+#: src/load_config.cc:69
+#, fuzzy, c-format
+msgid "Unrecognized attribute name \"%s\""
+msgstr "Tanınmayan Görevler"
 
-#: src/load_config.cc:34
-#, c-format
-msgid "Need exactly two colors in color definition \"%s\""
-msgstr "Tam olarak iki renk tanımına ihtiyaç var \"%s\""
+#: src/load_config.cc:106
+#, fuzzy, c-format
+msgid "Invalid entry in style definition group: \"%s\""
+msgstr "Renk tanımında geçersiz girdi: \"%s\""
 
-#: src/load_config.cc:50
-#, c-format
-msgid "Can't parse foreground \"%s\"of color \"%s\""
-msgstr "\"%s\" ön plan rengi \"%s\"den ayrıştırılamıyor"
+#: src/load_config.cc:108
+#, fuzzy, c-format
+msgid "Invalid tagless entry in style definition group: \"%s\""
+msgstr "Renk tanım grubunda hatalı etiketsiz giriş: \"%s\""
 
-#: src/load_config.cc:53
-#, c-format
-msgid "Can't parse background \"%s\" of color \"%s\""
-msgstr "\"%s\" arkaplan rengi \"%s\"den ayrıştırılamıyor"
+#: src/load_config.cc:130
+#, fuzzy, c-format
+msgid "Unknown style attribute %s"
+msgstr "Bilinmeye eylem tipi: %s"
 
-#: src/load_config.cc:72 src/load_config.cc:74
+#: src/load_config.cc:153 src/load_config.cc:155
 #, c-format
 msgid "Invalid entry in keybinding group: \"%s\""
 msgstr "tuşeşleme grubunda hatalı giriş: \"%s\""
 
-#: src/load_config.cc:89
+#: src/load_config.cc:170
 #, c-format
 msgid "Ignoring invalid keybinding \"%s\" -> \"%s\""
 msgstr "hatalı tuşeşleme gözardı ediliyor \"%s\" -> \"%s\""
@@ -2121,42 +2126,42 @@
 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:255
+#: src/main.cc:252
 #, 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:301 src/main.cc:310
+#: src/main.cc:291 src/main.cc:300
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr "TUHAFLIK: bilinmeyen seçenek kodu alındı\n"
 
-#: src/main.cc:319
+#: src/main.cc:309
 msgid "Only one of -u and -i may be specified\n"
 msgstr "Yalnızca -u ve -i den biri belirtilmeli\n"
 
-#: src/main.cc:327
+#: src/main.cc:317
 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:348
+#: src/main.cc:338
 msgid "-u and -i may not be specified with a command"
 msgstr "-u ve -i bir komutla birlikte kullanılamaz"
 
-#: src/main.cc:405
+#: src/main.cc:395
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr "Bilinmeyen komut \"%s\"\n"
 
-#: src/main.cc:412 src/main.cc:469
+#: src/main.cc:402 src/main.cc:450
 msgid "Internal error: uncaught 'out of solutions' exception.\n"
 msgstr ""
 
-#: src/main.cc:417 src/main.cc:474
+#: src/main.cc:407 src/main.cc:455
 msgid "Internal error: uncaught 'out of time' exception.\n"
 msgstr ""
 
-#: src/main.cc:424
+#: src/main.cc:414
 #, c-format
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
@@ -2187,7 +2192,7 @@
 msgid "Lost"
 msgstr "Kaybettin"
 
-#: src/mine/cmine.cc:119 src/ui.cc:1090
+#: src/mine/cmine.cc:119 src/ui.cc:1084
 msgid "Minesweeper"
 msgstr "Mayın tarlası"
 
@@ -2213,147 +2218,147 @@
 msgid "The number of mines must be a number"
 msgstr "Mayın adedi bir sayı olmalı"
 
-#: src/mine/cmine.cc:240
+#: src/mine/cmine.cc:238
 msgid "Setup custom game"
 msgstr "Özel oyun ayarları"
 
-#: src/mine/cmine.cc:243
+#: src/mine/cmine.cc:240
 msgid "Height of board: "
 msgstr "Alan yüksekliği: "
 
-#: src/mine/cmine.cc:247
+#: src/mine/cmine.cc:243
 msgid "Width of board: "
 msgstr "Alan geniÅŸliÄŸi: "
 
-#: src/mine/cmine.cc:251
+#: src/mine/cmine.cc:246
 msgid "Number of mines: "
 msgstr "Mayın adedi: "
 
-#: src/mine/cmine.cc:316
+#: src/mine/cmine.cc:305
 msgid "Choose difficulty level"
 msgstr "Zorluk derecesini seç"
 
-#: src/mine/cmine.cc:318
+#: src/mine/cmine.cc:307
 msgid "Easy"
 msgstr "Kolay"
 
-#: src/mine/cmine.cc:319
+#: src/mine/cmine.cc:308
 msgid "Medium"
 msgstr "Orta"
 
-#: src/mine/cmine.cc:320
+#: src/mine/cmine.cc:309
 msgid "Hard"
 msgstr "Zor"
 
-#: src/mine/cmine.cc:321
+#: src/mine/cmine.cc:310
 msgid "Custom"
 msgstr "Özel"
 
-#: src/mine/cmine.cc:411
+#: src/mine/cmine.cc:392
 msgid "You have won."
 msgstr "Kazandınız."
 
-#: src/mine/cmine.cc:414
+#: src/mine/cmine.cc:395
 msgid "You lose!"
 msgstr "Kaybettiniz!"
 
-#: src/mine/cmine.cc:419
+#: src/mine/cmine.cc:400
 msgid "You die...  --More--"
 msgstr "Öldünüz...  --Daha--"
 
-#: src/mine/cmine.cc:432
+#: src/mine/cmine.cc:413
 msgid "The spikes were poisoned!  The poison was deadly..  --More--"
 msgstr "Çiviler zehirliydi!  Zehir ölümcül..  --Daha--"
 
-#: src/mine/cmine.cc:435
+#: src/mine/cmine.cc:416
 msgid "You land on a set of sharp iron spikes!  --More--"
 msgstr "Sivri çivilerin üstüne düştün!  --Daha--"
 
-#: src/mine/cmine.cc:438
+#: src/mine/cmine.cc:419
 msgid "You fall into a pit!  --More--"
 msgstr "Bir çukurun içine düştün!  --Daha--"
 
-#: src/mine/cmine.cc:441
+#: src/mine/cmine.cc:422
 msgid "KABOOM!  You step on a land mine.  --More--"
 msgstr "BOOOM!  Bir kara mayınına bastın.  --More--"
 
-#: src/mine/cmine.cc:446
+#: src/mine/cmine.cc:427
 msgid "The dart was poisoned!  The poison was deadly...  --More--"
 msgstr "Ok zehirliydi!  Zehit ölümcül...  --Daha--"
 
-#: src/mine/cmine.cc:448
+#: src/mine/cmine.cc:429
 msgid ""
 "A little dart shoots out at you!  You are hit by a little dart!  --More--"
 msgstr "Sana doğru küçük bir ok atıldı!  Bu ok sana isabet etti!  --Daha--"
 
-#: src/mine/cmine.cc:452
+#: src/mine/cmine.cc:433
 msgid "You turn to stone... --More--"
 msgstr "Kayaya dönün...  --Daha--"
 
-#: src/mine/cmine.cc:454
+#: src/mine/cmine.cc:435
 msgid "Touching the cockatrice corpse was a fatal mistake.  --More--"
 msgstr "Ölü yılana dokunmak ölümcül bir hataydu.  --Daha--"
 
-#: src/mine/cmine.cc:456
+#: src/mine/cmine.cc:437
 msgid "You feel here a cockatrice corpse.  --More--"
 msgstr "Ölüm bir yılan fark ettiniz.  --Daha--"
 
-#: src/mine/cmine.cc:460
+#: src/mine/cmine.cc:441
 msgid ""
 "Click!  You trigger a rolling boulder trap!  You are hit by a boulder! --"
 "More--"
 msgstr "Tık! Bir tuzağa yakalandınız! Bir kafa size çarptı!  --Daha--"
 
-#: src/mine/cmine.cc:470
+#: src/mine/cmine.cc:451
 msgid "sleep"
 msgstr "uyu"
 
-#: src/mine/cmine.cc:473
+#: src/mine/cmine.cc:454
 msgid "striking"
 msgstr "vurma"
 
-#: src/mine/cmine.cc:476
+#: src/mine/cmine.cc:457
 msgid "death"
 msgstr "ölüm"
 
-#: src/mine/cmine.cc:479
+#: src/mine/cmine.cc:460
 msgid "polymorph"
 msgstr "polimorf"
 
-#: src/mine/cmine.cc:482
+#: src/mine/cmine.cc:463
 msgid "magic missile"
 msgstr "sihirli mermi"
 
-#: src/mine/cmine.cc:485
+#: src/mine/cmine.cc:466
 msgid "secret door detection"
 msgstr "gizli kapı bulma"
 
-#: src/mine/cmine.cc:488
+#: src/mine/cmine.cc:469
 msgid "invisibility"
 msgstr "görünmezlik"
 
-#: src/mine/cmine.cc:491
+#: src/mine/cmine.cc:472
 msgid "cold"
 msgstr "soÄŸuk"
 
-#: src/mine/cmine.cc:497
+#: src/mine/cmine.cc:478
 #, c-format
 msgid "Your wand of %s breaks apart and explodes!  --More--"
 msgstr "%s'den âsanız kırıldı ve infilak etti!  --Daha--"
 
-#: src/mine/cmine.cc:503
+#: src/mine/cmine.cc:484
 msgid "You are jolted by a surge of electricity!  --More--"
 msgstr "Güçlü bir elektrik çarpmasıyla sarsıldınız!  --Daha--"
 
-#: src/mine/cmine.cc:607
+#: src/mine/cmine.cc:588
 msgid "Enter the filename to load: "
 msgstr "Yüklenecek dosya adını giriniz:"
 
-#: src/mine/cmine.cc:614
+#: src/mine/cmine.cc:595
 msgid "Enter the filename to save: "
 msgstr "Kaydedilecek dosya adını giriniz:"
 
-#: src/mine/cmine.cc:624
+#: src/mine/cmine.cc:605
 msgid "mine-help.txt"
 msgstr "mine-help.txt"
 
@@ -2361,7 +2366,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:1670
+#: src/pkg_columnizer.cc:84 src/ui.cc:1662
 msgid "Package"
 msgstr "Paket"
 
@@ -3422,52 +3427,52 @@
 "Bu paketi kaldırmak istediğinizden emin misiniz?\n"
 "Eğer eminseniz '%s' yazın."
 
-#: src/pkg_item.cc:222 src/pkg_ver_item.cc:625
+#: src/pkg_item.cc:220 src/pkg_ver_item.cc:626
 #, c-format
 msgid "Information about %s"
 msgstr "%s hakkında bilgi"
 
-#: src/pkg_item.cc:224 src/pkg_ver_item.cc:627
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:628
 #, c-format
 msgid "%s info"
 msgstr ""
 
-#: src/pkg_item.cc:310
+#: src/pkg_item.cc:308
 #, fuzzy, c-format
 msgid "Available versions of %s"
 msgstr "Kullanılabilir sürümleri "
 
-#: src/pkg_item.cc:313
+#: src/pkg_item.cc:311
 #, fuzzy, c-format
 msgid "%s versions"
 msgstr "Sürümler"
 
-#: src/pkg_item.cc:325 src/pkg_ver_item.cc:655
+#: src/pkg_item.cc:323 src/pkg_ver_item.cc:656
 #, c-format
 msgid "Dependencies of %s"
 msgstr "%s paketinin bağımlılıkları"
 
-#: src/pkg_item.cc:327 src/pkg_ver_item.cc:657
+#: src/pkg_item.cc:325 src/pkg_ver_item.cc:658
 #, c-format
 msgid "%s deps"
 msgstr ""
 
-#: src/pkg_item.cc:338 src/pkg_ver_item.cc:667
+#: src/pkg_item.cc:336 src/pkg_ver_item.cc:668
 #, c-format
 msgid "Packages depending on %s"
 msgstr "%s paketine bağımlı paketler"
 
-#: src/pkg_item.cc:340 src/pkg_ver_item.cc:669
+#: src/pkg_item.cc:338 src/pkg_ver_item.cc:670
 #, c-format
 msgid "%s reverse deps"
 msgstr ""
 
-#: src/pkg_item.cc:392 src/pkg_ver_item.cc:707
+#: src/pkg_item.cc:390 src/pkg_ver_item.cc:708
 #, c-format
 msgid "Reporting a bug in %s:\n"
 msgstr "%s ile ilgili hata bildirimi:\n"
 
-#: src/pkg_item.cc:414
+#: src/pkg_item.cc:412
 #, fuzzy
 msgid ""
 "You are not root and I cannot find any way to become root.  To reconfigure "
@@ -3480,16 +3485,16 @@
 "'login' paketlerinden birini kurun veya aptitude \n"
 "programını root yetkisiyle çalıştırın."
 
-#: src/pkg_item.cc:422
+#: src/pkg_item.cc:420
 #, c-format
 msgid "Reconfiguring %s\n"
 msgstr "%s paketi yeniden yapılandırılıyor\n"
 
-#: src/pkg_item.cc:447
+#: src/pkg_item.cc:445
 msgid "Hierarchy editor"
 msgstr "Hiyerarşi düzenleyici"
 
-#: src/pkg_item.cc:447
+#: src/pkg_item.cc:445
 #, fuzzy
 msgid "Hierarchy Editor"
 msgstr "Hiyerarşi düzenleyici"
@@ -3523,21 +3528,21 @@
 msgid "Enter the new package sorting mechanism for this display: "
 msgstr "Bu ekran için yeni paket sıralama mekanizmasını girin: "
 
-#: src/pkg_view.cc:344
+#: src/pkg_view.cc:359
 msgid "make_package_view: error in arguments -- two main widgets??"
 msgstr "make_package_view: ifadelerde hata -- iki ana pencere mi olacak??"
 
-#: src/pkg_view.cc:350
+#: src/pkg_view.cc:365
 msgid ""
 "make_package_view: error in arguments -- bad column list for static item"
 msgstr ""
 "make_package_view: ifadelerde hata -- kalıcı öğe için yanlış kolon listesi"
 
-#: src/pkg_view.cc:443
+#: src/pkg_view.cc:458
 msgid "make_package_view: bad argument!"
 msgstr "make_package_view: hatalı ifade!"
 
-#: src/pkg_view.cc:495
+#: src/pkg_view.cc:510
 msgid "make_package_view: no main widget found"
 msgstr "make_package_view: Ana nesne bulunamadı"
 
@@ -3574,12 +3579,12 @@
 msgid " (provided by %F)"
 msgstr " (%F tarafından sağlanan)"
 
-#: src/reason_fragment.cc:278
+#: src/reason_fragment.cc:275
 #, c-format
 msgid "%F%s %F %F"
 msgstr "%F%s %F %F"
 
-#: src/reason_fragment.cc:327
+#: src/reason_fragment.cc:324
 msgid ""
 "If you select a package, an explanation of its current state will appear in "
 "this space."
@@ -3587,7 +3592,7 @@
 "Bir paket seçerseniz, şu andaki durumu ile ilgili bir açıklama burada "
 "görünecek."
 
-#: src/reason_fragment.cc:361
+#: src/reason_fragment.cc:358
 msgid ""
 "%B%s%b was installed automatically;  it is being removed because all of the "
 "packages which depend upon it are being removed:"
@@ -3595,18 +3600,18 @@
 "%B%s%b paketi otomatik olarak kurulmuştu,  şimdi kaldırılacak çünkü bu "
 "pakete bağımlı olan paketler kaldırılıyor:"
 
-#: src/reason_fragment.cc:365
+#: src/reason_fragment.cc:362
 msgid "%B%s%b will be automatically removed because of dependency errors:"
 msgstr ""
 "Bağımlılık hatalarından dolayı %B%s%b paketi otomatik olarak kaldırılacak:"
 
-#: src/reason_fragment.cc:369
+#: src/reason_fragment.cc:366
 msgid ""
 "%B%s%b will be automatically installed to satisfy the following dependencies:"
 msgstr ""
 "%B%s%b paketi bağımlılıkları karşılamak için otomatik olarak kurulacak:"
 
-#: src/reason_fragment.cc:375 src/reason_fragment.cc:387
+#: src/reason_fragment.cc:372 src/reason_fragment.cc:384
 msgid ""
 "%B%s%b cannot be upgraded now, but if it could be, it would still be held at "
 "version %B%s%b."
@@ -3614,7 +3619,7 @@
 "%B%s%b şu anda yükseltilemiyor fakat yükseltilebilecek olsaydı bile %B%s%b "
 "sürümünde tutulacaktı."
 
-#: src/reason_fragment.cc:378
+#: src/reason_fragment.cc:375
 msgid ""
 "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the "
 "following dependencies:"
@@ -3622,27 +3627,27 @@
 "%B%s%b paketi bazı bağımlılıkları bozmamak için %B%s%b sürümüne "
 "yükseltilmeyecek:"
 
-#: src/reason_fragment.cc:390
+#: src/reason_fragment.cc:387
 msgid "%B%s%b is currently installed."
 msgstr "%B%s%b ÅŸu anda kurulmuÅŸ durumda."
 
-#: src/reason_fragment.cc:396
+#: src/reason_fragment.cc:393
 msgid "%B%s%b is not currently installed."
 msgstr "%B%s%b ÅŸu anda kurulu deÄŸil."
 
-#: src/reason_fragment.cc:404
+#: src/reason_fragment.cc:401
 msgid "Some dependencies of %B%s%b are not satisfied:"
 msgstr "%B%s%b paketinin bazı bağımlılıkları karşılanamadı:"
 
-#: src/reason_fragment.cc:408
+#: src/reason_fragment.cc:405
 msgid "%B%s%b will be downgraded."
 msgstr "%B%s%b paketinin eski sürümü kurulacak."
 
-#: src/reason_fragment.cc:415
+#: src/reason_fragment.cc:412
 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b."
 msgstr "%B%s%b paketi, kurulumu engellenen %B%s%b sürümüne yükseltilmeyecek."
 
-#: src/reason_fragment.cc:419
+#: src/reason_fragment.cc:416
 msgid ""
 "%B%s%b could be upgraded to version %B%s%b, but it is being held at version %"
 "B%s%b."
@@ -3650,39 +3655,39 @@
 "%B%s%b paketi %B%s%b sürümüne güncellenebilirdi, fakat %B%s%b sürümünde "
 "kalacak."
 
-#: src/reason_fragment.cc:426
+#: src/reason_fragment.cc:423
 msgid "%B%s%b will be re-installed."
 msgstr "%B%s%b yeniden kurulacak."
 
-#: src/reason_fragment.cc:430
+#: src/reason_fragment.cc:427
 msgid "%B%s%b will be installed."
 msgstr "%B%s%b kurulacak."
 
-#: src/reason_fragment.cc:434
+#: src/reason_fragment.cc:431
 msgid "%B%s%b will be removed."
 msgstr "%B%s%b kaldırılacak."
 
-#: src/reason_fragment.cc:439
+#: src/reason_fragment.cc:436
 msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b."
 msgstr "%B%s%b paketi %B%s%b sürümünden %B%s%b sürümüne yükseltilecek."
 
-#: src/reason_fragment.cc:475
+#: src/reason_fragment.cc:472
 msgid ""
 "The following packages depend on %B%s%b and will be broken by its removal:"
 msgstr ""
 "Bu paketler %B%s%b paketine bağımlı ve bu paket kaldırılırsa bozulacaklar:"
 
-#: src/reason_fragment.cc:478
+#: src/reason_fragment.cc:475
 msgid "The following packages depend on %B%s%b and are broken:"
 msgstr "Bu paketler %B%s%b paketine bağımlıydı ve kırık bağımlılıkları var:"
 
-#: src/reason_fragment.cc:485
+#: src/reason_fragment.cc:482
 msgid ""
 "The following packages conflict with %B%s%b and will be broken by its "
 "installation:"
 msgstr "Bu paketler %B%s%b ile çakışıyorlar ve kurulursa bozuk olacaklar:"
 
-#: src/reason_fragment.cc:518
+#: src/reason_fragment.cc:515
 msgid ""
 "The following packages depend on a version of %B%s%b other than the "
 "currently installed version of %B%s%b, or conflict with the currently "
@@ -3692,7 +3697,7 @@
 "dışında bir sürüme bağımlılar veya şu anda kurulmuş olan sürümle "
 "çakışıyorlar:"
 
-#: src/reason_fragment.cc:522
+#: src/reason_fragment.cc:519
 msgid ""
 "The following packages conflict with %B%s%b, or depend on a version of it "
 "which is not going to be installed."
@@ -3700,11 +3705,11 @@
 "Bu paketler %B%s%b paketi ile çakışıyorlar veya kurulmayacak olan bir "
 "sürümüne bağımlılar:"
 
-#: src/reason_fragment.cc:526
+#: src/reason_fragment.cc:523
 msgid "The following packages conflict with %B%s%b:"
 msgstr "Bu paketler %B%s%b ile çakışıyorlar:"
 
-#: src/reason_fragment.cc:531
+#: src/reason_fragment.cc:528
 msgid ""
 "The following packages depend on a version of %B%s%b other than the "
 "currently installed version of %B%s%b:"
@@ -3712,22 +3717,22 @@
 "Bu paketler %B%s%b paketinin kurulmuş olan %B%s%b sürümünden farklı bir "
 "sürümüne bağımlı:"
 
-#: src/reason_fragment.cc:535
+#: src/reason_fragment.cc:532
 msgid ""
 "The following packages depend on a version of %B%s%b which is not going to "
 "be installed."
 msgstr ""
 "Bu paketler kurulmayacak olan %B%s%b paketinin bir sürümüne bağımlılar."
 
-#: src/reason_fragment.cc:541
+#: src/reason_fragment.cc:538
 msgid "upgraded"
 msgstr "güncellenirse"
 
-#: src/reason_fragment.cc:541
+#: src/reason_fragment.cc:538
 msgid "downgraded"
 msgstr "eski sürümü kurulursa"
 
-#: src/reason_fragment.cc:547
+#: src/reason_fragment.cc:544
 msgid ""
 "The following packages depend on the currently installed version of %B%s%b (%"
 "B%s%b), or conflict with the version it will be %s to (%B%s%b), and will be "
@@ -3737,7 +3742,7 @@
 "bağımlılar veya (%B%s%b) olacak sürümü ile çakışıyorlar ve %s bozuk "
 "olacaklar."
 
-#: src/reason_fragment.cc:554
+#: src/reason_fragment.cc:551
 msgid ""
 "The following packages conflict with version %B%s%b of %B%s%b, and will be "
 "broken if it is %s."
@@ -3745,7 +3750,7 @@
 "Bu paketler %B%s%b sürümündeki %B%s%b paketi ile çakışıyorlar ve eğer bu "
 "paket %s kırık bağımlılıkları olacak."
 
-#: src/reason_fragment.cc:559
+#: src/reason_fragment.cc:556
 msgid ""
 "The following packages depend on version %B%s%b of %B%s%b, and will be "
 "broken if it is %s."
@@ -3792,31 +3797,36 @@
 msgid "Close"
 msgstr "^Kapat"
 
-#: src/solution_fragment.cc:125
+#: src/solution_fragment.cc:134
 #, fuzzy
 msgid "%BRemove%b the following packages:%n"
 msgstr "Aşağıdaki paketler BOZUK:"
 
-#: src/solution_fragment.cc:135
+#: src/solution_fragment.cc:144
 #, fuzzy
 msgid "%BInstall%b the following packages:%n"
 msgstr "Aşağıdaki paketler BOZUK:"
 
-#: src/solution_fragment.cc:148
+#: src/solution_fragment.cc:157
 msgid "%BKeep%b the following packages at their current version:%n"
 msgstr ""
 
-#: src/solution_fragment.cc:161
+#: src/solution_fragment.cc:164
+#, fuzzy
+msgid "Not Installed"
+msgstr "kurulmadı"
+
+#: src/solution_fragment.cc:177
 #, fuzzy
 msgid "%BUpgrade%b the following packages:%n"
 msgstr "Aşağıdaki paketler BOZUK:"
 
-#: src/solution_fragment.cc:176
+#: src/solution_fragment.cc:192
 #, fuzzy
 msgid "%BDowngrade%b the following packages:%n"
 msgstr "Paketler indiriliyor"
 
-#: src/solution_fragment.cc:190
+#: src/solution_fragment.cc:206
 #, c-format
 msgid "Score is %d"
 msgstr ""
@@ -3844,43 +3854,43 @@
 msgid "W:"
 msgstr ""
 
-#: src/ui.cc:194
+#: src/ui.cc:193
 msgid "Search for:"
 msgstr "Ara: "
 
-#: src/ui.cc:262
+#: src/ui.cc:258
 msgid "You already are root!"
 msgstr "Zaten root yetkiniz var!"
 
-#: src/ui.cc:360
+#: src/ui.cc:356
 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:388
+#: src/ui.cc:384
 msgid "Loading cache"
 msgstr "Önbellek yükleniyor"
 
-#: src/ui.cc:410
+#: src/ui.cc:406
 msgid "Really quit Aptitude?"
 msgstr "Aptitude'dan çıkılsın mı?"
 
-#: src/ui.cc:489
+#: src/ui.cc:485
 msgid "Really discard your personal settings and reload the defaults?"
 msgstr "Kişisel tercihleriniz unutulup öntanımlı ayarlar yüklensin mi?"
 
-#: src/ui.cc:589 src/ui.cc:591 src/ui.cc:619 src/ui.cc:621
+#: src/ui.cc:585 src/ui.cc:587 src/ui.cc:615 src/ui.cc:617
 msgid "Packages"
 msgstr "Paketler"
 
-#: src/ui.cc:590 src/ui.cc:620
+#: src/ui.cc:586 src/ui.cc:616
 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:667
+#: src/ui.cc:663
 #, fuzzy
 msgid ""
-"%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
+"Aptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
 "BABSOLUTELY NO WARRANTY%b; for details see 'license' in the Help menu.  This "
 "is free software, and you are welcome to redistribute it under certain "
 "conditions; see 'license' for details."
@@ -3893,61 +3903,66 @@
 "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:688
+#: src/ui.cc:684
 msgid "help.txt"
 msgstr "yardım.txt"
 
-#: src/ui.cc:704
+#: src/ui.cc:700
 msgid "README"
 msgstr "BENÄ°OKU"
 
-#: src/ui.cc:786
+#: src/ui.cc:782
 msgid ""
-"%C%BWARNING%b: untrusted versions of the following packages will be "
-"installed!%n%nUntrusted packages could %Bcompromise your system's security%"
-"b.  You should only proceed with the installation if you are certain that "
-"this is what you want to do.%n%n"
+"%BWARNING%b: untrusted versions of the following packages will be installed!%"
+"n%nUntrusted packages could %Bcompromise your system's security%b.  You "
+"should only proceed with the installation if you are certain that this is "
+"what you want to do.%n%n"
 msgstr ""
 
-#: src/ui.cc:800
+#: src/ui.cc:788
+#, fuzzy
+msgid "  %S*%N %s [version %s]%n"
+msgstr "Sürümler"
+
+#: src/ui.cc:795
 #, fuzzy
 msgid "Really Continue"
 msgstr "Devam"
 
-#: src/ui.cc:802
+#: src/ui.cc:797
 msgid "Abort Installation"
 msgstr ""
 
-#: src/ui.cc:863
+#: src/ui.cc:858
 msgid "Preview of package installation"
 msgstr "Paket kurulumu önizlemesi"
 
-#: src/ui.cc:864
+#: src/ui.cc:859
 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:865
+#: src/ui.cc:860
 #, fuzzy
 msgid "Preview"
 msgstr "Ön^ceki"
 
-#: src/ui.cc:901
+#: src/ui.cc:896
 #, 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:907
+#: src/ui.cc:902
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:913
-#, c-format
+#: src/ui.cc:908
+#, fuzzy, c-format
 msgid ""
-"Ran out of time while trying to resolver dependencies (press \"%s\" to try "
+"Ran out of time while trying to resolve dependencies (press \"%s\" to try "
 "harder)"
-msgstr ""
+msgstr "Mayınları bulmaya çalışırken zamanı boşa harcayın"
 
-#: src/ui.cc:959
+#: src/ui.cc:954
 #, fuzzy
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
@@ -3956,23 +3971,23 @@
 "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:962 src/ui.cc:1078
+#: src/ui.cc:957 src/ui.cc:1072
 msgid "Become root"
 msgstr "Root ol"
 
-#: src/ui.cc:964 src/ui.cc:1080
+#: src/ui.cc:959 src/ui.cc:1074
 msgid "Don't become root"
 msgstr "Root olma"
 
-#: src/ui.cc:969 src/ui.cc:1085
+#: src/ui.cc:964 src/ui.cc:1079
 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:996
+#: src/ui.cc:991
 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:1002
+#: src/ui.cc:997
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -3984,7 +3999,7 @@
 "Bazı paketler yükseltilebilir, ama onları yükseltmeyi seçmediniz.\n"
 "Yükseltme için \"U\" tuşuna basın."
 
-#: src/ui.cc:1074
+#: src/ui.cc:1069
 #, fuzzy
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
@@ -3993,114 +4008,114 @@
 "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:1090 src/ui.cc:1377
+#: src/ui.cc:1084 src/ui.cc:1371
 msgid "Waste time trying to find mines"
 msgstr "Mayınları bulmaya çalışırken zamanı boşa harcayın"
 
-#: src/ui.cc:1097 src/ui.cc:1150
+#: src/ui.cc:1091 src/ui.cc:1144
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "İndirme işlemi sürerken temizlemeye izin verilmez."
 
-#: src/ui.cc:1100
+#: src/ui.cc:1094
 msgid "Deleting downloaded files"
 msgstr "Ä°ndirilmiÅŸ dosyalar siliniyor"
 
-#: src/ui.cc:1114
+#: src/ui.cc:1108
 msgid "Downloaded package files have been deleted"
 msgstr "Ä°ndirilmiÅŸ paketler silindi."
 
-#: src/ui.cc:1175
+#: src/ui.cc:1169
 #, fuzzy, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr "Ä°ndirilmiÅŸ eski paketler temizlendi."
 
-#: src/ui.cc:1247
+#: src/ui.cc:1241
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1252 src/ui.cc:1283
+#: src/ui.cc:1246 src/ui.cc:1277
 #, 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:1277
+#: src/ui.cc:1271
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1307
+#: src/ui.cc:1301
 #, fuzzy, c-format
 msgid "Unable to open %s"
 msgstr "%s yazmak için açılamıyor"
 
-#: src/ui.cc:1313
+#: src/ui.cc:1307
 msgid "Error while dumping resolver state"
 msgstr ""
 
-#: src/ui.cc:1323
+#: src/ui.cc:1317
 msgid "File to which the resolver state should be dumped:"
 msgstr ""
 
-#: src/ui.cc:1353
+#: src/ui.cc:1347
 msgid "^Install/remove packages"
 msgstr "^Paketleri kur/kaldır"
 
-#: src/ui.cc:1354
+#: src/ui.cc:1348
 msgid "Perform all pending installs and removals"
 msgstr "Bekleyen tüm kurulum ve kaldırma işlemlerini gerçekleştirir"
 
-#: src/ui.cc:1356
+#: src/ui.cc:1350
 msgid "^Update package list"
 msgstr "Paket listesini ^güncelle"
 
-#: src/ui.cc:1357
+#: src/ui.cc:1351
 msgid "Check for new versions of packages"
 msgstr "Paketleri yeni sürümleri için denetler"
 
-#: src/ui.cc:1360
+#: src/ui.cc:1354
 msgid "^Forget new packages"
 msgstr "Yeni paketleri ^unut"
 
-#: src/ui.cc:1361
+#: src/ui.cc:1355
 msgid "Forget which packages are \"new\""
 msgstr "Yeni paketleri unutur"
 
-#: src/ui.cc:1364
+#: src/ui.cc:1358
 msgid "^Clean package cache"
 msgstr "Paket ön^belleğini temizle"
 
-#: src/ui.cc:1365
+#: src/ui.cc:1359
 msgid "Delete package files which were previously downloaded"
 msgstr "Daha önce indirilmiş paket dosyalarını siler"
 
-#: src/ui.cc:1368
+#: src/ui.cc:1362
 msgid "Clean ^obsolete files"
 msgstr "Eski d^osyaları temizle"
 
-#: src/ui.cc:1369
+#: src/ui.cc:1363
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Artık indirilemeyecek olan (eski) paket dosyalarını siler"
 
-#: src/ui.cc:1372
+#: src/ui.cc:1366
 msgid "Mark ^Upgradable"
 msgstr "^Güncellenebilir işaretle"
 
-#: src/ui.cc:1373
+#: src/ui.cc:1367
 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:1376
+#: src/ui.cc:1370
 msgid "^Play Minesweeper"
 msgstr "Mayın tarlası ^oyna"
 
-#: src/ui.cc:1379
+#: src/ui.cc:1373
 msgid "^Become root"
 msgstr "Root o^l"
 
-#: src/ui.cc:1380
+#: src/ui.cc:1374
 #, fuzzy
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
@@ -4109,69 +4124,69 @@
 "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:1383
+#: src/ui.cc:1377
 msgid "^Reload package cache"
 msgstr "Paket arabelleÄŸini ^yenile"
 
-#: src/ui.cc:1384
+#: src/ui.cc:1378
 msgid "Reload the package cache"
 msgstr "Paket önbelleğini yeniden yükle"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1384
 msgid "^Quit"
 msgstr "Çı^k"
 
-#: src/ui.cc:1391
+#: src/ui.cc:1385
 msgid "Exit the program"
 msgstr "Programdan çıkar"
 
-#: src/ui.cc:1397 src/ui.cc:1669
+#: src/ui.cc:1391 src/ui.cc:1661
 msgid "Undo"
 msgstr "Geri al"
 
-#: src/ui.cc:1398
+#: src/ui.cc:1392
 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:1405
+#: src/ui.cc:1399
 msgid "^Install"
 msgstr "^Kur"
 
-#: src/ui.cc:1406
+#: src/ui.cc:1400
 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:1409
+#: src/ui.cc:1403
 msgid "^Remove"
 msgstr "^Kaldır"
 
-#: src/ui.cc:1410
+#: src/ui.cc:1404
 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:1413
+#: src/ui.cc:1407
 msgid "^Purge"
 msgstr "^Temizle"
 
-#: src/ui.cc:1414
+#: src/ui.cc:1408
 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:1417
+#: src/ui.cc:1411
 msgid "^Keep"
 msgstr "^Koru"
 
-#: src/ui.cc:1418
+#: src/ui.cc:1412
 msgid "Cancel any action on the selected package"
 msgstr "Seçili paket ile ilgili herhangi bir işlemi iptal et"
 
-#: src/ui.cc:1421
+#: src/ui.cc:1415
 msgid "^Hold"
 msgstr "^Tut"
 
-#: src/ui.cc:1422
+#: src/ui.cc:1416
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -4179,11 +4194,11 @@
 "Seçili paket ile ilgili herhangi bir işlemi iptal et ve daha sonra "
 "yapılacakyükseltmelerden koru"
 
-#: src/ui.cc:1425
+#: src/ui.cc:1419
 msgid "Mark ^Auto"
 msgstr "^Otom. Ä°ÅŸaretle"
 
-#: src/ui.cc:1426
+#: src/ui.cc:1420
 #, fuzzy
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
@@ -4192,11 +4207,11 @@
 "Paketi otomatik kurulmuÅŸ olarak iÅŸaretle; daha sonra bu pakete\n"
 "bağımlı paket kalmazsa otomatik olarak kaldır"
 
-#: src/ui.cc:1429
+#: src/ui.cc:1423
 msgid "Mark ^Manual"
 msgstr "Elle ^Ä°ÅŸaretle"
 
-#: src/ui.cc:1430
+#: src/ui.cc:1424
 #, fuzzy
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
@@ -4205,11 +4220,11 @@
 "Paketi el ile kurulmuÅŸ olarak iÅŸaretle; siz silmek istemediÄŸiniz\n"
 "sürece kurulu kalacaktır"
 
-#: src/ui.cc:1433
+#: src/ui.cc:1427
 msgid "^Forbid Version"
 msgstr "Sürümü ^Engelle"
 
-#: src/ui.cc:1434
+#: src/ui.cc:1428
 #, fuzzy
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
@@ -4218,232 +4233,232 @@
 "Ş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:1438
+#: src/ui.cc:1432
 msgid "I^nformation"
 msgstr "^Bilgi"
 
-#: src/ui.cc:1439
+#: src/ui.cc:1433
 msgid "Display more information about the selected package"
 msgstr "Seçilen paket hakkında daha detaylı bilgi göster"
 
-#: src/ui.cc:1442
+#: src/ui.cc:1436
 msgid "^Changelog"
 msgstr "^Changelog"
 
-#: src/ui.cc:1443
+#: src/ui.cc:1437
 msgid "Display the Debian changelog of the selected package"
 msgstr "Seçili paketin Debian değişiklik güncesini göster"
 
-#: src/ui.cc:1450
+#: src/ui.cc:1444
 msgid "^Find"
 msgstr "^Bul"
 
-#: src/ui.cc:1451
+#: src/ui.cc:1445
 msgid "Search for a package"
 msgstr "Paket ara"
 
-#: src/ui.cc:1454
+#: src/ui.cc:1448
 msgid "Find ^Again"
 msgstr "^Tekrar Bul"
 
-#: src/ui.cc:1455
+#: src/ui.cc:1449
 msgid "Repeat the last search"
 msgstr "Son aramayı tekrarla"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1453
 msgid "^Limit Display"
 msgstr "Görünümü ^Kısıtla"
 
-#: src/ui.cc:1460
+#: src/ui.cc:1454
 msgid "Apply a filter to the package list"
 msgstr "Paket listesini filtrele"
 
-#: src/ui.cc:1463
+#: src/ui.cc:1457
 msgid "^Un-Limit Display"
 msgstr "Görünümü Kısıtla^ma"
 
-#: src/ui.cc:1464
+#: src/ui.cc:1458
 msgid "Remove the filter from the package list"
 msgstr "Paket listesine uygulanan filtreyi kaldır"
 
-#: src/ui.cc:1468
+#: src/ui.cc:1462
 msgid "Find ^Broken"
 msgstr "^Bozukları Bul"
 
-#: src/ui.cc:1469
+#: src/ui.cc:1463
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Paket bağımlılığı karşılanamayan sonraki paketi bul"
 
-#: src/ui.cc:1476
+#: src/ui.cc:1470
 msgid "^UI options"
 msgstr "^Arayüz seçenekleri"
 
-#: src/ui.cc:1477
+#: src/ui.cc:1471
 msgid "Change the settings which affect the user interface"
 msgstr "Kullanıcı arayüzünü etkileyen ayarları değiştirir"
 
-#: src/ui.cc:1480
+#: src/ui.cc:1474
 msgid "^Dependency handling"
 msgstr "^Bağımlılık işleme"
 
-#: src/ui.cc:1481
+#: src/ui.cc:1475
 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:1484
+#: src/ui.cc:1478
 msgid "^Miscellaneous"
 msgstr "^Çeşitli"
 
-#: src/ui.cc:1485
+#: src/ui.cc:1479
 msgid "Change miscellaneous program settings"
 msgstr "Programın çeşitli ayarlarını değiştirir"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1484
 msgid "^Revert options"
 msgstr "^Seçenekleri sıfırla"
 
-#: src/ui.cc:1491
+#: src/ui.cc:1485
 msgid "Reset all settings to the system defaults"
 msgstr "Tüm ayarları sistem öntanımlı biçimlerine getirir"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1496
 msgid "^Next"
 msgstr "^Sonraki"
 
-#: src/ui.cc:1503
+#: src/ui.cc:1497
 msgid "View next display"
 msgstr "Sonraki ekranı görüntüle"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1500
 msgid "^Prev"
 msgstr "Ön^ceki"
 
-#: src/ui.cc:1507
+#: src/ui.cc:1501
 msgid "View previous display"
 msgstr "Önceki ekranı görüntüle"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1504
 msgid "^Close"
 msgstr "^Kapat"
 
-#: src/ui.cc:1511
+#: src/ui.cc:1505
 msgid "Close this display"
 msgstr "Bu ekranı kapat"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1510
 msgid "New Package ^View"
 msgstr "Yeni paket gö^rünümü"
 
-#: src/ui.cc:1517
+#: src/ui.cc:1511
 msgid "Create a new default package view"
 msgstr "Yeni bir öntanımlı paket görünümü oluştur"
 
-#: src/ui.cc:1520
+#: src/ui.cc:1514
 msgid "New Categorical ^Browser"
 msgstr "Yeni kategorik ^gezgin"
 
-#: src/ui.cc:1522
+#: src/ui.cc:1516
 msgid "Browse packages by category"
 msgstr "Paketlere kategoriye göre gözat"
 
-#: src/ui.cc:1530
+#: src/ui.cc:1524
 msgid "^About"
 msgstr "^Hakkında"
 
-#: src/ui.cc:1531
+#: src/ui.cc:1525
 msgid "View information about this program"
 msgstr "Bu program hakkındaki bilgileri görüntüler"
 
-#: src/ui.cc:1534
+#: src/ui.cc:1528
 msgid "^Help"
 msgstr "^Yardım"
 
-#: src/ui.cc:1535
+#: src/ui.cc:1529
 msgid "View the on-line help"
 msgstr "Çevrimiçi yardımı görüntüler"
 
-#: src/ui.cc:1537
+#: src/ui.cc:1531
 msgid "User's ^Manual"
 msgstr "Kulla^nıcı Elkitabı"
 
-#: src/ui.cc:1538
+#: src/ui.cc:1532
 msgid "View the detailed program manual"
 msgstr "Programın detaylı elkitabını görüntüler"
 
-#: src/ui.cc:1541
+#: src/ui.cc:1535
 msgid "^FAQ"
 msgstr "^SSS"
 
-#: src/ui.cc:1542
+#: src/ui.cc:1536
 msgid "View a list of frequently asked questions"
 msgstr "Sık sorulan soruların bir listesini görüntüler"
 
-#: src/ui.cc:1545
+#: src/ui.cc:1539
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1546
+#: src/ui.cc:1540
 #, 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:1549
+#: src/ui.cc:1543
 msgid "^License"
 msgstr "^Lisans"
 
-#: src/ui.cc:1550
+#: src/ui.cc:1544
 msgid "View the terms under which you may copy the program"
 msgstr "Programı kopyalayabileceğiniz koşulları görüntüler"
 
-#: src/ui.cc:1668
+#: src/ui.cc:1660
 msgid "Actions"
 msgstr "Eylemler"
 
-#: src/ui.cc:1671
+#: src/ui.cc:1663
 msgid "Search"
 msgstr "Ara"
 
-#: src/ui.cc:1672
+#: src/ui.cc:1664
 msgid "Options"
 msgstr "Seçenekler"
 
-#: src/ui.cc:1673
+#: src/ui.cc:1665
 msgid "Views"
 msgstr "Görünümler"
 
-#: src/ui.cc:1674
+#: src/ui.cc:1666
 msgid "Help"
 msgstr "Yardım"
 
-#: src/ui.cc:1734
+#: src/ui.cc:1726
 #, 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:2003 src/vscreen/vscreen.cc:281
+#: src/ui.cc:1996 src/vscreen/vscreen.cc:281
 msgid "yes_key"
 msgstr "evet_anahtarı"
 
-#: src/ui.cc:2004 src/vscreen/vscreen.cc:282
+#: src/ui.cc:1997 src/vscreen/vscreen.cc:282
 msgid "no_key"
 msgstr "anahtar_yok"
 
-#: src/view_changelog.cc:46
+#: src/view_changelog.cc:61
 msgid "You can only view changelogs of official Debian packages."
 msgstr "Sadece resmi Debian paketlerinin değişiklik güncesini görebilirsiniz."
 
-#: src/view_changelog.cc:52
+#: src/view_changelog.cc:67
 msgid "Downloading Changelog"
 msgstr "Changelog Ä°ndiriliyor"
 
-#: src/view_changelog.cc:54
+#: src/view_changelog.cc:69
 #, fuzzy
 msgid "Download Changelog"
 msgstr "Changelog Ä°ndiriliyor"
 
-#: src/view_changelog.cc:63
+#: src/view_changelog.cc:78
 #, c-format
 msgid "%s changes"
 msgstr ""
@@ -4539,18 +4554,193 @@
 #~ "Lütfen aşağıdaki CD'yi sürücüye yerleştirin \"%s\":\n"
 #~ "%s"
 
+#~ msgid "Need exactly two colors in color definition \"%s\""
+#~ msgstr "Tam olarak iki renk tanımına ihtiyaç var \"%s\""
+
+#~ msgid "Can't parse foreground \"%s\"of color \"%s\""
+#~ msgstr "\"%s\" ön plan rengi \"%s\"den ayrıştırılamıyor"
+
+#~ msgid "Can't parse background \"%s\" of color \"%s\""
+#~ msgstr "\"%s\" arkaplan rengi \"%s\"den ayrıştırılamıyor"
+
 #~ msgid "Invalid option for interactive mode: -s\n"
 #~ msgstr "Etkileşimli mod için geçersiz seçenek: -s\n"
 
+#~ 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."
+#~ 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 "
+#~ "kontrolünde kullanılır. Bunlar faxmodemi kontrol eden yazılımlar "
+#~ "(örneğin, internete bağlanmak için PP ve bu iş için yazılmış programlar"
+#~ "(zmodem/kermit)) olabileceği gibi, cep telefonları için programlar, "
+#~ "FidoNet için arayüz, ve BBS programları da olabilir."
+
+#~ 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"
+#~ " .\n"
+#~ " For more information about what Debian considers to be Free Software, "
+#~ "see http://www.debian.org/social_contract#guidelines"
+#~ msgstr ""
+#~ "Özgür Yazılım olmayan paketler\n"
+#~ " 'non-free' arşivi içerisindeki paketler Debian kapsamında değildir.\n"
+#~ " .\n"
+#~ " Bu paketler Debian Özgür Yazılım Rehberi'nin bir veya daha fazla "
+#~ "gereksinimini karşılamıyor. Bu bölümdeki yazılımları kullanmadan önce "
+#~ "lisanslarını okumalı ve amacınıza uygun kullanma izniniz olduğundan emin "
+#~ "olmalısınız.\n"
+#~ " .\n"
+#~ " Debian tarafından neyin Özgür Yazılım olarak değerlendirildiği hakkında "
+#~ "daha fazla bilgi için http://www.debian.org/social_contract#guidelines "
+#~ "adresine bakabilirsiniz."
+
+#~ 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)"
+#~ msgstr ""
+#~ "Yeni Paketler\n"
+#~ " Bu paketler siz \"yeni paket listesi\"ni son temizlediÄŸinizden beri "
+#~ "Debian'a eklenmiş paketlerdir. (Listeyi temizlemek için Eylemler "
+#~ "menüsündeki \"Yeni paketleri unut\" seçeneğini kullanın)"
+
+#~ msgid ""
+#~ "%s is an essential package!\n"
+#~ "\n"
+#~ "Are you sure you want to remove it?\n"
+#~ "Type '%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."
+
+#~ msgid "Available versions of "
+#~ msgstr "Kullanılabilir sürümleri "
+
+#~ 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."
+#~ msgstr ""
+#~ "Root yetkisine sahip deÄŸilsiniz ve size bu\n"
+#~ "yetkiyi sağlayabilmek için uygun bir yol bulunamadı.\n"
+#~ "Bu paketi yeniden yapılandırmak için 'menu' veya \n"
+#~ "'login' paketlerinden birini kurun veya aptitude \n"
+#~ "programını root yetkisiyle çalıştırın."
+
 #~ msgid "Information about "
 #~ msgstr "Hakkında bilgi"
 
+#~ msgid ""
+#~ "Aptitude %s\n"
+#~ "\n"
+#~ "Copyright 2000 Daniel Burrows.\n"
+#~ "\n"
+#~ "aptitude comes with ABSOLUTELY NO WARRANTY; for details see 'license' in "
+#~ "the\n"
+#~ "Help menu.  This is free software, and you are welcome to redistribute "
+#~ "it\n"
+#~ "under certain conditions; see 'license' for details."
+#~ msgstr ""
+#~ "Aptitude %s\n"
+#~ "\n"
+#~ "Copyright 2000 Daniel Burrows.\n"
+#~ "\n"
+#~ "aptitude kesinlikle HERHANGİ BİR GARANTİ içermez; detaylar için Yardım "
+#~ "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."
+
+#~ msgid "Some packages were broken and have been fixed"
+#~ msgstr "Bazı paket bağımlılıkları kırıktı ve düzeltildi."
+
 #~ msgid "Some broken packages could not be fixed!"
 #~ msgstr "Bazı kırık paket bağımlılıkları düzeltilemedi!"
 
+#~ msgid "Some packages are broken.  Try to fix them?"
+#~ msgstr "Bazı paket bağımlılıkları kırık.  Düzeltme denensin mi?"
+
+#~ msgid ""
+#~ "Installing/removing packages requires administrative privileges, which\n"
+#~ "you currently do not have.  Would you like to change to the root "
+#~ "account?\n"
+#~ 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"
+
+#~ msgid ""
+#~ "No packages will be installed, removed or upgraded.\n"
+#~ "\n"
+#~ "Some packages could be upgraded, but you have not chosen to upgrade "
+#~ "them.\n"
+#~ "Type \"U\" to prepare an upgrade."
+#~ msgstr ""
+#~ "Hiç bir paket kurulmayacak, kaldırılmayacak ya da yükseltilmeyecek.\n"
+#~ "\n"
+#~ "Bazı paketler yükseltilebilir, ama onları yükseltmeyi seçmediniz.\n"
+#~ "Yükseltme için \"U\" tuşuna basın."
+
+#~ 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"
+#~ 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"
+
+#~ msgid "Obsolete downloaded package files have been deleted"
+#~ msgstr "Ä°ndirilmiÅŸ eski paketler temizlendi."
+
+#~ msgid ""
+#~ "Run 'su' to become root; this will restart the program, but your\n"
+#~ "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"
+
+#~ msgid ""
+#~ "Mark the selected package as having been automatically installed;\n"
+#~ "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"
+
+#~ msgid ""
+#~ "Mark the selected package as having been manually installed;\n"
+#~ "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"
+
+#~ msgid ""
+#~ "Forbid the candidate version of the selected package from being "
+#~ "installed;\n"
+#~ "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"
+
 #~ msgid "^ChangeLog"
 #~ msgstr "^ChangeLog"
 
+#~ msgid "View the important changes made in each version of the program"
+#~ msgstr "Programın her sürümünde yapılmış önemli değişiklikleri görüntüler"
+
 #~ msgid "Install Suggested packages automatically"
 #~ msgstr "Teklif edilen paketleri otomatik olarak kur"
 

Modified: branches/aptitude-0.3/aptitude/po/vi.po
==============================================================================
--- branches/aptitude-0.3/aptitude/po/vi.po	(original)
+++ branches/aptitude-0.3/aptitude/po/vi.po	Sun Jun 12 21:04:47 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-05-01 14:08-0400\n"
+"POT-Creation-Date: 2005-06-12 22:42+0200\n"
 "PO-Revision-Date: 2005-04-27 15:54+0930\n"
 "Last-Translator: Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
 "Language-Team: Vietnamese <gnomevi-list at lists.sourceforge.net>\n"
@@ -148,14 +148,14 @@
 msgid "Automatically remove unused packages matching this filter"
 msgstr "Tự động loại bỏ các gói không dùng mà khớp với bộ lọc này."
 
-#: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:219 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
-#: src/vscreen/vs_util.cc:328
+#: src/apt_options.cc:240 src/mine/cmine.cc:249 src/mine/cmine.cc:312
+#: src/ui.cc:215 src/vscreen/vs_util.cc:77 src/vscreen/vs_util.cc:90
+#: src/vscreen/vs_util.cc:264 src/vscreen/vs_util.cc:298
 msgid "Ok"
 msgstr "Được"
 
-#: 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:328
+#: src/apt_options.cc:241 src/download_list.cc:69 src/mine/cmine.cc:250
+#: src/mine/cmine.cc:313 src/vscreen/vs_util.cc:298
 msgid "Cancel"
 msgstr "Thôi"
 
@@ -236,15 +236,15 @@
 msgid "%s: Previous"
 msgstr ""
 
-#: src/broken_indicator.cc:233
+#: src/broken_indicator.cc:232
 #, c-format
-msgid "%CSolution search failed.  %s: try harder"
+msgid "Solution search failed.  %s: try harder"
 msgstr ""
 
-#: src/broken_indicator.cc:239
-#, c-format
-msgid "%CUnable to resolve dependencies."
-msgstr ""
+#: src/broken_indicator.cc:237
+#, fuzzy
+msgid "Unable to resolve dependencies."
+msgstr "Không thể mở %s để ghi."
 
 #: src/cmdline/cmdline_action.cc:36
 #, c-format
@@ -623,13 +623,13 @@
 "Bạn chỉ nên tiếp tục cài nếu có chắc muốn làm như thế.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
-#: src/vscreen/vs_util.cc:212
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:165
+#: src/vscreen/vs_util.cc:202
 msgid "Yes"
 msgstr "Có"
 
-#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
-#: src/vscreen/vs_util.cc:212
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:165
+#: src/vscreen/vs_util.cc:202
 msgid "No"
 msgstr "Không"
 
@@ -942,7 +942,7 @@
 msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:212
+#: src/cmdline/cmdline_resolver.cc:212 src/cmdline/cmdline_resolver.cc:285
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
@@ -999,197 +999,202 @@
 msgid "The following packages have unmet dependencies:\n"
 msgstr "Theo đây có một số gói phụ thuộc vào phần mềm chưa cài:\n"
 
-#: src/cmdline/cmdline_show.cc:133
+#: src/cmdline/cmdline_show.cc:119 src/cmdline/cmdline_show.cc:305
+#: src/solution_fragment.cc:65
+msgid "<NULL>"
+msgstr ""
+
+#: src/cmdline/cmdline_show.cc:138
 msgid "not installed"
 msgstr "chưa cài đặt"
 
-#: src/cmdline/cmdline_show.cc:135 src/pkg_columnizer.cc:231
+#: src/cmdline/cmdline_show.cc:140 src/pkg_columnizer.cc:231
 #: src/pkg_ver_item.cc:225
 msgid "unpacked"
 msgstr "giải nén rồi"
 
-#: src/cmdline/cmdline_show.cc:137
+#: src/cmdline/cmdline_show.cc:142
 msgid "partially configured"
 msgstr "cấu hinh một cách bộ phân"
 
-#: src/cmdline/cmdline_show.cc:139
+#: src/cmdline/cmdline_show.cc:144
 msgid "partially installed"
 msgstr "cài một cách bộ phân"
 
-#: src/cmdline/cmdline_show.cc:141
+#: src/cmdline/cmdline_show.cc:146
 msgid "not installed (configuration files remain)"
 msgstr "chưa cài (các tập tin cấu hình còn lại)"
 
-#: src/cmdline/cmdline_show.cc:143 src/pkg_columnizer.cc:239
+#: src/cmdline/cmdline_show.cc:148 src/pkg_columnizer.cc:239
 #: src/pkg_ver_item.cc:233
 msgid "installed"
 msgstr "cài đặt rồi"
 
-#: src/cmdline/cmdline_show.cc:152
+#: src/cmdline/cmdline_show.cc:157
 msgid "not a real package"
 msgstr "không phải là gói thật"
 
-#: src/cmdline/cmdline_show.cc:165
+#: src/cmdline/cmdline_show.cc:170
 msgid " [held]"
 msgstr " [đã giữ lại]"
 
-#: src/cmdline/cmdline_show.cc:174
+#: src/cmdline/cmdline_show.cc:179
 #, c-format
 msgid "%s; version %s will be installed"
 msgstr "%s; sẽ cài phiên bản %s"
 
-#: src/cmdline/cmdline_show.cc:178
+#: src/cmdline/cmdline_show.cc:183
 #, c-format
 msgid "%s; version %s will be installed automatically"
 msgstr "%s; sẽ tự động cài phiên bản %s"
 
-#: src/cmdline/cmdline_show.cc:184 src/cmdline/cmdline_show.cc:199
+#: src/cmdline/cmdline_show.cc:189 src/cmdline/cmdline_show.cc:204
 #, c-format
 msgid "%s; will be purged"
 msgstr "%s; sẽ bị tẩy"
 
-#: src/cmdline/cmdline_show.cc:197
+#: src/cmdline/cmdline_show.cc:202
 #, c-format
 msgid "%s; will be purged because nothing depends on it"
 msgstr "%s; sẽ bị tẩy vì không có gì phụ thuộc vào nó."
 
-#: src/cmdline/cmdline_show.cc:204
+#: src/cmdline/cmdline_show.cc:209
 #, c-format
 msgid "%s; will be removed because nothing depends on it"
 msgstr "%s; sẽ bị loại bỏ vì không có gì phụ thuộc vào nó"
 
-#: src/cmdline/cmdline_show.cc:206
+#: src/cmdline/cmdline_show.cc:211
 #, c-format
 msgid "%s; will be removed"
 msgstr "%s; sẽ bị loại bỏ"
 
-#: src/cmdline/cmdline_show.cc:220
+#: src/cmdline/cmdline_show.cc:225
 #, c-format
 msgid "%s%s; will be downgraded [%s -> %s]"
 msgstr "%s%s; sẽ bị hạ cấp [%s -> %s]"
 
-#: src/cmdline/cmdline_show.cc:223
+#: src/cmdline/cmdline_show.cc:228
 #, c-format
 msgid "%s%s; will be upgraded [%s -> %s]"
 msgstr "%s%s; sẽ được cập nhật [%s -> %s]"
 
-#: src/cmdline/cmdline_show.cc:235 src/cmdline/cmdline_show.cc:256
+#: src/cmdline/cmdline_show.cc:240 src/cmdline/cmdline_show.cc:261
 msgid "Package: "
 msgstr "Gói:"
 
-#: src/cmdline/cmdline_show.cc:236 src/cmdline/cmdline_show.cc:264
+#: src/cmdline/cmdline_show.cc:241 src/cmdline/cmdline_show.cc:269
 #: src/pkg_columnizer.cc:87
 msgid "State"
 msgstr "Tính trạng"
 
-#: src/cmdline/cmdline_show.cc:237 src/cmdline/cmdline_show.cc:318
+#: src/cmdline/cmdline_show.cc:242 src/cmdline/cmdline_show.cc:325
 msgid "Provided by"
 msgstr "Cung cấp bởi"
 
-#: src/cmdline/cmdline_show.cc:258 src/pkg_info_screen.cc:105
+#: src/cmdline/cmdline_show.cc:263 src/pkg_info_screen.cc:105
 msgid "Essential: "
 msgstr "Chủ yếu:"
 
-#: src/cmdline/cmdline_show.cc:258 src/cmdline/cmdline_show.cc:262
-#: src/cmdline/cmdline_show.cc:273 src/pkg_info_screen.cc:105
+#: src/cmdline/cmdline_show.cc:263 src/cmdline/cmdline_show.cc:267
+#: src/cmdline/cmdline_show.cc:278 src/pkg_info_screen.cc:105
 msgid "yes"
 msgstr "có"
 
-#: src/cmdline/cmdline_show.cc:262
+#: src/cmdline/cmdline_show.cc:267
 msgid "New"
 msgstr "Má»›i"
 
-#: src/cmdline/cmdline_show.cc:267
+#: src/cmdline/cmdline_show.cc:272
 msgid "Forbidden version"
 msgstr "Phiên bản bị cấm"
 
-#: src/cmdline/cmdline_show.cc:271
+#: src/cmdline/cmdline_show.cc:276
 msgid "Automatically installed"
 msgstr "Tự động cài đặt"
 
-#: src/cmdline/cmdline_show.cc:273
+#: src/cmdline/cmdline_show.cc:278
 msgid "no"
 msgstr "không"
 
-#: src/cmdline/cmdline_show.cc:275
+#: src/cmdline/cmdline_show.cc:280
 msgid "Version: "
 msgstr "Phiên bản:"
 
-#: src/cmdline/cmdline_show.cc:276 src/pkg_info_screen.cc:113
+#: src/cmdline/cmdline_show.cc:281 src/pkg_info_screen.cc:113
 msgid "Priority: "
 msgstr "Ưu tiên:"
 
-#: src/cmdline/cmdline_show.cc:277 src/cmdline/cmdline_show.cc:279
-#: src/cmdline/cmdline_show.cc:288
+#: src/cmdline/cmdline_show.cc:282 src/cmdline/cmdline_show.cc:284
+#: src/cmdline/cmdline_show.cc:293
 msgid "N/A"
 msgstr "⌀ có"
 
-#: src/cmdline/cmdline_show.cc:278 src/pkg_info_screen.cc:114
+#: src/cmdline/cmdline_show.cc:283 src/pkg_info_screen.cc:114
 msgid "Section: "
 msgstr "Phần:"
 
-#: src/cmdline/cmdline_show.cc:280 src/pkg_info_screen.cc:115
+#: src/cmdline/cmdline_show.cc:285 src/pkg_info_screen.cc:115
 msgid "Maintainer: "
 msgstr "Bảo quản trị:"
 
-#: src/cmdline/cmdline_show.cc:283
+#: src/cmdline/cmdline_show.cc:288
 msgid "Uncompressed Size: "
 msgstr "Cỡ đã giải nén:"
 
-#: src/cmdline/cmdline_show.cc:287
+#: src/cmdline/cmdline_show.cc:292
 msgid "Architecture: "
 msgstr "Kiến trúc:"
 
-#: src/cmdline/cmdline_show.cc:289
+#: src/cmdline/cmdline_show.cc:294
 msgid "Compressed Size: "
 msgstr "Cỡ đã nén:"
 
-#: src/cmdline/cmdline_show.cc:291
+#: src/cmdline/cmdline_show.cc:296
 msgid "Filename: "
 msgstr "Tên tập tin:"
 
 # Do not translate/ đừng dịch
-#: src/cmdline/cmdline_show.cc:293
+#: src/cmdline/cmdline_show.cc:298
 msgid "MD5sum: "
 msgstr "MD5sum: "
 
-#: src/cmdline/cmdline_show.cc:297 src/cmdline/cmdline_show.cc:299
+#: src/cmdline/cmdline_show.cc:302 src/cmdline/cmdline_show.cc:305
 msgid "Archive"
 msgstr "Kho"
 
-#: src/cmdline/cmdline_show.cc:303
+#: src/cmdline/cmdline_show.cc:310
 msgid "Depends"
 msgstr "Phụ thuộc "
 
-#: src/cmdline/cmdline_show.cc:305
+#: src/cmdline/cmdline_show.cc:312
 msgid "PreDepends"
 msgstr "Phụ thuộc trước"
 
-#: src/cmdline/cmdline_show.cc:307
+#: src/cmdline/cmdline_show.cc:314
 msgid "Recommends"
 msgstr "Khuyến khích"
 
-#: src/cmdline/cmdline_show.cc:309
+#: src/cmdline/cmdline_show.cc:316
 msgid "Suggests"
 msgstr "Đệ nghị"
 
-#: src/cmdline/cmdline_show.cc:311
+#: src/cmdline/cmdline_show.cc:318
 msgid "Conflicts"
 msgstr "Xung Ä‘á»™t"
 
-#: src/cmdline/cmdline_show.cc:313
+#: src/cmdline/cmdline_show.cc:320
 msgid "Replaces"
 msgstr "Thay thế"
 
-#: src/cmdline/cmdline_show.cc:315
+#: src/cmdline/cmdline_show.cc:322
 msgid "Obsoletes"
 msgstr "Làm cho cũ"
 
-#: src/cmdline/cmdline_show.cc:317
+#: src/cmdline/cmdline_show.cc:324
 msgid "Provides"
 msgstr "Cung cấp"
 
-#: src/cmdline/cmdline_show.cc:321 src/pkg_info_screen.cc:97
+#: src/cmdline/cmdline_show.cc:328 src/pkg_info_screen.cc:97
 msgid "Description: "
 msgstr "Mô tả:"
 
@@ -1234,32 +1239,32 @@
 msgid "You cannot specify both an archive and a version for a package\n"
 msgstr "Không thể ghi rõ cả hai kho và phiên bản đều cho gói.\n"
 
-#: src/dep_item.cc:137
+#: src/dep_item.cc:139
 msgid "UNSATISFIED"
 msgstr "CÒN NGỜ"
 
-#: src/dep_item.cc:137 src/reason_fragment.cc:247
+#: src/dep_item.cc:139 src/reason_fragment.cc:244
 msgid "UNAVAILABLE"
 msgstr "KHÔNG CÓ"
 
-#: src/download_bar.cc:56 src/download_list.cc:263 src/download_screen.cc:57
+#: src/download_bar.cc:56 src/download_list.cc:266 src/download_screen.cc:57
 #, c-format
 msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
 msgstr "Hãy nạp đĩa có nhãn \"%s\" vào ổ \"%s\"."
 
-#: src/download_bar.cc:77 src/generic/acqprogress.cc:63
+#: src/download_bar.cc:75 src/generic/acqprogress.cc:63
 msgid "Hit "
 msgstr "Lần ghé"
 
-#: src/download_bar.cc:90
+#: src/download_bar.cc:88
 msgid "Downloading "
 msgstr "Tải về"
 
-#: src/download_bar.cc:103
+#: src/download_bar.cc:101
 msgid "Got "
 msgstr "Gọi rồi"
 
-#: src/download_bar.cc:157
+#: src/download_bar.cc:155
 msgid "Downloading..."
 msgstr "Tải về..."
 
@@ -1288,7 +1293,7 @@
 msgid "Couldn't clean out list directories"
 msgstr "Không thể xóa các thư mục danh sách."
 
-#: src/download.cc:177 src/ui.cc:1153
+#: src/download.cc:177 src/ui.cc:1147
 msgid "Deleting obsolete downloaded files"
 msgstr "Xóa bỏ các tập tin cũ đã tải về..."
 
@@ -1425,7 +1430,7 @@
 "Ack!  Something bad happened while installing packages.  Trying to recover:"
 msgstr "Aiie, có gì đó xấu trong khi cài gói. Thử phục hồi..."
 
-#: src/download.cc:477 src/pkg_item.cc:432
+#: src/download.cc:477 src/pkg_item.cc:430
 msgid "Press return to continue.\n"
 msgstr "Hãy bấm phím Return để tiếp tục.\n"
 
@@ -1436,17 +1441,17 @@
 "Không thể gọi lại khóa hệ thống. Có lẽ một trình apt hay dpkg khác có chạy "
 "không?)"
 
-#: src/download_item.cc:66 src/download_item.cc:70 src/download_item.cc:100
+#: src/download_item.cc:70 src/download_item.cc:74 src/download_item.cc:104
 #: src/generic/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr " [Hoạt động]"
 
-#: src/download_item.cc:104 src/download_list.cc:283
+#: src/download_item.cc:108 src/download_list.cc:284
 msgid "[Hit]"
 msgstr "[Lần ghé]"
 
-#: src/download_item.cc:104 src/download_list.cc:303
+#: src/download_item.cc:108 src/download_list.cc:304
 msgid "[Downloaded]"
 msgstr "[Tải về rồi]"
 
@@ -1460,35 +1465,35 @@
 msgid "%n%nSome files were not downloaded successfully."
 msgstr ""
 
-#: src/download_list.cc:68
+#: src/download_list.cc:66
 msgid "Continue"
 msgstr "Tiếp tục"
 
-#: src/download_list.cc:175 src/download_screen.cc:203
+#: src/download_list.cc:178 src/download_screen.cc:203
 msgid "Total Progress: "
 msgstr "Tổng tiến hành:"
 
-#: src/download_list.cc:194 src/download_screen.cc:218
+#: src/download_list.cc:197 src/download_screen.cc:218
 #, c-format
 msgid " [ %i%% ] (%sB/s, %s remaining)"
 msgstr " [ %i%% ] (%sB/s, %s còn lại)"
 
-#: src/download_list.cc:196
+#: src/download_list.cc:199
 #, c-format
 msgid " [ %i%% ] (stalled)"
 msgstr " [ %i%% ] (bị ngừng chạy)"
 
 # Variable: do not translate/ biến: đừng dịch
-#: src/download_list.cc:198
+#: src/download_list.cc:201
 #, c-format
 msgid " [ %i%% ]"
 msgstr " [ %i%% ]"
 
-#: src/download_list.cc:323
+#: src/download_list.cc:324
 msgid "[IGNORED]"
 msgstr "[BỊ BỎ QUA]"
 
-#: src/download_list.cc:329
+#: src/download_list.cc:330
 msgid "[ERROR]"
 msgstr "[Lá»–I]"
 
@@ -1497,11 +1502,11 @@
 msgid "Downloaded %sB in %ss (%sB/s)."
 msgstr "Tải về %sB mất %ss (%sB/s) rồi."
 
-#: src/edit_pkg_hier.cc:158
+#: src/edit_pkg_hier.cc:176
 msgid "No hierarchy information to edit"
 msgstr "Không có thông tin cây nào cần sửa đổi."
 
-#: src/edit_pkg_hier.cc:258
+#: src/edit_pkg_hier.cc:276
 msgid "Couldn't open for writing"
 msgstr "Không thể mở để ghi."
 
@@ -1600,39 +1605,39 @@
 msgstr ""
 "Cảnh báo: không thể khóa tập tin nhớ tạm nên mở nó trong chế độ chỉ đọc."
 
-#: src/generic/matchers.cc:797
+#: src/generic/matchers.cc:798
 msgid "Unmatched '('"
 msgstr "ChÆ°a khá»›p '('"
 
-#: src/generic/matchers.cc:887 src/generic/matchers.cc:968
+#: src/generic/matchers.cc:888 src/generic/matchers.cc:969
 #, c-format
 msgid "Unknown dependency type: %s"
 msgstr "Không biết kiểu cách phụ thuộc: %s"
 
-#: src/generic/matchers.cc:950
+#: src/generic/matchers.cc:951
 #, c-format
 msgid "Unknown action type: %s"
 msgstr "Không biểu kiểu hành động: %s"
 
-#: src/generic/matchers.cc:1017
+#: src/generic/matchers.cc:1018
 #, c-format
 msgid "Unknown priority %s"
 msgstr "Không biết ưu tiên %s"
 
-#: src/generic/matchers.cc:1039
+#: src/generic/matchers.cc:1040
 #, c-format
 msgid "Unknown pattern type: %c"
 msgstr "Không biết kiểu mẫu: %c"
 
-#: src/generic/matchers.cc:1084
+#: src/generic/matchers.cc:1105
 msgid "Unexpected empty expression"
 msgstr "Biểu thức rỗng bất ngờ"
 
-#: src/generic/matchers.cc:1119
+#: src/generic/matchers.cc:1143
 msgid "Badly formed expression"
 msgstr "Biểu thức dạng sai"
 
-#: src/generic/matchers.cc:1148
+#: src/generic/matchers.cc:1175
 msgid "Unexpected ')'"
 msgstr "')' bất ngờ"
 
@@ -1659,7 +1664,7 @@
 "Không thể gói giá trị của $HOME (nhà) dùng TMPDIR (thư mục tạm), cách không "
 "bảo mật."
 
-#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:61
+#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:76
 #, c-format
 msgid "ChangeLog of %s"
 msgstr "Bản ghi đổi của %s."
@@ -1700,37 +1705,37 @@
 msgid "Reading task descriptions"
 msgstr "Đọc mô tả tác vụ..."
 
-#: src/load_config.cc:30
-#, c-format
-msgid "Invalid entry in color definition group: \"%s\""
-msgstr "Mục không hợp lệ trong nhóm định nghĩa màu: \"%s\""
+#: src/load_config.cc:42
+#, fuzzy, c-format
+msgid "Unrecognized color name \"%s\""
+msgstr "Tác vụ chưa nhận biết"
 
-#: src/load_config.cc:32
-#, c-format
-msgid "Invalid tagless entry in color definition group: \"%s\""
-msgstr "Mục không có thẻ không hợp lệ trong nhóm định nghĩa màu: \"%s\""
+#: src/load_config.cc:69
+#, fuzzy, c-format
+msgid "Unrecognized attribute name \"%s\""
+msgstr "Tác vụ chưa nhận biết"
 
-#: src/load_config.cc:34
-#, c-format
-msgid "Need exactly two colors in color definition \"%s\""
-msgstr "Cần thiết đúng hai màu khác trong lời định nghĩa \"%s\"."
+#: src/load_config.cc:106
+#, fuzzy, c-format
+msgid "Invalid entry in style definition group: \"%s\""
+msgstr "Mục không hợp lệ trong nhóm định nghĩa màu: \"%s\""
 
-#: src/load_config.cc:50
-#, c-format
-msgid "Can't parse foreground \"%s\"of color \"%s\""
-msgstr "Không thể phân tách cảnh gần \"%s\" của màu \"%s\"."
+#: src/load_config.cc:108
+#, fuzzy, c-format
+msgid "Invalid tagless entry in style definition group: \"%s\""
+msgstr "Mục không có thẻ không hợp lệ trong nhóm định nghĩa màu: \"%s\""
 
-#: src/load_config.cc:53
-#, c-format
-msgid "Can't parse background \"%s\" of color \"%s\""
-msgstr "Không thể phân tách nền \"%s\" của màu \"%s\"."
+#: src/load_config.cc:130
+#, fuzzy, c-format
+msgid "Unknown style attribute %s"
+msgstr "Không biểu kiểu hành động: %s"
 
-#: src/load_config.cc:72 src/load_config.cc:74
+#: src/load_config.cc:153 src/load_config.cc:155
 #, c-format
 msgid "Invalid entry in keybinding group: \"%s\""
 msgstr "Mục ghi không hợp lệ trong nhóm đóng kết phím: \"%s\""
 
-#: src/load_config.cc:89
+#: src/load_config.cc:170
 #, c-format
 msgid "Ignoring invalid keybinding \"%s\" -> \"%s\""
 msgstr "Bỏ qua điều đóng kết phím \"%s\" → \"%s\""
@@ -2148,44 +2153,44 @@
 "                  Trình aptitude này không phải có tài năng của bò ma "
 "thuật.\n"
 
-#: src/main.cc:255
+#: src/main.cc:252
 #, c-format
 msgid "-o requires an argument of the form key=value, got %s"
 msgstr "-o cần thiết đối số dạng key=giá_trị, còn nhân %s (key=phím)"
 
-#: src/main.cc:301 src/main.cc:310
+#: src/main.cc:291 src/main.cc:300
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr "LẠ: không biết mã tùy chọn đã nhận.\n"
 
-#: src/main.cc:319
+#: src/main.cc:309
 msgid "Only one of -u and -i may be specified\n"
 msgstr "Có ghi rõ được chỉ một của hai tùy chọn -u và -i.\n"
 
-#: src/main.cc:327
+#: src/main.cc:317
 msgid ""
 "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgstr ""
 "Không thể ghi rõ tùy chọn -u hay -i trong chế độ dòng lệnh (v.d. với lệnh "
 "'install' (càì))."
 
-#: src/main.cc:348
+#: src/main.cc:338
 msgid "-u and -i may not be specified with a command"
 msgstr "Không thể ghi rõ tùy chọn -u hay -i với lệnh."
 
-#: src/main.cc:405
+#: src/main.cc:395
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr "Không biết lệnh \"%s\".\n"
 
-#: src/main.cc:412 src/main.cc:469
+#: src/main.cc:402 src/main.cc:450
 msgid "Internal error: uncaught 'out of solutions' exception.\n"
 msgstr ""
 
-#: src/main.cc:417 src/main.cc:474
+#: src/main.cc:407 src/main.cc:455
 msgid "Internal error: uncaught 'out of time' exception.\n"
 msgstr ""
 
-#: src/main.cc:424
+#: src/main.cc:414
 #, c-format
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
@@ -2216,7 +2221,7 @@
 msgid "Lost"
 msgstr "Thua"
 
-#: src/mine/cmine.cc:119 src/ui.cc:1090
+#: src/mine/cmine.cc:119 src/ui.cc:1084
 msgid "Minesweeper"
 msgstr "Quét mìn"
 
@@ -2242,147 +2247,147 @@
 msgid "The number of mines must be a number"
 msgstr "Số mìn phải là con số."
 
-#: src/mine/cmine.cc:240
+#: src/mine/cmine.cc:238
 msgid "Setup custom game"
 msgstr "Thiết lập trò chơi tự chọn"
 
-#: src/mine/cmine.cc:243
+#: src/mine/cmine.cc:240
 msgid "Height of board: "
 msgstr "Độ cao bảng:"
 
-#: src/mine/cmine.cc:247
+#: src/mine/cmine.cc:243
 msgid "Width of board: "
 msgstr "Độ rộng bảng:"
 
-#: src/mine/cmine.cc:251
+#: src/mine/cmine.cc:246
 msgid "Number of mines: "
 msgstr "Số mìn:"
 
-#: src/mine/cmine.cc:316
+#: src/mine/cmine.cc:305
 msgid "Choose difficulty level"
 msgstr "Hãy chọn lớp khó"
 
-#: src/mine/cmine.cc:318
+#: src/mine/cmine.cc:307
 msgid "Easy"
 msgstr "Dá»…"
 
-#: src/mine/cmine.cc:319
+#: src/mine/cmine.cc:308
 msgid "Medium"
 msgstr "Giữa"
 
-#: src/mine/cmine.cc:320
+#: src/mine/cmine.cc:309
 msgid "Hard"
 msgstr "Khó"
 
-#: src/mine/cmine.cc:321
+#: src/mine/cmine.cc:310
 msgid "Custom"
 msgstr "Tự chọn"
 
-#: src/mine/cmine.cc:411
+#: src/mine/cmine.cc:392
 msgid "You have won."
 msgstr "Bạn thắng rồi."
 
-#: src/mine/cmine.cc:414
+#: src/mine/cmine.cc:395
 msgid "You lose!"
 msgstr "Bạn thua rồi."
 
-#: src/mine/cmine.cc:419
+#: src/mine/cmine.cc:400
 msgid "You die...  --More--"
 msgstr "Bạn chết... --Thêm--"
 
-#: src/mine/cmine.cc:432
+#: src/mine/cmine.cc:413
 msgid "The spikes were poisoned!  The poison was deadly..  --More--"
 msgstr "Gai độc! Thuốc độc chết người...  --Thêm--"
 
-#: src/mine/cmine.cc:435
+#: src/mine/cmine.cc:416
 msgid "You land on a set of sharp iron spikes!  --More--"
 msgstr "Bạn rơi vào các gai sắt sắc!  --Thêm--"
 
-#: src/mine/cmine.cc:438
+#: src/mine/cmine.cc:419
 msgid "You fall into a pit!  --More--"
 msgstr "Bạn rơi vào bẫy!  --Thêm--"
 
-#: src/mine/cmine.cc:441
+#: src/mine/cmine.cc:422
 msgid "KABOOM!  You step on a land mine.  --More--"
 msgstr "ĐÙNG!  Bạn giẫm lên mìn.  --Thêm--"
 
-#: src/mine/cmine.cc:446
+#: src/mine/cmine.cc:427
 msgid "The dart was poisoned!  The poison was deadly...  --More--"
 msgstr "Cái lao độc! Thuốc độc chết người...  --Thêm--"
 
-#: src/mine/cmine.cc:448
+#: src/mine/cmine.cc:429
 msgid ""
 "A little dart shoots out at you!  You are hit by a little dart!  --More--"
 msgstr "Một cái lao nhỏ ném đến bạn! Bạn được đánh bởi cái lao nhỏ.  --Thêm--"
 
-#: src/mine/cmine.cc:452
+#: src/mine/cmine.cc:433
 msgid "You turn to stone... --More--"
 msgstr "Bạn trở thành đá.  --Thêm--"
 
-#: src/mine/cmine.cc:454
+#: src/mine/cmine.cc:435
 msgid "Touching the cockatrice corpse was a fatal mistake.  --More--"
 msgstr "Sờ xác chết rắn thần là lỗi lầm tai hại.  --Thêm--"
 
-#: src/mine/cmine.cc:456
+#: src/mine/cmine.cc:437
 msgid "You feel here a cockatrice corpse.  --More--"
 msgstr "Ở đây bạn sờ một xác chết rắn thần.  --Thêm--"
 
-#: src/mine/cmine.cc:460
+#: src/mine/cmine.cc:441
 msgid ""
 "Click!  You trigger a rolling boulder trap!  You are hit by a boulder! --"
 "More--"
 msgstr "Lách cách! Bạn nhả bẫy có đá to lớn lăn đến bạn! Nó đánh bạn! --"
 
-#: src/mine/cmine.cc:470
+#: src/mine/cmine.cc:451
 msgid "sleep"
 msgstr "ngủ"
 
-#: src/mine/cmine.cc:473
+#: src/mine/cmine.cc:454
 msgid "striking"
 msgstr "có đánh"
 
-#: src/mine/cmine.cc:476
+#: src/mine/cmine.cc:457
 msgid "death"
 msgstr "sự chết"
 
-#: src/mine/cmine.cc:479
+#: src/mine/cmine.cc:460
 msgid "polymorph"
 msgstr "có thể đổi hình"
 
-#: src/mine/cmine.cc:482
+#: src/mine/cmine.cc:463
 msgid "magic missile"
 msgstr "vật ma thuật phóng ra"
 
-#: src/mine/cmine.cc:485
+#: src/mine/cmine.cc:466
 msgid "secret door detection"
 msgstr "phát hiện cửa bí mật"
 
-#: src/mine/cmine.cc:488
+#: src/mine/cmine.cc:469
 msgid "invisibility"
 msgstr "tính vô hình"
 
-#: src/mine/cmine.cc:491
+#: src/mine/cmine.cc:472
 msgid "cold"
 msgstr "lạnh"
 
-#: src/mine/cmine.cc:497
+#: src/mine/cmine.cc:478
 #, c-format
 msgid "Your wand of %s breaks apart and explodes!  --More--"
 msgstr "Đũa thần %s của bạn rã ra và nổ!  --Thêm--"
 
-#: src/mine/cmine.cc:503
+#: src/mine/cmine.cc:484
 msgid "You are jolted by a surge of electricity!  --More--"
 msgstr "Điện giật làm bạn xóc nảy lên!  --Thêm--"
 
-#: src/mine/cmine.cc:607
+#: src/mine/cmine.cc:588
 msgid "Enter the filename to load: "
 msgstr "Hãy gõ tên tập tin cần tải:"
 
-#: src/mine/cmine.cc:614
+#: src/mine/cmine.cc:595
 msgid "Enter the filename to save: "
 msgstr "Hãy gõ tên tập tin cần lưu:"
 
-#: src/mine/cmine.cc:624
+#: src/mine/cmine.cc:605
 msgid "mine-help.txt"
 msgstr "mine-help.txt"
 
@@ -2390,7 +2395,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:1670
+#: src/pkg_columnizer.cc:84 src/ui.cc:1662
 msgid "Package"
 msgstr "Gói"
 
@@ -3444,52 +3449,52 @@
 "Bạn có chắc muốn loại bỏ nó không?\n"
 "Hãy gõ '%s' nếu có."
 
-#: src/pkg_item.cc:222 src/pkg_ver_item.cc:625
+#: src/pkg_item.cc:220 src/pkg_ver_item.cc:626
 #, c-format
 msgid "Information about %s"
 msgstr "Thông tin về %s"
 
-#: src/pkg_item.cc:224 src/pkg_ver_item.cc:627
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:628
 #, c-format
 msgid "%s info"
 msgstr ""
 
-#: src/pkg_item.cc:310
+#: src/pkg_item.cc:308
 #, fuzzy, c-format
 msgid "Available versions of %s"
 msgstr "Các phiên bản công bố của "
 
-#: src/pkg_item.cc:313
+#: src/pkg_item.cc:311
 #, fuzzy, c-format
 msgid "%s versions"
 msgstr "Phiên bản"
 
-#: src/pkg_item.cc:325 src/pkg_ver_item.cc:655
+#: src/pkg_item.cc:323 src/pkg_ver_item.cc:656
 #, c-format
 msgid "Dependencies of %s"
 msgstr "%s phụ thuộc vào"
 
-#: src/pkg_item.cc:327 src/pkg_ver_item.cc:657
+#: src/pkg_item.cc:325 src/pkg_ver_item.cc:658
 #, c-format
 msgid "%s deps"
 msgstr ""
 
-#: src/pkg_item.cc:338 src/pkg_ver_item.cc:667
+#: src/pkg_item.cc:336 src/pkg_ver_item.cc:668
 #, c-format
 msgid "Packages depending on %s"
 msgstr "Các gói khác phụ thuộc vào %s"
 
-#: src/pkg_item.cc:340 src/pkg_ver_item.cc:669
+#: src/pkg_item.cc:338 src/pkg_ver_item.cc:670
 #, c-format
 msgid "%s reverse deps"
 msgstr ""
 
-#: src/pkg_item.cc:392 src/pkg_ver_item.cc:707
+#: src/pkg_item.cc:390 src/pkg_ver_item.cc:708
 #, c-format
 msgid "Reporting a bug in %s:\n"
 msgstr "Thông báo lỗi trong %s:\n"
 
-#: src/pkg_item.cc:414
+#: src/pkg_item.cc:412
 #, fuzzy
 msgid ""
 "You are not root and I cannot find any way to become root.  To reconfigure "
@@ -3501,16 +3506,16 @@
 "cài gói trình đơn, cài gói đăng nhập, hoặc chạy trình aptitude như là người "
 "chủ."
 
-#: src/pkg_item.cc:422
+#: src/pkg_item.cc:420
 #, c-format
 msgid "Reconfiguring %s\n"
 msgstr "Cấu hình lại %s\n"
 
-#: src/pkg_item.cc:447
+#: src/pkg_item.cc:445
 msgid "Hierarchy editor"
 msgstr "Bộ sửa đổi cây"
 
-#: src/pkg_item.cc:447
+#: src/pkg_item.cc:445
 #, fuzzy
 msgid "Hierarchy Editor"
 msgstr "Bộ sửa đổi cây"
@@ -3544,24 +3549,24 @@
 msgid "Enter the new package sorting mechanism for this display: "
 msgstr "ãy nhập cơ chế sắư xếp gói mới cho bộ trình bày này:"
 
-#: src/pkg_view.cc:344
+#: src/pkg_view.cc:359
 msgid "make_package_view: error in arguments -- two main widgets??"
 msgstr ""
 "make_package_view: (tạo khung xem gói) gặp lỗi trong đối số -- hai ô điều "
 "khiển chính?"
 
-#: src/pkg_view.cc:350
+#: src/pkg_view.cc:365
 msgid ""
 "make_package_view: error in arguments -- bad column list for static item"
 msgstr ""
 "make_package_view: (tạo khung xem gói) gặp lỗi trong đối số -- danh sách cột "
 "sai cho mục tĩnh."
 
-#: src/pkg_view.cc:443
+#: src/pkg_view.cc:458
 msgid "make_package_view: bad argument!"
 msgstr "make_package_view: (tạo khung xem gói) đối số sai."
 
-#: src/pkg_view.cc:495
+#: src/pkg_view.cc:510
 msgid "make_package_view: no main widget found"
 msgstr ""
 "make_package_view: (tạo khung xem gói) không tìm thấy ô điều khiển chính nào."
@@ -3600,12 +3605,12 @@
 msgstr " (được cung cấp bởi %F)"
 
 # Variable: do not translate/ biến: đừng dịch
-#: src/reason_fragment.cc:278
+#: src/reason_fragment.cc:275
 #, c-format
 msgid "%F%s %F %F"
 msgstr "%F%s %F %F"
 
-#: src/reason_fragment.cc:327
+#: src/reason_fragment.cc:324
 msgid ""
 "If you select a package, an explanation of its current state will appear in "
 "this space."
@@ -3613,7 +3618,7 @@
 "Nếu bạn chọn một gói, mô tả tính trạng hiện thời nó sẽ xuất hiện trong "
 "trường này."
 
-#: src/reason_fragment.cc:361
+#: src/reason_fragment.cc:358
 msgid ""
 "%B%s%b was installed automatically;  it is being removed because all of the "
 "packages which depend upon it are being removed:"
@@ -3621,17 +3626,17 @@
 "%B%s%b đã được cài tự động; nó đang bị loại bỏ vì các gói phụ thuộc vào nó "
 "cũng đang bị loại bỏ."
 
-#: src/reason_fragment.cc:365
+#: src/reason_fragment.cc:362
 msgid "%B%s%b will be automatically removed because of dependency errors:"
 msgstr "%B%s%b sẽ bị loại bỏ tự đông vì gặp lỗi cách phụ thuộc:"
 
-#: src/reason_fragment.cc:369
+#: src/reason_fragment.cc:366
 msgid ""
 "%B%s%b will be automatically installed to satisfy the following dependencies:"
 msgstr ""
 "%B%s%b sẽ được cài tự động để thỏa những tiêu chuẩn cách phụ thuộc theo đây:"
 
-#: src/reason_fragment.cc:375 src/reason_fragment.cc:387
+#: src/reason_fragment.cc:372 src/reason_fragment.cc:384
 msgid ""
 "%B%s%b cannot be upgraded now, but if it could be, it would still be held at "
 "version %B%s%b."
@@ -3639,7 +3644,7 @@
 "Lúc này không thể cập nhật %B%s%b, nhưng nếu có thể thì sẽ giữ lại nó với "
 "phiên bản %B%s%b."
 
-#: src/reason_fragment.cc:378
+#: src/reason_fragment.cc:375
 msgid ""
 "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the "
 "following dependencies:"
@@ -3647,27 +3652,27 @@
 "Sẽ không cập nhật %B%s%b lên phiên bản %B%s%b, để tránh ngắt những cách phụ "
 "thuộc này:"
 
-#: src/reason_fragment.cc:390
+#: src/reason_fragment.cc:387
 msgid "%B%s%b is currently installed."
 msgstr "%B%s%b có cài hiện thời."
 
-#: src/reason_fragment.cc:396
+#: src/reason_fragment.cc:393
 msgid "%B%s%b is not currently installed."
 msgstr "%B%s%b chưa cài hiện thời."
 
-#: src/reason_fragment.cc:404
+#: src/reason_fragment.cc:401
 msgid "Some dependencies of %B%s%b are not satisfied:"
 msgstr "Chưa thỏa một số tiêu chuẩn cách phụ thuộc của %B%s%b."
 
-#: src/reason_fragment.cc:408
+#: src/reason_fragment.cc:405
 msgid "%B%s%b will be downgraded."
 msgstr "Sẽ hạ cấp %B%s%b."
 
-#: src/reason_fragment.cc:415
+#: src/reason_fragment.cc:412
 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b."
 msgstr "Sẽ không cập nhật %B%s%b lên phiên bản bị cấm %B%s%b."
 
-#: src/reason_fragment.cc:419
+#: src/reason_fragment.cc:416
 msgid ""
 "%B%s%b could be upgraded to version %B%s%b, but it is being held at version %"
 "B%s%b."
@@ -3675,39 +3680,39 @@
 "Có thể cập nhật %B%s%b lên phiên bản %B%s%b, nhưng mà hiện thời có giữ lại "
 "nó với phiên bản %B%s%b."
 
-#: src/reason_fragment.cc:426
+#: src/reason_fragment.cc:423
 msgid "%B%s%b will be re-installed."
 msgstr "Sẽ cài lại %B%s%b."
 
-#: src/reason_fragment.cc:430
+#: src/reason_fragment.cc:427
 msgid "%B%s%b will be installed."
 msgstr "Sẽ cài %B%s%b."
 
-#: src/reason_fragment.cc:434
+#: src/reason_fragment.cc:431
 msgid "%B%s%b will be removed."
 msgstr "Sẽ loại bỏ %B%s%b."
 
-#: src/reason_fragment.cc:439
+#: src/reason_fragment.cc:436
 msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b."
 msgstr "Sẽ cập nhật %B%s%b từ phiên bản %B%s%b lên phiên bản %B%s%b."
 
-#: src/reason_fragment.cc:475
+#: src/reason_fragment.cc:472
 msgid ""
 "The following packages depend on %B%s%b and will be broken by its removal:"
 msgstr ""
 "Những gói theo đây phụ thuộc vào %B%s%b thì sẽ bị ngắt nếu nó bị loại bỏ:"
 
-#: src/reason_fragment.cc:478
+#: src/reason_fragment.cc:475
 msgid "The following packages depend on %B%s%b and are broken:"
 msgstr "Những gói theo đây phụ thuộc vào %B%s%b thì bị ngắt:"
 
-#: src/reason_fragment.cc:485
+#: src/reason_fragment.cc:482
 msgid ""
 "The following packages conflict with %B%s%b and will be broken by its "
 "installation:"
 msgstr "Những gói theo đây xung đột vớí %B%s%b thì sẽ bị ngắt nếu nó có cài:"
 
-#: src/reason_fragment.cc:518
+#: src/reason_fragment.cc:515
 msgid ""
 "The following packages depend on a version of %B%s%b other than the "
 "currently installed version of %B%s%b, or conflict with the currently "
@@ -3716,7 +3721,7 @@
 "Những gói theo đây phụ thuộc vào một phiên bản %B%s%b khác với phiên bản "
 "hiện có cài, hoặc xung đột với phiên bản hiện có cài."
 
-#: src/reason_fragment.cc:522
+#: src/reason_fragment.cc:519
 msgid ""
 "The following packages conflict with %B%s%b, or depend on a version of it "
 "which is not going to be installed."
@@ -3724,11 +3729,11 @@
 "Những gói theo đây xung đột với %B%s%b, hoặc phụ thuộc vào một phiên bản nó "
 "sẽ không được cài."
 
-#: src/reason_fragment.cc:526
+#: src/reason_fragment.cc:523
 msgid "The following packages conflict with %B%s%b:"
 msgstr "Những gói theo đây xung đột với %B%s%b:"
 
-#: src/reason_fragment.cc:531
+#: src/reason_fragment.cc:528
 msgid ""
 "The following packages depend on a version of %B%s%b other than the "
 "currently installed version of %B%s%b:"
@@ -3736,22 +3741,22 @@
 "Những gói theo đây phụ thuộc vào một phiên bản %B%s%b khác với phiên bản %B%s"
 "%b hiện có cài."
 
-#: src/reason_fragment.cc:535
+#: src/reason_fragment.cc:532
 msgid ""
 "The following packages depend on a version of %B%s%b which is not going to "
 "be installed."
 msgstr ""
 "Những gói theo đây phụ thuôc vào một phiên bản %B%s%b sẽ không được cài."
 
-#: src/reason_fragment.cc:541
+#: src/reason_fragment.cc:538
 msgid "upgraded"
 msgstr "đã cập nhật"
 
-#: src/reason_fragment.cc:541
+#: src/reason_fragment.cc:538
 msgid "downgraded"
 msgstr "bị hạ cấp"
 
-#: src/reason_fragment.cc:547
+#: src/reason_fragment.cc:544
 msgid ""
 "The following packages depend on the currently installed version of %B%s%b (%"
 "B%s%b), or conflict with the version it will be %s to (%B%s%b), and will be "
@@ -3761,7 +3766,7 @@
 "xung đột với phiên bản sẽ có sau khi %s lên/xuống (%B%s%b) thì sẽ bị ngắt "
 "nếu làm như thế."
 
-#: src/reason_fragment.cc:554
+#: src/reason_fragment.cc:551
 msgid ""
 "The following packages conflict with version %B%s%b of %B%s%b, and will be "
 "broken if it is %s."
@@ -3769,7 +3774,7 @@
 "Những gói theo đây xung đột với phiên bản %B%s%b %B%s%b thì sẽ bị ngắt nếu "
 "nó được %s."
 
-#: src/reason_fragment.cc:559
+#: src/reason_fragment.cc:556
 msgid ""
 "The following packages depend on version %B%s%b of %B%s%b, and will be "
 "broken if it is %s."
@@ -3816,31 +3821,36 @@
 msgid "Close"
 msgstr "^Đóng"
 
-#: src/solution_fragment.cc:125
+#: src/solution_fragment.cc:134
 #, fuzzy
 msgid "%BRemove%b the following packages:%n"
 msgstr "Theo đây có những gói bị NGẮT:"
 
-#: src/solution_fragment.cc:135
+#: src/solution_fragment.cc:144
 #, fuzzy
 msgid "%BInstall%b the following packages:%n"
 msgstr "Theo đây có những gói bị NGẮT:"
 
-#: src/solution_fragment.cc:148
+#: src/solution_fragment.cc:157
 msgid "%BKeep%b the following packages at their current version:%n"
 msgstr ""
 
-#: src/solution_fragment.cc:161
+#: src/solution_fragment.cc:164
+#, fuzzy
+msgid "Not Installed"
+msgstr "chưa cài đặt"
+
+#: src/solution_fragment.cc:177
 #, fuzzy
 msgid "%BUpgrade%b the following packages:%n"
 msgstr "Theo đây có những gói bị NGẮT:"
 
-#: src/solution_fragment.cc:176
+#: src/solution_fragment.cc:192
 #, fuzzy
 msgid "%BDowngrade%b the following packages:%n"
 msgstr "Tài về gói..."
 
-#: src/solution_fragment.cc:190
+#: src/solution_fragment.cc:206
 #, c-format
 msgid "Score is %d"
 msgstr ""
@@ -3871,44 +3881,44 @@
 msgid "W:"
 msgstr ""
 
-#: src/ui.cc:194
+#: src/ui.cc:193
 msgid "Search for:"
 msgstr "Tìm:L"
 
-#: src/ui.cc:262
+#: src/ui.cc:258
 msgid "You already are root!"
 msgstr "Bạn có đăng nhập như là người chủ rồi."
 
-#: src/ui.cc:360
+#: src/ui.cc:356
 msgid ""
 "Subprocess exited with an error -- did you type your password correctly?"
 msgstr "Tiến trình con đã thoát với lỗi -- bạn có gõ đúng mật khẩu không?"
 
-#: src/ui.cc:388
+#: src/ui.cc:384
 msgid "Loading cache"
 msgstr "Tải bộ nhớ tạm..."
 
-#: src/ui.cc:410
+#: src/ui.cc:406
 msgid "Really quit Aptitude?"
 msgstr "Thật sự thoát trình Aptitude không?"
 
-#: src/ui.cc:489
+#: src/ui.cc:485
 msgid "Really discard your personal settings and reload the defaults?"
 msgstr ""
 "Thật sự xóa bỏ các thiết lập cá nhân của bạn và tải lại điều mặc định không?"
 
-#: src/ui.cc:589 src/ui.cc:591 src/ui.cc:619 src/ui.cc:621
+#: src/ui.cc:585 src/ui.cc:587 src/ui.cc:615 src/ui.cc:617
 msgid "Packages"
 msgstr "Gói"
 
-#: src/ui.cc:590 src/ui.cc:620
+#: src/ui.cc:586 src/ui.cc:616
 msgid "View available packages and choose actions to perform"
 msgstr "Xem các gói công bố và chọn thực hiện hành động"
 
-#: src/ui.cc:667
+#: src/ui.cc:663
 #, fuzzy
 msgid ""
-"%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
+"Aptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
 "BABSOLUTELY NO WARRANTY%b; for details see 'license' in the Help menu.  This "
 "is free software, and you are welcome to redistribute it under certain "
 "conditions; see 'license' for details."
@@ -3921,64 +3931,68 @@
 "quyền» trong trình Trợ giúp. Đây là phần mềm tự do, vì vậy bạn có thể phân "
 "phối lại nó với một số điều kiện nào đó: hãy xem Bản quyền để tìm chi tiết."
 
-#: src/ui.cc:688
+#: src/ui.cc:684
 msgid "help.txt"
 msgstr "help.txt"
 
-#: src/ui.cc:704
+#: src/ui.cc:700
 msgid "README"
 msgstr "README"
 
-#: src/ui.cc:786
-#, fuzzy
+#: src/ui.cc:782
 msgid ""
-"%C%BWARNING%b: untrusted versions of the following packages will be "
-"installed!%n%nUntrusted packages could %Bcompromise your system's security%"
-"b.  You should only proceed with the installation if you are certain that "
-"this is what you want to do.%n%n"
+"%BWARNING%b: untrusted versions of the following packages will be installed!%"
+"n%nUntrusted packages could %Bcompromise your system's security%b.  You "
+"should only proceed with the installation if you are certain that this is "
+"what you want to do.%n%n"
 msgstr ""
 "%BCẢNH BÁO%b: sẽ cài phiên bản không đáng tin của những gói theo đây.%n%nGói "
 "không đáng tin có thể %Bhại thậm bảo mật của hệ thống bạn%b.  Bạn nên chỉ "
 "tiếp tục cài nếu có chắc muốn làm như thế.%n%n"
 
-#: src/ui.cc:800
+#: src/ui.cc:788
+#, fuzzy
+msgid "  %S*%N %s [version %s]%n"
+msgstr "Phiên bản"
+
+#: src/ui.cc:795
 msgid "Really Continue"
 msgstr "Thật tiếp tục"
 
-#: src/ui.cc:802
+#: src/ui.cc:797
 msgid "Abort Installation"
 msgstr "Hủy bỏ cài"
 
-#: src/ui.cc:863
+#: src/ui.cc:858
 msgid "Preview of package installation"
 msgstr "Xem trước cách cài gói"
 
-#: src/ui.cc:864
+#: src/ui.cc:859
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Xem và/hay sửa đổi những hành động sẽ thực hiện."
 
-#: src/ui.cc:865
+#: src/ui.cc:860
 #, fuzzy
 msgid "Preview"
 msgstr "^TrÆ°á»›c"
 
-#: src/ui.cc:901
+#: src/ui.cc:896
 #, fuzzy
 msgid "Some packages were broken and have been fixed:"
 msgstr "Một số gói bị ngắt thì đã sửa chúng rồi. :)"
 
-#: src/ui.cc:907
+#: src/ui.cc:902
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:913
-#, c-format
+#: src/ui.cc:908
+#, fuzzy, c-format
 msgid ""
-"Ran out of time while trying to resolver dependencies (press \"%s\" to try "
+"Ran out of time while trying to resolve dependencies (press \"%s\" to try "
 "harder)"
-msgstr ""
+msgstr "Mật thời gian khi cố tìm mìn."
 
-#: src/ui.cc:959
+#: src/ui.cc:954
 #, fuzzy
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
@@ -3987,23 +4001,23 @@
 "Cài / loai bỏ gói cần thiết quyền quản trị mà bạn hiện thời không có.\n"
 "Bạn có muốn chuyển đổi sang tài khoản ngươi chủ không?\n"
 
-#: src/ui.cc:962 src/ui.cc:1078
+#: src/ui.cc:957 src/ui.cc:1072
 msgid "Become root"
 msgstr "Trờ thành người chủ"
 
-#: src/ui.cc:964 src/ui.cc:1080
+#: src/ui.cc:959 src/ui.cc:1074
 msgid "Don't become root"
 msgstr "Đừng trở thành người chủ"
 
-#: src/ui.cc:969 src/ui.cc:1085
+#: src/ui.cc:964 src/ui.cc:1079
 msgid "A package-list update or install run is already taking place."
 msgstr "Việc cập nhật hay cài danh sách gói có đang xảy ra."
 
-#: src/ui.cc:996
+#: src/ui.cc:991
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "Không có gói nào định cài, loại bỏ hay cập nhật."
 
-#: src/ui.cc:1002
+#: src/ui.cc:997
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -4015,7 +4029,7 @@
 "Có thể cập nhật một số gói, nhưng mà bạn chưa chọn cập nhật chúng.\n"
 "Hãy phím U để chuẩn bị cập nhật."
 
-#: src/ui.cc:1074
+#: src/ui.cc:1069
 #, fuzzy
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
@@ -4024,112 +4038,112 @@
 "Cập nhật danh sách gói thi cần thiết quyền quản trị, mà bạn hiện thời không "
 "có. Bạn có muốn chuyển đổi sang tài khoản người chủ không?\n"
 
-#: src/ui.cc:1090 src/ui.cc:1377
+#: src/ui.cc:1084 src/ui.cc:1371
 msgid "Waste time trying to find mines"
 msgstr "Mật thời gian khi cố tìm mìn."
 
-#: src/ui.cc:1097 src/ui.cc:1150
+#: src/ui.cc:1091 src/ui.cc:1144
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "Không cho phép xóa trong khi tải về gì."
 
-#: src/ui.cc:1100
+#: src/ui.cc:1094
 msgid "Deleting downloaded files"
 msgstr "Xóa bỏ tập tin đã tải về..."
 
-#: src/ui.cc:1114
+#: src/ui.cc:1108
 msgid "Downloaded package files have been deleted"
 msgstr "Mới xóa bỏ những tập tin gói đã tải về rồi."
 
-#: src/ui.cc:1175
+#: src/ui.cc:1169
 #, fuzzy, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr "Mới xóa bỏ những tập tin gói cũ đã tải về rồi."
 
-#: src/ui.cc:1247
+#: src/ui.cc:1241
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1252 src/ui.cc:1283
+#: src/ui.cc:1246 src/ui.cc:1277
 #, fuzzy
 msgid "Ran out of time while trying to find a solution."
 msgstr "Mật thời gian khi cố tìm mìn."
 
-#: src/ui.cc:1277
+#: src/ui.cc:1271
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1307
+#: src/ui.cc:1301
 #, fuzzy, c-format
 msgid "Unable to open %s"
 msgstr "Không thể mở %s để ghi."
 
-#: src/ui.cc:1313
+#: src/ui.cc:1307
 msgid "Error while dumping resolver state"
 msgstr ""
 
-#: src/ui.cc:1323
+#: src/ui.cc:1317
 msgid "File to which the resolver state should be dumped:"
 msgstr ""
 
-#: src/ui.cc:1353
+#: src/ui.cc:1347
 msgid "^Install/remove packages"
 msgstr "^Cài / loại bỏ gói"
 
-#: src/ui.cc:1354
+#: src/ui.cc:1348
 msgid "Perform all pending installs and removals"
 msgstr "Thực hiện mọi việc cài hay loại bỏ sắp"
 
-#: src/ui.cc:1356
+#: src/ui.cc:1350
 msgid "^Update package list"
 msgstr "^Cập nhật danh sách gói"
 
-#: src/ui.cc:1357
+#: src/ui.cc:1351
 msgid "Check for new versions of packages"
 msgstr "Kiểm tra có phiên bản gói mới"
 
-#: src/ui.cc:1360
+#: src/ui.cc:1354
 msgid "^Forget new packages"
 msgstr "^Quên các gói mới"
 
-#: src/ui.cc:1361
+#: src/ui.cc:1355
 msgid "Forget which packages are \"new\""
 msgstr "Quên gói nào là «Mới»"
 
-#: src/ui.cc:1364
+#: src/ui.cc:1358
 msgid "^Clean package cache"
 msgstr "^Xóa bộ nhớ tạm gói"
 
-#: src/ui.cc:1365
+#: src/ui.cc:1359
 msgid "Delete package files which were previously downloaded"
 msgstr "Xóa bỏ tập tin gói đã tải về trước"
 
-#: src/ui.cc:1368
+#: src/ui.cc:1362
 msgid "Clean ^obsolete files"
 msgstr "Xóa tập tin ^cũ"
 
-#: src/ui.cc:1369
+#: src/ui.cc:1363
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Xóa bỏ tập tin gói không còn có thể tải về lại"
 
-#: src/ui.cc:1372
+#: src/ui.cc:1366
 msgid "Mark ^Upgradable"
 msgstr "Nhãn ^co thể cập nhật"
 
-#: src/ui.cc:1373
+#: src/ui.cc:1367
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr "Đánh dấu mọi gói cập nhật mà không được giữ lại cho cập nhật"
 
-#: src/ui.cc:1376
+#: src/ui.cc:1370
 msgid "^Play Minesweeper"
 msgstr "^Chơi Quét mìn"
 
-#: src/ui.cc:1379
+#: src/ui.cc:1373
 msgid "^Become root"
 msgstr "^Trở thành người chủ"
 
-#: src/ui.cc:1380
+#: src/ui.cc:1374
 #, fuzzy
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
@@ -4138,79 +4152,79 @@
 "Hãy chạy lệnh 'su' để trở thành người chủ: lệnh này sẽ khởi chạy lại chương "
 "trình này, còn giữ các thiết lập của bạn."
 
-#: src/ui.cc:1383
+#: src/ui.cc:1377
 msgid "^Reload package cache"
 msgstr "^Tải lại bộ nhớ tạm gói"
 
-#: src/ui.cc:1384
+#: src/ui.cc:1378
 msgid "Reload the package cache"
 msgstr "Tải lại bộ nhớ tạm gói"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1384
 msgid "^Quit"
 msgstr "^Thoát"
 
-#: src/ui.cc:1391
+#: src/ui.cc:1385
 msgid "Exit the program"
 msgstr "Thoát khỏi chương trình"
 
-#: src/ui.cc:1397 src/ui.cc:1669
+#: src/ui.cc:1391 src/ui.cc:1661
 msgid "Undo"
 msgstr "Hồi lại"
 
-#: src/ui.cc:1398
+#: src/ui.cc:1392
 msgid "Undo the last package operation or group of operations"
 msgstr "Hồi lại thao tác (hay nhóm thao tác) gói cuối cùng."
 
-#: src/ui.cc:1405
+#: src/ui.cc:1399
 msgid "^Install"
 msgstr "^Cài"
 
-#: src/ui.cc:1406
+#: src/ui.cc:1400
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "Nhãn gói đã chọn hiện thời để cài hay cập nhật."
 
-#: src/ui.cc:1409
+#: src/ui.cc:1403
 msgid "^Remove"
 msgstr "^Bỏ"
 
-#: src/ui.cc:1410
+#: src/ui.cc:1404
 msgid "Flag the currently selected package for removal"
 msgstr "Nhãn gói đã chọn hiện thời để loại bỏ."
 
-#: src/ui.cc:1413
+#: src/ui.cc:1407
 msgid "^Purge"
 msgstr "^Tẩy"
 
-#: src/ui.cc:1414
+#: src/ui.cc:1408
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr "Nhãn gói đã chọn hiện thời và các tập tin câu hình để loại bỏ."
 
-#: src/ui.cc:1417
+#: src/ui.cc:1411
 msgid "^Keep"
 msgstr "^Giữ"
 
-#: src/ui.cc:1418
+#: src/ui.cc:1412
 msgid "Cancel any action on the selected package"
 msgstr "Thôi hành động nào với gói được chọn."
 
-#: src/ui.cc:1421
+#: src/ui.cc:1415
 msgid "^Hold"
 msgstr "^Giữ lại"
 
-#: src/ui.cc:1422
+#: src/ui.cc:1416
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
 msgstr ""
 "Thôi hành động nào với gói được chọn, và bảo vệ nó khoi những cập nhật sau."
 
-#: src/ui.cc:1425
+#: src/ui.cc:1419
 msgid "Mark ^Auto"
 msgstr "Nhãn ^Tự động"
 
-#: src/ui.cc:1426
+#: src/ui.cc:1420
 #, fuzzy
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
@@ -4219,11 +4233,11 @@
 "Đánh dấu gói đã chọn như là đã cài tự động;\n"
 "nó sẽ bi loại bỏ tự động nếu không có gói khác phụ thuộc vào nó."
 
-#: src/ui.cc:1429
+#: src/ui.cc:1423
 msgid "Mark ^Manual"
 msgstr "Nhãn ^Thủ công"
 
-#: src/ui.cc:1430
+#: src/ui.cc:1424
 #, fuzzy
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
@@ -4232,11 +4246,11 @@
 "Đánh dấu gói đã chọn như là đã cài thủ công;\n"
 "sẽ không loại bỏ nó trừ khi bạn tự loại bỏ nó."
 
-#: src/ui.cc:1433
+#: src/ui.cc:1427
 msgid "^Forbid Version"
 msgstr "^Cấm phiên bản"
 
-#: src/ui.cc:1434
+#: src/ui.cc:1428
 #, fuzzy
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
@@ -4245,204 +4259,204 @@
 "Cấm cài phiên bản ứng cử của gói đã chọn;\n"
 "sẽ tiếp tục cài phiên bản mới hơn."
 
-#: src/ui.cc:1438
+#: src/ui.cc:1432
 msgid "I^nformation"
 msgstr "Thông ti^n"
 
-#: src/ui.cc:1439
+#: src/ui.cc:1433
 msgid "Display more information about the selected package"
 msgstr "Hiển thị thông tin thêm về gói đã chọn."
 
-#: src/ui.cc:1442
+#: src/ui.cc:1436
 msgid "^Changelog"
 msgstr "Bản ghi ^đổi"
 
-#: src/ui.cc:1443
+#: src/ui.cc:1437
 msgid "Display the Debian changelog of the selected package"
 msgstr "Hiển thị bản ghi các thay đổi (ChangeLog) cho gói đa chọn."
 
-#: src/ui.cc:1450
+#: src/ui.cc:1444
 msgid "^Find"
 msgstr "^Tìm"
 
-#: src/ui.cc:1451
+#: src/ui.cc:1445
 msgid "Search for a package"
 msgstr "Tìm gói."
 
-#: src/ui.cc:1454
+#: src/ui.cc:1448
 msgid "Find ^Again"
 msgstr "Tìm ^lại"
 
-#: src/ui.cc:1455
+#: src/ui.cc:1449
 msgid "Repeat the last search"
 msgstr "Tìm lại chuỗi mới tìm"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1453
 msgid "^Limit Display"
 msgstr "^Hạn hiển thị"
 
-#: src/ui.cc:1460
+#: src/ui.cc:1454
 msgid "Apply a filter to the package list"
 msgstr "Áp dụng bô lọc vào danh sách gói."
 
-#: src/ui.cc:1463
+#: src/ui.cc:1457
 msgid "^Un-Limit Display"
 msgstr "^Bỏ hạn hiển thị"
 
-#: src/ui.cc:1464
+#: src/ui.cc:1458
 msgid "Remove the filter from the package list"
 msgstr "Loại bỏ bộ lọc ra danh sách gói."
 
-#: src/ui.cc:1468
+#: src/ui.cc:1462
 msgid "Find ^Broken"
 msgstr "Tìm bị ^ngắt"
 
-#: src/ui.cc:1469
+#: src/ui.cc:1463
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Tìm gói kế phụ thuộc vào phần mềm chưa có."
 
-#: src/ui.cc:1476
+#: src/ui.cc:1470
 msgid "^UI options"
 msgstr "Tùy chọn _giao diện người dùng"
 
-#: src/ui.cc:1477
+#: src/ui.cc:1471
 msgid "Change the settings which affect the user interface"
 msgstr "Thay đổi thiết lập làm ảnh hưởng đến giao diện người dùng."
 
-#: src/ui.cc:1480
+#: src/ui.cc:1474
 msgid "^Dependency handling"
 msgstr "^Quản lý cách phụ thuộc"
 
-#: src/ui.cc:1481
+#: src/ui.cc:1475
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr "Thay đổi thiết lập làm ảnh hưởng đến quản lý cách phụ thuộc thế nào."
 
-#: src/ui.cc:1484
+#: src/ui.cc:1478
 msgid "^Miscellaneous"
 msgstr "^Linh tinh"
 
-#: src/ui.cc:1485
+#: src/ui.cc:1479
 msgid "Change miscellaneous program settings"
 msgstr "Thay đổi thiết lập chương trình linh tinh."
 
-#: src/ui.cc:1490
+#: src/ui.cc:1484
 msgid "^Revert options"
 msgstr "^Trở về tùy chọn"
 
-#: src/ui.cc:1491
+#: src/ui.cc:1485
 msgid "Reset all settings to the system defaults"
 msgstr "Hoàn nguyên trở lại các thiết lập thành điều măc định hệ thống."
 
-#: src/ui.cc:1502
+#: src/ui.cc:1496
 msgid "^Next"
 msgstr "^Kế"
 
-#: src/ui.cc:1503
+#: src/ui.cc:1497
 msgid "View next display"
 msgstr "Xem bộ trình bày kế tiếp"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1500
 msgid "^Prev"
 msgstr "^TrÆ°á»›c"
 
-#: src/ui.cc:1507
+#: src/ui.cc:1501
 msgid "View previous display"
 msgstr "Xem bộ trình bày trước"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1504
 msgid "^Close"
 msgstr "^Đóng"
 
-#: src/ui.cc:1511
+#: src/ui.cc:1505
 msgid "Close this display"
 msgstr "Đóng bộ trình bày này."
 
-#: src/ui.cc:1516
+#: src/ui.cc:1510
 msgid "New Package ^View"
 msgstr "Khung ^xem gói mới"
 
-#: src/ui.cc:1517
+#: src/ui.cc:1511
 msgid "Create a new default package view"
 msgstr "Tạo một khung xem gói mặc định mới."
 
-#: src/ui.cc:1520
+#: src/ui.cc:1514
 msgid "New Categorical ^Browser"
 msgstr "Bộ ^duyệt phân loại mới"
 
-#: src/ui.cc:1522
+#: src/ui.cc:1516
 msgid "Browse packages by category"
 msgstr "Duyệt các gói theo loại."
 
-#: src/ui.cc:1530
+#: src/ui.cc:1524
 msgid "^About"
 msgstr "^Giới thiệu"
 
-#: src/ui.cc:1531
+#: src/ui.cc:1525
 msgid "View information about this program"
 msgstr "Xem thông tin về chương trình này."
 
-#: src/ui.cc:1534
+#: src/ui.cc:1528
 msgid "^Help"
 msgstr "^Trợ giúp"
 
-#: src/ui.cc:1535
+#: src/ui.cc:1529
 msgid "View the on-line help"
 msgstr "Xem trợ giúp trực tuyến."
 
-#: src/ui.cc:1537
+#: src/ui.cc:1531
 msgid "User's ^Manual"
 msgstr "^Sổ hướng dẫn người dùng"
 
-#: src/ui.cc:1538
+#: src/ui.cc:1532
 msgid "View the detailed program manual"
 msgstr "Xem sổ hướng dẫn chi tiết cho chương trình này."
 
-#: src/ui.cc:1541
+#: src/ui.cc:1535
 msgid "^FAQ"
 msgstr "^Hỏi đáp"
 
-#: src/ui.cc:1542
+#: src/ui.cc:1536
 msgid "View a list of frequently asked questions"
 msgstr "Xem danh sách câu hỏi đã hỏi nhiều lần."
 
-#: src/ui.cc:1545
+#: src/ui.cc:1539
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1546
+#: src/ui.cc:1540
 #, fuzzy
 msgid "View the important changes made in each version of "
 msgstr "Xem những thay đổi quan trọng thuộc về mỗi phiên bản chương trình mới."
 
-#: src/ui.cc:1549
+#: src/ui.cc:1543
 msgid "^License"
 msgstr "^Bản quyền"
 
-#: src/ui.cc:1550
+#: src/ui.cc:1544
 msgid "View the terms under which you may copy the program"
 msgstr "Xem những điều kiện sao chép chương trình này."
 
-#: src/ui.cc:1668
+#: src/ui.cc:1660
 msgid "Actions"
 msgstr "Hành động"
 
-#: src/ui.cc:1671
+#: src/ui.cc:1663
 msgid "Search"
 msgstr "Tìm"
 
-#: src/ui.cc:1672
+#: src/ui.cc:1664
 msgid "Options"
 msgstr "Tùy chọn"
 
-#: src/ui.cc:1673
+#: src/ui.cc:1665
 msgid "Views"
 msgstr "Xem"
 
-#: src/ui.cc:1674
+#: src/ui.cc:1666
 msgid "Help"
 msgstr "Trợ giúp"
 
-#: src/ui.cc:1734
+#: src/ui.cc:1726
 #, c-format
 msgid ""
 "%s: Menu  %s: Help  %s: Quit  %s: Update  %s: Download/Install/Remove Pkgs"
@@ -4450,29 +4464,29 @@
 "%s: Trình đơn  %s: Trợ giúp  %s: Thoát  %s: Cập nhật  %s: Tải về/Cài/Loại bỏ "
 "Gói"
 
-#: src/ui.cc:2003 src/vscreen/vscreen.cc:281
+#: src/ui.cc:1996 src/vscreen/vscreen.cc:281
 msgid "yes_key"
 msgstr "yes_key"
 
-#: src/ui.cc:2004 src/vscreen/vscreen.cc:282
+#: src/ui.cc:1997 src/vscreen/vscreen.cc:282
 msgid "no_key"
 msgstr "no_key"
 
-#: src/view_changelog.cc:46
+#: src/view_changelog.cc:61
 msgid "You can only view changelogs of official Debian packages."
 msgstr ""
 "Bạn chỉ có thể xem bản ghi các thay đổi thuộc về gói Debian chính thức."
 
-#: src/view_changelog.cc:52
+#: src/view_changelog.cc:67
 msgid "Downloading Changelog"
 msgstr "Tải về Bản ghi đổi..."
 
-#: src/view_changelog.cc:54
+#: src/view_changelog.cc:69
 #, fuzzy
 msgid "Download Changelog"
 msgstr "Tải về Bản ghi đổi..."
 
-#: src/view_changelog.cc:63
+#: src/view_changelog.cc:78
 #, c-format
 msgid "%s changes"
 msgstr ""
@@ -4567,14 +4581,200 @@
 #~ "Hãy nạp đĩa này vào ổ \"%s\":\n"
 #~ "%s"
 
+#~ msgid "Need exactly two colors in color definition \"%s\""
+#~ msgstr "Cần thiết đúng hai màu khác trong lời định nghĩa \"%s\"."
+
+#~ msgid "Can't parse foreground \"%s\"of color \"%s\""
+#~ msgstr "Không thể phân tách cảnh gần \"%s\" của màu \"%s\"."
+
+#~ msgid "Can't parse background \"%s\" of color \"%s\""
+#~ msgstr "Không thể phân tách nền \"%s\" của màu \"%s\"."
+
 #~ msgid "Invalid option for interactive mode: -s\n"
 #~ msgstr "Tùy chọn không hợp lê cho chế độ tương tác: -s\n"
 
+#~ 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."
+#~ msgstr ""
+#~ "Chương trình cho fax-mô-đem và thiết bị truyền thông khác.\n"
+#~ "Gói trong phần 'comm' (liên lạc) thì được dùng để điều khiển mô-đem và "
+#~ "những thiết bị truyền thông phần cứng khác. Gói loại ấy cũng bao gồm phần "
+#~ "mềm điều khiểm fax-mô-đem (v.d. phần mềm PPP để kết nối bằng quay số, "
+#~ "chương trình dành cho sự kết nối [zmodem, kermit v.v.]), và phần mềm điều "
+#~ "khiển điện thoại di động, giao diện FidoNet, và chạy hệ thộng bảng công "
+#~ "báo (BBS)."
+
+#~ 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"
+#~ " .\n"
+#~ " For more information about what Debian considers to be Free Software, "
+#~ "see http://www.debian.org/social_contract#guidelines"
+#~ msgstr ""
+#~ "Chương trình không phải là phần mềm tự do\n"
+#~ "Gói trong phần 'non-free' (không phải tự do) không phải thuộc về Debian.\n"
+#~ "\n"
+#~ "Những gói này không thỏa một hay nhiều tiêu chuẩn của Những Hướng dẫn "
+#~ "Phần mềm Tự do Debian (Debian Free Software Guidelines: xem liên kết bên "
+#~ "dưới). Bạn hay đọc bản quyền của mọi chương trình trong phần này, để chắc "
+#~ "là nó cho phép bạn sử dụng chương trình ấy bằng cách định.\n"
+#~ "\n"
+#~ "Để tìm thông tin thêm về ý kiến Debian về Phần mềm Tự do, hãy xem http://"
+#~ "www.debian.org/social_contract#guidelines."
+
+#~ 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)"
+#~ msgstr ""
+#~ "Gói mới\n"
+#~ "Những gói này đã được thêm vào Debian sau khi bạn xóa danh sách gói \"new"
+#~ "\" (mới) lần trước. Hãy chọn lệnh «Quên các gói mới» từ trình đơn Hành "
+#~ "động để xóa danh sách ấy."
+
+#~ msgid ""
+#~ "%s is an essential package!\n"
+#~ "\n"
+#~ "Are you sure you want to remove it?\n"
+#~ "Type '%s' if you are."
+#~ msgstr ""
+#~ "%s là một gói chủ yếu.\n"
+#~ "\n"
+#~ "Bạn có chắc muốn loại bỏ nó không?\n"
+#~ "Hãy gõ '%s' nếu có."
+
+#~ msgid "Available versions of "
+#~ msgstr "Các phiên bản công bố của "
+
+#~ 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."
+#~ msgstr ""
+#~ "Bạn không phải đã đăng nhập như là người chủ (root), và tôi không thể tìm "
+#~ "cách nào bạn có thể trở thành người chủ, Để định cấu hình lại gói này, "
+#~ "hãy cài gói trình đơn, cài gói đăng nhập, hoặc chạy trình aptitude như là "
+#~ "người chủ."
+
 #~ msgid "Information about "
 #~ msgstr "Thông tin về     "
 
+#~ msgid ""
+#~ "Aptitude %s\n"
+#~ "\n"
+#~ "Copyright 2000 Daniel Burrows.\n"
+#~ "\n"
+#~ "aptitude comes with ABSOLUTELY NO WARRANTY; for details see 'license' in "
+#~ "the\n"
+#~ "Help menu.  This is free software, and you are welcome to redistribute "
+#~ "it\n"
+#~ "under certain conditions; see 'license' for details."
+#~ msgstr ""
+#~ "Aptitude %s\n"
+#~ "\n"
+#~ "Bản quyền © 2000 Daniel Burrows.\n"
+#~ "\n"
+#~ "aptitude không có bảo đảm gì cả: để tìm chi tiết thì hãy xem lệnh «Bản "
+#~ "quyền» trong trình Trợ giúp. Đây là phần mềm tự do, vì vậy bạn có thể "
+#~ "phân phối lại nó với một số điều kiện nào đó: hãy xem Bản quyền để tìm "
+#~ "chi tiết."
+
+#~ msgid "Some packages were broken and have been fixed"
+#~ msgstr "Một số gói bị ngắt thì đã sửa chúng rồi. :)"
+
 #~ msgid "Some broken packages could not be fixed!"
 #~ msgstr "Không thể sửa một số gói nị ngắt. :("
 
+#~ msgid "Some packages are broken.  Try to fix them?"
+#~ msgstr "Một số gói bị ngắt. Cố sửa chúng không?"
+
+#~ msgid ""
+#~ "Installing/removing packages requires administrative privileges, which\n"
+#~ "you currently do not have.  Would you like to change to the root "
+#~ "account?\n"
+#~ msgstr ""
+#~ "Cài / loai bỏ gói cần thiết quyền quản trị mà bạn hiện thời không có.\n"
+#~ "Bạn có muốn chuyển đổi sang tài khoản ngươi chủ không?\n"
+
+#~ msgid ""
+#~ "No packages will be installed, removed or upgraded.\n"
+#~ "\n"
+#~ "Some packages could be upgraded, but you have not chosen to upgrade "
+#~ "them.\n"
+#~ "Type \"U\" to prepare an upgrade."
+#~ msgstr ""
+#~ "Sẽ không cài, loại bỏ hay cập nhật gói nào.\n"
+#~ "\n"
+#~ "Có thể cập nhật một số gói, nhưng mà bạn chưa chọn cập nhật chúng.\n"
+#~ "Hãy phím U để chuẩn bị cập nhật."
+
+#~ 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"
+#~ msgstr ""
+#~ "Cập nhật danh sách gói thi cần thiết quyền quản trị, mà bạn hiện thời "
+#~ "không có. Bạn có muốn chuyển đổi sang tài khoản người chủ không?\n"
+
+#~ msgid "Obsolete downloaded package files have been deleted"
+#~ msgstr "Mới xóa bỏ những tập tin gói cũ đã tải về rồi."
+
+#~ msgid ""
+#~ "Run 'su' to become root; this will restart the program, but your\n"
+#~ "settings will be preserved"
+#~ msgstr ""
+#~ "Hãy chạy lệnh 'su' để trở thành người chủ: lệnh này sẽ khởi chạy lại "
+#~ "chương trình này, còn giữ các thiết lập của bạn."
+
+#~ msgid ""
+#~ "Mark the selected package as having been automatically installed;\n"
+#~ "it will automatically be removed if no other packages depend on it"
+#~ msgstr ""
+#~ "Đánh dấu gói đã chọn như là đã cài tự động;\n"
+#~ "nó sẽ bi loại bỏ tự động nếu không có gói khác phụ thuộc vào nó."
+
+#~ msgid ""
+#~ "Mark the selected package as having been manually installed;\n"
+#~ "it will not be removed unless you manually remove it"
+#~ msgstr ""
+#~ "Đánh dấu gói đã chọn như là đã cài thủ công;\n"
+#~ "sẽ không loại bỏ nó trừ khi bạn tự loại bỏ nó."
+
+#~ msgid ""
+#~ "Forbid the candidate version of the selected package from being "
+#~ "installed;\n"
+#~ "newer versions of the package will be installed as usual"
+#~ msgstr ""
+#~ "Cấm cài phiên bản ứng cử của gói đã chọn;\n"
+#~ "sẽ tiếp tục cài phiên bản mới hơn."
+
 #~ msgid "^ChangeLog"
 #~ msgstr "^Bản ghi đổi"
+
+#~ msgid "View the important changes made in each version of the program"
+#~ msgstr ""
+#~ "Xem những thay đổi quan trọng thuộc về mỗi phiên bản chương trình mới."
+
+#, fuzzy
+#~ msgid ""
+#~ "%C%BWARNING%b: untrusted versions of the following packages will be "
+#~ "installed!%n%nUntrusted packages could %Bcompromise your system's security"
+#~ "%b.  You should only proceed with the installation if you are certain "
+#~ "that this is what you want to do.%n%n"
+#~ msgstr ""
+#~ "%BCẢNH BÁO%b: sẽ cài phiên bản không đáng tin của những gói theo đây.%n%"
+#~ "nGói không đáng tin có thể %Bhại thậm bảo mật của hệ thống bạn%b.  Bạn "
+#~ "nên chỉ tiếp tục cài nếu có chắc muốn làm như thế.%n%n"

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	Sun Jun 12 21:04:47 2005
@@ -6,8 +6,8 @@
 msgstr ""
 "Project-Id-Version: aptitude 0.2.13\n"
 "Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-05-01 14:08-0400\n"
-"PO-Revision-Date: 2004-10-11 09:15+0200\n"
+"POT-Creation-Date: 2005-06-12 22:42+0200\n"
+"PO-Revision-Date: 2005-04-28 20:41+1200\n"
 "Last-Translator: Yongtao Yang <yongtao.yang at telia.com>\n"
 "Language-Team: zh_CN <i18n-translation at lists.linux.net.cn>\n"
 "MIME-Version: 1.0\n"
@@ -147,14 +147,14 @@
 msgid "Automatically remove unused packages matching this filter"
 msgstr "自动卸载匹配该过滤器的未用软件包"
 
-#: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:219 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
-#: src/vscreen/vs_util.cc:328
+#: src/apt_options.cc:240 src/mine/cmine.cc:249 src/mine/cmine.cc:312
+#: src/ui.cc:215 src/vscreen/vs_util.cc:77 src/vscreen/vs_util.cc:90
+#: src/vscreen/vs_util.cc:264 src/vscreen/vs_util.cc:298
 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:328
+#: src/apt_options.cc:241 src/download_list.cc:69 src/mine/cmine.cc:250
+#: src/mine/cmine.cc:313 src/vscreen/vs_util.cc:298
 msgid "Cancel"
 msgstr "取消"
 
@@ -235,15 +235,15 @@
 msgid "%s: Previous"
 msgstr ""
 
-#: src/broken_indicator.cc:233
+#: src/broken_indicator.cc:232
 #, c-format
-msgid "%CSolution search failed.  %s: try harder"
+msgid "Solution search failed.  %s: try harder"
 msgstr ""
 
-#: src/broken_indicator.cc:239
-#, c-format
-msgid "%CUnable to resolve dependencies."
-msgstr ""
+#: src/broken_indicator.cc:237
+#, fuzzy
+msgid "Unable to resolve dependencies."
+msgstr "无法打开 %s 以写入"
 
 #: src/cmdline/cmdline_action.cc:36
 #, c-format
@@ -287,7 +287,7 @@
 msgid ""
 "Note: selecting \"%s\" instead of the\n"
 "      virtual package \"%s\"\n"
-msgstr "注意:选择 “%s”而不是虚拟软件包 “%s”\n"
+msgstr "注意:选择“%s”而不是虚拟软件包“%s”\n"
 
 #: src/cmdline/cmdline_action.cc:93
 #, c-format
@@ -317,7 +317,7 @@
 #: src/cmdline/cmdline_action.cc:211
 #, c-format
 msgid "Note: selecting the task \"%s: %s\" for installation\n"
-msgstr "注意:选择任务 “%s:%s”安装\n"
+msgstr "注意:选择任务“%s:%s”安装\n"
 
 #: src/cmdline/cmdline_action.cc:238
 #, c-format
@@ -591,7 +591,7 @@
 #: src/cmdline/cmdline_prompt.cc:336
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
-msgstr "要继续的话,键入词组 “%s”:\n"
+msgstr "要继续的话,键入词组“%s”:\n"
 
 #: src/cmdline/cmdline_prompt.cc:375
 #, c-format
@@ -603,31 +603,36 @@
 "this is what you want to do.\n"
 "\n"
 msgstr ""
+"警告:您将安装以下软件包的不可信版本!\n"
+"\n"
+"不可信的软件可能会危害您的系统安全。\n"
+"只有当您非常清楚地了解这就是您所要执行的操作时,才应该进行安装操作。\n"
+"\n"
 
-#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
-#: src/vscreen/vs_util.cc:212
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:165
+#: src/vscreen/vs_util.cc:202
 msgid "Yes"
 msgstr "是"
 
-#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
-#: src/vscreen/vs_util.cc:212
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:165
+#: src/vscreen/vs_util.cc:202
 msgid "No"
 msgstr "否"
 
 #: src/cmdline/cmdline_prompt.cc:388
 #, c-format
 msgid "Do you want to ignore this warning and proceed anyway?\n"
-msgstr ""
+msgstr "您想忽略这条警告信息并继续执行吗?\n"
 
 #: src/cmdline/cmdline_prompt.cc:389
-#, fuzzy, c-format
+#, c-format
 msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
-msgstr "要继续的话,键入词组 “%s”:\n"
+msgstr "要继续,请键入“%s”;要中止,请键入“%s”:"
 
 #: src/cmdline/cmdline_prompt.cc:400
 #, c-format
 msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
-msgstr ""
+msgstr "未被识别的输入。请键入 \"%s\" 或 \"%s\"。\n"
 
 #: src/cmdline/cmdline_prompt.cc:499
 #, c-format
@@ -919,7 +924,7 @@
 msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:212
+#: src/cmdline/cmdline_resolver.cc:212 src/cmdline/cmdline_resolver.cc:285
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
@@ -974,196 +979,201 @@
 msgid "The following packages have unmet dependencies:\n"
 msgstr "下列软件包存在未满足的依赖关系:\n"
 
-#: src/cmdline/cmdline_show.cc:133
+#: src/cmdline/cmdline_show.cc:119 src/cmdline/cmdline_show.cc:305
+#: src/solution_fragment.cc:65
+msgid "<NULL>"
+msgstr ""
+
+#: src/cmdline/cmdline_show.cc:138
 msgid "not installed"
 msgstr "未安装"
 
-#: src/cmdline/cmdline_show.cc:135 src/pkg_columnizer.cc:231
+#: src/cmdline/cmdline_show.cc:140 src/pkg_columnizer.cc:231
 #: src/pkg_ver_item.cc:225
 msgid "unpacked"
 msgstr "未解包的"
 
-#: src/cmdline/cmdline_show.cc:137
+#: src/cmdline/cmdline_show.cc:142
 msgid "partially configured"
 msgstr "部分配置"
 
-#: src/cmdline/cmdline_show.cc:139
+#: src/cmdline/cmdline_show.cc:144
 msgid "partially installed"
 msgstr "部分安装"
 
-#: src/cmdline/cmdline_show.cc:141
+#: src/cmdline/cmdline_show.cc:146
 msgid "not installed (configuration files remain)"
 msgstr "未安装 (配置文件保留)"
 
-#: src/cmdline/cmdline_show.cc:143 src/pkg_columnizer.cc:239
+#: src/cmdline/cmdline_show.cc:148 src/pkg_columnizer.cc:239
 #: src/pkg_ver_item.cc:233
 msgid "installed"
 msgstr "已安装"
 
-#: src/cmdline/cmdline_show.cc:152
+#: src/cmdline/cmdline_show.cc:157
 msgid "not a real package"
 msgstr "不是一个真实的软件包"
 
-#: src/cmdline/cmdline_show.cc:165
+#: src/cmdline/cmdline_show.cc:170
 msgid " [held]"
 msgstr " [保持]"
 
-#: src/cmdline/cmdline_show.cc:174
+#: src/cmdline/cmdline_show.cc:179
 #, c-format
 msgid "%s; version %s will be installed"
 msgstr "%s;版本 %s 将被安装"
 
-#: src/cmdline/cmdline_show.cc:178
+#: src/cmdline/cmdline_show.cc:183
 #, c-format
 msgid "%s; version %s will be installed automatically"
 msgstr "%s;版本 %s 将被自动安装"
 
-#: src/cmdline/cmdline_show.cc:184 src/cmdline/cmdline_show.cc:199
+#: src/cmdline/cmdline_show.cc:189 src/cmdline/cmdline_show.cc:204
 #, c-format
 msgid "%s; will be purged"
 msgstr "%s;将被删除"
 
-#: src/cmdline/cmdline_show.cc:197
+#: src/cmdline/cmdline_show.cc:202
 #, c-format
 msgid "%s; will be purged because nothing depends on it"
 msgstr "%s;将被清除因为没有任何其它软件包依赖于它"
 
-#: src/cmdline/cmdline_show.cc:204
+#: src/cmdline/cmdline_show.cc:209
 #, c-format
 msgid "%s; will be removed because nothing depends on it"
 msgstr "%s;将被删除因为没有任何其它软件包依赖于它"
 
-#: src/cmdline/cmdline_show.cc:206
+#: src/cmdline/cmdline_show.cc:211
 #, c-format
 msgid "%s; will be removed"
 msgstr "%s;将被删除"
 
-#: src/cmdline/cmdline_show.cc:220
+#: src/cmdline/cmdline_show.cc:225
 #, c-format
 msgid "%s%s; will be downgraded [%s -> %s]"
 msgstr "%s%s;将被降级 [%s -> %s]"
 
-#: src/cmdline/cmdline_show.cc:223
+#: src/cmdline/cmdline_show.cc:228
 #, c-format
 msgid "%s%s; will be upgraded [%s -> %s]"
 msgstr "%s%s;将被升级 [%s -> %s]"
 
-#: src/cmdline/cmdline_show.cc:235 src/cmdline/cmdline_show.cc:256
+#: src/cmdline/cmdline_show.cc:240 src/cmdline/cmdline_show.cc:261
 msgid "Package: "
 msgstr "软件包:"
 
-#: src/cmdline/cmdline_show.cc:236 src/cmdline/cmdline_show.cc:264
+#: src/cmdline/cmdline_show.cc:241 src/cmdline/cmdline_show.cc:269
 #: src/pkg_columnizer.cc:87
 msgid "State"
 msgstr "状态"
 
-#: src/cmdline/cmdline_show.cc:237 src/cmdline/cmdline_show.cc:318
+#: src/cmdline/cmdline_show.cc:242 src/cmdline/cmdline_show.cc:325
 msgid "Provided by"
 msgstr "提供者:"
 
-#: src/cmdline/cmdline_show.cc:258 src/pkg_info_screen.cc:105
+#: src/cmdline/cmdline_show.cc:263 src/pkg_info_screen.cc:105
 msgid "Essential: "
 msgstr "核心的:"
 
-#: src/cmdline/cmdline_show.cc:258 src/cmdline/cmdline_show.cc:262
-#: src/cmdline/cmdline_show.cc:273 src/pkg_info_screen.cc:105
+#: src/cmdline/cmdline_show.cc:263 src/cmdline/cmdline_show.cc:267
+#: src/cmdline/cmdline_show.cc:278 src/pkg_info_screen.cc:105
 msgid "yes"
 msgstr "是"
 
-#: src/cmdline/cmdline_show.cc:262
+#: src/cmdline/cmdline_show.cc:267
 msgid "New"
 msgstr "æ–°"
 
-#: src/cmdline/cmdline_show.cc:267
+#: src/cmdline/cmdline_show.cc:272
 msgid "Forbidden version"
 msgstr "被禁止的版本"
 
-#: src/cmdline/cmdline_show.cc:271
+#: src/cmdline/cmdline_show.cc:276
 msgid "Automatically installed"
 msgstr "自动安装"
 
-#: src/cmdline/cmdline_show.cc:273
+#: src/cmdline/cmdline_show.cc:278
 msgid "no"
 msgstr "否"
 
-#: src/cmdline/cmdline_show.cc:275
+#: src/cmdline/cmdline_show.cc:280
 msgid "Version: "
 msgstr "版本号:"
 
-#: src/cmdline/cmdline_show.cc:276 src/pkg_info_screen.cc:113
+#: src/cmdline/cmdline_show.cc:281 src/pkg_info_screen.cc:113
 msgid "Priority: "
 msgstr "优先级:"
 
-#: src/cmdline/cmdline_show.cc:277 src/cmdline/cmdline_show.cc:279
-#: src/cmdline/cmdline_show.cc:288
+#: src/cmdline/cmdline_show.cc:282 src/cmdline/cmdline_show.cc:284
+#: src/cmdline/cmdline_show.cc:293
 msgid "N/A"
 msgstr "不可用"
 
-#: src/cmdline/cmdline_show.cc:278 src/pkg_info_screen.cc:114
+#: src/cmdline/cmdline_show.cc:283 src/pkg_info_screen.cc:114
 msgid "Section: "
 msgstr "部分:"
 
-#: src/cmdline/cmdline_show.cc:280 src/pkg_info_screen.cc:115
+#: src/cmdline/cmdline_show.cc:285 src/pkg_info_screen.cc:115
 msgid "Maintainer: "
 msgstr "维护者:"
 
-#: src/cmdline/cmdline_show.cc:283
+#: src/cmdline/cmdline_show.cc:288
 msgid "Uncompressed Size: "
 msgstr "未压缩尺寸:"
 
-#: src/cmdline/cmdline_show.cc:287
+#: src/cmdline/cmdline_show.cc:292
 msgid "Architecture: "
 msgstr "体系:"
 
-#: src/cmdline/cmdline_show.cc:289
+#: src/cmdline/cmdline_show.cc:294
 msgid "Compressed Size: "
 msgstr "压缩后尺寸:"
 
-#: src/cmdline/cmdline_show.cc:291
+#: src/cmdline/cmdline_show.cc:296
 msgid "Filename: "
 msgstr "文件名:"
 
-#: src/cmdline/cmdline_show.cc:293
+#: src/cmdline/cmdline_show.cc:298
 msgid "MD5sum: "
 msgstr "MD5sum: "
 
-#: src/cmdline/cmdline_show.cc:297 src/cmdline/cmdline_show.cc:299
+#: src/cmdline/cmdline_show.cc:302 src/cmdline/cmdline_show.cc:305
 msgid "Archive"
 msgstr "存档"
 
-#: src/cmdline/cmdline_show.cc:303
+#: src/cmdline/cmdline_show.cc:310
 msgid "Depends"
 msgstr "依赖于"
 
-#: src/cmdline/cmdline_show.cc:305
+#: src/cmdline/cmdline_show.cc:312
 msgid "PreDepends"
 msgstr "预依赖于"
 
-#: src/cmdline/cmdline_show.cc:307
+#: src/cmdline/cmdline_show.cc:314
 msgid "Recommends"
 msgstr "推荐"
 
-#: src/cmdline/cmdline_show.cc:309
+#: src/cmdline/cmdline_show.cc:316
 msgid "Suggests"
 msgstr "建议"
 
-#: src/cmdline/cmdline_show.cc:311
+#: src/cmdline/cmdline_show.cc:318
 msgid "Conflicts"
 msgstr "冲突"
 
-#: src/cmdline/cmdline_show.cc:313
+#: src/cmdline/cmdline_show.cc:320
 msgid "Replaces"
 msgstr "代替"
 
-#: src/cmdline/cmdline_show.cc:315
+#: src/cmdline/cmdline_show.cc:322
 msgid "Obsoletes"
 msgstr "过期"
 
-#: src/cmdline/cmdline_show.cc:317
+#: src/cmdline/cmdline_show.cc:324
 msgid "Provides"
 msgstr "提供"
 
-#: src/cmdline/cmdline_show.cc:321 src/pkg_info_screen.cc:97
+#: src/cmdline/cmdline_show.cc:328 src/pkg_info_screen.cc:97
 msgid "Description: "
 msgstr "描述:"
 
@@ -1189,7 +1199,7 @@
 #: src/cmdline/cmdline_util.cc:83
 #, c-format
 msgid "Unable to find an archive \"%s\" for the package \"%s\"\n"
-msgstr "无法找到存档 “%s” ,该存档用于软件包 “%s”\n"
+msgstr "无法找到存档“%s”,该存档用于软件包“%s”\n"
 
 #: src/cmdline/cmdline_util.cc:93
 #, c-format
@@ -1206,32 +1216,32 @@
 msgid "You cannot specify both an archive and a version for a package\n"
 msgstr "您不能为一个软件包同时指定存档和版本号\n"
 
-#: src/dep_item.cc:137
+#: src/dep_item.cc:139
 msgid "UNSATISFIED"
 msgstr "未满足的"
 
-#: src/dep_item.cc:137 src/reason_fragment.cc:247
+#: src/dep_item.cc:139 src/reason_fragment.cc:244
 msgid "UNAVAILABLE"
 msgstr "不可用"
 
-#: src/download_bar.cc:56 src/download_list.cc:263 src/download_screen.cc:57
+#: src/download_bar.cc:56 src/download_list.cc:266 src/download_screen.cc:57
 #, c-format
 msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
 msgstr "请将标号为“%s”的磁盘插入驱动器“%s”"
 
-#: src/download_bar.cc:77 src/generic/acqprogress.cc:63
+#: src/download_bar.cc:75 src/generic/acqprogress.cc:63
 msgid "Hit "
 msgstr "命中 "
 
-#: src/download_bar.cc:90
+#: src/download_bar.cc:88
 msgid "Downloading "
 msgstr "正在下载 "
 
-#: src/download_bar.cc:103
+#: src/download_bar.cc:101
 msgid "Got "
 msgstr "已取得 "
 
-#: src/download_bar.cc:157
+#: src/download_bar.cc:155
 msgid "Downloading..."
 msgstr "正在下载..."
 
@@ -1259,7 +1269,7 @@
 msgid "Couldn't clean out list directories"
 msgstr "无法清空列表目录"
 
-#: src/download.cc:177 src/ui.cc:1153
+#: src/download.cc:177 src/ui.cc:1147
 msgid "Deleting obsolete downloaded files"
 msgstr "删除过期的下载文件"
 
@@ -1394,7 +1404,7 @@
 "Ack!  Something bad happened while installing packages.  Trying to recover:"
 msgstr "啊!安装软件包时出现某些坏情况。正在试图恢复:"
 
-#: src/download.cc:477 src/pkg_item.cc:432
+#: src/download.cc:477 src/pkg_item.cc:430
 msgid "Press return to continue.\n"
 msgstr "按回车继续。\n"
 
@@ -1403,17 +1413,17 @@
 "Could not regain the system lock!  (Perhaps another apt or dpkg is running?)"
 msgstr "无法重新获得系统锁!(也许另一个 apt 或 dpkg 正在运行?)"
 
-#: src/download_item.cc:66 src/download_item.cc:70 src/download_item.cc:100
+#: src/download_item.cc:70 src/download_item.cc:74 src/download_item.cc:104
 #: src/generic/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr "[正在工作]"
 
-#: src/download_item.cc:104 src/download_list.cc:283
+#: src/download_item.cc:108 src/download_list.cc:284
 msgid "[Hit]"
 msgstr "[命中]"
 
-#: src/download_item.cc:104 src/download_list.cc:303
+#: src/download_item.cc:108 src/download_list.cc:304
 msgid "[Downloaded]"
 msgstr "[已下载]"
 
@@ -1427,34 +1437,34 @@
 msgid "%n%nSome files were not downloaded successfully."
 msgstr ""
 
-#: src/download_list.cc:68
+#: src/download_list.cc:66
 msgid "Continue"
 msgstr "继续"
 
-#: src/download_list.cc:175 src/download_screen.cc:203
+#: src/download_list.cc:178 src/download_screen.cc:203
 msgid "Total Progress: "
 msgstr "总进度:"
 
-#: src/download_list.cc:194 src/download_screen.cc:218
+#: src/download_list.cc:197 src/download_screen.cc:218
 #, c-format
 msgid " [ %i%% ] (%sB/s, %s remaining)"
 msgstr " [ %i%% ]  (%sB/s, 剩下 %s)"
 
-#: src/download_list.cc:196
+#: src/download_list.cc:199
 #, c-format
 msgid " [ %i%% ] (stalled)"
 msgstr " [ %i%% ] (已停顿)"
 
-#: src/download_list.cc:198
+#: src/download_list.cc:201
 #, c-format
 msgid " [ %i%% ]"
 msgstr " [ %i%% ]"
 
-#: src/download_list.cc:323
+#: src/download_list.cc:324
 msgid "[IGNORED]"
 msgstr "[忽略]"
 
-#: src/download_list.cc:329
+#: src/download_list.cc:330
 msgid "[ERROR]"
 msgstr "[错误]"
 
@@ -1463,11 +1473,11 @@
 msgid "Downloaded %sB in %ss (%sB/s)."
 msgstr "下载%sB,耗时 %ss (%sB/s)。"
 
-#: src/edit_pkg_hier.cc:158
+#: src/edit_pkg_hier.cc:176
 msgid "No hierarchy information to edit"
 msgstr "没有层次信息可编辑"
 
-#: src/edit_pkg_hier.cc:258
+#: src/edit_pkg_hier.cc:276
 msgid "Couldn't open for writing"
 msgstr "无法打开文件以写入"
 
@@ -1560,39 +1570,39 @@
 msgid "Warning: could not lock the cache file.  Opening in read-only mode"
 msgstr "警告:无法锁定缓存文件。以只读方式打开"
 
-#: src/generic/matchers.cc:797
+#: src/generic/matchers.cc:798
 msgid "Unmatched '('"
 msgstr "不匹配“(”"
 
-#: src/generic/matchers.cc:887 src/generic/matchers.cc:968
+#: src/generic/matchers.cc:888 src/generic/matchers.cc:969
 #, c-format
 msgid "Unknown dependency type: %s"
 msgstr "未知依赖类型:%s"
 
-#: src/generic/matchers.cc:950
+#: src/generic/matchers.cc:951
 #, c-format
 msgid "Unknown action type: %s"
 msgstr "未知的操作类型:%s"
 
-#: src/generic/matchers.cc:1017
+#: src/generic/matchers.cc:1018
 #, c-format
 msgid "Unknown priority %s"
 msgstr "未知的优先级:%s"
 
-#: src/generic/matchers.cc:1039
+#: src/generic/matchers.cc:1040
 #, c-format
 msgid "Unknown pattern type: %c"
 msgstr "未知的模式类型:%c"
 
-#: src/generic/matchers.cc:1084
+#: src/generic/matchers.cc:1105
 msgid "Unexpected empty expression"
 msgstr "意外的空表达式"
 
-#: src/generic/matchers.cc:1119
+#: src/generic/matchers.cc:1143
 msgid "Badly formed expression"
 msgstr "错误格式的表达式"
 
-#: src/generic/matchers.cc:1148
+#: src/generic/matchers.cc:1175
 msgid "Unexpected ')'"
 msgstr "意外的“)”"
 
@@ -1615,7 +1625,7 @@
 msgid "Can't get value of $HOME, using TMPDIR (insecure)"
 msgstr "无法获取 $HOME 的值,使用 TMPDIR (不安全)"
 
-#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:61
+#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:76
 #, c-format
 msgid "ChangeLog of %s"
 msgstr "%s 的变更日志"
@@ -1656,37 +1666,37 @@
 msgid "Reading task descriptions"
 msgstr "正在读取任务描述"
 
-#: src/load_config.cc:30
-#, c-format
-msgid "Invalid entry in color definition group: \"%s\""
-msgstr "颜色定义组中的无效条目:“%s”"
+#: src/load_config.cc:42
+#, fuzzy, c-format
+msgid "Unrecognized color name \"%s\""
+msgstr "无法识别的任务"
 
-#: src/load_config.cc:32
-#, c-format
-msgid "Invalid tagless entry in color definition group: \"%s\""
-msgstr "颜色定义组中无效的无标签条目:“%s”"
+#: src/load_config.cc:69
+#, fuzzy, c-format
+msgid "Unrecognized attribute name \"%s\""
+msgstr "无法识别的任务"
 
-#: src/load_config.cc:34
-#, c-format
-msgid "Need exactly two colors in color definition \"%s\""
-msgstr "颜色定义“%s”需要正好两种颜色"
+#: src/load_config.cc:106
+#, fuzzy, c-format
+msgid "Invalid entry in style definition group: \"%s\""
+msgstr "颜色定义组中的无效条目:“%s”"
 
-#: src/load_config.cc:50
-#, c-format
-msgid "Can't parse foreground \"%s\"of color \"%s\""
-msgstr "无法解析颜色“%2$s”的前景“%1$s”"
+#: src/load_config.cc:108
+#, fuzzy, c-format
+msgid "Invalid tagless entry in style definition group: \"%s\""
+msgstr "颜色定义组中无效的无标签条目:“%s”"
 
-#: src/load_config.cc:53
-#, c-format
-msgid "Can't parse background \"%s\" of color \"%s\""
-msgstr "无法解析颜色“%2$s”的背景“%1$s”"
+#: src/load_config.cc:130
+#, fuzzy, c-format
+msgid "Unknown style attribute %s"
+msgstr "未知的操作类型:%s"
 
-#: src/load_config.cc:72 src/load_config.cc:74
+#: src/load_config.cc:153 src/load_config.cc:155
 #, c-format
 msgid "Invalid entry in keybinding group: \"%s\""
 msgstr "快捷键绑定中的无效条目:“%s”"
 
-#: src/load_config.cc:89
+#: src/load_config.cc:170
 #, c-format
 msgid "Ignoring invalid keybinding \"%s\" -> \"%s\""
 msgstr "忽略无效快捷键绑定“%s”->“%s”"
@@ -2079,42 +2089,42 @@
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                  这个 aptitude 没有超级牛力。\n"
 
-#: src/main.cc:255
+#: src/main.cc:252
 #, c-format
 msgid "-o requires an argument of the form key=value, got %s"
 msgstr "-o 要求参数格式为 key=val,接受到 %s"
 
-#: src/main.cc:301 src/main.cc:310
+#: src/main.cc:291 src/main.cc:300
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr "“诡异”:收到未知的选项代码\n"
 
-#: src/main.cc:319
+#: src/main.cc:309
 msgid "Only one of -u and -i may be specified\n"
 msgstr "选项 -u 和 -i 只能指定一个\n"
 
-#: src/main.cc:327
+#: src/main.cc:317
 msgid ""
 "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgstr "选项 -u 和 -i 不能在命令行模式中指定 (例如,和“install”一起)"
 
-#: src/main.cc:348
+#: src/main.cc:338
 msgid "-u and -i may not be specified with a command"
 msgstr "选项 -u 和 -i 不能在和一个命令一起指定 "
 
-#: src/main.cc:405
+#: src/main.cc:395
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr "未知的命令“%s”\n"
 
-#: src/main.cc:412 src/main.cc:469
+#: src/main.cc:402 src/main.cc:450
 msgid "Internal error: uncaught 'out of solutions' exception.\n"
 msgstr ""
 
-#: src/main.cc:417 src/main.cc:474
+#: src/main.cc:407 src/main.cc:455
 msgid "Internal error: uncaught 'out of time' exception.\n"
 msgstr ""
 
-#: src/main.cc:424
+#: src/main.cc:414
 #, c-format
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
@@ -2145,7 +2155,7 @@
 msgid "Lost"
 msgstr "输"
 
-#: src/mine/cmine.cc:119 src/ui.cc:1090
+#: src/mine/cmine.cc:119 src/ui.cc:1084
 msgid "Minesweeper"
 msgstr "扫雷"
 
@@ -2171,147 +2181,147 @@
 msgid "The number of mines must be a number"
 msgstr "地雷个数必须是数字"
 
-#: src/mine/cmine.cc:240
+#: src/mine/cmine.cc:238
 msgid "Setup custom game"
 msgstr "设置自定义游戏"
 
-#: src/mine/cmine.cc:243
+#: src/mine/cmine.cc:240
 msgid "Height of board: "
 msgstr "棋盘高度:"
 
-#: src/mine/cmine.cc:247
+#: src/mine/cmine.cc:243
 msgid "Width of board: "
 msgstr "棋盘宽度:"
 
-#: src/mine/cmine.cc:251
+#: src/mine/cmine.cc:246
 msgid "Number of mines: "
 msgstr "地雷数量:"
 
-#: src/mine/cmine.cc:316
+#: src/mine/cmine.cc:305
 msgid "Choose difficulty level"
 msgstr "选择难度级别"
 
-#: src/mine/cmine.cc:318
+#: src/mine/cmine.cc:307
 msgid "Easy"
 msgstr "容易"
 
-#: src/mine/cmine.cc:319
+#: src/mine/cmine.cc:308
 msgid "Medium"
 msgstr "中等"
 
-#: src/mine/cmine.cc:320
+#: src/mine/cmine.cc:309
 msgid "Hard"
 msgstr "å›°éš¾"
 
-#: src/mine/cmine.cc:321
+#: src/mine/cmine.cc:310
 msgid "Custom"
 msgstr "自定义"
 
-#: src/mine/cmine.cc:411
+#: src/mine/cmine.cc:392
 msgid "You have won."
 msgstr "您赢了。"
 
-#: src/mine/cmine.cc:414
+#: src/mine/cmine.cc:395
 msgid "You lose!"
 msgstr "您输了!"
 
-#: src/mine/cmine.cc:419
+#: src/mine/cmine.cc:400
 msgid "You die...  --More--"
 msgstr "您死了...  --更多--"
 
-#: src/mine/cmine.cc:432
+#: src/mine/cmine.cc:413
 msgid "The spikes were poisoned!  The poison was deadly..  --More--"
 msgstr "桩子有毒!毒药是致命的..  --更多--"
 
-#: src/mine/cmine.cc:435
+#: src/mine/cmine.cc:416
 msgid "You land on a set of sharp iron spikes!  --More--"
 msgstr "您着陆于一片尖锐的铁桩上了!  --更多--"
 
-#: src/mine/cmine.cc:438
+#: src/mine/cmine.cc:419
 msgid "You fall into a pit!  --More--"
 msgstr "您掉进了一个坑中!  --更多--"
 
-#: src/mine/cmine.cc:441
+#: src/mine/cmine.cc:422
 msgid "KABOOM!  You step on a land mine.  --More--"
 msgstr "梆!您踩到地雷上了!  --更多--"
 
-#: src/mine/cmine.cc:446
+#: src/mine/cmine.cc:427
 msgid "The dart was poisoned!  The poison was deadly...  --More--"
 msgstr "飞镖有毒!毒药是致命的...  --更多--"
 
-#: src/mine/cmine.cc:448
+#: src/mine/cmine.cc:429
 msgid ""
 "A little dart shoots out at you!  You are hit by a little dart!  --More--"
 msgstr "一个飞镖向您射来! 您被一个飞镖刺中了!  --更多--"
 
-#: src/mine/cmine.cc:452
+#: src/mine/cmine.cc:433
 msgid "You turn to stone... --More--"
 msgstr "您变成了石头... --更多--"
 
-#: src/mine/cmine.cc:454
+#: src/mine/cmine.cc:435
 msgid "Touching the cockatrice corpse was a fatal mistake.  --More--"
 msgstr "接触怪蛇的身体是一个致命的错误。 --更多--"
 
-#: src/mine/cmine.cc:456
+#: src/mine/cmine.cc:437
 msgid "You feel here a cockatrice corpse.  --More--"
 msgstr "这里您感觉到一个怪蛇的身体。 --更多--"
 
-#: src/mine/cmine.cc:460
+#: src/mine/cmine.cc:441
 msgid ""
 "Click!  You trigger a rolling boulder trap!  You are hit by a boulder! --"
 "More--"
 msgstr "啪!您触发了一个滚石陷阱!您被一个大圆石击中了! --更多--"
 
-#: src/mine/cmine.cc:470
+#: src/mine/cmine.cc:451
 msgid "sleep"
 msgstr "休眠"
 
-#: src/mine/cmine.cc:473
+#: src/mine/cmine.cc:454
 msgid "striking"
 msgstr "攻击"
 
-#: src/mine/cmine.cc:476
+#: src/mine/cmine.cc:457
 msgid "death"
 msgstr "死亡"
 
-#: src/mine/cmine.cc:479
+#: src/mine/cmine.cc:460
 msgid "polymorph"
 msgstr "变形"
 
-#: src/mine/cmine.cc:482
+#: src/mine/cmine.cc:463
 msgid "magic missile"
 msgstr "魔术导弹"
 
-#: src/mine/cmine.cc:485
+#: src/mine/cmine.cc:466
 msgid "secret door detection"
 msgstr "探测密门"
 
-#: src/mine/cmine.cc:488
+#: src/mine/cmine.cc:469
 msgid "invisibility"
 msgstr "隐身"
 
-#: src/mine/cmine.cc:491
+#: src/mine/cmine.cc:472
 msgid "cold"
 msgstr "寒冷"
 
-#: src/mine/cmine.cc:497
+#: src/mine/cmine.cc:478
 #, c-format
 msgid "Your wand of %s breaks apart and explodes!  --More--"
 msgstr "您的魔杖 %s 断开并爆炸了! --更多--"
 
-#: src/mine/cmine.cc:503
+#: src/mine/cmine.cc:484
 msgid "You are jolted by a surge of electricity!  --More--"
 msgstr "您被一股强电流电击了!  --更多--"
 
-#: src/mine/cmine.cc:607
+#: src/mine/cmine.cc:588
 msgid "Enter the filename to load: "
 msgstr "请输入要载入的文件名:"
 
-#: src/mine/cmine.cc:614
+#: src/mine/cmine.cc:595
 msgid "Enter the filename to save: "
 msgstr "输入要保存的文件名:"
 
-#: src/mine/cmine.cc:624
+#: src/mine/cmine.cc:605
 msgid "mine-help.txt"
 msgstr "mine-help.txt"
 
@@ -2319,7 +2329,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:1670
+#: src/pkg_columnizer.cc:84 src/ui.cc:1662
 msgid "Package"
 msgstr "软件包"
 
@@ -2515,7 +2525,7 @@
 #: src/pkg_columnizer.cc:410
 #, c-format
 msgid "DL Size: %sB"
-msgstr "下载文件大小:%sB"
+msgstr "需下载:%sB"
 
 #: src/pkg_columnizer.cc:480
 msgid "HN too long"
@@ -2643,8 +2653,9 @@
 "a typical desktop system: for instance, a PDA, a cell phone, or a Tivo."
 msgstr ""
 "由于嵌入式系统的程序\n"
-"“嵌入式”部分的软件包需要运行在嵌入式系统中。嵌入式设备是一类特殊的硬件设备, "
-"其硬件功能比典型的桌面系统少:例如,PDA (个人数字助理), 手机或者 Tivo。 "
+" “嵌入式”部分的软件包需要运行在嵌入式系统中。嵌入式设备是一类特殊的硬件设"
+"备, 其硬件功能比典型的桌面系统少:例如,PDA (个人数字助理), 手机或者 "
+"Tivo。 "
 
 #: src/pkg_grouppolicy.cc:164
 msgid ""
@@ -2714,7 +2725,7 @@
 "from this section unless you want to compile software yourself."
 msgstr ""
 "用于库的开发文件\n"
-"“libdevel”部分的软件包包含若干文件,这些文件在编译其它用到“libs”部分的库的程"
+" “libdevel”部分的软件包包含若干文件,这些文件在编译其它用到“libs”部分的库的程"
 "序需要。除非您希望自己编译软件,否则您不需要该部分的软件包。"
 
 #: src/pkg_grouppolicy.cc:171
@@ -2738,7 +2749,7 @@
 "system will install them if they are required."
 msgstr ""
 "Perl 解释器以及库\n"
-"“perl”部分的软件包提供 Perl 编程语言和许多基于该语言的第三方软件库。除非您是"
+" “perl”部分的软件包提供 Perl 编程语言和许多基于该语言的第三方软件库。除非您是"
 "一个 Perl 程序员,您不需要显式地从该部分选择安装软件包;软件包系统将在需要的"
 "时候自动安装它们。"
 
@@ -2751,7 +2762,7 @@
 "system will install them if they are required."
 msgstr ""
 "Python 解释器以及库\n"
-"“python”部分的软件包提供 Python 编程语言和许多基于该语言的第三方软件库。除非"
+" “python”部分的软件包提供 Python 编程语言和许多基于该语言的第三方软件库。除非"
 "您是一个 Python 程序员,您不需要显式地从该部分选择安装软件包;软件包系统将在"
 "需要的时候自动安装它们。"
 
@@ -2944,7 +2955,7 @@
 "http://www.debian.org/social_contract#guidelines"
 msgstr ""
 "依赖于未被 Debian 包括的软件的程序\n"
-" “捐赠”部分的软件包不是 Debian 的组成部分。\n"
+" “contrib”部分的软件包不是 Debian 的组成部分。\n"
 " .\n"
 " 这些软件包是自由软件,但是它们依赖于 Debian 以外的软件。这可能是因为该软件不"
 "是自由软件,但是被打包并放置于本存档的“非自由”部分,因为 Debian 根本无法发行"
@@ -3317,52 +3328,52 @@
 "您确定您要卸载它吗?\n"
 "如果您确定的话输入“%s”。"
 
-#: src/pkg_item.cc:222 src/pkg_ver_item.cc:625
+#: src/pkg_item.cc:220 src/pkg_ver_item.cc:626
 #, c-format
 msgid "Information about %s"
 msgstr "关于 %s 的信息"
 
-#: src/pkg_item.cc:224 src/pkg_ver_item.cc:627
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:628
 #, c-format
 msgid "%s info"
 msgstr ""
 
-#: src/pkg_item.cc:310
+#: src/pkg_item.cc:308
 #, fuzzy, c-format
 msgid "Available versions of %s"
 msgstr "可用的版本 "
 
-#: src/pkg_item.cc:313
+#: src/pkg_item.cc:311
 #, fuzzy, c-format
 msgid "%s versions"
 msgstr "版本号"
 
-#: src/pkg_item.cc:325 src/pkg_ver_item.cc:655
+#: src/pkg_item.cc:323 src/pkg_ver_item.cc:656
 #, c-format
 msgid "Dependencies of %s"
 msgstr "%s 的依赖关系"
 
-#: src/pkg_item.cc:327 src/pkg_ver_item.cc:657
+#: src/pkg_item.cc:325 src/pkg_ver_item.cc:658
 #, c-format
 msgid "%s deps"
 msgstr ""
 
-#: src/pkg_item.cc:338 src/pkg_ver_item.cc:667
+#: src/pkg_item.cc:336 src/pkg_ver_item.cc:668
 #, c-format
 msgid "Packages depending on %s"
 msgstr "依赖于 %s 的软件包"
 
-#: src/pkg_item.cc:340 src/pkg_ver_item.cc:669
+#: src/pkg_item.cc:338 src/pkg_ver_item.cc:670
 #, c-format
 msgid "%s reverse deps"
 msgstr ""
 
-#: src/pkg_item.cc:392 src/pkg_ver_item.cc:707
+#: src/pkg_item.cc:390 src/pkg_ver_item.cc:708
 #, c-format
 msgid "Reporting a bug in %s:\n"
 msgstr "报告 %s 中的错误\n"
 
-#: src/pkg_item.cc:414
+#: src/pkg_item.cc:412
 #, fuzzy
 msgid ""
 "You are not root and I cannot find any way to become root.  To reconfigure "
@@ -3374,16 +3385,16 @@
 "请安装 menu 软件包,login 软件包,\n"
 "或者以 root 身份运行 aptitude 。"
 
-#: src/pkg_item.cc:422
+#: src/pkg_item.cc:420
 #, c-format
 msgid "Reconfiguring %s\n"
 msgstr "重新配置 %s \n"
 
-#: src/pkg_item.cc:447
+#: src/pkg_item.cc:445
 msgid "Hierarchy editor"
 msgstr "层次编辑器"
 
-#: src/pkg_item.cc:447
+#: src/pkg_item.cc:445
 #, fuzzy
 msgid "Hierarchy Editor"
 msgstr "层次编辑器"
@@ -3403,7 +3414,7 @@
 #: src/pkg_tree.cc:632
 #, c-format
 msgid "No packages matched the pattern \"%s\"."
-msgstr "没有软件包匹配模式 “%s”。"
+msgstr "没有软件包匹配模式“%s”。"
 
 #: src/pkg_tree.cc:654
 msgid "Enter the new package tree limit: "
@@ -3417,20 +3428,20 @@
 msgid "Enter the new package sorting mechanism for this display: "
 msgstr "为此显示输入新的软件包排序机制:"
 
-#: src/pkg_view.cc:344
+#: src/pkg_view.cc:359
 msgid "make_package_view: error in arguments -- two main widgets??"
 msgstr "make_package_view: 参数错误 -- 两个主要部件? "
 
-#: src/pkg_view.cc:350
+#: src/pkg_view.cc:365
 msgid ""
 "make_package_view: error in arguments -- bad column list for static item"
 msgstr "make_package_view: 参数错误 -- 静态项目的栏列表错误"
 
-#: src/pkg_view.cc:443
+#: src/pkg_view.cc:458
 msgid "make_package_view: bad argument!"
 msgstr "make_package_view: 参数错误!"
 
-#: src/pkg_view.cc:495
+#: src/pkg_view.cc:510
 msgid "make_package_view: no main widget found"
 msgstr "make_package_view: 未发现主要部件"
 
@@ -3467,103 +3478,103 @@
 msgid " (provided by %F)"
 msgstr "(由 %F 提供)"
 
-#: src/reason_fragment.cc:278
+#: src/reason_fragment.cc:275
 #, c-format
 msgid "%F%s %F %F"
 msgstr "%F%s %F %F"
 
-#: src/reason_fragment.cc:327
+#: src/reason_fragment.cc:324
 msgid ""
 "If you select a package, an explanation of its current state will appear in "
 "this space."
 msgstr "如果您选择了一个软件包,其当前状态的描述将会出现在这片空间。"
 
-#: src/reason_fragment.cc:361
+#: src/reason_fragment.cc:358
 msgid ""
 "%B%s%b was installed automatically;  it is being removed because all of the "
 "packages which depend upon it are being removed:"
 msgstr ""
 "%B%s%b 被自动安装;现在它将被删除,因为所有依赖于它的软件包都将被删除:"
 
-#: src/reason_fragment.cc:365
+#: src/reason_fragment.cc:362
 msgid "%B%s%b will be automatically removed because of dependency errors:"
 msgstr "由于依赖关系出错,%B%s%b 将被自动删除:"
 
-#: src/reason_fragment.cc:369
+#: src/reason_fragment.cc:366
 msgid ""
 "%B%s%b will be automatically installed to satisfy the following dependencies:"
 msgstr "%B%s%b 将被自动安装以满足下列依赖关系:"
 
-#: src/reason_fragment.cc:375 src/reason_fragment.cc:387
+#: src/reason_fragment.cc:372 src/reason_fragment.cc:384
 msgid ""
 "%B%s%b cannot be upgraded now, but if it could be, it would still be held at "
 "version %B%s%b."
 msgstr "%B%s%b 现在无法升级,但是如果可以升级的话,它仍将被保持在版本 %B%s%b。"
 
-#: src/reason_fragment.cc:378
+#: src/reason_fragment.cc:375
 msgid ""
 "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the "
 "following dependencies:"
 msgstr "%B%s%b 将不会被升级到版本 %B%s%b,以避免破坏下列依赖关系:"
 
-#: src/reason_fragment.cc:390
+#: src/reason_fragment.cc:387
 msgid "%B%s%b is currently installed."
 msgstr "%B%s%b 目前已安装。"
 
-#: src/reason_fragment.cc:396
+#: src/reason_fragment.cc:393
 msgid "%B%s%b is not currently installed."
 msgstr "%B%s%b 目前未被安装。"
 
-#: src/reason_fragment.cc:404
+#: src/reason_fragment.cc:401
 msgid "Some dependencies of %B%s%b are not satisfied:"
 msgstr "%B%s%b 的某些依赖关系未被满足:"
 
-#: src/reason_fragment.cc:408
+#: src/reason_fragment.cc:405
 msgid "%B%s%b will be downgraded."
 msgstr "%B%s%b 将被降级。"
 
-#: src/reason_fragment.cc:415
+#: src/reason_fragment.cc:412
 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b."
 msgstr "%B%s%b 将从不会升级到禁止的版本 %B%s%b。"
 
-#: src/reason_fragment.cc:419
+#: src/reason_fragment.cc:416
 msgid ""
 "%B%s%b could be upgraded to version %B%s%b, but it is being held at version %"
 "B%s%b."
 msgstr "%B%s%b 可以升级到版本 %B%s%b,但是它将被保持在版本%B%s%b。"
 
-#: src/reason_fragment.cc:426
+#: src/reason_fragment.cc:423
 msgid "%B%s%b will be re-installed."
 msgstr "%B%s%b 将被重新安装。"
 
-#: src/reason_fragment.cc:430
+#: src/reason_fragment.cc:427
 msgid "%B%s%b will be installed."
 msgstr "%B%s%b 将被安装。"
 
-#: src/reason_fragment.cc:434
+#: src/reason_fragment.cc:431
 msgid "%B%s%b will be removed."
 msgstr "%B%s%b 将被删除。"
 
-#: src/reason_fragment.cc:439
+#: src/reason_fragment.cc:436
 msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b."
 msgstr "%B%s%b 将从版本 %B%s%b升级到版本%B%s%b。"
 
-#: src/reason_fragment.cc:475
+#: src/reason_fragment.cc:472
 msgid ""
 "The following packages depend on %B%s%b and will be broken by its removal:"
 msgstr "下列软件包依赖于 %B%s%b,删除该软件包将使它们破损:"
 
-#: src/reason_fragment.cc:478
+#: src/reason_fragment.cc:475
 msgid "The following packages depend on %B%s%b and are broken:"
 msgstr "下列软件包依赖于 %B%s%b,它们目前是破损的:"
 
-#: src/reason_fragment.cc:485
+#: src/reason_fragment.cc:482
 msgid ""
 "The following packages conflict with %B%s%b and will be broken by its "
 "installation:"
 msgstr "下列软件包与 %B%s%b 相冲突,安装该软件包将使它们破损:"
 
-#: src/reason_fragment.cc:518
+#: src/reason_fragment.cc:515
 msgid ""
 "The following packages depend on a version of %B%s%b other than the "
 "currently installed version of %B%s%b, or conflict with the currently "
@@ -3572,37 +3583,37 @@
 "下列软件包依赖于某一版本的 %B%s%b,该版本当前安装的版本 %B%s%b 不同,或者它们"
 "与当前安装的版本冲突:"
 
-#: src/reason_fragment.cc:522
+#: src/reason_fragment.cc:519
 msgid ""
 "The following packages conflict with %B%s%b, or depend on a version of it "
 "which is not going to be installed."
 msgstr "下列软件包与 %B%s%b 冲突,或者依赖于它的某一版本,该版本将不被安装。"
 
-#: src/reason_fragment.cc:526
+#: src/reason_fragment.cc:523
 msgid "The following packages conflict with %B%s%b:"
 msgstr "下列软件包与 %B%s%b 相冲突:"
 
-#: src/reason_fragment.cc:531
+#: src/reason_fragment.cc:528
 msgid ""
 "The following packages depend on a version of %B%s%b other than the "
 "currently installed version of %B%s%b:"
 msgstr "下列软件包依赖于某一版本的 %B%s%b,该版本当前安装的版本 %B%s%b 不同:"
 
-#: src/reason_fragment.cc:535
+#: src/reason_fragment.cc:532
 msgid ""
 "The following packages depend on a version of %B%s%b which is not going to "
 "be installed."
 msgstr "下列软件包依赖于 %B%s%b 的某一版本,该版本将不被安装。"
 
-#: src/reason_fragment.cc:541
+#: src/reason_fragment.cc:538
 msgid "upgraded"
 msgstr "已升级"
 
-#: src/reason_fragment.cc:541
+#: src/reason_fragment.cc:538
 msgid "downgraded"
 msgstr "已下载"
 
-#: src/reason_fragment.cc:547
+#: src/reason_fragment.cc:544
 msgid ""
 "The following packages depend on the currently installed version of %B%s%b (%"
 "B%s%b), or conflict with the version it will be %s to (%B%s%b), and will be "
@@ -3611,13 +3622,13 @@
 "下列软件包依赖于当前安装版本的 %B%s%b ( %B%s%b ),或者与它将被 %s 至的版本 (%"
 "B%s%b)冲突,并且将会破损如果它是 %s。"
 
-#: src/reason_fragment.cc:554
+#: src/reason_fragment.cc:551
 msgid ""
 "The following packages conflict with version %B%s%b of %B%s%b, and will be "
 "broken if it is %s."
 msgstr "下列软件包与版本 %B%s%b 的 %B%s%b 冲突,并且将会破损如果它是 %s。"
 
-#: src/reason_fragment.cc:559
+#: src/reason_fragment.cc:556
 msgid ""
 "The following packages depend on version %B%s%b of %B%s%b, and will be "
 "broken if it is %s."
@@ -3662,38 +3673,43 @@
 msgid "Close"
 msgstr "关闭(^C)"
 
-#: src/solution_fragment.cc:125
+#: src/solution_fragment.cc:134
 #, fuzzy
 msgid "%BRemove%b the following packages:%n"
 msgstr "下列软件包是“破损”的:"
 
-#: src/solution_fragment.cc:135
+#: src/solution_fragment.cc:144
 #, fuzzy
 msgid "%BInstall%b the following packages:%n"
 msgstr "下列软件包是“破损”的:"
 
-#: src/solution_fragment.cc:148
+#: src/solution_fragment.cc:157
 msgid "%BKeep%b the following packages at their current version:%n"
 msgstr ""
 
-#: src/solution_fragment.cc:161
+#: src/solution_fragment.cc:164
+#, fuzzy
+msgid "Not Installed"
+msgstr "未安装"
+
+#: src/solution_fragment.cc:177
 #, fuzzy
 msgid "%BUpgrade%b the following packages:%n"
 msgstr "下列软件包是“破损”的:"
 
-#: src/solution_fragment.cc:176
+#: src/solution_fragment.cc:192
 #, fuzzy
 msgid "%BDowngrade%b the following packages:%n"
 msgstr "正在下载软件包"
 
-#: src/solution_fragment.cc:190
+#: src/solution_fragment.cc:206
 #, c-format
 msgid "Score is %d"
 msgstr ""
 
 #: src/trust.cc:17 src/trust.cc:19
 msgid "WARNING"
-msgstr ""
+msgstr "警告"
 
 #: src/trust.cc:18
 msgid ""
@@ -3701,6 +3717,8 @@
 "package could allow a malicious individual to damage or take control of your "
 "system."
 msgstr ""
+"%F:此版本的 %s 是来自于 %B不可信源%b!安装此软件包可能会允许恶意人士毁坏或控"
+"制您的系统。"
 
 #: src/ui.cc:165
 msgid "Er, there aren't any errors, this shouldn't have happened.."
@@ -3714,43 +3732,43 @@
 msgid "W:"
 msgstr ""
 
-#: src/ui.cc:194
+#: src/ui.cc:193
 msgid "Search for:"
 msgstr "搜索:"
 
-#: src/ui.cc:262
+#: src/ui.cc:258
 msgid "You already are root!"
 msgstr "您已经是 root 了!"
 
-#: src/ui.cc:360
+#: src/ui.cc:356
 msgid ""
 "Subprocess exited with an error -- did you type your password correctly?"
 msgstr "子进程返回一个错误 -- 您输入的密码正确吗?"
 
-#: src/ui.cc:388
+#: src/ui.cc:384
 msgid "Loading cache"
 msgstr "载入缓存"
 
-#: src/ui.cc:410
+#: src/ui.cc:406
 msgid "Really quit Aptitude?"
 msgstr "真的要退出 Aptitude 吗?"
 
-#: src/ui.cc:489
+#: src/ui.cc:485
 msgid "Really discard your personal settings and reload the defaults?"
 msgstr "真的要放弃您的个人设置并载入默认值吗?"
 
-#: src/ui.cc:589 src/ui.cc:591 src/ui.cc:619 src/ui.cc:621
+#: src/ui.cc:585 src/ui.cc:587 src/ui.cc:615 src/ui.cc:617
 msgid "Packages"
 msgstr "软件包"
 
-#: src/ui.cc:590 src/ui.cc:620
+#: src/ui.cc:586 src/ui.cc:616
 msgid "View available packages and choose actions to perform"
 msgstr "查看可选软件包以及选择要执行的动作"
 
-#: src/ui.cc:667
+#: src/ui.cc:663
 #, fuzzy
 msgid ""
-"%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
+"Aptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
 "BABSOLUTELY NO WARRANTY%b; for details see 'license' in the Help menu.  This "
 "is free software, and you are welcome to redistribute it under certain "
 "conditions; see 'license' for details."
@@ -3762,61 +3780,68 @@
 "使用 Aptitude 软件无任何担保;细节请查阅帮助菜单的 'license' 项。\n"
 "该软件是自由软件,欢迎您遵照某些条款分发该软件;细节请查阅 'license' 文件"
 
-#: src/ui.cc:688
+#: src/ui.cc:684
 msgid "help.txt"
 msgstr "help-zh_CN.txt"
 
-#: src/ui.cc:704
+#: src/ui.cc:700
 msgid "README"
 msgstr "README"
 
-#: src/ui.cc:786
+#: src/ui.cc:782
 msgid ""
-"%C%BWARNING%b: untrusted versions of the following packages will be "
-"installed!%n%nUntrusted packages could %Bcompromise your system's security%"
-"b.  You should only proceed with the installation if you are certain that "
-"this is what you want to do.%n%n"
+"%BWARNING%b: untrusted versions of the following packages will be installed!%"
+"n%nUntrusted packages could %Bcompromise your system's security%b.  You "
+"should only proceed with the installation if you are certain that this is "
+"what you want to do.%n%n"
 msgstr ""
+"%B警告%b:以下软件包的不可信版本将被安装!%n%n不可信的软件包可能会%B危害您的"
+"系统安全%b。只有当您非常清楚地了解这就是您所要执行的操作时,才应该进行安装操"
+"作。%n%n"
 
-#: src/ui.cc:800
+#: src/ui.cc:788
 #, fuzzy
+msgid "  %S*%N %s [version %s]%n"
+msgstr "版本号"
+
+#: src/ui.cc:795
 msgid "Really Continue"
-msgstr "继续"
+msgstr "真的继续"
 
-#: src/ui.cc:802
+#: src/ui.cc:797
 msgid "Abort Installation"
-msgstr ""
+msgstr "中止安装"
 
-#: src/ui.cc:863
+#: src/ui.cc:858
 msgid "Preview of package installation"
 msgstr "预览软件包安装"
 
-#: src/ui.cc:864
+#: src/ui.cc:859
 msgid "View and/or adjust the actions that will be performed"
 msgstr "查看以及/或者调整将要被执行的动作"
 
-#: src/ui.cc:865
+#: src/ui.cc:860
 #, fuzzy
 msgid "Preview"
 msgstr "上一个(^P)"
 
-#: src/ui.cc:901
+#: src/ui.cc:896
 #, fuzzy
 msgid "Some packages were broken and have been fixed:"
 msgstr "某些破损的包已经被修补!"
 
-#: src/ui.cc:907
+#: src/ui.cc:902
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:913
-#, c-format
+#: src/ui.cc:908
+#, fuzzy, c-format
 msgid ""
-"Ran out of time while trying to resolver dependencies (press \"%s\" to try "
+"Ran out of time while trying to resolve dependencies (press \"%s\" to try "
 "harder)"
-msgstr ""
+msgstr "通过找地雷来消磨时间"
 
-#: src/ui.cc:959
+#: src/ui.cc:954
 #, fuzzy
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
@@ -3825,23 +3850,23 @@
 "安装/删除软件包需要管理员权限,而您现在\n"
 "没有这种权限。您想要进入 root 帐号吗?\n"
 
-#: src/ui.cc:962 src/ui.cc:1078
+#: src/ui.cc:957 src/ui.cc:1072
 msgid "Become root"
 msgstr "变成 root"
 
-#: src/ui.cc:964 src/ui.cc:1080
+#: src/ui.cc:959 src/ui.cc:1074
 msgid "Don't become root"
 msgstr "不变成 root"
 
-#: src/ui.cc:969 src/ui.cc:1085
+#: src/ui.cc:964 src/ui.cc:1079
 msgid "A package-list update or install run is already taking place."
 msgstr "已经开始了一个软件包列表更新或者安装的动作。"
 
-#: src/ui.cc:996
+#: src/ui.cc:991
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "没有任何软件包被设定为安装,删除或者升级。"
 
-#: src/ui.cc:1002
+#: src/ui.cc:997
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -3853,7 +3878,7 @@
 "某些软件包可以被升级,但是您并未选择升级它们。\n"
 "输入 “U”来准备升级。"
 
-#: src/ui.cc:1074
+#: src/ui.cc:1069
 #, fuzzy
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
@@ -3862,112 +3887,112 @@
 "更新软件包列表需要管理员权限,而您现在\n"
 "没有这种权限。您想要进入 root 帐号吗?\n"
 
-#: src/ui.cc:1090 src/ui.cc:1377
+#: src/ui.cc:1084 src/ui.cc:1371
 msgid "Waste time trying to find mines"
 msgstr "通过找地雷来消磨时间"
 
-#: src/ui.cc:1097 src/ui.cc:1150
+#: src/ui.cc:1091 src/ui.cc:1144
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "在下载进行过程中不允许执行清除"
 
-#: src/ui.cc:1100
+#: src/ui.cc:1094
 msgid "Deleting downloaded files"
 msgstr "删除下载的文件"
 
-#: src/ui.cc:1114
+#: src/ui.cc:1108
 msgid "Downloaded package files have been deleted"
 msgstr "下载的文件已经被删除"
 
-#: src/ui.cc:1175
+#: src/ui.cc:1169
 #, fuzzy, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr "过期的下载文件已经被删除"
 
-#: src/ui.cc:1247
+#: src/ui.cc:1241
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1252 src/ui.cc:1283
+#: src/ui.cc:1246 src/ui.cc:1277
 #, fuzzy
 msgid "Ran out of time while trying to find a solution."
 msgstr "通过找地雷来消磨时间"
 
-#: src/ui.cc:1277
+#: src/ui.cc:1271
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1307
+#: src/ui.cc:1301
 #, fuzzy, c-format
 msgid "Unable to open %s"
 msgstr "无法打开 %s 以写入"
 
-#: src/ui.cc:1313
+#: src/ui.cc:1307
 msgid "Error while dumping resolver state"
 msgstr ""
 
-#: src/ui.cc:1323
+#: src/ui.cc:1317
 msgid "File to which the resolver state should be dumped:"
 msgstr ""
 
-#: src/ui.cc:1353
+#: src/ui.cc:1347
 msgid "^Install/remove packages"
 msgstr "安装/卸载软件包(^I)"
 
-#: src/ui.cc:1354
+#: src/ui.cc:1348
 msgid "Perform all pending installs and removals"
 msgstr "执行所有等待执行的安装和卸载任务"
 
-#: src/ui.cc:1356
+#: src/ui.cc:1350
 msgid "^Update package list"
 msgstr "更新软件包列表(^U)"
 
-#: src/ui.cc:1357
+#: src/ui.cc:1351
 msgid "Check for new versions of packages"
 msgstr "正在检查新版本的软件包"
 
-#: src/ui.cc:1360
+#: src/ui.cc:1354
 msgid "^Forget new packages"
 msgstr "忘记新软件包(^F)"
 
-#: src/ui.cc:1361
+#: src/ui.cc:1355
 msgid "Forget which packages are \"new\""
 msgstr "忘记哪些软件包是“新”的"
 
-#: src/ui.cc:1364
+#: src/ui.cc:1358
 msgid "^Clean package cache"
 msgstr "清除软件包缓存(^C)"
 
-#: src/ui.cc:1365
+#: src/ui.cc:1359
 msgid "Delete package files which were previously downloaded"
 msgstr "删除以前下载的软件包文件"
 
-#: src/ui.cc:1368
+#: src/ui.cc:1362
 msgid "Clean ^obsolete files"
 msgstr "关闭过期文件(^O)"
 
-#: src/ui.cc:1369
+#: src/ui.cc:1363
 msgid "Delete package files which can no longer be downloaded"
 msgstr "删除无法再下载的软件包文件"
 
-#: src/ui.cc:1372
+#: src/ui.cc:1366
 msgid "Mark ^Upgradable"
 msgstr "标记可升级的(^U)"
 
-#: src/ui.cc:1373
+#: src/ui.cc:1367
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr "为所有未被保持现状的软件包加上升级标记"
 
-#: src/ui.cc:1376
+#: src/ui.cc:1370
 msgid "^Play Minesweeper"
 msgstr "玩扫雷游戏(^P)"
 
-#: src/ui.cc:1379
+#: src/ui.cc:1373
 msgid "^Become root"
 msgstr "变成 root(^B)"
 
-#: src/ui.cc:1380
+#: src/ui.cc:1374
 #, fuzzy
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
@@ -3976,78 +4001,78 @@
 "运行“su”成为 root。这将重新启动程序,但是您的\n"
 "设置将会被保存下来。"
 
-#: src/ui.cc:1383
+#: src/ui.cc:1377
 msgid "^Reload package cache"
 msgstr "重新载入软件包缓存(^R)"
 
-#: src/ui.cc:1384
+#: src/ui.cc:1378
 msgid "Reload the package cache"
 msgstr "重新载入软件包缓存"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1384
 msgid "^Quit"
 msgstr "退出(^Q)"
 
-#: src/ui.cc:1391
+#: src/ui.cc:1385
 msgid "Exit the program"
 msgstr "退出此程序"
 
-#: src/ui.cc:1397 src/ui.cc:1669
+#: src/ui.cc:1391 src/ui.cc:1661
 msgid "Undo"
 msgstr "撤消"
 
-#: src/ui.cc:1398
+#: src/ui.cc:1392
 msgid "Undo the last package operation or group of operations"
 msgstr "撤销最近一次或者一组软件包操作"
 
-#: src/ui.cc:1405
+#: src/ui.cc:1399
 msgid "^Install"
 msgstr "安装(^I)"
 
-#: src/ui.cc:1406
+#: src/ui.cc:1400
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "标记当前选择的软件包以安装或者升级"
 
-#: src/ui.cc:1409
+#: src/ui.cc:1403
 msgid "^Remove"
 msgstr "删除(^R)"
 
-#: src/ui.cc:1410
+#: src/ui.cc:1404
 msgid "Flag the currently selected package for removal"
 msgstr "标记当前选择的软件包以删除"
 
-#: src/ui.cc:1413
+#: src/ui.cc:1407
 msgid "^Purge"
 msgstr "清除(^P)"
 
-#: src/ui.cc:1414
+#: src/ui.cc:1408
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr "标记当前选择的软件包和它的配置文件以删除"
 
-#: src/ui.cc:1417
+#: src/ui.cc:1411
 msgid "^Keep"
 msgstr "保持(^K)"
 
-#: src/ui.cc:1418
+#: src/ui.cc:1412
 msgid "Cancel any action on the selected package"
 msgstr "取消选定软件包上的任何动作"
 
-#: src/ui.cc:1421
+#: src/ui.cc:1415
 msgid "^Hold"
 msgstr "保持(^H)"
 
-#: src/ui.cc:1422
+#: src/ui.cc:1416
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
 msgstr "取消选定软件包上的任何动作,并且保护它免于以后被升级"
 
-#: src/ui.cc:1425
+#: src/ui.cc:1419
 msgid "Mark ^Auto"
 msgstr "标记为自动安装(^A)"
 
-#: src/ui.cc:1426
+#: src/ui.cc:1420
 #, fuzzy
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
@@ -4056,11 +4081,11 @@
 "将所选定的软件包标记为自动安装;\n"
 "如果没有其它软件包依赖于它,它将会被自动删除"
 
-#: src/ui.cc:1429
+#: src/ui.cc:1423
 msgid "Mark ^Manual"
 msgstr "标记为手动安装(^M)"
 
-#: src/ui.cc:1430
+#: src/ui.cc:1424
 #, fuzzy
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
@@ -4069,11 +4094,11 @@
 "将所选定的软件包标记为手动安装;\n"
 "除非您手动删除该软件包,否则它将不会被删除"
 
-#: src/ui.cc:1433
+#: src/ui.cc:1427
 msgid "^Forbid Version"
 msgstr "禁止版本(^F)"
 
-#: src/ui.cc:1434
+#: src/ui.cc:1428
 #, fuzzy
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
@@ -4082,231 +4107,231 @@
 "禁止安装选定软件包的候选版本;\n"
 "该软件包的新版本将可以正常安装"
 
-#: src/ui.cc:1438
+#: src/ui.cc:1432
 msgid "I^nformation"
 msgstr "信息(^N)"
 
-#: src/ui.cc:1439
+#: src/ui.cc:1433
 msgid "Display more information about the selected package"
 msgstr "显示关于选定软件包上的更多信息"
 
-#: src/ui.cc:1442
+#: src/ui.cc:1436
 msgid "^Changelog"
 msgstr "变更日志(^C)"
 
-#: src/ui.cc:1443
+#: src/ui.cc:1437
 msgid "Display the Debian changelog of the selected package"
 msgstr "显示选定软件包上的变更日志"
 
-#: src/ui.cc:1450
+#: src/ui.cc:1444
 msgid "^Find"
 msgstr "查找(^F)"
 
-#: src/ui.cc:1451
+#: src/ui.cc:1445
 msgid "Search for a package"
 msgstr "搜索一个软件包"
 
-#: src/ui.cc:1454
+#: src/ui.cc:1448
 msgid "Find ^Again"
 msgstr "继续查找(^A)"
 
-#: src/ui.cc:1455
+#: src/ui.cc:1449
 msgid "Repeat the last search"
 msgstr "重复上一次查找"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1453
 msgid "^Limit Display"
 msgstr "限制显示(^L)"
 
-#: src/ui.cc:1460
+#: src/ui.cc:1454
 msgid "Apply a filter to the package list"
 msgstr "使用过滤器过滤软件包列表"
 
-#: src/ui.cc:1463
+#: src/ui.cc:1457
 msgid "^Un-Limit Display"
 msgstr "取消显示限制(^U)"
 
-#: src/ui.cc:1464
+#: src/ui.cc:1458
 msgid "Remove the filter from the package list"
 msgstr "取消软件包列表中过滤器的效果"
 
-#: src/ui.cc:1468
+#: src/ui.cc:1462
 msgid "Find ^Broken"
 msgstr "搜寻损坏(^F)"
 
-#: src/ui.cc:1469
+#: src/ui.cc:1463
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "下列软件包存在未满足的依赖关系:"
 
-#: src/ui.cc:1476
+#: src/ui.cc:1470
 msgid "^UI options"
 msgstr "用户界面选项(^U)"
 
-#: src/ui.cc:1477
+#: src/ui.cc:1471
 msgid "Change the settings which affect the user interface"
 msgstr "修改影响用户界面的设置"
 
-#: src/ui.cc:1480
+#: src/ui.cc:1474
 msgid "^Dependency handling"
 msgstr "处理依赖关系(^D)"
 
-#: src/ui.cc:1481
+#: src/ui.cc:1475
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr "改变影响处理依赖关系的设置"
 
-#: src/ui.cc:1484
+#: src/ui.cc:1478
 msgid "^Miscellaneous"
 msgstr "杂项(^M)"
 
-#: src/ui.cc:1485
+#: src/ui.cc:1479
 msgid "Change miscellaneous program settings"
 msgstr "改变程序的杂项设置"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1484
 msgid "^Revert options"
 msgstr "还原选项(^R)"
 
-#: src/ui.cc:1491
+#: src/ui.cc:1485
 msgid "Reset all settings to the system defaults"
 msgstr "把所有项目重设为它们的默认值"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1496
 msgid "^Next"
 msgstr "下一个(^N)"
 
-#: src/ui.cc:1503
+#: src/ui.cc:1497
 msgid "View next display"
 msgstr "查看下一个画面"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1500
 msgid "^Prev"
 msgstr "上一个(^P)"
 
-#: src/ui.cc:1507
+#: src/ui.cc:1501
 msgid "View previous display"
 msgstr "查看上一画面"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1504
 msgid "^Close"
 msgstr "关闭(^C)"
 
-#: src/ui.cc:1511
+#: src/ui.cc:1505
 msgid "Close this display"
 msgstr "关闭此画面"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1510
 msgid "New Package ^View"
 msgstr "新建软件包视图(^V)"
 
-#: src/ui.cc:1517
+#: src/ui.cc:1511
 msgid "Create a new default package view"
 msgstr "创建新的默认软件包视图"
 
-#: src/ui.cc:1520
+#: src/ui.cc:1514
 msgid "New Categorical ^Browser"
 msgstr "新建分类浏览器(^B)"
 
-#: src/ui.cc:1522
+#: src/ui.cc:1516
 msgid "Browse packages by category"
 msgstr "分类浏览软件包"
 
-#: src/ui.cc:1530
+#: src/ui.cc:1524
 msgid "^About"
 msgstr "关于(^A)"
 
-#: src/ui.cc:1531
+#: src/ui.cc:1525
 msgid "View information about this program"
 msgstr "查看关于此程序的信息"
 
-#: src/ui.cc:1534
+#: src/ui.cc:1528
 msgid "^Help"
 msgstr "帮助(^H)"
 
-#: src/ui.cc:1535
+#: src/ui.cc:1529
 msgid "View the on-line help"
 msgstr "查看在线帮助"
 
-#: src/ui.cc:1537
+#: src/ui.cc:1531
 msgid "User's ^Manual"
 msgstr "用户手册(^M)"
 
-#: src/ui.cc:1538
+#: src/ui.cc:1532
 msgid "View the detailed program manual"
 msgstr "查看详细的程序使用手册"
 
-#: src/ui.cc:1541
+#: src/ui.cc:1535
 msgid "^FAQ"
 msgstr "常见问题回答(^F)"
 
-#: src/ui.cc:1542
+#: src/ui.cc:1536
 msgid "View a list of frequently asked questions"
 msgstr "查看常见问题列表"
 
-#: src/ui.cc:1545
+#: src/ui.cc:1539
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1546
+#: src/ui.cc:1540
 #, fuzzy
 msgid "View the important changes made in each version of "
 msgstr "查看该程序每一版本中所做的重大修改"
 
-#: src/ui.cc:1549
+#: src/ui.cc:1543
 msgid "^License"
 msgstr "许可证(^L)"
 
-#: src/ui.cc:1550
+#: src/ui.cc:1544
 msgid "View the terms under which you may copy the program"
 msgstr "查看您可以在何种条款下拷贝该程序"
 
-#: src/ui.cc:1668
+#: src/ui.cc:1660
 msgid "Actions"
 msgstr "动作"
 
-#: src/ui.cc:1671
+#: src/ui.cc:1663
 msgid "Search"
 msgstr "搜索"
 
-#: src/ui.cc:1672
+#: src/ui.cc:1664
 msgid "Options"
 msgstr "选项"
 
-#: src/ui.cc:1673
+#: src/ui.cc:1665
 msgid "Views"
 msgstr "查看"
 
-#: src/ui.cc:1674
+#: src/ui.cc:1666
 msgid "Help"
 msgstr "帮助"
 
-#: src/ui.cc:1734
+#: src/ui.cc:1726
 #, 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:2003 src/vscreen/vscreen.cc:281
+#: src/ui.cc:1996 src/vscreen/vscreen.cc:281
 msgid "yes_key"
 msgstr "是_按键"
 
-#: src/ui.cc:2004 src/vscreen/vscreen.cc:282
+#: src/ui.cc:1997 src/vscreen/vscreen.cc:282
 msgid "no_key"
 msgstr "否_按键"
 
-#: src/view_changelog.cc:46
+#: src/view_changelog.cc:61
 msgid "You can only view changelogs of official Debian packages."
 msgstr "您只能查看官方 Debian 软件包的变更日志。"
 
-#: src/view_changelog.cc:52
+#: src/view_changelog.cc:67
 msgid "Downloading Changelog"
 msgstr "正在下载 "
 
-#: src/view_changelog.cc:54
+#: src/view_changelog.cc:69
 #, fuzzy
 msgid "Download Changelog"
 msgstr "正在下载 "
 
-#: src/view_changelog.cc:63
+#: src/view_changelog.cc:78
 #, c-format
 msgid "%s changes"
 msgstr ""
@@ -4400,18 +4425,185 @@
 #~ "请将以下盘插入驱动器“%s”:\n"
 #~ "%s"
 
+#~ msgid "Need exactly two colors in color definition \"%s\""
+#~ msgstr "颜色定义“%s”需要正好两种颜色"
+
+#~ msgid "Can't parse foreground \"%s\"of color \"%s\""
+#~ msgstr "无法解析颜色“%2$s”的前景“%1$s”"
+
+#~ msgid "Can't parse background \"%s\" of color \"%s\""
+#~ msgstr "无法解析颜色“%2$s”的背景“%1$s”"
+
 #~ msgid "Invalid option for interactive mode: -s\n"
 #~ msgstr "交互模式的无效选项:-s\n"
 
+#~ 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."
+#~ msgstr ""
+#~ "用于传真调制解调器和其它通讯设备的程序\n"
+#~ " “通讯”部分的软件包用于控制调制解调器和其它硬件通讯设备。包括控制传真调制"
+#~ "解调器的软件(例如,用于拨号网络连接的 PPP)以及原本为该用途所编写的程序"
+#~ "(zmodem/kermit),还有用于控制蜂窝式移动电话,与 FidoNet 接口,以及运行 "
+#~ "BBS 的软件"
+
+#~ 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"
+#~ " .\n"
+#~ " For more information about what Debian considers to be Free Software, "
+#~ "see http://www.debian.org/social_contract#guidelines"
+#~ msgstr ""
+#~ "不是自由软件的程序\n"
+#~ " “非自由”部分的软件包不是 Debian 的组成部分。\n"
+#~ " .\n"
+#~ " 这些软件包不满足 Debian 自由软件标准(见下)的一项或者多项要求。您应该阅读"
+#~ "该部分程序的许可证以确认您能够以您自己希望的方式使用这些程序。\n"
+#~ " .\n"
+#~ " 关于 Debian 认为什么样的软件是自由软件的更多信息,请参见http://www."
+#~ "debian.org/social_contract#guidelines"
+
+#~ 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)"
+#~ msgstr ""
+#~ "新软件包\n"
+#~ " 这些软件包在您上次清空“新”软件包列表之后添加到 Debian 中。(从动作菜单中选"
+#~ "择“忘记新软件包”项以清空此列表) "
+
+#~ msgid ""
+#~ "%s is an essential package!\n"
+#~ "\n"
+#~ "Are you sure you want to remove it?\n"
+#~ "Type '%s' if you are."
+#~ msgstr ""
+#~ "%s 是一个核心软件包!\n"
+#~ "\n"
+#~ "您确定您要卸载它吗?\n"
+#~ "如果您确定的话输入“%s”。"
+
+#~ msgid "Available versions of "
+#~ msgstr "可用的版本 "
+
+#~ 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."
+#~ msgstr ""
+#~ "您不是 root,而且我没有发现任何方法\n"
+#~ "来变成 root。要重新配置这个软件包,\n"
+#~ "请安装 menu 软件包,login 软件包,\n"
+#~ "或者以 root 身份运行 aptitude 。"
+
 #~ msgid "Information about "
 #~ msgstr "信息关于"
 
+#~ msgid ""
+#~ "Aptitude %s\n"
+#~ "\n"
+#~ "Copyright 2000 Daniel Burrows.\n"
+#~ "\n"
+#~ "aptitude comes with ABSOLUTELY NO WARRANTY; for details see 'license' in "
+#~ "the\n"
+#~ "Help menu.  This is free software, and you are welcome to redistribute "
+#~ "it\n"
+#~ "under certain conditions; see 'license' for details."
+#~ msgstr ""
+#~ "Aptitude %s\n"
+#~ "\n"
+#~ "版权所有 2000 Daniel Burrows.\n"
+#~ "\n"
+#~ "使用 Aptitude 软件无任何担保;细节请查阅帮助菜单的 'license' 项。\n"
+#~ "该软件是自由软件,欢迎您遵照某些条款分发该软件;细节请查阅 'license' 文件"
+
+#~ msgid "Some packages were broken and have been fixed"
+#~ msgstr "某些破损的包已经被修补!"
+
 #~ msgid "Some broken packages could not be fixed!"
 #~ msgstr "某些破损的包无法修补!"
 
+#~ msgid "Some packages are broken.  Try to fix them?"
+#~ msgstr "某些包已破损。试图修补它们吗?"
+
+#~ msgid ""
+#~ "Installing/removing packages requires administrative privileges, which\n"
+#~ "you currently do not have.  Would you like to change to the root "
+#~ "account?\n"
+#~ msgstr ""
+#~ "安装/删除软件包需要管理员权限,而您现在\n"
+#~ "没有这种权限。您想要进入 root 帐号吗?\n"
+
+#~ msgid ""
+#~ "No packages will be installed, removed or upgraded.\n"
+#~ "\n"
+#~ "Some packages could be upgraded, but you have not chosen to upgrade "
+#~ "them.\n"
+#~ "Type \"U\" to prepare an upgrade."
+#~ msgstr ""
+#~ "没有任何软件包将被安装,删除或者升级。\n"
+#~ "\n"
+#~ "某些软件包可以被升级,但是您并未选择升级它们。\n"
+#~ "输入“U”来准备升级。"
+
+#~ 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"
+#~ msgstr ""
+#~ "更新软件包列表需要管理员权限,而您现在\n"
+#~ "没有这种权限。您想要进入 root 帐号吗?\n"
+
+#~ msgid "Obsolete downloaded package files have been deleted"
+#~ msgstr "过期的下载文件已经被删除"
+
+#~ msgid ""
+#~ "Run 'su' to become root; this will restart the program, but your\n"
+#~ "settings will be preserved"
+#~ msgstr ""
+#~ "运行“su”成为 root。这将重新启动程序,但是您的\n"
+#~ "设置将会被保存下来。"
+
+#~ msgid ""
+#~ "Mark the selected package as having been automatically installed;\n"
+#~ "it will automatically be removed if no other packages depend on it"
+#~ msgstr ""
+#~ "将所选定的软件包标记为自动安装;\n"
+#~ "如果没有其它软件包依赖于它,它将会被自动删除"
+
+#~ msgid ""
+#~ "Mark the selected package as having been manually installed;\n"
+#~ "it will not be removed unless you manually remove it"
+#~ msgstr ""
+#~ "将所选定的软件包标记为手动安装;\n"
+#~ "除非您手动删除该软件包,否则它将不会被删除"
+
+#~ msgid ""
+#~ "Forbid the candidate version of the selected package from being "
+#~ "installed;\n"
+#~ "newer versions of the package will be installed as usual"
+#~ msgstr ""
+#~ "禁止安装选定软件包的候选版本;\n"
+#~ "该软件包的新版本将可以正常安装"
+
 #~ msgid "^ChangeLog"
 #~ msgstr "变更日志(^C)"
 
+#~ msgid "View the important changes made in each version of the program"
+#~ msgstr "查看该程序每一版本中所做的重大修改"
+
 #~ 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	Sun Jun 12 21:04:47 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-05-01 14:08-0400\n"
+"POT-Creation-Date: 2005-06-12 22:42+0200\n"
 "PO-Revision-Date: 2005-06-02 11:05+0800\n"
 "Last-Translator: Rex Tsai <chihchun at linux.org.tw>\n"
 "Language-Team: Chinese/Traditional <zh-l10n at linux.org.tw>\n"
@@ -147,14 +147,14 @@
 msgid "Automatically remove unused packages matching this filter"
 msgstr "自動移除符合此過濾器的未用套件"
 
-#: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:219 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
-#: src/vscreen/vs_util.cc:328
+#: src/apt_options.cc:240 src/mine/cmine.cc:249 src/mine/cmine.cc:312
+#: src/ui.cc:215 src/vscreen/vs_util.cc:77 src/vscreen/vs_util.cc:90
+#: src/vscreen/vs_util.cc:264 src/vscreen/vs_util.cc:298
 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:328
+#: src/apt_options.cc:241 src/download_list.cc:69 src/mine/cmine.cc:250
+#: src/mine/cmine.cc:313 src/vscreen/vs_util.cc:298
 msgid "Cancel"
 msgstr "取消"
 
@@ -235,15 +235,15 @@
 msgid "%s: Previous"
 msgstr ""
 
-#: src/broken_indicator.cc:233
+#: src/broken_indicator.cc:232
 #, c-format
-msgid "%CSolution search failed.  %s: try harder"
+msgid "Solution search failed.  %s: try harder"
 msgstr ""
 
-#: src/broken_indicator.cc:239
-#, c-format
-msgid "%CUnable to resolve dependencies."
-msgstr ""
+#: src/broken_indicator.cc:237
+#, fuzzy
+msgid "Unable to resolve dependencies."
+msgstr "無法打開 %s 以寫入"
 
 #: src/cmdline/cmdline_action.cc:36
 #, c-format
@@ -611,13 +611,13 @@
 "只有在您確定您真的要這麼做時,您才可以進行安裝作業。\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
-#: src/vscreen/vs_util.cc:212
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:165
+#: src/vscreen/vs_util.cc:202
 msgid "Yes"
 msgstr "是(Y)"
 
-#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
-#: src/vscreen/vs_util.cc:212
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:165
+#: src/vscreen/vs_util.cc:202
 msgid "No"
 msgstr "否(N)"
 
@@ -926,7 +926,7 @@
 msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:212
+#: src/cmdline/cmdline_resolver.cc:212 src/cmdline/cmdline_resolver.cc:285
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
@@ -981,196 +981,201 @@
 msgid "The following packages have unmet dependencies:\n"
 msgstr "以下套件含有相依性:\n"
 
-#: src/cmdline/cmdline_show.cc:133
+#: src/cmdline/cmdline_show.cc:119 src/cmdline/cmdline_show.cc:305
+#: src/solution_fragment.cc:65
+msgid "<NULL>"
+msgstr ""
+
+#: src/cmdline/cmdline_show.cc:138
 msgid "not installed"
 msgstr "尚未安裝"
 
-#: src/cmdline/cmdline_show.cc:135 src/pkg_columnizer.cc:231
+#: src/cmdline/cmdline_show.cc:140 src/pkg_columnizer.cc:231
 #: src/pkg_ver_item.cc:225
 msgid "unpacked"
 msgstr "未解包的"
 
-#: src/cmdline/cmdline_show.cc:137
+#: src/cmdline/cmdline_show.cc:142
 msgid "partially configured"
 msgstr "部份已設定"
 
-#: src/cmdline/cmdline_show.cc:139
+#: src/cmdline/cmdline_show.cc:144
 msgid "partially installed"
 msgstr "部份安裝"
 
-#: src/cmdline/cmdline_show.cc:141
+#: src/cmdline/cmdline_show.cc:146
 msgid "not installed (configuration files remain)"
 msgstr "未安裝 (尚保留設定檔案)"
 
-#: src/cmdline/cmdline_show.cc:143 src/pkg_columnizer.cc:239
+#: src/cmdline/cmdline_show.cc:148 src/pkg_columnizer.cc:239
 #: src/pkg_ver_item.cc:233
 msgid "installed"
 msgstr "已安裝"
 
-#: src/cmdline/cmdline_show.cc:152
+#: src/cmdline/cmdline_show.cc:157
 msgid "not a real package"
 msgstr "不是一個真正的套件"
 
-#: src/cmdline/cmdline_show.cc:165
+#: src/cmdline/cmdline_show.cc:170
 msgid " [held]"
 msgstr " [保留]"
 
-#: src/cmdline/cmdline_show.cc:174
+#: src/cmdline/cmdline_show.cc:179
 #, c-format
 msgid "%s; version %s will be installed"
 msgstr "%s; 版本 %s 將被安裝"
 
-#: src/cmdline/cmdline_show.cc:178
+#: src/cmdline/cmdline_show.cc:183
 #, c-format
 msgid "%s; version %s will be installed automatically"
 msgstr "%s; 版本 %s 將會自動安裝"
 
-#: src/cmdline/cmdline_show.cc:184 src/cmdline/cmdline_show.cc:199
+#: src/cmdline/cmdline_show.cc:189 src/cmdline/cmdline_show.cc:204
 #, c-format
 msgid "%s; will be purged"
 msgstr "%s; 將被清除"
 
-#: src/cmdline/cmdline_show.cc:197
+#: src/cmdline/cmdline_show.cc:202
 #, c-format
 msgid "%s; will be purged because nothing depends on it"
 msgstr "%s; 將清除,因為無軟體相依於上"
 
-#: src/cmdline/cmdline_show.cc:204
+#: src/cmdline/cmdline_show.cc:209
 #, c-format
 msgid "%s; will be removed because nothing depends on it"
 msgstr "%s: 將會由於無軟體相依於上而自動移除:"
 
-#: src/cmdline/cmdline_show.cc:206
+#: src/cmdline/cmdline_show.cc:211
 #, c-format
 msgid "%s; will be removed"
 msgstr "%s; 將被移除。"
 
-#: src/cmdline/cmdline_show.cc:220
+#: src/cmdline/cmdline_show.cc:225
 #, c-format
 msgid "%s%s; will be downgraded [%s -> %s]"
 msgstr "%s%s; 將會降級 [%s -> %s]"
 
-#: src/cmdline/cmdline_show.cc:223
+#: src/cmdline/cmdline_show.cc:228
 #, c-format
 msgid "%s%s; will be upgraded [%s -> %s]"
 msgstr "%s%s; 將會升級 [%s -> %s]"
 
-#: src/cmdline/cmdline_show.cc:235 src/cmdline/cmdline_show.cc:256
+#: src/cmdline/cmdline_show.cc:240 src/cmdline/cmdline_show.cc:261
 msgid "Package: "
 msgstr "套件:"
 
-#: src/cmdline/cmdline_show.cc:236 src/cmdline/cmdline_show.cc:264
+#: src/cmdline/cmdline_show.cc:241 src/cmdline/cmdline_show.cc:269
 #: src/pkg_columnizer.cc:87
 msgid "State"
 msgstr "狀態"
 
-#: src/cmdline/cmdline_show.cc:237 src/cmdline/cmdline_show.cc:318
+#: src/cmdline/cmdline_show.cc:242 src/cmdline/cmdline_show.cc:325
 msgid "Provided by"
 msgstr "提供於"
 
-#: src/cmdline/cmdline_show.cc:258 src/pkg_info_screen.cc:105
+#: src/cmdline/cmdline_show.cc:263 src/pkg_info_screen.cc:105
 msgid "Essential: "
 msgstr "基礎的:"
 
-#: src/cmdline/cmdline_show.cc:258 src/cmdline/cmdline_show.cc:262
-#: src/cmdline/cmdline_show.cc:273 src/pkg_info_screen.cc:105
+#: src/cmdline/cmdline_show.cc:263 src/cmdline/cmdline_show.cc:267
+#: src/cmdline/cmdline_show.cc:278 src/pkg_info_screen.cc:105
 msgid "yes"
 msgstr "是"
 
-#: src/cmdline/cmdline_show.cc:262
+#: src/cmdline/cmdline_show.cc:267
 msgid "New"
 msgstr "æ–°"
 
-#: src/cmdline/cmdline_show.cc:267
+#: src/cmdline/cmdline_show.cc:272
 msgid "Forbidden version"
 msgstr "禁制版本"
 
-#: src/cmdline/cmdline_show.cc:271
+#: src/cmdline/cmdline_show.cc:276
 msgid "Automatically installed"
 msgstr "已自動安裝"
 
-#: src/cmdline/cmdline_show.cc:273
+#: src/cmdline/cmdline_show.cc:278
 msgid "no"
 msgstr "否"
 
-#: src/cmdline/cmdline_show.cc:275
+#: src/cmdline/cmdline_show.cc:280
 msgid "Version: "
 msgstr "版本:"
 
-#: src/cmdline/cmdline_show.cc:276 src/pkg_info_screen.cc:113
+#: src/cmdline/cmdline_show.cc:281 src/pkg_info_screen.cc:113
 msgid "Priority: "
 msgstr "優先級:"
 
-#: src/cmdline/cmdline_show.cc:277 src/cmdline/cmdline_show.cc:279
-#: src/cmdline/cmdline_show.cc:288
+#: src/cmdline/cmdline_show.cc:282 src/cmdline/cmdline_show.cc:284
+#: src/cmdline/cmdline_show.cc:293
 msgid "N/A"
 msgstr "N/A"
 
-#: src/cmdline/cmdline_show.cc:278 src/pkg_info_screen.cc:114
+#: src/cmdline/cmdline_show.cc:283 src/pkg_info_screen.cc:114
 msgid "Section: "
 msgstr "部分:"
 
-#: src/cmdline/cmdline_show.cc:280 src/pkg_info_screen.cc:115
+#: src/cmdline/cmdline_show.cc:285 src/pkg_info_screen.cc:115
 msgid "Maintainer: "
 msgstr "維護者:"
 
-#: src/cmdline/cmdline_show.cc:283
+#: src/cmdline/cmdline_show.cc:288
 msgid "Uncompressed Size: "
 msgstr "未壓縮大小:"
 
-#: src/cmdline/cmdline_show.cc:287
+#: src/cmdline/cmdline_show.cc:292
 msgid "Architecture: "
 msgstr "硬體架構: "
 
-#: src/cmdline/cmdline_show.cc:289
+#: src/cmdline/cmdline_show.cc:294
 msgid "Compressed Size: "
 msgstr "壓縮後大小:"
 
-#: src/cmdline/cmdline_show.cc:291
+#: src/cmdline/cmdline_show.cc:296
 msgid "Filename: "
 msgstr "檔名: "
 
-#: src/cmdline/cmdline_show.cc:293
+#: src/cmdline/cmdline_show.cc:298
 msgid "MD5sum: "
 msgstr "MD5sum: "
 
-#: src/cmdline/cmdline_show.cc:297 src/cmdline/cmdline_show.cc:299
+#: src/cmdline/cmdline_show.cc:302 src/cmdline/cmdline_show.cc:305
 msgid "Archive"
 msgstr "歸檔"
 
-#: src/cmdline/cmdline_show.cc:303
+#: src/cmdline/cmdline_show.cc:310
 msgid "Depends"
 msgstr "Depends"
 
-#: src/cmdline/cmdline_show.cc:305
+#: src/cmdline/cmdline_show.cc:312
 msgid "PreDepends"
 msgstr "PreDepends"
 
-#: src/cmdline/cmdline_show.cc:307
+#: src/cmdline/cmdline_show.cc:314
 msgid "Recommends"
 msgstr "推薦"
 
-#: src/cmdline/cmdline_show.cc:309
+#: src/cmdline/cmdline_show.cc:316
 msgid "Suggests"
 msgstr "建議"
 
-#: src/cmdline/cmdline_show.cc:311
+#: src/cmdline/cmdline_show.cc:318
 msgid "Conflicts"
 msgstr "衝突"
 
-#: src/cmdline/cmdline_show.cc:313
+#: src/cmdline/cmdline_show.cc:320
 msgid "Replaces"
 msgstr "替換"
 
-#: src/cmdline/cmdline_show.cc:315
+#: src/cmdline/cmdline_show.cc:322
 msgid "Obsoletes"
 msgstr "過期檔案"
 
-#: src/cmdline/cmdline_show.cc:317
+#: src/cmdline/cmdline_show.cc:324
 msgid "Provides"
 msgstr "提供"
 
-#: src/cmdline/cmdline_show.cc:321 src/pkg_info_screen.cc:97
+#: src/cmdline/cmdline_show.cc:328 src/pkg_info_screen.cc:97
 msgid "Description: "
 msgstr "描述: "
 
@@ -1213,32 +1218,32 @@
 msgid "You cannot specify both an archive and a version for a package\n"
 msgstr "你無法同時指定一個套件的歸檔類別與版本\n"
 
-#: src/dep_item.cc:137
+#: src/dep_item.cc:139
 msgid "UNSATISFIED"
 msgstr "未滿足的"
 
-#: src/dep_item.cc:137 src/reason_fragment.cc:247
+#: src/dep_item.cc:139 src/reason_fragment.cc:244
 msgid "UNAVAILABLE"
 msgstr "不可用"
 
-#: src/download_bar.cc:56 src/download_list.cc:263 src/download_screen.cc:57
+#: src/download_bar.cc:56 src/download_list.cc:266 src/download_screen.cc:57
 #, c-format
 msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
 msgstr "請將標號為“%s”的磁碟插入驅動器“%s”"
 
-#: src/download_bar.cc:77 src/generic/acqprogress.cc:63
+#: src/download_bar.cc:75 src/generic/acqprogress.cc:63
 msgid "Hit "
 msgstr "已有 "
 
-#: src/download_bar.cc:90
+#: src/download_bar.cc:88
 msgid "Downloading "
 msgstr "正在下載 "
 
-#: src/download_bar.cc:103
+#: src/download_bar.cc:101
 msgid "Got "
 msgstr "已取得 "
 
-#: src/download_bar.cc:157
+#: src/download_bar.cc:155
 msgid "Downloading..."
 msgstr "正在下載..."
 
@@ -1266,7 +1271,7 @@
 msgid "Couldn't clean out list directories"
 msgstr "無法清空列表目錄"
 
-#: src/download.cc:177 src/ui.cc:1153
+#: src/download.cc:177 src/ui.cc:1147
 msgid "Deleting obsolete downloaded files"
 msgstr "刪除過期的下載檔案"
 
@@ -1401,7 +1406,7 @@
 "Ack!  Something bad happened while installing packages.  Trying to recover:"
 msgstr "啊!安裝套件時出現某些壞情況。正在試圖恢復:"
 
-#: src/download.cc:477 src/pkg_item.cc:432
+#: src/download.cc:477 src/pkg_item.cc:430
 msgid "Press return to continue.\n"
 msgstr "按 Return 繼續。\n"
 
@@ -1410,17 +1415,17 @@
 "Could not regain the system lock!  (Perhaps another apt or dpkg is running?)"
 msgstr "無法重新取得系統鎖定!(也許另一個 apt 或 dpkg 正在執行?)"
 
-#: src/download_item.cc:66 src/download_item.cc:70 src/download_item.cc:100
+#: src/download_item.cc:70 src/download_item.cc:74 src/download_item.cc:104
 #: src/generic/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr "[正在工作]"
 
-#: src/download_item.cc:104 src/download_list.cc:283
+#: src/download_item.cc:108 src/download_list.cc:284
 msgid "[Hit]"
 msgstr "[命中]"
 
-#: src/download_item.cc:104 src/download_list.cc:303
+#: src/download_item.cc:108 src/download_list.cc:304
 msgid "[Downloaded]"
 msgstr "[已下載]"
 
@@ -1434,34 +1439,34 @@
 msgid "%n%nSome files were not downloaded successfully."
 msgstr ""
 
-#: src/download_list.cc:68
+#: src/download_list.cc:66
 msgid "Continue"
 msgstr "繼續"
 
-#: src/download_list.cc:175 src/download_screen.cc:203
+#: src/download_list.cc:178 src/download_screen.cc:203
 msgid "Total Progress: "
 msgstr "總進度:"
 
-#: src/download_list.cc:194 src/download_screen.cc:218
+#: src/download_list.cc:197 src/download_screen.cc:218
 #, c-format
 msgid " [ %i%% ] (%sB/s, %s remaining)"
 msgstr " [ %i%% ]  (%sB/s, 剩下 %s)"
 
-#: src/download_list.cc:196
+#: src/download_list.cc:199
 #, c-format
 msgid " [ %i%% ] (stalled)"
 msgstr " [ %i%% ] (已停頓)"
 
-#: src/download_list.cc:198
+#: src/download_list.cc:201
 #, c-format
 msgid " [ %i%% ]"
 msgstr " [ %i%% ]"
 
-#: src/download_list.cc:323
+#: src/download_list.cc:324
 msgid "[IGNORED]"
 msgstr "[忽略]"
 
-#: src/download_list.cc:329
+#: src/download_list.cc:330
 msgid "[ERROR]"
 msgstr "[錯誤]"
 
@@ -1470,11 +1475,11 @@
 msgid "Downloaded %sB in %ss (%sB/s)."
 msgstr "下載%sB,耗時 %ss (%sB/s)。"
 
-#: src/edit_pkg_hier.cc:158
+#: src/edit_pkg_hier.cc:176
 msgid "No hierarchy information to edit"
 msgstr "沒有階層訊息可編輯"
 
-#: src/edit_pkg_hier.cc:258
+#: src/edit_pkg_hier.cc:276
 msgid "Couldn't open for writing"
 msgstr "無法開啟寫入"
 
@@ -1567,39 +1572,39 @@
 msgid "Warning: could not lock the cache file.  Opening in read-only mode"
 msgstr "警告:無法鎖定快取檔案。以只讀方式打開"
 
-#: src/generic/matchers.cc:797
+#: src/generic/matchers.cc:798
 msgid "Unmatched '('"
 msgstr "不匹配“(”"
 
-#: src/generic/matchers.cc:887 src/generic/matchers.cc:968
+#: src/generic/matchers.cc:888 src/generic/matchers.cc:969
 #, c-format
 msgid "Unknown dependency type: %s"
 msgstr "未知依賴類型:%s"
 
-#: src/generic/matchers.cc:950
+#: src/generic/matchers.cc:951
 #, c-format
 msgid "Unknown action type: %s"
 msgstr "未知的操作類型:%s"
 
-#: src/generic/matchers.cc:1017
+#: src/generic/matchers.cc:1018
 #, c-format
 msgid "Unknown priority %s"
 msgstr "未知的優先值 %s"
 
-#: src/generic/matchers.cc:1039
+#: src/generic/matchers.cc:1040
 #, c-format
 msgid "Unknown pattern type: %c"
 msgstr "未知的模式類型:%c"
 
-#: src/generic/matchers.cc:1084
+#: src/generic/matchers.cc:1105
 msgid "Unexpected empty expression"
 msgstr "意外的空表達式"
 
-#: src/generic/matchers.cc:1119
+#: src/generic/matchers.cc:1143
 msgid "Badly formed expression"
 msgstr "錯誤格式的表達式"
 
-#: src/generic/matchers.cc:1148
+#: src/generic/matchers.cc:1175
 msgid "Unexpected ')'"
 msgstr "意外的“)”"
 
@@ -1622,7 +1627,7 @@
 msgid "Can't get value of $HOME, using TMPDIR (insecure)"
 msgstr "無法取得 $HOME 的值,使用 TMPDIR (不安全)"
 
-#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:61
+#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:76
 #, c-format
 msgid "ChangeLog of %s"
 msgstr "%s 的變更日誌"
@@ -1663,37 +1668,37 @@
 msgid "Reading task descriptions"
 msgstr "閱讀作業敘述"
 
-#: src/load_config.cc:30
-#, c-format
-msgid "Invalid entry in color definition group: \"%s\""
-msgstr "顏色定義組中的無效條目:“%s”"
+#: src/load_config.cc:42
+#, fuzzy, c-format
+msgid "Unrecognized color name \"%s\""
+msgstr "其他作業"
 
-#: src/load_config.cc:32
-#, c-format
-msgid "Invalid tagless entry in color definition group: \"%s\""
-msgstr "顏色定義組中無效的無標簽條目:“%s”"
+#: src/load_config.cc:69
+#, fuzzy, c-format
+msgid "Unrecognized attribute name \"%s\""
+msgstr "其他作業"
 
-#: src/load_config.cc:34
-#, c-format
-msgid "Need exactly two colors in color definition \"%s\""
-msgstr "顏色定義“%s”需要正好兩種顏色"
+#: src/load_config.cc:106
+#, fuzzy, c-format
+msgid "Invalid entry in style definition group: \"%s\""
+msgstr "顏色定義組中的無效條目:“%s”"
 
-#: src/load_config.cc:50
-#, c-format
-msgid "Can't parse foreground \"%s\"of color \"%s\""
-msgstr "無法解析前景 \"%s\" 色 \"%s\""
+#: src/load_config.cc:108
+#, fuzzy, c-format
+msgid "Invalid tagless entry in style definition group: \"%s\""
+msgstr "顏色定義組中無效的無標簽條目:“%s”"
 
-#: src/load_config.cc:53
-#, c-format
-msgid "Can't parse background \"%s\" of color \"%s\""
-msgstr "無法解析背景 \"%s\" 色 \"%s\""
+#: src/load_config.cc:130
+#, fuzzy, c-format
+msgid "Unknown style attribute %s"
+msgstr "未知的操作類型:%s"
 
-#: src/load_config.cc:72 src/load_config.cc:74
+#: src/load_config.cc:153 src/load_config.cc:155
 #, c-format
 msgid "Invalid entry in keybinding group: \"%s\""
 msgstr "快捷鍵綁定中的無效條目:“%s”"
 
-#: src/load_config.cc:89
+#: src/load_config.cc:170
 #, c-format
 msgid "Ignoring invalid keybinding \"%s\" -> \"%s\""
 msgstr "忽略無效快捷鍵綁定“%s”->“%s”"
@@ -2084,42 +2089,42 @@
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                  這個 aptitude 無超級牛力。\n"
 
-#: src/main.cc:255
+#: src/main.cc:252
 #, c-format
 msgid "-o requires an argument of the form key=value, got %s"
 msgstr "-o 需要一個參數如 key=value, 得 %s"
 
-#: src/main.cc:301 src/main.cc:310
+#: src/main.cc:291 src/main.cc:300
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr "詭異:收到未知的選項代碼\n"
 
-#: src/main.cc:319
+#: src/main.cc:309
 msgid "Only one of -u and -i may be specified\n"
 msgstr "選項 -u 和 -i 只能指定一個\n"
 
-#: src/main.cc:327
+#: src/main.cc:317
 msgid ""
 "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgstr "選項 -u 和 -i 不能在命令行模式中指定 (例如,和“install”一起)"
 
-#: src/main.cc:348
+#: src/main.cc:338
 msgid "-u and -i may not be specified with a command"
 msgstr "選項 -u 和 -i 不能在和一個命令一起指定 "
 
-#: src/main.cc:405
+#: src/main.cc:395
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr "未知的命令“%s”\n"
 
-#: src/main.cc:412 src/main.cc:469
+#: src/main.cc:402 src/main.cc:450
 msgid "Internal error: uncaught 'out of solutions' exception.\n"
 msgstr ""
 
-#: src/main.cc:417 src/main.cc:474
+#: src/main.cc:407 src/main.cc:455
 msgid "Internal error: uncaught 'out of time' exception.\n"
 msgstr ""
 
-#: src/main.cc:424
+#: src/main.cc:414
 #, c-format
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
@@ -2150,7 +2155,7 @@
 msgid "Lost"
 msgstr "輸"
 
-#: src/mine/cmine.cc:119 src/ui.cc:1090
+#: src/mine/cmine.cc:119 src/ui.cc:1084
 msgid "Minesweeper"
 msgstr "掃雷"
 
@@ -2176,147 +2181,147 @@
 msgid "The number of mines must be a number"
 msgstr "地雷個數必須是數字"
 
-#: src/mine/cmine.cc:240
+#: src/mine/cmine.cc:238
 msgid "Setup custom game"
 msgstr "設置自定義遊戲"
 
-#: src/mine/cmine.cc:243
+#: src/mine/cmine.cc:240
 msgid "Height of board: "
 msgstr "棋盤高度:"
 
-#: src/mine/cmine.cc:247
+#: src/mine/cmine.cc:243
 msgid "Width of board: "
 msgstr "棋盤寬度:"
 
-#: src/mine/cmine.cc:251
+#: src/mine/cmine.cc:246
 msgid "Number of mines: "
 msgstr "地雷數量:"
 
-#: src/mine/cmine.cc:316
+#: src/mine/cmine.cc:305
 msgid "Choose difficulty level"
 msgstr "選擇難度級別"
 
-#: src/mine/cmine.cc:318
+#: src/mine/cmine.cc:307
 msgid "Easy"
 msgstr "容易"
 
-#: src/mine/cmine.cc:319
+#: src/mine/cmine.cc:308
 msgid "Medium"
 msgstr "中等"
 
-#: src/mine/cmine.cc:320
+#: src/mine/cmine.cc:309
 msgid "Hard"
 msgstr "困難"
 
-#: src/mine/cmine.cc:321
+#: src/mine/cmine.cc:310
 msgid "Custom"
 msgstr "自定義"
 
-#: src/mine/cmine.cc:411
+#: src/mine/cmine.cc:392
 msgid "You have won."
 msgstr "您贏了。"
 
-#: src/mine/cmine.cc:414
+#: src/mine/cmine.cc:395
 msgid "You lose!"
 msgstr "您輸了!"
 
-#: src/mine/cmine.cc:419
+#: src/mine/cmine.cc:400
 msgid "You die...  --More--"
 msgstr "您死了...  --更多--"
 
-#: src/mine/cmine.cc:432
+#: src/mine/cmine.cc:413
 msgid "The spikes were poisoned!  The poison was deadly..  --More--"
 msgstr "樁子有毒!毒藥是致命的..  --更多--"
 
-#: src/mine/cmine.cc:435
+#: src/mine/cmine.cc:416
 msgid "You land on a set of sharp iron spikes!  --More--"
 msgstr "您著陸於一片尖銳的鐵樁上了!  --更多--"
 
-#: src/mine/cmine.cc:438
+#: src/mine/cmine.cc:419
 msgid "You fall into a pit!  --More--"
 msgstr "您掉進了一個坑中!  --更多--"
 
-#: src/mine/cmine.cc:441
+#: src/mine/cmine.cc:422
 msgid "KABOOM!  You step on a land mine.  --More--"
 msgstr "梆!您踩到地雷上了!  --更多--"
 
-#: src/mine/cmine.cc:446
+#: src/mine/cmine.cc:427
 msgid "The dart was poisoned!  The poison was deadly...  --More--"
 msgstr "飛鏢有毒!毒藥是致命的...  --更多--"
 
-#: src/mine/cmine.cc:448
+#: src/mine/cmine.cc:429
 msgid ""
 "A little dart shoots out at you!  You are hit by a little dart!  --More--"
 msgstr "一個飛鏢向您射來! 您被一個飛鏢刺中了!  --更多--"
 
-#: src/mine/cmine.cc:452
+#: src/mine/cmine.cc:433
 msgid "You turn to stone... --More--"
 msgstr "您變成了石頭... --更多--"
 
-#: src/mine/cmine.cc:454
+#: src/mine/cmine.cc:435
 msgid "Touching the cockatrice corpse was a fatal mistake.  --More--"
 msgstr "接觸怪蛇的身體是一個致命的錯誤。 --更多--"
 
-#: src/mine/cmine.cc:456
+#: src/mine/cmine.cc:437
 msgid "You feel here a cockatrice corpse.  --More--"
 msgstr "這裡您感覺到一個怪蛇的身體。 --更多--"
 
-#: src/mine/cmine.cc:460
+#: src/mine/cmine.cc:441
 msgid ""
 "Click!  You trigger a rolling boulder trap!  You are hit by a boulder! --"
 "More--"
 msgstr "啪!您觸發了一個滾石陷阱!您被一個大圓石擊中了! --更多--"
 
-#: src/mine/cmine.cc:470
+#: src/mine/cmine.cc:451
 msgid "sleep"
 msgstr "睡"
 
-#: src/mine/cmine.cc:473
+#: src/mine/cmine.cc:454
 msgid "striking"
 msgstr "醒"
 
-#: src/mine/cmine.cc:476
+#: src/mine/cmine.cc:457
 msgid "death"
 msgstr "深度"
 
-#: src/mine/cmine.cc:479
+#: src/mine/cmine.cc:460
 msgid "polymorph"
 msgstr "多形體"
 
-#: src/mine/cmine.cc:482
+#: src/mine/cmine.cc:463
 msgid "magic missile"
 msgstr "神奇飛彈"
 
-#: src/mine/cmine.cc:485
+#: src/mine/cmine.cc:466
 msgid "secret door detection"
 msgstr "偵測秘密門"
 
-#: src/mine/cmine.cc:488
+#: src/mine/cmine.cc:469
 msgid "invisibility"
 msgstr "隱形"
 
-#: src/mine/cmine.cc:491
+#: src/mine/cmine.cc:472
 msgid "cold"
 msgstr "冷"
 
-#: src/mine/cmine.cc:497
+#: src/mine/cmine.cc:478
 #, c-format
 msgid "Your wand of %s breaks apart and explodes!  --More--"
 msgstr "您的魔杖 %s 斷開並爆炸了! --更多--"
 
-#: src/mine/cmine.cc:503
+#: src/mine/cmine.cc:484
 msgid "You are jolted by a surge of electricity!  --More--"
 msgstr "您被一股強電流電擊了!  --更多--"
 
-#: src/mine/cmine.cc:607
+#: src/mine/cmine.cc:588
 msgid "Enter the filename to load: "
 msgstr "請輸入要載入的檔案名:"
 
-#: src/mine/cmine.cc:614
+#: src/mine/cmine.cc:595
 msgid "Enter the filename to save: "
 msgstr "輸入要保存的檔案名:"
 
-#: src/mine/cmine.cc:624
+#: src/mine/cmine.cc:605
 msgid "mine-help.txt"
 msgstr "mine-help.txt"
 
@@ -2324,7 +2329,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:1670
+#: src/pkg_columnizer.cc:84 src/ui.cc:1662
 msgid "Package"
 msgstr "套件"
 
@@ -3323,52 +3328,52 @@
 "您確定您要移除它嗎?\n"
 "如果您確定的話輸入 '%s' 。"
 
-#: src/pkg_item.cc:222 src/pkg_ver_item.cc:625
+#: src/pkg_item.cc:220 src/pkg_ver_item.cc:626
 #, c-format
 msgid "Information about %s"
 msgstr "關於 %s 的訊息"
 
-#: src/pkg_item.cc:224 src/pkg_ver_item.cc:627
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:628
 #, c-format
 msgid "%s info"
 msgstr ""
 
-#: src/pkg_item.cc:310
+#: src/pkg_item.cc:308
 #, fuzzy, c-format
 msgid "Available versions of %s"
 msgstr "可用的版本 "
 
-#: src/pkg_item.cc:313
+#: src/pkg_item.cc:311
 #, fuzzy, c-format
 msgid "%s versions"
 msgstr "版本號"
 
-#: src/pkg_item.cc:325 src/pkg_ver_item.cc:655
+#: src/pkg_item.cc:323 src/pkg_ver_item.cc:656
 #, c-format
 msgid "Dependencies of %s"
 msgstr "%s 的依賴關係"
 
-#: src/pkg_item.cc:327 src/pkg_ver_item.cc:657
+#: src/pkg_item.cc:325 src/pkg_ver_item.cc:658
 #, c-format
 msgid "%s deps"
 msgstr ""
 
-#: src/pkg_item.cc:338 src/pkg_ver_item.cc:667
+#: src/pkg_item.cc:336 src/pkg_ver_item.cc:668
 #, c-format
 msgid "Packages depending on %s"
 msgstr "依賴於 %s 的套件"
 
-#: src/pkg_item.cc:340 src/pkg_ver_item.cc:669
+#: src/pkg_item.cc:338 src/pkg_ver_item.cc:670
 #, c-format
 msgid "%s reverse deps"
 msgstr ""
 
-#: src/pkg_item.cc:392 src/pkg_ver_item.cc:707
+#: src/pkg_item.cc:390 src/pkg_ver_item.cc:708
 #, c-format
 msgid "Reporting a bug in %s:\n"
 msgstr "回報 %s 的臭蟲:\n"
 
-#: src/pkg_item.cc:414
+#: src/pkg_item.cc:412
 #, fuzzy
 msgid ""
 "You are not root and I cannot find any way to become root.  To reconfigure "
@@ -3380,16 +3385,16 @@
 "請安裝 menu 套件,login 套件,\n"
 "或者以 root 身份執行 aptitude 。"
 
-#: src/pkg_item.cc:422
+#: src/pkg_item.cc:420
 #, c-format
 msgid "Reconfiguring %s\n"
 msgstr "重新設定 %s\n"
 
-#: src/pkg_item.cc:447
+#: src/pkg_item.cc:445
 msgid "Hierarchy editor"
 msgstr "層次編輯器"
 
-#: src/pkg_item.cc:447
+#: src/pkg_item.cc:445
 #, fuzzy
 msgid "Hierarchy Editor"
 msgstr "層次編輯器"
@@ -3423,20 +3428,20 @@
 msgid "Enter the new package sorting mechanism for this display: "
 msgstr "為此顯示輸入新的套件排序機制:"
 
-#: src/pkg_view.cc:344
+#: src/pkg_view.cc:359
 msgid "make_package_view: error in arguments -- two main widgets??"
 msgstr "make_package_view: 參數錯誤 -- 兩個主要部件? "
 
-#: src/pkg_view.cc:350
+#: src/pkg_view.cc:365
 msgid ""
 "make_package_view: error in arguments -- bad column list for static item"
 msgstr "make_package_view: 參數錯誤 -- 靜態項目的欄列表錯誤"
 
-#: src/pkg_view.cc:443
+#: src/pkg_view.cc:458
 msgid "make_package_view: bad argument!"
 msgstr "make_package_view: 參數錯誤!"
 
-#: src/pkg_view.cc:495
+#: src/pkg_view.cc:510
 msgid "make_package_view: no main widget found"
 msgstr "make_package_view: 未發現主要部件"
 
@@ -3473,139 +3478,139 @@
 msgid " (provided by %F)"
 msgstr " (由 %F 提供)"
 
-#: src/reason_fragment.cc:278
+#: src/reason_fragment.cc:275
 #, c-format
 msgid "%F%s %F %F"
 msgstr "%F%s %F %F"
 
-#: src/reason_fragment.cc:327
+#: src/reason_fragment.cc:324
 msgid ""
 "If you select a package, an explanation of its current state will appear in "
 "this space."
 msgstr "如果你選擇了一個套件,它的敘述將會顯示在此空白處。"
 
-#: src/reason_fragment.cc:361
+#: src/reason_fragment.cc:358
 msgid ""
 "%B%s%b was installed automatically;  it is being removed because all of the "
 "packages which depend upon it are being removed:"
 msgstr "%B%s%b 已自動安裝; 它將與相依的套件一起被移除: "
 
-#: src/reason_fragment.cc:365
+#: src/reason_fragment.cc:362
 msgid "%B%s%b will be automatically removed because of dependency errors:"
 msgstr "%B%s%b 將會由於相依性錯誤自動移除:"
 
-#: src/reason_fragment.cc:369
+#: src/reason_fragment.cc:366
 msgid ""
 "%B%s%b will be automatically installed to satisfy the following dependencies:"
 msgstr "%B%s%b 將會自動安裝以滿足以下的關聯性:"
 
-#: src/reason_fragment.cc:375 src/reason_fragment.cc:387
+#: src/reason_fragment.cc:372 src/reason_fragment.cc:384
 msgid ""
 "%B%s%b cannot be upgraded now, but if it could be, it would still be held at "
 "version %B%s%b."
 msgstr "%B%s%b 目前將不會升級,但如果可以升級,它依舊會保持在版本 %B%s%b。"
 
-#: src/reason_fragment.cc:378
+#: src/reason_fragment.cc:375
 msgid ""
 "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the "
 "following dependencies:"
 msgstr "%B%s%b 將會升級到 %B%s%b, 以避免破壞以下相依性:"
 
-#: src/reason_fragment.cc:390
+#: src/reason_fragment.cc:387
 msgid "%B%s%b is currently installed."
 msgstr "%B%s%b 已安裝。"
 
-#: src/reason_fragment.cc:396
+#: src/reason_fragment.cc:393
 msgid "%B%s%b is not currently installed."
 msgstr "%B%s%b 尚未安裝。"
 
-#: src/reason_fragment.cc:404
+#: src/reason_fragment.cc:401
 msgid "Some dependencies of %B%s%b are not satisfied:"
 msgstr "%B%s%b 的某些關聯將不會滿足:"
 
-#: src/reason_fragment.cc:408
+#: src/reason_fragment.cc:405
 msgid "%B%s%b will be downgraded."
 msgstr "%B%s%b 將會降級。"
 
-#: src/reason_fragment.cc:415
+#: src/reason_fragment.cc:412
 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b."
 msgstr "%B%s%b 遭禁制,將不會升級到版本 %B%s%b。"
 
-#: src/reason_fragment.cc:419
+#: src/reason_fragment.cc:416
 msgid ""
 "%B%s%b could be upgraded to version %B%s%b, but it is being held at version %"
 "B%s%b."
 msgstr "%B%s%b 可以升級到版本 %B%s%b,但它將會保持為版本 %B%s%b。"
 
-#: src/reason_fragment.cc:426
+#: src/reason_fragment.cc:423
 msgid "%B%s%b will be re-installed."
 msgstr "%B%s%b 將被重新安裝。"
 
-#: src/reason_fragment.cc:430
+#: src/reason_fragment.cc:427
 msgid "%B%s%b will be installed."
 msgstr "%B%s%b 將被安裝。"
 
-#: src/reason_fragment.cc:434
+#: src/reason_fragment.cc:431
 msgid "%B%s%b will be removed."
 msgstr "%B%s%b 將被移除。"
 
-#: src/reason_fragment.cc:439
+#: src/reason_fragment.cc:436
 msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b."
 msgstr "%B%s%b 將從版本 %B%s%b 升級到版本 %B%s%b。"
 
-#: src/reason_fragment.cc:475
+#: src/reason_fragment.cc:472
 msgid ""
 "The following packages depend on %B%s%b and will be broken by its removal:"
 msgstr "以下套件將會由於 %B%s%b 遭到移除而毀斷:"
 
-#: src/reason_fragment.cc:478
+#: src/reason_fragment.cc:475
 msgid "The following packages depend on %B%s%b and are broken:"
 msgstr "以下相依於·%B%s%b 的套件將毀損:"
 
-#: src/reason_fragment.cc:485
+#: src/reason_fragment.cc:482
 msgid ""
 "The following packages conflict with %B%s%b and will be broken by its "
 "installation:"
 msgstr "以下套件與 %B%s%b 衝突 且將在此次安裝中毀斷:"
 
-#: src/reason_fragment.cc:518
+#: src/reason_fragment.cc:515
 msgid ""
 "The following packages depend on a version of %B%s%b other than the "
 "currently installed version of %B%s%b, or conflict with the currently "
 "installed version:"
 msgstr "以下套件相依於 %B%s%b,而非目前安裝版本 %B%s%b,或與目前安裝版本衝突:"
 
-#: src/reason_fragment.cc:522
+#: src/reason_fragment.cc:519
 msgid ""
 "The following packages conflict with %B%s%b, or depend on a version of it "
 "which is not going to be installed."
 msgstr "以下套件與 %B%s%b 衝突,或相依於將不被安裝的版本。"
 
-#: src/reason_fragment.cc:526
+#: src/reason_fragment.cc:523
 msgid "The following packages conflict with %B%s%b:"
 msgstr "以下套件與 %B%s%b 衝突:"
 
-#: src/reason_fragment.cc:531
+#: src/reason_fragment.cc:528
 msgid ""
 "The following packages depend on a version of %B%s%b other than the "
 "currently installed version of %B%s%b:"
 msgstr "以下套件相依於版本 %B%s%b 而非現有安裝的版本 %B%s%b:"
 
-#: src/reason_fragment.cc:535
+#: src/reason_fragment.cc:532
 msgid ""
 "The following packages depend on a version of %B%s%b which is not going to "
 "be installed."
 msgstr "以下相依於版本 %B%s%b 的套件將不會安裝。"
 
-#: src/reason_fragment.cc:541
+#: src/reason_fragment.cc:538
 msgid "upgraded"
 msgstr "已升級"
 
-#: src/reason_fragment.cc:541
+#: src/reason_fragment.cc:538
 msgid "downgraded"
 msgstr "已下載"
 
-#: src/reason_fragment.cc:547
+#: src/reason_fragment.cc:544
 msgid ""
 "The following packages depend on the currently installed version of %B%s%b (%"
 "B%s%b), or conflict with the version it will be %s to (%B%s%b), and will be "
@@ -3614,13 +3619,13 @@
 "以下套件相依於現有安裝版本 %B%s%b (%b%s%b),或與版本 %s (%B%s%b) 衝突,且 若"
 "為 %s 將造成毀斷。"
 
-#: src/reason_fragment.cc:554
+#: src/reason_fragment.cc:551
 msgid ""
 "The following packages conflict with version %B%s%b of %B%s%b, and will be "
 "broken if it is %s."
 msgstr "以下套件與版本 %B%s%b 的 %B%s%b 衝突,使用 %s 將會造成毀斷。"
 
-#: src/reason_fragment.cc:559
+#: src/reason_fragment.cc:556
 msgid ""
 "The following packages depend on version %B%s%b of %B%s%b, and will be "
 "broken if it is %s."
@@ -3665,31 +3670,36 @@
 msgid "Close"
 msgstr "關閉(^C)"
 
-#: src/solution_fragment.cc:125
+#: src/solution_fragment.cc:134
 #, fuzzy
 msgid "%BRemove%b the following packages:%n"
 msgstr "以下的套件狀態為毀斷"
 
-#: src/solution_fragment.cc:135
+#: src/solution_fragment.cc:144
 #, fuzzy
 msgid "%BInstall%b the following packages:%n"
 msgstr "以下的套件狀態為毀斷"
 
-#: src/solution_fragment.cc:148
+#: src/solution_fragment.cc:157
 msgid "%BKeep%b the following packages at their current version:%n"
 msgstr ""
 
-#: src/solution_fragment.cc:161
+#: src/solution_fragment.cc:164
+#, fuzzy
+msgid "Not Installed"
+msgstr "尚未安裝"
+
+#: src/solution_fragment.cc:177
 #, fuzzy
 msgid "%BUpgrade%b the following packages:%n"
 msgstr "以下的套件狀態為毀斷"
 
-#: src/solution_fragment.cc:176
+#: src/solution_fragment.cc:192
 #, fuzzy
 msgid "%BDowngrade%b the following packages:%n"
 msgstr "下載套件中"
 
-#: src/solution_fragment.cc:190
+#: src/solution_fragment.cc:206
 #, c-format
 msgid "Score is %d"
 msgstr ""
@@ -3719,43 +3729,43 @@
 msgid "W:"
 msgstr ""
 
-#: src/ui.cc:194
+#: src/ui.cc:193
 msgid "Search for:"
 msgstr "搜尋:"
 
-#: src/ui.cc:262
+#: src/ui.cc:258
 msgid "You already are root!"
 msgstr "您已經是 root 了!"
 
-#: src/ui.cc:360
+#: src/ui.cc:356
 msgid ""
 "Subprocess exited with an error -- did you type your password correctly?"
 msgstr "子程序返回一個錯誤 -- 您輸入的密碼正確嗎?"
 
-#: src/ui.cc:388
+#: src/ui.cc:384
 msgid "Loading cache"
 msgstr "載入快取"
 
-#: src/ui.cc:410
+#: src/ui.cc:406
 msgid "Really quit Aptitude?"
 msgstr "真的要退出 Aptitude 嗎?"
 
-#: src/ui.cc:489
+#: src/ui.cc:485
 msgid "Really discard your personal settings and reload the defaults?"
 msgstr "真的要放棄您的個人設置並載入預設值嗎?"
 
-#: src/ui.cc:589 src/ui.cc:591 src/ui.cc:619 src/ui.cc:621
+#: src/ui.cc:585 src/ui.cc:587 src/ui.cc:615 src/ui.cc:617
 msgid "Packages"
 msgstr "套件"
 
-#: src/ui.cc:590 src/ui.cc:620
+#: src/ui.cc:586 src/ui.cc:616
 msgid "View available packages and choose actions to perform"
 msgstr "查看可選套件以及選擇要執行的動作"
 
-#: src/ui.cc:667
+#: src/ui.cc:663
 #, fuzzy
 msgid ""
-"%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
+"Aptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
 "BABSOLUTELY NO WARRANTY%b; for details see 'license' in the Help menu.  This "
 "is free software, and you are welcome to redistribute it under certain "
 "conditions; see 'license' for details."
@@ -3767,63 +3777,67 @@
 "Aptitude 無任何擔保;細節請查閱求助選單的許可證。\n"
 "此軟體是自由軟體,歡迎您遵照特定條款散佈此軟體;細節請查閱許可證。"
 
-#: src/ui.cc:688
+#: src/ui.cc:684
 msgid "help.txt"
 msgstr "help.txt"
 
-#: src/ui.cc:704
+#: src/ui.cc:700
 msgid "README"
 msgstr "README"
 
-#: src/ui.cc:786
-#, fuzzy
+#: src/ui.cc:782
 msgid ""
-"%C%BWARNING%b: untrusted versions of the following packages will be "
-"installed!%n%nUntrusted packages could %Bcompromise your system's security%"
-"b.  You should only proceed with the installation if you are certain that "
-"this is what you want to do.%n%n"
+"%BWARNING%b: untrusted versions of the following packages will be installed!%"
+"n%nUntrusted packages could %Bcompromise your system's security%b.  You "
+"should only proceed with the installation if you are certain that this is "
+"what you want to do.%n%n"
 msgstr ""
 "%B[警告]%b:將會安裝以下版本未受信賴的套件!%n%n未受信賴的套件有可能會%B危害"
 "到您系統的安全%b。 只有在您確定您真的要這麼做時,您才可以進行安裝作業。%n%n"
 
-#: src/ui.cc:800
+#: src/ui.cc:788
+#, fuzzy
+msgid "  %S*%N %s [version %s]%n"
+msgstr "版本號"
+
+#: src/ui.cc:795
 msgid "Really Continue"
 msgstr "繼續進行"
 
-#: src/ui.cc:802
+#: src/ui.cc:797
 msgid "Abort Installation"
 msgstr "放棄安裝"
 
-#: src/ui.cc:863
+#: src/ui.cc:858
 msgid "Preview of package installation"
 msgstr "預覽套件安裝"
 
-#: src/ui.cc:864
+#: src/ui.cc:859
 msgid "View and/or adjust the actions that will be performed"
 msgstr "檢視與/或調整即將執行的指令"
 
-#: src/ui.cc:865
+#: src/ui.cc:860
 #, fuzzy
 msgid "Preview"
 msgstr "上一個(^P)"
 
-#: src/ui.cc:901
+#: src/ui.cc:896
 #, fuzzy
 msgid "Some packages were broken and have been fixed:"
 msgstr "某些毀斷的套件已經被修補!"
 
-#: src/ui.cc:907
+#: src/ui.cc:902
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:913
-#, c-format
+#: src/ui.cc:908
+#, fuzzy, c-format
 msgid ""
-"Ran out of time while trying to resolver dependencies (press \"%s\" to try "
+"Ran out of time while trying to resolve dependencies (press \"%s\" to try "
 "harder)"
-msgstr ""
+msgstr "玩玩踩地雷來消磨時間"
 
-#: src/ui.cc:959
+#: src/ui.cc:954
 #, fuzzy
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
@@ -3832,23 +3846,23 @@
 "安裝/刪除套件需要管理員權限,而您現在\n"
 "沒有這種權限。您想要進入 root 帳號嗎?\n"
 
-#: src/ui.cc:962 src/ui.cc:1078
+#: src/ui.cc:957 src/ui.cc:1072
 msgid "Become root"
 msgstr "變成 root(^B)"
 
-#: src/ui.cc:964 src/ui.cc:1080
+#: src/ui.cc:959 src/ui.cc:1074
 msgid "Don't become root"
 msgstr "不變成 root"
 
-#: src/ui.cc:969 src/ui.cc:1085
+#: src/ui.cc:964 src/ui.cc:1079
 msgid "A package-list update or install run is already taking place."
 msgstr "已經開始了一個套件列表更新或者安裝的動作。"
 
-#: src/ui.cc:996
+#: src/ui.cc:991
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "沒有套件被預定安裝、升級或移除。"
 
-#: src/ui.cc:1002
+#: src/ui.cc:997
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -3860,7 +3874,7 @@
 "某些套件可以被升級,但是您並沒有選擇升級它們。\n"
 "輸入 \"U\" 來準備升級。"
 
-#: src/ui.cc:1074
+#: src/ui.cc:1069
 #, fuzzy
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
@@ -3869,112 +3883,112 @@
 "更新套件列表需要管理員權限,而您現在\n"
 "沒有這種權限。您想要進入 root 帳號嗎?\n"
 
-#: src/ui.cc:1090 src/ui.cc:1377
+#: src/ui.cc:1084 src/ui.cc:1371
 msgid "Waste time trying to find mines"
 msgstr "玩玩踩地雷來消磨時間"
 
-#: src/ui.cc:1097 src/ui.cc:1150
+#: src/ui.cc:1091 src/ui.cc:1144
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "在下載進行過程中不允許執行清除"
 
-#: src/ui.cc:1100
+#: src/ui.cc:1094
 msgid "Deleting downloaded files"
 msgstr "刪除下載的檔案"
 
-#: src/ui.cc:1114
+#: src/ui.cc:1108
 msgid "Downloaded package files have been deleted"
 msgstr "下載的檔案已經被刪除"
 
-#: src/ui.cc:1175
+#: src/ui.cc:1169
 #, fuzzy, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr "過期的下載檔案已經被刪除"
 
-#: src/ui.cc:1247
+#: src/ui.cc:1241
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1252 src/ui.cc:1283
+#: src/ui.cc:1246 src/ui.cc:1277
 #, fuzzy
 msgid "Ran out of time while trying to find a solution."
 msgstr "玩玩踩地雷來消磨時間"
 
-#: src/ui.cc:1277
+#: src/ui.cc:1271
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1307
+#: src/ui.cc:1301
 #, fuzzy, c-format
 msgid "Unable to open %s"
 msgstr "無法打開 %s 以寫入"
 
-#: src/ui.cc:1313
+#: src/ui.cc:1307
 msgid "Error while dumping resolver state"
 msgstr ""
 
-#: src/ui.cc:1323
+#: src/ui.cc:1317
 msgid "File to which the resolver state should be dumped:"
 msgstr ""
 
-#: src/ui.cc:1353
+#: src/ui.cc:1347
 msgid "^Install/remove packages"
 msgstr "安裝/移除套件(^I)"
 
-#: src/ui.cc:1354
+#: src/ui.cc:1348
 msgid "Perform all pending installs and removals"
 msgstr "執行所有等待執行的安裝和移除作業"
 
-#: src/ui.cc:1356
+#: src/ui.cc:1350
 msgid "^Update package list"
 msgstr "更新套件列表(^U)"
 
-#: src/ui.cc:1357
+#: src/ui.cc:1351
 msgid "Check for new versions of packages"
 msgstr "正在檢查新版本的套件"
 
-#: src/ui.cc:1360
+#: src/ui.cc:1354
 msgid "^Forget new packages"
 msgstr "忽略新套件(^F)"
 
-#: src/ui.cc:1361
+#: src/ui.cc:1355
 msgid "Forget which packages are \"new\""
 msgstr "忽略哪些套件是 '新' 的"
 
-#: src/ui.cc:1364
+#: src/ui.cc:1358
 msgid "^Clean package cache"
 msgstr "清除套件快取(^C)"
 
-#: src/ui.cc:1365
+#: src/ui.cc:1359
 msgid "Delete package files which were previously downloaded"
 msgstr "刪除以前下載的套件檔案"
 
-#: src/ui.cc:1368
+#: src/ui.cc:1362
 msgid "Clean ^obsolete files"
 msgstr "關閉過期檔案(^O)"
 
-#: src/ui.cc:1369
+#: src/ui.cc:1363
 msgid "Delete package files which can no longer be downloaded"
 msgstr "刪除無法再下載的套件檔案"
 
-#: src/ui.cc:1372
+#: src/ui.cc:1366
 msgid "Mark ^Upgradable"
 msgstr "標記為可升級(^U)"
 
-#: src/ui.cc:1373
+#: src/ui.cc:1367
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr "為所有未被保持現狀的套件加上升級標記"
 
-#: src/ui.cc:1376
+#: src/ui.cc:1370
 msgid "^Play Minesweeper"
 msgstr "玩掃雷遊戲(^P)"
 
-#: src/ui.cc:1379
+#: src/ui.cc:1373
 msgid "^Become root"
 msgstr "變成 root(^B)"
 
-#: src/ui.cc:1380
+#: src/ui.cc:1374
 #, fuzzy
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
@@ -3983,78 +3997,78 @@
 "執行 'su' 成為 root。這將重新啟動程式,但是您的\n"
 "設置將會被保存下來。"
 
-#: src/ui.cc:1383
+#: src/ui.cc:1377
 msgid "^Reload package cache"
 msgstr "重新載入套件快取(^R)"
 
-#: src/ui.cc:1384
+#: src/ui.cc:1378
 msgid "Reload the package cache"
 msgstr "重新載入套件快取"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1384
 msgid "^Quit"
 msgstr "退出(^Q)"
 
-#: src/ui.cc:1391
+#: src/ui.cc:1385
 msgid "Exit the program"
 msgstr "退出此程序"
 
-#: src/ui.cc:1397 src/ui.cc:1669
+#: src/ui.cc:1391 src/ui.cc:1661
 msgid "Undo"
 msgstr "復原"
 
-#: src/ui.cc:1398
+#: src/ui.cc:1392
 msgid "Undo the last package operation or group of operations"
 msgstr "復原最近一次或者一組操作"
 
-#: src/ui.cc:1405
+#: src/ui.cc:1399
 msgid "^Install"
 msgstr "安裝(^I)"
 
-#: src/ui.cc:1406
+#: src/ui.cc:1400
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "標示安裝或升級現選的套件"
 
-#: src/ui.cc:1409
+#: src/ui.cc:1403
 msgid "^Remove"
 msgstr "移除(^R)"
 
-#: src/ui.cc:1410
+#: src/ui.cc:1404
 msgid "Flag the currently selected package for removal"
 msgstr "標示移除現選的套件"
 
-#: src/ui.cc:1413
+#: src/ui.cc:1407
 msgid "^Purge"
 msgstr "清除(^P)"
 
-#: src/ui.cc:1414
+#: src/ui.cc:1408
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr "標示移除現選的套件與其設定檔"
 
-#: src/ui.cc:1417
+#: src/ui.cc:1411
 msgid "^Keep"
 msgstr "保留(^K)"
 
-#: src/ui.cc:1418
+#: src/ui.cc:1412
 msgid "Cancel any action on the selected package"
 msgstr "取消選擇的套件上的任何動作"
 
-#: src/ui.cc:1421
+#: src/ui.cc:1415
 msgid "^Hold"
 msgstr "保留(^H)"
 
-#: src/ui.cc:1422
+#: src/ui.cc:1416
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
 msgstr "取消在選擇套件的任何指令,並保證未來也不升級"
 
-#: src/ui.cc:1425
+#: src/ui.cc:1419
 msgid "Mark ^Auto"
 msgstr "標示為自動(^A)"
 
-#: src/ui.cc:1426
+#: src/ui.cc:1420
 #, fuzzy
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
@@ -4063,11 +4077,11 @@
 "標示自動安裝選擇的套件;\n"
 "如果沒有其他套件相依於上,它將會被自動移除"
 
-#: src/ui.cc:1429
+#: src/ui.cc:1423
 msgid "Mark ^Manual"
 msgstr "標示為手動處理(^M)"
 
-#: src/ui.cc:1430
+#: src/ui.cc:1424
 #, fuzzy
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
@@ -4076,11 +4090,11 @@
 "標示手動安裝選擇的套件;\n"
 "除非您手動移除,否則它將不會被移除"
 
-#: src/ui.cc:1433
+#: src/ui.cc:1427
 msgid "^Forbid Version"
 msgstr "禁制版本(^F)"
 
-#: src/ui.cc:1434
+#: src/ui.cc:1428
 #, fuzzy
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
@@ -4089,231 +4103,231 @@
 "禁制安裝選擇套件的候選版本;\n"
 "新版本的套件將會像往常一樣被安裝"
 
-#: src/ui.cc:1438
+#: src/ui.cc:1432
 msgid "I^nformation"
 msgstr "資訊(^n)"
 
-#: src/ui.cc:1439
+#: src/ui.cc:1433
 msgid "Display more information about the selected package"
 msgstr "顯示選擇的套件之細節資訊"
 
-#: src/ui.cc:1442
+#: src/ui.cc:1436
 msgid "^Changelog"
 msgstr "變更紀錄(^C)"
 
-#: src/ui.cc:1443
+#: src/ui.cc:1437
 msgid "Display the Debian changelog of the selected package"
 msgstr "顯示選擇套件的 Debian 更改紀錄"
 
-#: src/ui.cc:1450
+#: src/ui.cc:1444
 msgid "^Find"
 msgstr "尋找(^F)"
 
-#: src/ui.cc:1451
+#: src/ui.cc:1445
 msgid "Search for a package"
 msgstr "搜尋套件"
 
-#: src/ui.cc:1454
+#: src/ui.cc:1448
 msgid "Find ^Again"
 msgstr "重新尋找(^A)"
 
-#: src/ui.cc:1455
+#: src/ui.cc:1449
 msgid "Repeat the last search"
 msgstr "重複最後尋找"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1453
 msgid "^Limit Display"
 msgstr "限制顯示(^L)"
 
-#: src/ui.cc:1460
+#: src/ui.cc:1454
 msgid "Apply a filter to the package list"
 msgstr "套用套件列表篩選"
 
-#: src/ui.cc:1463
+#: src/ui.cc:1457
 msgid "^Un-Limit Display"
 msgstr "無限制顯示(^U)"
 
-#: src/ui.cc:1464
+#: src/ui.cc:1458
 msgid "Remove the filter from the package list"
 msgstr "移除套件列表的篩選"
 
-#: src/ui.cc:1468
+#: src/ui.cc:1462
 msgid "Find ^Broken"
 msgstr "搜尋損壞套件(^B)"
 
-#: src/ui.cc:1469
+#: src/ui.cc:1463
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "尋找下個未滿足相依性的套件"
 
-#: src/ui.cc:1476
+#: src/ui.cc:1470
 msgid "^UI options"
 msgstr "用戶界面選項(^U)"
 
-#: src/ui.cc:1477
+#: src/ui.cc:1471
 msgid "Change the settings which affect the user interface"
 msgstr "修改影響用戶界面的設置"
 
-#: src/ui.cc:1480
+#: src/ui.cc:1474
 msgid "^Dependency handling"
 msgstr "處理依賴關係(^D)"
 
-#: src/ui.cc:1481
+#: src/ui.cc:1475
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr "改變影響處理依賴關係的設置"
 
-#: src/ui.cc:1484
+#: src/ui.cc:1478
 msgid "^Miscellaneous"
 msgstr "雜項(^M)"
 
-#: src/ui.cc:1485
+#: src/ui.cc:1479
 msgid "Change miscellaneous program settings"
 msgstr "改變程序的雜項設置"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1484
 msgid "^Revert options"
 msgstr "還原選項(^R)"
 
-#: src/ui.cc:1491
+#: src/ui.cc:1485
 msgid "Reset all settings to the system defaults"
 msgstr "把所有項目重設為它們的預設值"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1496
 msgid "^Next"
 msgstr "下一個(^N)"
 
-#: src/ui.cc:1503
+#: src/ui.cc:1497
 msgid "View next display"
 msgstr "查看下一個畫面"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1500
 msgid "^Prev"
 msgstr "上一個(^P)"
 
-#: src/ui.cc:1507
+#: src/ui.cc:1501
 msgid "View previous display"
 msgstr "查看上一畫面"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1504
 msgid "^Close"
 msgstr "關閉(^C)"
 
-#: src/ui.cc:1511
+#: src/ui.cc:1505
 msgid "Close this display"
 msgstr "關閉此畫面"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1510
 msgid "New Package ^View"
 msgstr "新套件視野(^V)"
 
-#: src/ui.cc:1517
+#: src/ui.cc:1511
 msgid "Create a new default package view"
 msgstr "建立新的預設套件視野"
 
-#: src/ui.cc:1520
+#: src/ui.cc:1514
 msgid "New Categorical ^Browser"
 msgstr "新分類瀏覽器(^B)"
 
-#: src/ui.cc:1522
+#: src/ui.cc:1516
 msgid "Browse packages by category"
 msgstr "分類瀏覽套件"
 
-#: src/ui.cc:1530
+#: src/ui.cc:1524
 msgid "^About"
 msgstr "關於(^A)"
 
-#: src/ui.cc:1531
+#: src/ui.cc:1525
 msgid "View information about this program"
 msgstr "查看關於此程式的資訊"
 
-#: src/ui.cc:1534
+#: src/ui.cc:1528
 msgid "^Help"
 msgstr "求助(^H)"
 
-#: src/ui.cc:1535
+#: src/ui.cc:1529
 msgid "View the on-line help"
 msgstr "查看線上求助"
 
-#: src/ui.cc:1537
+#: src/ui.cc:1531
 msgid "User's ^Manual"
 msgstr "用戶手冊(^M)"
 
-#: src/ui.cc:1538
+#: src/ui.cc:1532
 msgid "View the detailed program manual"
 msgstr "瀏覽詳細的使用手冊"
 
-#: src/ui.cc:1541
+#: src/ui.cc:1535
 msgid "^FAQ"
 msgstr "常見問題(^F)"
 
-#: src/ui.cc:1542
+#: src/ui.cc:1536
 msgid "View a list of frequently asked questions"
 msgstr "瀏覽常見問題列表"
 
-#: src/ui.cc:1545
+#: src/ui.cc:1539
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1546
+#: src/ui.cc:1540
 #, fuzzy
 msgid "View the important changes made in each version of "
 msgstr "查看此程式每一版本中所做的重大修改"
 
-#: src/ui.cc:1549
+#: src/ui.cc:1543
 msgid "^License"
 msgstr "許可證(^L)"
 
-#: src/ui.cc:1550
+#: src/ui.cc:1544
 msgid "View the terms under which you may copy the program"
 msgstr "查看您可以在何種條款下重製該程式"
 
-#: src/ui.cc:1668
+#: src/ui.cc:1660
 msgid "Actions"
 msgstr "動作"
 
-#: src/ui.cc:1671
+#: src/ui.cc:1663
 msgid "Search"
 msgstr "搜尋"
 
-#: src/ui.cc:1672
+#: src/ui.cc:1664
 msgid "Options"
 msgstr "選項"
 
-#: src/ui.cc:1673
+#: src/ui.cc:1665
 msgid "Views"
 msgstr "查看"
 
-#: src/ui.cc:1674
+#: src/ui.cc:1666
 msgid "Help"
 msgstr "求助"
 
-#: src/ui.cc:1734
+#: src/ui.cc:1726
 #, 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:2003 src/vscreen/vscreen.cc:281
+#: src/ui.cc:1996 src/vscreen/vscreen.cc:281
 msgid "yes_key"
 msgstr "確定鍵"
 
-#: src/ui.cc:2004 src/vscreen/vscreen.cc:282
+#: src/ui.cc:1997 src/vscreen/vscreen.cc:282
 msgid "no_key"
 msgstr "否定鍵"
 
-#: src/view_changelog.cc:46
+#: src/view_changelog.cc:61
 msgid "You can only view changelogs of official Debian packages."
 msgstr "您只能閱讀官方 Debian 套件的更改紀錄。"
 
-#: src/view_changelog.cc:52
+#: src/view_changelog.cc:67
 msgid "Downloading Changelog"
 msgstr "正在下載更改紀錄"
 
-#: src/view_changelog.cc:54
+#: src/view_changelog.cc:69
 #, fuzzy
 msgid "Download Changelog"
 msgstr "正在下載更改紀錄"
 
-#: src/view_changelog.cc:63
+#: src/view_changelog.cc:78
 #, c-format
 msgid "%s changes"
 msgstr ""
@@ -4406,18 +4420,195 @@
 #~ "請將以下磁碟插入磁碟器“%s”:\n"
 #~ "%s"
 
+#~ msgid "Need exactly two colors in color definition \"%s\""
+#~ msgstr "顏色定義“%s”需要正好兩種顏色"
+
+#~ msgid "Can't parse foreground \"%s\"of color \"%s\""
+#~ msgstr "無法解析前景 \"%s\" 色 \"%s\""
+
+#~ msgid "Can't parse background \"%s\" of color \"%s\""
+#~ msgstr "無法解析背景 \"%s\" 色 \"%s\""
+
 #~ msgid "Invalid option for interactive mode: -s\n"
 #~ msgstr "交互模式的無效選項:-s\n"
 
+#~ 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."
+#~ msgstr ""
+#~ "用於傳真數據機和其它通訊設備的程式\n"
+#~ " “通訊”分類的套件用於控制數據機和其它硬體通訊設備。包括控制傳真數據機的軟 "
+#~ "體(例如,用於撥號網路連接的 PPP)以及原本為該用途所編寫的程式(zmodem/"
+#~ "kermit), 還有用於控制蜂窩式移動電話、與 FidoNet 介面、以及執行 BBS 的軟體"
+
+#~ 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"
+#~ " .\n"
+#~ " For more information about what Debian considers to be Free Software, "
+#~ "see http://www.debian.org/social_contract#guidelines"
+#~ msgstr ""
+#~ "非自由軟體的程式\n"
+#~ "  'non-free' 分類的套件不是 Debian 的組成部分。\n"
+#~ " .\n"
+#~ " 這些套件不符合 Debian 自由軟體標準(見下)的一項或者多項要求。 您應該閱讀該"
+#~ "部分程式的許可證以確認您能夠以您自己希望的方式使用這些程序。\n"
+#~ " .\n"
+#~ " 關於 Debian 認為什麼樣的軟體是自由軟體的更多訊息,請參見 http://www."
+#~ "debian.org/social_contract#guidelines"
+
+#~ 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)"
+#~ msgstr ""
+#~ "新套件\n"
+#~ " 這些套件在您上次清空 '新' 套件列表之後添加到 Debian 中。(從動作選單中選"
+#~ "擇 '忽略新套件' 項以清空此列表) "
+
+#~ msgid ""
+#~ "%s is an essential package!\n"
+#~ "\n"
+#~ "Are you sure you want to remove it?\n"
+#~ "Type '%s' if you are."
+#~ msgstr ""
+#~ "%s 是一個基礎套件!\n"
+#~ "\n"
+#~ "您確定您要移除它嗎?\n"
+#~ "如果您確定的話輸入 '%s' 。"
+
+#~ msgid "Available versions of "
+#~ msgstr "可用的版本 "
+
+#~ 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."
+#~ msgstr ""
+#~ "您不是 root,而且我沒有發現任何方法\n"
+#~ "來變成 root。要重新配置這個套件,\n"
+#~ "請安裝 menu 套件,login 套件,\n"
+#~ "或者以 root 身份執行 aptitude 。"
+
 #~ msgid "Information about "
 #~ msgstr "訊息關於"
 
+#~ msgid ""
+#~ "Aptitude %s\n"
+#~ "\n"
+#~ "Copyright 2000 Daniel Burrows.\n"
+#~ "\n"
+#~ "aptitude comes with ABSOLUTELY NO WARRANTY; for details see 'license' in "
+#~ "the\n"
+#~ "Help menu.  This is free software, and you are welcome to redistribute "
+#~ "it\n"
+#~ "under certain conditions; see 'license' for details."
+#~ msgstr ""
+#~ "Aptitude %s\n"
+#~ "\n"
+#~ "版權所有 2000 Daniel Burrows.\n"
+#~ "\n"
+#~ "Aptitude 無任何擔保;細節請查閱求助選單的許可證。\n"
+#~ "此軟體是自由軟體,歡迎您遵照特定條款散佈此軟體;細節請查閱許可證。"
+
+#~ msgid "Some packages were broken and have been fixed"
+#~ msgstr "某些毀斷的套件已經被修補!"
+
 #~ msgid "Some broken packages could not be fixed!"
 #~ msgstr "某些毀斷的套件無法修補!"
 
+#~ msgid "Some packages are broken.  Try to fix them?"
+#~ msgstr "某些套件已毀斷。試圖修補它們嗎?"
+
+#~ msgid ""
+#~ "Installing/removing packages requires administrative privileges, which\n"
+#~ "you currently do not have.  Would you like to change to the root "
+#~ "account?\n"
+#~ msgstr ""
+#~ "安裝/刪除套件需要管理員權限,而您現在\n"
+#~ "沒有這種權限。您想要進入 root 帳號嗎?\n"
+
+#~ msgid ""
+#~ "No packages will be installed, removed or upgraded.\n"
+#~ "\n"
+#~ "Some packages could be upgraded, but you have not chosen to upgrade "
+#~ "them.\n"
+#~ "Type \"U\" to prepare an upgrade."
+#~ msgstr ""
+#~ "沒有套件將被安裝、移除或升級。\n"
+#~ "\n"
+#~ "某些套件可以被升級,但是您並沒有選擇升級它們。\n"
+#~ "輸入 \"U\" 來準備升級。"
+
+#~ 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"
+#~ msgstr ""
+#~ "更新套件列表需要管理員權限,而您現在\n"
+#~ "沒有這種權限。您想要進入 root 帳號嗎?\n"
+
+#~ msgid "Obsolete downloaded package files have been deleted"
+#~ msgstr "過期的下載檔案已經被刪除"
+
+#~ msgid ""
+#~ "Run 'su' to become root; this will restart the program, but your\n"
+#~ "settings will be preserved"
+#~ msgstr ""
+#~ "執行 'su' 成為 root。這將重新啟動程式,但是您的\n"
+#~ "設置將會被保存下來。"
+
+#~ msgid ""
+#~ "Mark the selected package as having been automatically installed;\n"
+#~ "it will automatically be removed if no other packages depend on it"
+#~ msgstr ""
+#~ "標示自動安裝選擇的套件;\n"
+#~ "如果沒有其他套件相依於上,它將會被自動移除"
+
+#~ msgid ""
+#~ "Mark the selected package as having been manually installed;\n"
+#~ "it will not be removed unless you manually remove it"
+#~ msgstr ""
+#~ "標示手動安裝選擇的套件;\n"
+#~ "除非您手動移除,否則它將不會被移除"
+
+#~ msgid ""
+#~ "Forbid the candidate version of the selected package from being "
+#~ "installed;\n"
+#~ "newer versions of the package will be installed as usual"
+#~ msgstr ""
+#~ "禁制安裝選擇套件的候選版本;\n"
+#~ "新版本的套件將會像往常一樣被安裝"
+
 #~ msgid "^ChangeLog"
 #~ msgstr "變更紀錄(^C)"
 
+#~ msgid "View the important changes made in each version of the program"
+#~ msgstr "查看此程式每一版本中所做的重大修改"
+
+#, fuzzy
+#~ msgid ""
+#~ "%C%BWARNING%b: untrusted versions of the following packages will be "
+#~ "installed!%n%nUntrusted packages could %Bcompromise your system's security"
+#~ "%b.  You should only proceed with the installation if you are certain "
+#~ "that this is what you want to do.%n%n"
+#~ msgstr ""
+#~ "%B[警告]%b:將會安裝以下版本未受信賴的套件!%n%n未受信賴的套件有可能會%B危"
+#~ "害到您系統的安全%b。 只有在您確定您真的要這麼做時,您才可以進行安裝作業。%"
+#~ "n%n"
+
 #~ msgid "Go away, I'm trying to think.\n"
 #~ msgstr "走開啦,我正試著專心。\n"
 



More information about the Aptitude-svn-commit mailing list